Forráskód Böngészése

报故修改。错误提示字体修改。用户下拉数据展示nickname。

jxq 1 hete
szülő
commit
f3ec7e56e3

+ 4 - 0
src/styles/index.scss

@@ -11,6 +11,10 @@
   font-size: $f24 !important;
 }
 
+.el-message__content {
+  font-size: 24px !important;;
+}
+
 .el-button-update {
   height: 80px !important;
   border-radius: 16px !important;

+ 1 - 1
src/views/pro-operation/appoint-out/applyFor.vue

@@ -87,7 +87,7 @@
             <el-option
               v-for="item in dictStroe.allUsers"
               :key="item.id"
-              :label="item.userName"
+              :label="item.nickName"
               :value="item.userName"
             />
           </el-select>

+ 2 - 1
src/views/pro-operation/report-break/index.vue

@@ -151,7 +151,7 @@
                     <el-option
                       v-for="item in dictStroe.allUsers"
                       :key="item.id"
-                      :label="item.userName"
+                      :label="item.nickName"
                       :value="item.userName"
                     />
                   </el-select>
@@ -255,6 +255,7 @@ const openReportBreakDrawer = () => {
   formLabelAlign.firstInspection = 0;
   formLabelAlign.personResponsible = "";
   formLabelAlign.remark = "";
+  formLabelAlign.seqNoList = [];
 
   getProcessInfo(processStore.scanInfo.id).then((res) => {
     processStore.scanInfo.currentState = res.data.currentState;

+ 4 - 4
src/views/pro-operation/report-work/index.vue

@@ -55,7 +55,7 @@
                     <el-option
                       v-for="item in dictStroe.allUsers"
                       :key="item.id"
-                      :label="item.userName"
+                      :label="item.nickName"
                       :value="item.userName"
                     />
                   </el-select>
@@ -105,7 +105,7 @@
         style="display: flex; margin-bottom: 10px"
         v-if="processStore.scanInfo.outTime == true"
       >
-        <div style="margin-top:3px;font-size:18px;">超期原因: &nbsp;</div>
+        <div style="margin-top: 3px; font-size: 18px">超期原因: &nbsp;</div>
 
         <el-select
           v-model="outTimeReason"
@@ -196,8 +196,8 @@ const confirmClick = () => {
   persons.value.forEach((item) => {
     total += item.workingHoursRate ?? 0;
   });
-  if (total > 100) {
-    ElMessage.error("总占比不能超过100%");
+  if (total != 100) {
+    ElMessage.error("报工总和必须是100%");
     return;
   }