年审选择初审人

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -820,9 +820,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
@@ -1032,6 +1046,7 @@
         }
       }
       return {
+        firOptions: [],
         IsCompanyUser: 0,
         add_flat: true,
         totalTab: 3,
@@ -1536,8 +1551,18 @@
         }
         return retUrl
       },
-
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       fenbanBtn () {
+        this.getFirAuditerByDept()
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.addshow = true
       },
@@ -1574,12 +1599,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'
         api
-          .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/annualaudit/_opera/basicauditoperation.vue

@@ -716,9 +716,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
@@ -928,6 +942,7 @@
         }
       }
       return {
+        firOptions: [],
         loading: false,
         sizeProject: 10,
         currentPageProject: 1,
@@ -1317,6 +1332,16 @@
       this.getsubfile()
     },
     methods: {
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // ======
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
@@ -1367,6 +1392,7 @@
       },
 
       fenbanBtn () {
+        this.getFirAuditerByDept()
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.addshow = true
       },
@@ -1403,12 +1429,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'
         api
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
@@ -1615,10 +1641,8 @@
           InfomainId: this.annualId
         }
         annualapi.GetChangeEntity(Id, params, this.$axios).then(res => {
-          console.log(res, '=====')
           this.copyformdata = _.cloneDeep(res.data[0])
           this.formData = res.data[1]
-          console.log(this.copyformdata, 'this.copyformdata')
           this.CityAry = []
           this.CityAry.push(this.formData.Province)
           this.CityAry.push(this.formData.City)
@@ -1822,7 +1846,6 @@
           MInfoId: this.annualId,
           InfochangeForm: this.infochangeItemList
         }
-        console.log('----', AllInfochangeItemList)
         annualapi.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -25,7 +25,10 @@
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
                      v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办
           </el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status <= 10 &&  authUser.Profile.IsCompanyUser == 0">
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="clickaddshow()"
+                     v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核
+          </el-button>
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="clickaddshow()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">
             提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit/basicindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
@@ -732,9 +735,23 @@
               </el-select>
             </el-form-item> -->
             <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
@@ -1084,6 +1101,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
         }
       }
       return {
+        firOptions: [],
         newVisible: false,
         newSubfileForm: {
           Id: '',
@@ -1591,6 +1609,20 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       this.getFileDictOptions()
     },
     methods: {
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      clickaddshow () {
+        this.getFirAuditerByDept()
+        this.addshow = true
+      },
       getFileDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.yasuoname = res.data.items['YaSuoName']
@@ -2372,10 +2404,10 @@ import apiCert from '@/api/oilsupplier/suppliercert'
         })
       },
 
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL';
         api
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
@@ -2392,7 +2424,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.auditer)
+        // this.auditOrgChang(this.auditer)
       },
       itemsshow () {
         this.myitemsshow = true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -25,10 +25,10 @@
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
                      v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办
           </el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="addshow = true"
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="clickaddshow()"
                      v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核
           </el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="clickaddshow()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">
             提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit/goodsindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
@@ -804,9 +804,23 @@
               </el-select>
             </el-form-item> -->
            <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
@@ -1004,6 +1018,7 @@
   import uploadajax from '@/assets/js//uploadajax.js'
   import fileapi from '@/api/oilsupplier/supplierfile'
   import setapi from '@/api/oilsupplier/oilclassorgset'
+  import suppapi from '@/api/oilsupplier/supplier'
 
   export default {
     computed: {
@@ -1185,6 +1200,7 @@
         }
       }
       return {
+        firOptions: [],
         newVisible: false,
         newSubfileForm: {
           Id: '',
@@ -1694,6 +1710,20 @@
       this.initTableHeader()
     },
     methods: {
+      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)
+        })
+      },
+      clickaddshow () {
+        this.getFirAuditerByDept()
+        this.addshow = true
+      },
       // 添加资质
       initTableHeader () {
         setapi.initGoodTableHeader(this.$axios).then(res => {
@@ -2477,10 +2507,10 @@
         }
       },
 
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
         api
-          .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/annualaudit/_opera/operation.vue

@@ -25,7 +25,10 @@
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
                      v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办
           </el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status <= 10 &&  authUser.Profile.IsCompanyUser == 0">
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="clickaddshow()"
+                     v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核
+          </el-button>
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="clickaddshow()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">
             提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit/techindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
@@ -632,9 +635,23 @@
               </el-input>
             </el-form-item> -->
             <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
@@ -1002,6 +1019,7 @@
         }
       }
       return {
+        firOptions: [],
         newVisible: false,
         newSubfileForm: {
           Id: '',
@@ -1506,6 +1524,21 @@
       this.initTableHeader()
     },
     methods: {
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      clickaddshow () {
+        this.getFirAuditerByDept()
+        this.addshow = true
+      },
+
       // 添加资质
       initTableHeader () {
         setapi.initTsTableHeader(this.$axios).then(res => {
@@ -2333,10 +2366,10 @@
         })
       },
 
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL';
         api
-          .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/annualaudit/_opera/techoperation.vue

@@ -628,9 +628,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
@@ -840,6 +854,7 @@
         }
       }
       return {
+        firOptions: [],
         sizeProject: 10,
         currentPageProject: 1,
         currentItemCountProject: 0,
@@ -1359,8 +1374,18 @@
         this.currentPageProject = value
         this.getsubfile()
       },
-
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       fenbanBtn () {
+        this.getFirAuditerByDept()
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.addshow = true
       },
@@ -1400,12 +1425,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'
         api
-          .getAuditerByFirst(val, auditstepcode, this.$axios)
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })