增项选择初审人

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

@@ -124,8 +124,6 @@
           })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
-            console.log(_this.orgtreelist, '_this.orgtreelist')
-            debugger
             _this.SupplierTypeCode = SupplierTypeCode
             if (SupplierTypeCode == '01') { //物资类
               _this.handleNodeClick(_this.orgtreelist[0].children[11])

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

@@ -566,9 +566,23 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
+              <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
+                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
+              <el-select ref="selectAuditer"
+                         v-model="auditer"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         allow-create
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -682,6 +696,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         }
       }
       return {
+        firOptions: [],
         btnloading: false,
         activeName: '0',
         supplierId: '',
@@ -980,7 +995,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
       this.getSupplierList() // 获取供应方公司列表
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
     },
     methods: {
       // 获取需要修改的增项信息
@@ -1091,7 +1106,16 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
           console.error(err)
         })
       },
-
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        suppapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       AuditEntity () {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
@@ -1099,6 +1123,8 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         } else if (this.formData.Status === '1') {
           this.dialogMakeSure2 = true
         } else if (this.formData.Status === '10') {
+          this.getFirAuditerByDept()
+          this.changeOrgUnit(this.selectDept)
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
@@ -1505,12 +1531,12 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.auditer)
+        // this.auditOrgChang(this.auditer)
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
       suppapi
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })

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

@@ -646,9 +646,23 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
+              <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
+                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
+              <el-select ref="selectAuditer"
+                         v-model="auditer"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         allow-create
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -761,6 +775,7 @@
         }
       }
       return {
+        firOptions: [],
         btnloading: false,
         activeName: '0',
         supplierId: '',
@@ -1060,7 +1075,7 @@
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
       this.getSupplierList() // 获取供应方公司列表
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
     },
     methods: {
       // 获取需要修改的增项信息
@@ -1198,7 +1213,16 @@
           console.error(err)
         })
       },
-
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        suppapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       AuditEntity () {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
@@ -1206,6 +1230,8 @@
         } else if (this.formData.Status === '1') {
           this.dialogMakeSure2 = true
         } else if (this.formData.Status === '10') {
+          this.getFirAuditerByDept()
+          this.changeOrgUnit(this.selectDept)
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
@@ -1584,19 +1610,18 @@
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.auditer)
+        // this.auditOrgChang(this.auditer)
       },
-      auditOrgChang (val) {
-        let auditstepcode = 'SECOND_TRIAL';
+      auditOrgChang () {
+        let auditstepcode = 'SECOND_TRIAL'
         suppapi
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
             console.error(err)
-        })
-    },
+          })},
 
       auditOrgChange () {
         let auditstepcode = ''

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

@@ -551,9 +551,23 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
+              <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
+                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
+              <el-select ref="selectAuditer"
+                         v-model="auditer"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         allow-create
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -664,6 +678,7 @@
         }
       }
       return {
+        firOptions: [],
         btnloading: false,
         activeName: '0',
         supplierId: '',
@@ -984,7 +999,7 @@
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
       this.getSupplierList() // 获取供应方公司列表
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
     },
     methods: {
       // 获取需要修改的增项信息
@@ -1124,7 +1139,16 @@
           console.error(err)
         })
       },
-
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        suppapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       AuditEntity () {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
@@ -1132,6 +1156,7 @@
         } else if (this.formData.Status === '1') {
           this.dialogMakeSure2 = true
         } else if (this.formData.Status === '10') {
+          this.getFirAuditerByDept()
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
@@ -1508,12 +1533,12 @@
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.auditer)
+        // this.auditOrgChang(this.auditer)
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL';
         suppapi
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })

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

@@ -634,9 +634,23 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="初审人员">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
+              <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
+                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
+              <el-select ref="selectAuditer"
+                         v-model="auditer"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         allow-create
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -919,6 +933,7 @@
         }
       }
       return {
+        firOptions: [],
         btnloading: false,
         fileList: [],
         myitemsshow: false,
@@ -1416,7 +1431,7 @@
       this.getFileDictOptions()
       this.getorgtreelist()
       this.orgtreeChange(this.majorDept)
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
       this.initTableHeader()
       //this.getsubfile()
     },
@@ -1843,12 +1858,24 @@
         }
         return retUrl
       },
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        suppapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       commitaudit () {
         if (this.formData.InStyle === '2' || this.formData.InStyle === '6' || this.formData.InStyle === '4') {
           this.allowpre = false
         } else {
           this.allowpre = true
         }
+        this.getFirAuditerByDept()
+        this.changeOrgUnit(this.selectDept)
         this.AuditdialogShow = true
         // if (this.subfileList && this.subfileList.length > 0) {
         //   for (var i = 0; i < this.subfileList.length; i++) {
@@ -2653,12 +2680,12 @@
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.auditer)
+        // this.auditOrgChang(this.auditer)
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
         suppapi
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })

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

@@ -878,9 +878,23 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="初审人员">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
+              <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
+                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
+              <el-select ref="selectAuditer"
+                         v-model="auditer"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         allow-create
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -1180,6 +1194,7 @@
       }
       return {
         // 456
+        firOptions: [],
         btnloading: false,
         fileList: [],
         myitemsshow: false,
@@ -1711,7 +1726,7 @@
       this.getDictOptions()
       // this.getorgtreelist()
       // this.orgtreeChange(this.majorDept)
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
       this.initTableHeader()
       this.initData2019()
       // this.getsubfile()
@@ -2023,13 +2038,24 @@
       }
       this.getSortList()
     },
-
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        suppapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       commitaudit () {
         if (this.formData.InStyle === '2' || this.formData.InStyle === '6' || this.formData.InStyle === '4') {
           this.allowpre = false
         } else {
           this.allowpre = true
         }
+        this.getFirAuditerByDept()
+        this.changeOrgUnit(this.selectDept)
         this.AuditdialogShow = true
         // if (this.subfileList && this.subfileList.length > 0) {
         //   for (var i = 0; i < this.subfileList.length; i++) {
@@ -3058,10 +3084,10 @@
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
         suppapi
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })

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

@@ -602,9 +602,23 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="初审人员">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
+              <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
+                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
+              <el-select ref="selectAuditer"
+                         v-model="auditer"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         allow-create
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -897,6 +911,7 @@
         }
       }
       return {
+        firOptions: [],
         btnloading: false,
         myitemsshow: false,
         disabled: false,
@@ -2024,13 +2039,23 @@
             console.error(err)
           })
       },
-
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        suppapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       commitaudit () {
         if (this.formData.InStyle === '2' || this.formData.InStyle === '6' || this.formData.InStyle === '4') {
           this.allowpre = false
         } else {
           this.allowpre = true
         }
+        this.getFirAuditerByDept()
         this.AuditdialogShow = true
         // if (this.subfileList && this.subfileList.length > 0) {
         //   for (var i = 0; i < this.subfileList.length; i++) {
@@ -2521,12 +2546,12 @@
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.auditer)
+        // this.auditOrgChang(this.auditer)
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
         suppapi
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })