liuzhihui лет назад: 2
Родитель
Сommit
3d2970d77d

+ 2 - 1
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

12
                 <span v-if="orderDetailData.StateName" class="wostate">{{
12
                 <span v-if="orderDetailData.StateName" class="wostate">{{
13
                   orderDetailData.StateName
13
                   orderDetailData.StateName
14
                 }}</span>
14
                 }}</span>
15
-                <span v-if="orderDetailData.F_UrgeCount > 0" class="wostate">催{{ orderDetailData.F_UrgeCount }}</span>
15
+                <span v-if="orderDetailData.F_UrgeCount > 0" class="wostate">催办{{ orderDetailData.F_UrgeCount }}</span>
16
+                <span class="wostate" v-if="orderDetailData.GapTime && orderDetailData.GapTime.indexOf('超时')>=0" style="color: #880000;border: 1px solid #880000; ">超期</span>
16
               </h1>
17
               </h1>
17
             </el-col>
18
             </el-col>
18
           </el-col>
19
           </el-col>

+ 2 - 1
CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

187
       updatePass(){
187
       updatePass(){
188
         const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,20}$/;
188
         const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,20}$/;
189
         const pass = window.localStorage.getItem('loginpass');
189
         const pass = window.localStorage.getItem('loginpass');
190
-        if (!reg.test(pass)) {
190
+        const loginway = window.localStorage.getItem('loginway');
191
+        if (loginway =='pc' && !reg.test(pass)) {
191
           this.$alert('您的密码不符合规范,请更新密码!', '提示', {
192
           this.$alert('您的密码不符合规范,请更新密码!', '提示', {
192
             showClose: false,
193
             showClose: false,
193
             confirmButtonText: '确定',
194
             confirmButtonText: '确定',

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

53
           <el-tag v-if="scope.row.F_UrgeCount > 0" style="color: #60c136;border: 1px solid #60c136;background: none;">催办{{ scope.row.F_UrgeCount }}</el-tag>
53
           <el-tag v-if="scope.row.F_UrgeCount > 0" style="color: #60c136;border: 1px solid #60c136;background: none;">催办{{ scope.row.F_UrgeCount }}</el-tag>
54
           <el-tag v-if="scope.row.F_IsBack == 1" style="color: #3478f6;border: 1px solid #3478f6;background: none;">退单</el-tag>
54
           <el-tag v-if="scope.row.F_IsBack == 1" style="color: #3478f6;border: 1px solid #3478f6;background: none;">退单</el-tag>
55
           <el-tag v-if="scope.row.F_ReplayCount > 0" style="color: #ddb642;border: 1px solid #ddb642;background: none;">延期{{ scope.row.F_ReplayCount }}</el-tag>
55
           <el-tag v-if="scope.row.F_ReplayCount > 0" style="color: #ddb642;border: 1px solid #ddb642;background: none;">延期{{ scope.row.F_ReplayCount }}</el-tag>
56
-          <el-tag v-if="scope.row.ishangup == '是'" style="color: #4fa0f4;border: 1px solid #4fa0f4;background: none;">挂起</el-tag>
56
+          <el-tag v-if="scope.row.F_IsStop == 1" style="color: #4fa0f4;border: 1px solid #4fa0f4;background: none;">挂起</el-tag>
57
           <el-tag v-if="scope.row.GapTime && scope.row.GapTime.indexOf('超时')>=0"  style="color: #880000;border: 1px solid #a80000;background: none;">超期</el-tag>
57
           <el-tag v-if="scope.row.GapTime && scope.row.GapTime.indexOf('超时')>=0"  style="color: #880000;border: 1px solid #a80000;background: none;">超期</el-tag>
58
         </template>
58
         </template>
59
       </el-table-column>
59
       </el-table-column>