2
3
lining 5 жил өмнө
parent
commit
6ba6bf6c87

+ 32 - 6
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -642,9 +642,23 @@
           </el-col>
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
             <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>
             <el-form-item label="复审人员">
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -711,6 +725,7 @@
     },
     },
     data() {
     data() {
       return {
       return {
+        firOptions: [],
         btnloading: false,
         btnloading: false,
         sizeProject: 10,
         sizeProject: 10,
         currentItemCount: 0,
         currentItemCount: 0,
@@ -1036,7 +1051,18 @@
           return false
           return false
         }
         }
       },
       },
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        supplierapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       fenbanbtn () {
       fenbanbtn () {
+        this.getFirAuditerByDept()
         this.commitshowfen = true
         this.commitshowfen = true
       },
       },
       addInfoChangeAudit () {
       addInfoChangeAudit () {
@@ -1098,11 +1124,11 @@
         this.auditer = val
         this.auditer = val
         this.auditerName = name
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.auditer)
+        // this.auditOrgChang(this.auditer)
       },
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
         let auditstepcode = 'SECOND_TRIAL'
-        supplierapi.getAuditerByFirst(val, auditstepcode, this.$axios)
+        supplierapi.getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
           .then(res => {
             this.secauditerOptions = res.data.item
             this.secauditerOptions = res.data.item
           })
           })

+ 31 - 5
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -681,9 +681,23 @@
         <el-row>
         <el-row>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="初审人员">
             <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>
             <el-form-item label="复审人员">
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
@@ -902,6 +916,7 @@
         }
         }
       }
       }
       return {
       return {
+        firOptions: [],
         btnloading: false,
         btnloading: false,
         lineheightpx: '23',
         lineheightpx: '23',
         IsMust: false,
         IsMust: false,
@@ -2371,9 +2386,9 @@
         this.chooseAuditorVisible = false
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
         this.auditOrgChang(this.auditer)
       },
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
         let auditstepcode = 'SECOND_TRIAL'
-        supplierapi.getAuditerByFirst(val, auditstepcode, this.$axios)
+        supplierapi.getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
           .then(res => {
             this.secauditerOptions = res.data.item
             this.secauditerOptions = res.data.item
           })
           })
@@ -2402,7 +2417,18 @@
         // this.commitshow = true
         // this.commitshow = true
         this.ComAuditdialogShow = true
         this.ComAuditdialogShow = true
       },
       },
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        supplierapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       submitApplyBtn () {
       submitApplyBtn () {
+        this.getFirAuditerByDept()
         this.commitshow = true
         this.commitshow = true
       },
       },
       addInfoChangeAudit () {
       addInfoChangeAudit () {