2
3
Prechádzať zdrojové kódy

增项分办专业处室的选择判断以及参数检查bugfix

baichengfei 5 rokov pred
rodič
commit
df19088941

+ 5 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -647,7 +647,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' && inStyle != '3' ">
+            <el-form-item label="专业处室">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
               <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
@@ -1420,7 +1420,7 @@
             return false
           }
         }
-        return false
+        return true
       },
       // 专业处室分办审批
       businessOfficeSeparateAuditClick () {
@@ -1943,6 +1943,9 @@
         })
       },
       changeOrgUnit (val) {
+        if (!val) {
+          return
+        }
         let auditstepcode = 'PROF_RECE'
         suppapi.getAuditerByDept(val, auditstepcode, this.$axios).then(res => {
           this.userOptions = res.data.item

+ 4 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -734,7 +734,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室" v-if="(inStyle != '2' && inStyle != '4' && inStyle != '6' && inStyle != '3')">
+            <el-form-item label="专业处室">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
               <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
@@ -2090,6 +2090,9 @@
         })
       },
       changeOrgUnit (val) {
+        if (!val) {
+          return
+        }
         let auditstepcode = 'PROF_RECE'
         suppapi.getAuditerByDept(val, auditstepcode, this.$axios).then(res => {
           this.userOptions = res.data.item

+ 11 - 10
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -633,7 +633,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' && inStyle != '3' ">
+            <el-form-item label="专业处室">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
               <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
@@ -1412,14 +1412,12 @@
             })
             return
           }
-          if (![2, 4, 6].includes(parseInt(this.inStyle))) {
-            if (this.userOptions == null || this.userOptions.length === 0) {
-              this.$message({
-                type: 'warning',
-                message: '该专业科室未配置接收人!'
-              })
-              return
-            }
+          if (this.userOptions == null || this.userOptions.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该专业科室未配置接收人!'
+            })
+            return
           }
           if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
             this.$message({
@@ -1452,7 +1450,7 @@
             return false
           }
         }
-        return false
+        return true
       },
       // 专业处室分办审批
       businessOfficeSeparateAuditClick () {
@@ -1944,6 +1942,9 @@
         })
       },
       changeOrgUnit (val) {
+        if (!val) {
+          return
+        }
         let auditstepcode = 'PROF_RECE'
         suppapi.getAuditerByDept(val, auditstepcode, this.$axios).then(res => {
           this.userOptions = res.data.item