tag

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

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

CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

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

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

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