Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/styles/transition/common.scss

@@ -65,6 +65,11 @@
   justify-content: flex-end !important;
 
 }
+table th .is-required::before{
+  content: "*";
+  color: red;
+  margin-right: 4px;
+}
 .form_item_label {
   .el-form-item__label {
     line-height: 21px !important;
@@ -74,15 +79,26 @@
 .el-form-box {
   .el-row {
     .el-form-item {
-      margin-bottom: 17px;
+      margin-bottom: 4px;
 
       .el-form-item__error {
         font-size: 11px;
       }
+
+      .el-col {
+        .el-form-item {
+          margin-bottom: 4px;
+
+          .el-form-item__error {
+            font-size: 11px;
+          }
+        }
+      }
     }
+
     .el-col {
       .el-form-item {
-        margin-bottom: 17px;
+        margin-bottom: 4px;
 
         .el-form-item__error {
           font-size: 11px;
@@ -92,9 +108,63 @@
   }
 
   .el-form-item {
-    margin-bottom: 17px;
+    margin-bottom: 4px;
+
     .el-form-item__error {
       font-size: 11px;
     }
   }
+
+  .el-table {
+    .el-form-item {
+      margin-bottom: 0 !important;
+
+      .el-form-item__error {
+        font-size: 11px;
+      }
+    }
+
+    .el-table__row {
+      .el-table__cell {
+        padding: 0 0 !important;
+        .el-input-group__append{
+          border: none;
+          background: none
+        }
+        .el-textarea__inner,  input {
+          border: none;
+          text-align: center;
+          vertical-align: middle;
+        }
+
+        input::placeholder {
+          text-align: center;
+          vertical-align: middle;
+        }
+        textarea::placeholder {
+          text-align: center;
+          vertical-align: middle;
+        }
+        .is-error{
+          .el-input{
+            border: 1px solid #ff4d4f !important;
+
+            border-collapse: collapse !important;
+          }
+
+        }
+        .cell {
+          padding: 0 !important;
+        }
+      }
+    }
+
+  }
+  .el-form-item {
+    margin-bottom: 4px !important
+  }
+
+  .el-form-item__error {
+    display: none !important;
+  }
 }

src/views/documentManagement/certificateManagement/components/add-dialog.vue

@@ -76,12 +76,12 @@
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 24 } : { span: 24 }">
-          <el-form-item prop="imageObj" label="证照图片">
+          <el-form-item prop="fileObj" label="证照图片">
             <fileUpload
-              v-model="form.imageObj"
+              v-model="form.fileObj"
               module="main"
               :showLib="true"
-              :limit="1"
+              :limit="5"
             />
           </el-form-item>
         </el-col>
@@ -128,7 +128,7 @@
         holder: '',
         holderId: '',
         date: [],
-        imageObj: []
+        fileObj: []
       };
       return {
         dialogVisible: false,
@@ -163,7 +163,7 @@
           status: [
             { required: true, trigger: 'change', message: '请选择状态' }
           ],
-          imageObj: [
+          fileObj: [
             { required: true, trigger: 'change', message: '请选择证照图片' }
           ]
         },
@@ -214,7 +214,7 @@
           ...data,
           date: [data.validityStartTime, data.validityEndTime]
         };
-        this.$set(this.form, 'imageObj', [data.fileObj]);
+
       },
 
       close() {
@@ -232,15 +232,13 @@
             this.form.validityStartTime = this.form.date[0];
             this.form.validityEndTime = this.form.date[1];
           }
-          if (this.form.imageObj.length) {
-            this.form.fileObj = this.form.imageObj[0];
-          }
+          // if (this.form.fileObj.length) {
+          //   this.form.fileObj = this.form.fileObj[0];
+          // }
           const data = {
             ...this.form,
-            fileId: this.form.fileObj.id
           };
           delete data.date;
-          delete data.imageObj;
           saveOrEdit(data)
             .then((msg) => {
               this.loading = false;

src/views/factoryModel/jobManagement/components/user-edit.vue

@@ -74,7 +74,7 @@
       </el-row>
       <el-row>
         <el-col :span="20">
-          <el-form-item label="标准工时费:" prop="hourCost">
+          <el-form-item label="标准工时费:">
             <div class="hourCostStyle">
               <el-input
                 style="width: 80%"