专业处室判断

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -1288,19 +1288,23 @@ import fileapi from '@/api/oilsupplier/supplierfile'
           })
           return
         }
-        if (this.majorDept.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '请选择专业处室！'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.majorDept.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '请选择专业处室！'
+            })
+            return
+          }
         }
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人！'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.userOptions == null || this.userOptions.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该专业科室未配置接收人！'
+            })
+            return
+          }
         }
         this.applyLoading = true
         this.auditform.FirstAuditName = this.auditer

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -353,8 +353,8 @@
     mapGetters
   } from 'vuex'
   import axios from 'axios'
-  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue';
-  import uploadajax from '@/assets/js//uploadajax.js'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
+import uploadajax from '@/assets/js//uploadajax.js'
   import suppapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
@@ -376,7 +376,7 @@
     watch: {
       filterText (val) {
         this.$refs.orgmanagetree.filter(val)
-    }
+      }
     },
     name: 'oilsuppliercertappendsub',
 
@@ -613,7 +613,7 @@
     methods: {
       newdeletedata (val) {
         let _this = this
-      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -626,20 +626,20 @@
                     type: 'success',
                     message: response.data.message
                   })
-                _this.getFileList()
-              } else {
+                  _this.getFileList()
+                } else {
                   _this.$message({
                     type: 'warning',
                     message: response.data.message
                   })
-              }
+                }
               })
               .catch(function (error) {
                 console.log(error)
-            })
-        })
+              })
+          })
           .catch(() => {})
-    },
+      },
       makeNewSure () {
         if (this.$refs.newrefuploadattach.uploadFiles && this.$refs.newrefuploadattach.uploadFiles.length > 0) {
           // 上传附件是否完成判断
@@ -801,8 +801,8 @@
       getInfo (vId) { // 这个vId也就是value值
         let obj = {}
         obj = this.supplierList.find((item) => {
-          return item.SupplierId === vId //筛选出匹配数据
-      })
+          return item.SupplierId === vId // 筛选出匹配数据
+        })
         this.formData.SupplierId = parseInt(obj.SupplierId)
         this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
       },
@@ -826,7 +826,7 @@
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = _this.Id
           this.entrydetail.instance = this.formData.WorkFlowId
-        this.entrydetail.Status = this.formData.Status
+          this.entrydetail.Status = this.formData.Status
           if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
             this.allowpre = false
           }
@@ -950,7 +950,7 @@
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        }*/
+        } */
         let isLt50m = file.size / 1024 / 1024 / 5 < 1
         if (!isLt50m) {
           this.$message.error('上传文件大小不能超过 5MB!')
@@ -1086,12 +1086,12 @@
               type: 'success',
               message: res.data.message
             })
-        } else {
+          } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
-        }
+          }
         }).catch(err => {
           console.error(err)
         })
@@ -1110,8 +1110,8 @@
           SupTypeCode: this.formData.AppendType
         }
 
-      //访问接口
-      api.getList(params, this.$axios).then(res => {
+        // 访问接口
+        api.getList(params, this.$axios).then(res => {
           this.entityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -1131,8 +1131,8 @@
           SupTypeCode: this.formData.AppendType
         }
 
-      //访问接口
-      api.getMyList(params, this.$axios).then(res => {
+        // 访问接口
+        api.getMyList(params, this.$axios).then(res => {
           this.myentityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -1375,16 +1375,16 @@
         this.auditOrgChang(this.auditer)
       },
       auditOrgChang (val) {
-        let auditstepcode = 'SECOND_TRIAL';
-        suppapi
+        let auditstepcode = 'SECOND_TRIAL'
+      suppapi
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
             console.error(err)
-        })
-    },
+          })
+      },
       chooseAuditorShowFen () {
         this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisibleFen = true
@@ -1410,19 +1410,23 @@
           })
           return
         }
-        if (this.majorDept.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '请选择专业处室！'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.majorDept.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '请选择专业处室！'
+            })
+            return
+          }
         }
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人！'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.userOptions == null || this.userOptions.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该专业科室未配置接收人！'
+            })
+            return
+          }
         }
         this.applyLoading = true
         this.auditform.FirstAuditName = this.auditer

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -336,8 +336,8 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue';
-  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
+import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import setapi from '@/api/oilsupplier/oilclassorgset'
 
   export default {
@@ -572,7 +572,7 @@
     methods: {
       newdeletedata (val) {
         let _this = this
-      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -585,20 +585,20 @@
                     type: 'success',
                     message: response.data.message
                   })
-                _this.getFileList()
-              } else {
+                  _this.getFileList()
+                } else {
                   _this.$message({
                     type: 'warning',
                     message: response.data.message
                   })
-              }
+                }
               })
               .catch(function (error) {
                 console.log(error)
-            })
-        })
+              })
+          })
           .catch(() => {})
-    },
+      },
       makeNewSure () {
         if (this.$refs.newrefuploadattach.uploadFiles && this.$refs.newrefuploadattach.uploadFiles.length > 0) {
           // 上传附件是否完成判断
@@ -742,8 +742,8 @@
       getInfo (vId) { // 这个vId也就是value值
         let obj = {}
         obj = this.supplierList.find((item) => {
-          return item.SupplierId === vId //筛选出匹配数据
-      })
+          return item.SupplierId === vId // 筛选出匹配数据
+        })
         this.formData.SupplierId = parseInt(obj.SupplierId)
         this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
       },
@@ -786,7 +786,7 @@
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = _this.Id
           this.entrydetail.instance = this.formData.WorkFlowId
-        this.entrydetail.Status = this.formData.Status
+          this.entrydetail.Status = this.formData.Status
           if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
             this.allowpre = false
           }
@@ -902,7 +902,7 @@
         _this.doclist.push(params)
       },
       beforeAvatarUpload (file) {
-        /*let isLt512K = file.size / 1024 < 512
+        /* let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
@@ -1014,12 +1014,12 @@
               type: 'success',
               message: res.data.message
             })
-        } else {
+          } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
-        }
+          }
         }).catch(err => {
           console.error(err)
         })
@@ -1038,8 +1038,8 @@
           SupTypeCode: this.formData.AppendType
         }
 
-      //访问接口
-      api.getList(params, this.$axios).then(res => {
+        // 访问接口
+        api.getList(params, this.$axios).then(res => {
           this.entityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -1059,8 +1059,8 @@
           SupTypeCode: this.formData.AppendType
         }
 
-      //访问接口
-      api.getMyList(params, this.$axios).then(res => {
+        // 访问接口
+        api.getMyList(params, this.$axios).then(res => {
           this.myentityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -1230,16 +1230,16 @@
         this.auditOrgChang(this.auditer)
       },
       auditOrgChang (val) {
-        let auditstepcode = 'SECOND_TRIAL';
-        suppapi
+        let auditstepcode = 'SECOND_TRIAL'
+      suppapi
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
             console.error(err)
-        })
-    },
+          })
+      },
       chooseAuditorShowFen () {
         console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
         this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
@@ -1267,19 +1267,23 @@
           })
           return
         }
-        if (this.majorDept.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '请选择专业处室！'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.majorDept.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '请选择专业处室！'
+            })
+            return
+          }
         }
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人！'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.userOptions == null || this.userOptions.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该专业科室未配置接收人！'
+            })
+            return
+          }
         }
         this.applyLoading = true
         this.auditform.FirstAuditName = this.auditer