现场观察报告上传;企业情况数量限制

src/dashoo.cn/frontend_web/package.json

@@ -20,6 +20,7 @@
     "@nuxtjs/axios": "^4.4.0",
     "axios": "^0.16.2",
     "chart.js": "^2.7.0",
+    "chromedriver": "^84.0.1",
     "cross-env": "^5.1.1",
     "echarts": "^3.8.5",
     "element-ui": "2.8.2",

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -1248,6 +1248,39 @@ export default {
     editSubfile () {
       let _this = this
       _this.SubfileForm.SupplierId = parseInt(_this.formData.Id)
+      var list = _this.scenefileurllist
+      var url = ''
+      var name = ''
+      for (var i = 0; i < list.length; i++) {
+        url += list[i] + '$'
+        name += list[i].split('|')[1] + '$'
+      }
+      var newUrl = url + _this.SubfileForm['FileUrl']
+      var newName = name + _this.SubfileForm['FileName']
+      var nameArr = newName.split('$')
+      var urlArr = newUrl.split('$')
+      // name去重
+      for (var i = 0, len = nameArr.length; i < len; i++) {
+        for (var j = i + 1, len = nameArr.length; j < len; j++) {
+          if (nameArr[i] === nameArr[j]) {
+            nameArr.splice(j, 1)
+            j--
+            len--
+          }
+        }
+      }
+      // url去重
+      for (var i = 0, len = urlArr.length; i < len; i++) {
+        for (var j = i + 1, len = urlArr.length; j < len; j++) {
+          if (urlArr[i].split('|')[1] === urlArr[j].split('|')[1]) {
+            urlArr.splice(j, 1)
+            j--
+            len--
+          }
+        }
+      }
+      _this.SubfileForm['FileName'] = nameArr.join('$')
+      _this.SubfileForm['FileUrl'] = urlArr.join('$')
       _this.$axios.put('/supplier/editsubfile/' + this.SubfileForm.SupplierId, _this.SubfileForm)
         .then(res => {
           if (res.data.code === 0) {
@@ -1292,7 +1325,10 @@ export default {
           return
         }
         this.getattachissuccess()
+        console.log('wwwwww')
+
         this.editSubfile()
+        return false;
       } else {
         this.$message({
           type: 'warning',
@@ -1330,7 +1366,6 @@ export default {
               } else {
                 option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               }
-
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -122,7 +122,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="合同化用工数量">
+                  <el-form-item label="合同化用工数量"
+                                prop="ContractNum">
                     <el-input-number v-model="formDataCert.ContractNum"
                                      controls-position="right"
                                      :min="0"
@@ -131,7 +132,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="大学及以上学历人员数量">
+                  <el-form-item label="大学及以上学历人员数量"
+                                prop="UniversityNum">
                     <el-input-number v-model="formDataCert.UniversityNum"
                                      controls-position="right"
                                      :min="0"
@@ -150,7 +152,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="高级及以上职称人员数量">
+                  <el-form-item label="高级及以上职称人员数量"
+                                prop="AboveProfNum">
                     <el-input-number v-model="formDataCert.AboveProfNum"
                                      controls-position="right"
                                      :min="0"
@@ -159,7 +162,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="中级职称人员数量">
+                  <el-form-item label="中级职称人员数量"
+                                prop="MiddleProfNum">
                     <el-input-number v-model="formDataCert.MiddleProfNum"
                                      controls-position="right"
                                      :min="0"
@@ -168,7 +172,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="具有国家注册执业资格人员数量">
+                  <el-form-item label="具有国家注册执业资格人员数量"
+                                prop="NationalRegNum">
                     <el-input-number v-model="formDataCert.NationalRegNum"
                                      controls-position="right"
                                      :min="0"
@@ -177,7 +182,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="具有国家注册执业资格证书总数">
+                  <el-form-item label="具有国家注册执业资格证书总数"
+                                prop="NationalCertTotal">
                     <el-input-number v-model="formDataCert.NationalCertTotal"
                                      controls-position="right"
                                      :min="0"
@@ -186,7 +192,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="设计人员总数">
+                  <el-form-item label="设计人员总数"
+                                prop="DesignerTotal">
                     <el-input-number v-model="formDataCert.DesignerTotal"
                                      controls-position="right"
                                      :min="0"
@@ -540,25 +547,29 @@ export default {
     }
   },
   data () {
-    var checkWorkerTotal = (rule, value, callback) => {
-      if (value <= 0) {
-        callback(new Error('企业员工总数必须大于0'))
+    var checkFucntion = (rule, value, callback) => {
+      if (value > this.formDataCert.WorkerTotal) {
+        callback(new Error('该数值不能大于员工总数！'))
       } else {
         callback()
       }
     }
-    var checkTechnicalNum = (rule, value, callback) => {
+    var checkWorkerTotal = (rule, value, callback) => {
       if (value <= 0) {
-        callback(new Error('技术、管理人员数量必须大于0'))
+        callback(new Error('企业员工总数必须大于0'))
       } else {
         callback()
       }
     }
-    var checkSkillerTotal = (rule, value, callback) => {
+    var checkTechnicalNum = (rule, value, callback) => {
       if (value <= 0) {
-        callback(new Error('技术工人总数必须大于0'))
+        callback(new Error('该数值必须大于0'))
       } else {
-        callback()
+        if (value > this.formDataCert.WorkerTotal) {
+          callback(new Error('该数值不能大于员工总数！'))
+        } else {
+          callback()
+        }
       }
     }
     return {
@@ -736,17 +747,52 @@ export default {
         WorkerTotal: [{
           required: true,
           validator: checkWorkerTotal,
-          trigger: 'blur'
+          trigger: 'change'
         }],
         TechnicalNum: [{
           required: true,
           validator: checkTechnicalNum,
-          trigger: 'blur'
+          trigger: 'change'
         }],
         SkillerTotal: [{
           required: true,
-          validator: checkSkillerTotal,
-          trigger: 'blur'
+          validator: checkTechnicalNum,
+          trigger: 'change'
+        }],
+        ContractNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        UniversityNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        AboveProfNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        MiddleProfNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        NationalRegNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        NationalCertTotal: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        DesignerTotal: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
         }]
       },
       appendformData: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -130,7 +130,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="合同化用工数量">
+                  <el-form-item label="合同化用工数量"
+                                prop="ContractNum">
                     <el-input-number v-model="formDataCert.ContractNum"
                                      controls-position="right"
                                      step-strictly
@@ -140,7 +141,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="大学及以上学历人员数量">
+                  <el-form-item label="大学及以上学历人员数量"
+                                prop="UniversityNum">
                     <el-input-number v-model="formDataCert.UniversityNum"
                                      controls-position="right"
                                      step-strictly
@@ -163,7 +165,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="高级及以上职称人员数量">
+                  <el-form-item label="高级及以上职称人员数量"
+                                prop="AboveProfNum">
                     <el-input-number v-model="formDataCert.AboveProfNum"
                                      controls-position="right"
                                      step-strictly
@@ -173,7 +176,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="中级职称人员数量">
+                  <el-form-item label="中级职称人员数量"
+                                prop="MiddleProfNum">
                     <el-input-number v-model="formDataCert.MiddleProfNum"
                                      controls-position="right"
                                      step-strictly
@@ -183,7 +187,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="具有国家注册执业资格人员数量">
+                  <el-form-item label="具有国家注册执业资格人员数量"
+                                prop="NationalRegNum">
                     <el-input-number v-model="formDataCert.NationalRegNum"
                                      controls-position="right"
                                      step-strictly
@@ -193,7 +198,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="具有国家注册执业资格证书总数">
+                  <el-form-item label="具有国家注册执业资格证书总数"
+                                prop="NationalCertTotal">
                     <el-input-number v-model="formDataCert.NationalCertTotal"
                                      controls-position="right"
                                      step-strictly
@@ -203,7 +209,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="设计人员总数">
+                  <el-form-item label="设计人员总数"
+                                prop="DesignerTotal">
                     <el-input-number v-model="formDataCert.DesignerTotal"
                                      controls-position="right"
                                      step-strictly
@@ -578,31 +585,29 @@ export default {
     }
   },
   data () {
-    var checkWorkerTotal = (rule, value, callback) => {
-      if (value <= 0) {
-        callback(new Error('企业员工总数必须大于0'))
+    var checkFucntion = (rule, value, callback) => {
+      if (value > this.formDataCert.WorkerTotal) {
+        callback(new Error('该数值不能大于员工总数！'))
       } else {
         callback()
       }
     }
-    var checkTechnicalNum = (rule, value, callback) => {
+    var checkWorkerTotal = (rule, value, callback) => {
       if (value <= 0) {
-        callback(new Error('技术、管理人员数量必须大于0'))
-      }
-      if (value >= this.formDataCert.WorkerTotal) {
-        callback(new Error('人员数量不能大于员工总数！'))
+        callback(new Error('企业员工总数必须大于0'))
       } else {
         callback()
       }
     }
-    var checkSkillerTotal = (rule, value, callback) => {
+    var checkTechnicalNum = (rule, value, callback) => {
       if (value <= 0) {
-        callback(new Error('技术工人总数必1须大于0'))
-      }
-      if (value >= this.formDataCert.WorkerTotal) {
-        callback(new Error('技术工人总数不能大于员工总数！'))
+        callback(new Error('该数值必须大于0'))
       } else {
-        callback()
+        if (value > this.formDataCert.WorkerTotal) {
+          callback(new Error('该数值不能大于员工总数！'))
+        } else {
+          callback()
+        }
       }
     }
     return {
@@ -793,7 +798,42 @@ export default {
         }],
         SkillerTotal: [{
           required: true,
-          validator: checkSkillerTotal,
+          validator: checkTechnicalNum,
+          trigger: 'change'
+        }],
+        ContractNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        UniversityNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        AboveProfNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        MiddleProfNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        NationalRegNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        NationalCertTotal: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        DesignerTotal: [{
+          required: false,
+          validator: checkFucntion,
           trigger: 'change'
         }]
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -131,7 +131,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="合同化用工数量">
+                  <el-form-item label="合同化用工数量"
+                                prop="ContractNum">
                     <el-input-number v-model="formDataCert.ContractNum"
                                      controls-position="right"
                                      :min="0"
@@ -159,7 +160,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="高级及以上职称人员数量">
+                  <el-form-item label="高级及以上职称人员数量"
+                                prop="AboveProfNum">
                     <el-input-number v-model="formDataCert.AboveProfNum"
                                      controls-position="right"
                                      :min="0"
@@ -168,7 +170,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="中级职称人员数量">
+                  <el-form-item label="中级职称人员数量"
+                                prop="MiddleProfNum">
                     <el-input-number v-model="formDataCert.MiddleProfNum"
                                      controls-position="right"
                                      :min="0"
@@ -177,7 +180,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="具有国家注册执业资格人员数量">
+                  <el-form-item label="具有国家注册执业资格人员数量"
+                                prop="NationalRegNum">
                     <el-input-number v-model="formDataCert.NationalRegNum"
                                      controls-position="right"
                                      :min="0"
@@ -186,7 +190,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="具有国家注册执业资格证书总数">
+                  <el-form-item label="具有国家注册执业资格证书总数"
+                                prop="NationalCertTotal">
                     <el-input-number v-model="formDataCert.NationalCertTotal"
                                      controls-position="right"
                                      :min="0"
@@ -195,7 +200,8 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="设计人员总数">
+                  <el-form-item label="设计人员总数"
+                                prop="DesignerTotal">
                     <el-input-number v-model="formDataCert.DesignerTotal"
                                      controls-position="right"
                                      :min="0"
@@ -549,25 +555,29 @@ export default {
     }
   },
   data () {
-    var checkWorkerTotal = (rule, value, callback) => {
-      if (value <= 0) {
-        callback(new Error('企业员工总数必须大于0'))
+    var checkFucntion = (rule, value, callback) => {
+      if (value > this.formDataCert.WorkerTotal) {
+        callback(new Error('该数值不能大于员工总数！'))
       } else {
         callback()
       }
     }
-    var checkTechnicalNum = (rule, value, callback) => {
+    var checkWorkerTotal = (rule, value, callback) => {
       if (value <= 0) {
-        callback(new Error('技术、管理人员数量必须大于0'))
+        callback(new Error('企业员工总数必须大于0'))
       } else {
         callback()
       }
     }
-    var checkSkillerTotal = (rule, value, callback) => {
+    var checkTechnicalNum = (rule, value, callback) => {
       if (value <= 0) {
-        callback(new Error('技术工人总数必须大于0'))
+        callback(new Error('该数值必须大于0'))
       } else {
-        callback()
+        if (value > this.formDataCert.WorkerTotal) {
+          callback(new Error('该数值不能大于员工总数！'))
+        } else {
+          callback()
+        }
       }
     }
     return {
@@ -745,17 +755,52 @@ export default {
         WorkerTotal: [{
           required: true,
           validator: checkWorkerTotal,
-          trigger: 'blur'
+          trigger: 'change'
         }],
         TechnicalNum: [{
           required: true,
           validator: checkTechnicalNum,
-          trigger: 'blur'
+          trigger: 'change'
         }],
         SkillerTotal: [{
           required: true,
-          validator: checkSkillerTotal,
-          trigger: 'blur'
+          validator: checkTechnicalNum,
+          trigger: 'change'
+        }],
+        ContractNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        UniversityNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        AboveProfNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        MiddleProfNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        NationalRegNum: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        NationalCertTotal: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
+        }],
+        DesignerTotal: [{
+          required: false,
+          validator: checkFucntion,
+          trigger: 'change'
         }]
       },
       appendformData: {