Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/major/todoDetail.vue

@@ -1342,7 +1342,7 @@
                           :options="districtsOptions"
                           :props="{ expandTrigger: 'hover' }"
                           @change="handleChange"
-                          :disabled="currentNode.nodeCode!='SPOT_RECONNAISSANCE'"
+                          :disabled="!couldAddTarget"
                           style="width:100%"></el-cascader>
                       </el-form-item>
                     </el-col>
@@ -1580,7 +1580,7 @@
                           v-model="landTarget.citys"
                           :options="districtsOptions"
                           :props="{ expandTrigger: 'hover' }"
-                          :disabled="currentNode.nodeCode!='SPOT_RECONNAISSANCE'"
+                          :disabled="!couldAddTarget"
                           @change="handleChange"
                           style="width:100%"></el-cascader>
                       </el-form-item>
@@ -1901,7 +1901,7 @@
         <div class="createMajor-main-container">
           <div class="postInfo-container">
             <el-row>
-              <el-col :xs="24" :sm="12" :lg="24" :span="6" v-if="currentNode.nodeCode =='SPOT_RECONNAISSANCE'">
+              <el-col :xs="24" :sm="12" :lg="24" :span="6" v-if="couldAddTarget">
                 <el-button style="float:right" type="success" @click="saveAllotUnit()">确认分配</el-button>
               </el-col>
             </el-row>
@@ -2345,6 +2345,7 @@ export default {
         majorId:null
       },
       allotUnitDialog:false,
+      
     }
   },
   created() {
@@ -2776,6 +2777,7 @@ export default {
         }
         this.landTarget.evaluateMethods = JSON.stringify(this.eMethods);
         this.landTarget.housePurpose = JSON.stringify(this.houseToUse);
+        console.log(values,1)
         if (values.includes(null)) {
           this.editLandTarget();
           return;
@@ -2807,13 +2809,15 @@ export default {
           return;
         }
         this.landTarget.evaluateMethods = JSON.stringify(this.eMethods);
-        if (checkeds.includes(null)) {
-          this.editLandTarget();
-          return;
-        } else {
-          this.doTaskLandCommon();
-          return;
-        }
+        // console.log(this.evaluateLandData)
+        // if (checkeds.includes(null)) {
+        //   this.editLandTarget();
+        //   return;
+        // } else {
+        //   this.doTaskLandCommon();
+        //   return;
+        // }
+        this.doTaskLandCommon();
 
       }
     },
@@ -3524,6 +3528,32 @@ export default {
               callback(verify);
               return;
             }
+            if (this.allotUnit.userUnit.length==0){
+                this.$notify({
+                  title: '提示',
+                  message: '项目计件数未分配，请先分配后再提交',
+                  type: 'error',
+                  duration: 2000,
+                });
+                verify.state = false;
+                callback(verify);
+                return;
+             }
+             let sumUnit1 = 0;
+             this.allotUnit.userUnit.forEach(element => {
+              sumUnit1+=element.unitRate;
+             });
+             if (sumUnit1!=this.major.evaluateUnit){
+              this.$notify({
+                  title: '提示',
+                  message: '项目计件数未分配之和错误，请检查。',
+                  type: 'error',
+                  duration: 2000,
+                });
+                verify.state = false;
+                callback(verify);
+                return;
+             }
             break;
           case 'WRITE_REPORT':
             let notTakeReportNoTargets = this.evaluateLandData.filter(function (e) {
@@ -3568,7 +3598,32 @@ export default {
               callback(verify);
               return;
             }
-
+            if (this.allotUnit.userUnit.length==0){
+                this.$notify({
+                  title: '提示',
+                  message: '项目计件数未分配，请先分配后再提交',
+                  type: 'error',
+                  duration: 2000,
+                });
+                verify.state = false;
+                callback(verify);
+                return;
+             }
+             let sumUnit2 = 0;
+             this.allotUnit.userUnit.forEach(element => {
+              sumUnit2+=element.unitRate;
+             });
+             if (sumUnit2!=this.major.evaluateUnit){
+              this.$notify({
+                  title: '提示',
+                  message: '项目计件数未分配之和错误，请检查。',
+                  type: 'error',
+                  duration: 2000,
+                });
+                verify.state = false;
+                callback(verify);
+                return;
+             }
             break;
           case 'WRITE_LETTER':
             let notTakeLetterNumberTargets = this.evaluateLandData.filter(function (e) {
@@ -3614,6 +3669,32 @@ export default {
               callback(verify);
               return;
             }
+             if (this.allotUnit.userUnit.length==0){
+                this.$notify({
+                  title: '提示',
+                  message: '项目计件数未分配，请先分配后再提交',
+                  type: 'error',
+                  duration: 2000,
+                });
+                verify.state = false;
+                callback(verify);
+                return;
+             }
+             let sumUnit3 = 0;
+             this.allotUnit.userUnit.forEach(element => {
+              sumUnit3+=element.unitRate;
+             });
+             if (sumUnit3!=this.major.evaluateUnit){
+              this.$notify({
+                  title: '提示',
+                  message: '项目计件数未分配之和错误，请检查。',
+                  type: 'error',
+                  duration: 2000,
+                });
+                verify.state = false;
+                callback(verify);
+                return;
+             }
             break;
           case "CHECK_STATEMENT":
           case "CHECK_REPORT":
@@ -3696,7 +3777,7 @@ export default {
             }
             break;
           case "SPOT_RECONNAISSANCE":
-             if (this.allotUnit.userUnit.length==0 || this.allotUnit.userUnit[0].unitRate==0){
+             if (this.allotUnit.userUnit.length==0){
                 this.$notify({
                   title: '提示',
                   message: '项目计件数未分配，请先分配后再提交',
@@ -3707,6 +3788,21 @@ export default {
                 callback(verify);
                 return;
              }
+             let sum = 0;
+             this.allotUnit.userUnit.forEach(element => {
+               sum+=element.unitRate;
+             });
+             if (sum!=this.major.evaluateUnit){
+              this.$notify({
+                  title: '提示',
+                  message: '项目计件数未分配之和错误，请检查。',
+                  type: 'error',
+                  duration: 2000,
+                });
+                verify.state = false;
+                callback(verify);
+                return;
+             }
              break;
           }
         callback(verify);
@@ -4332,8 +4428,8 @@ export default {
       const units = this.allotUnit.userUnit;
       let sum = 0;
       for (let i in units){
-        if (units[i].unitRate<=0){
-            this.$message('不能填入负数或0','error')
+        if (units[i].unitRate<0){
+            this.$message('不能填入负数','error')
             return;
         }
         sum +=units[i].unitRate;