准入选择初审

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1984,7 +1984,8 @@ func (this *OilSupplierController) GetFirAuditerByDept() {
 	svc.GetEntity(&setting, where)
 
 	svcdepartment := organize.GetOrganizeService(utils.DBE)
-	alldep := svcdepartment.GetAllChildById(Id)
+	unitId := svcdepartment.GetMyUnitDepartmentId(this.User.DepartmentId)
+	alldep := svcdepartment.GetAllChildById(unitId)
 
 	ids := svc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
 	tempstr := strings.Join(ids, ",")

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

@@ -113,6 +113,7 @@
     created() {},
     methods: {
       getorgtreelist(SupplierTypeCode) {
+        console.log(SupplierTypeCode)
         let _this = this
         let params = {
           IsInnerOrganize: 1,
@@ -123,6 +124,8 @@
           })
           .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/components/oilsupplier/subfilelist.vue

@@ -511,20 +511,21 @@
               return
             }
           }
-          if (this.subfileList && this.subfileList.length > 0) {
-            for (var i = 0; i < this.subfileList.length; i++) {
-              if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-                this.$message({
-                  type: 'warning',
-                  message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-                })
-                return
-              }
-            }
-            this.$emit('close')
-          } else {
-            this.$emit('close')
-          }
+          // if (this.subfileList && this.subfileList.length > 0) {
+          //   for (var i = 0; i < this.subfileList.length; i++) {
+          //     if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
+          //       this.$message({
+          //         type: 'warning',
+          //         message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+          //       })
+          //       return
+          //     }
+          //   }
+          //   this.$emit('close')
+          // } else {
+          //   this.$emit('close')
+          // }
+          this.$emit('close')
         } else {
           this.$message({
             type: 'warning',

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -583,7 +583,6 @@
         }
       },
       rowClick (val) {
-        console.log(val, 'val')
         let SupplierType = ''
         if (val.Type === '1') {
           if (val.SupplierTypeCode === '01') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/techlist.vue

@@ -249,7 +249,6 @@
         //访问接口
         api.getMyTasks(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
-          console.log("--this.entityList----",this.entityList)
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -331,7 +330,6 @@
       getvalues(val) {
         this.entrydetail.business = val.Id
         this.entrydetail.instance = val.WorkFlowId
-        console.log("------this.entrydetail---",this.entrydetail)
         this.historyVisible = true
       },
       clearSearch() {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operationgoods.vue

@@ -532,14 +532,12 @@
       getMainInfo() {
         api.GetMainInfo(this.MInfoId, this.$axios)
           .then(res => {
-            this.Infomain = res.data.items;
-            console.log("this.Infomain", this.Infomain)
+            this.Infomain = res.data.items
             if (this.Infomain.length > 0) {
               this.entrydetail.business = this.MInfoId + ''
               this.entrydetail.instance = this.Infomain[0].WorkFlowId + ''
               this.entrydetail.Status = this.Infomain[0].Status + ''
             }
-            console.log("---ent",this.entrydetail)
           })
           .catch(err => {
             console.error(err);
@@ -584,7 +582,6 @@
       },
       //添加变更项目
       additems() {
-        console.log(this.$refs.infochangeCorp.selectedLabel)
         api.getinfoforitem(this.serviceId, this.infochangeForm.Selectitem, this.$axios).then(res => {
           this.infochangeForm.BeChangeInfo = res.data
           this.infochangeForm.SelectItemName = this.$refs.infochangeCorp.selectedLabel + ''
@@ -597,7 +594,6 @@
       //保存信息变更数据
       saveitemschange() {
         this.infochangeForm.SupplierId = parseInt(this.serviceId)
-        console.log(this.infochangeForm)
         api.addInfoChangeItem(this.infochangeForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -651,7 +647,6 @@
       addInfoChangeAudit() {
         this.entityForm.auditer = this.auditer
         this.entityForm.MInfoId = this.MInfoId + ""
-        console.log("==this.entityForm====", this.entityForm)
         api.auditEntity(this.supplierId, this.entityForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -375,19 +375,32 @@
                :visible.sync="dialogVisible"
                width="520px">
       <el-form ref="searchForm"
-               label-width="100px"
-               size="mini">
+               label-width="100px">
         <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-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-input ref="selectAuditer"-->
+                        <!--readonly-->
+                        <!--v-model="auditerName"-->
+                        <!--placeholder="请选择初审人">-->
+                <!--<el-button slot="append"-->
+                           <!--icon="el-icon-search"-->
+                           <!--@click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer"
@@ -490,10 +503,10 @@
       </span>
     </el-dialog>
 
-    <choose-auditor ref="chooseAuditor"
-                    @close="setAuditer"
-                    @hideChooseAuditer="chooseAuditorVisible=false"
-                    :visible="chooseAuditorVisible"></choose-auditor>
+    <!--<choose-auditor ref="chooseAuditor"-->
+                    <!--@close="setAuditer"-->
+                    <!--@hideChooseAuditer="chooseAuditorVisible=false"-->
+                    <!--:visible="chooseAuditorVisible"></choose-auditor>-->
     <choose-auditor-fen ref="chooseAuditorFen"
                         @close="setAuditerFen"
                         @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -523,7 +536,7 @@ import SubfileList from '@/components/oilsupplier/subfilelist'
 import BasisInfo from '@/components/oilsupplier/basisinfo'
 
 import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
-import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+// import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 import FloatImgBtn from '@/components/floatButton/index'
 import ElButton from '../../../../../node_modules/element-ui/packages/button/src/button'
 
@@ -546,7 +559,7 @@ export default {
     SubfileList, // 选择企业资质
     BasisInfo,
 
-    ChooseAuditor
+    // ChooseAuditor
   },
   computed: {
     ...mapGetters({
@@ -578,6 +591,7 @@ export default {
       }
     }
     return {
+      firOptions: [],
       loading: false,
       WorkerTotal: 0,
       allowpre: true,
@@ -819,7 +833,7 @@ export default {
       this.initDatas()
     }
     this.orgtreeChange(this.majorDept)
-    this.changeOrgUnit(this.selectDept)
+    // this.changeOrgUnit(this.selectDept)
   },
   methods: {
     nextStep () {
@@ -1337,17 +1351,17 @@ export default {
             this.secOrganize = _this.authUser.Profile.Superior.split(',').map((val) => {
               return parseInt(val)
             })
-            this.auditOrgChang(this.secOrganize)
+            // this.auditOrgChang(this.secOrganize)
           }
         })
         .catch(err => {
           console.error(err)
         })
     },
-    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
         })
@@ -1491,7 +1505,20 @@ export default {
         }
       })
     },
+    getFirAuditerByDept () {
+      let deptid = this.authUser.Profile.DepartmentId
+      this.userOptions = []
+      let auditstepcode = 'FIRST_TRIAL' // 初审人
+      api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+        console.log(res)
+        this.firOptions = res.data.item
+      }).catch(err => {
+        console.error(err)
+      })
+    },
     selectAuditOrg () {
+      this.getFirAuditerByDept()
+      this.changeOrgUnit(this.selectDept)
       if (this.IsCompanyUser === 0) {
         this.dialogVisible = true
       } else if (this.IsCompanyUser === 1) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -391,14 +391,28 @@
         <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-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-input ref="selectAuditer"-->
+                        <!--readonly-->
+                        <!--v-model="auditerName"-->
+                        <!--placeholder="请选择初审人">-->
+                <!--<el-button slot="append"-->
+                           <!--icon="el-icon-search"-->
+                           <!--@click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer"
@@ -500,10 +514,10 @@
       </span>
     </el-dialog>
 
-    <choose-auditor ref="chooseAuditor"
-                    @close="setAuditer"
-                    @hideChooseAuditer="chooseAuditorVisible=false"
-                    :visible="chooseAuditorVisible"></choose-auditor>
+    <!--<choose-auditor ref="chooseAuditor"-->
+                    <!--@close="setAuditer"-->
+                    <!--@hideChooseAuditer="chooseAuditorVisible=false"-->
+                    <!--:visible="chooseAuditorVisible"></choose-auditor>-->
     <choose-auditor-fen ref="chooseAuditorFen"
                         @close="setAuditerFen"
                         @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -532,7 +546,7 @@ import GoodsList from '@/components/oilsupplier/goodslist'
 import SubfileList from '@/components/oilsupplier/subfilelist'
 import GoodsInfo from '@/components/oilsupplier/goodsinfo'
 import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
-import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+// import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 import FloatImgBtn from '@/components/floatButton/index'
 
 export default {
@@ -552,7 +566,7 @@ export default {
     SubfileList, // 选择企业资质
     GoodsInfo,
 
-    ChooseAuditor
+    // ChooseAuditor
   },
   computed: {
     ...mapGetters({
@@ -598,6 +612,7 @@ export default {
       fushenauditer: '', // 复审人员
       majorDept: [100000000, 100000001, 100000071], // 专业可是
       userOptions: [],
+      firOptions: [],
       UnitOrgOptions: [],
       orgauditOptions: [],
       UnitOrg: '',
@@ -834,7 +849,7 @@ export default {
     }
     this.isAccess()
     // this.orgtreeChange(this.majorDept)
-    this.changeOrgUnit(this.selectDept)
+    // this.changeOrgUnit(this.selectDept)
   },
   methods: {
     tabclick () {
@@ -929,7 +944,7 @@ export default {
     },
     orgunitChange (val) {
       let deptid = val
-      let auditstepcode = 'SUB_OFFICE_JS'
+      let auditstepcode = 'SUB_OFFICE_WZ'
       api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
         this.orgauditOptions = res.data.item
       }).catch(err => {
@@ -1436,9 +1451,9 @@ export default {
     //     });
     // },
 
-    auditOrgChang (val) {
+    auditOrgChang () {
       let auditstepcode = 'SECOND_TRIAL'
-      api.getAuditerByFirst(val, auditstepcode, this.$axios)
+      api.getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
         .then(res => {
           this.secauditerOptions = res.data.item
         })
@@ -1655,19 +1670,34 @@ export default {
         }
       })
     },
+    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
+        // if (res.data.item != null && res.data.item.length > 0) {
+        //   this.AuditorForm.UserId = res.data.item[0].Id
+        // }
+      }).catch(err => {
+        console.error(err)
+      })
+    },
     selectAuditOrg () {
+      this.getFirAuditerByDept()
+      this.changeOrgUnit(this.selectDept)
       if (this.IsCompanyUser === 0) {
         this.dialogVisible = true
       } else if (this.IsCompanyUser === 1) {
         this.dialogVisibleCom = true
       }
     },
-    chooseAuditorShow () {
-      this.$refs['chooseAuditor'].getorgtreelist(
-        this.formData.SupplierTypeCode
-      )
-      this.chooseAuditorVisible = true
-    },
+    // chooseAuditorShow () {
+    //   this.$refs['chooseAuditor'].getorgtreelist(
+    //     this.formData.SupplierTypeCode
+    //   )
+    //   this.chooseAuditorVisible = true
+    // },
     setAuditer (val, name) {
       this.auditer = val
       this.auditerName = name

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -376,14 +376,28 @@
         <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-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-input ref="selectAuditer"-->
+                        <!--readonly-->
+                        <!--v-model="auditerName"-->
+                        <!--placeholder="请选择初审人">-->
+                <!--<el-button slot="append"-->
+                           <!--icon="el-icon-search"-->
+                           <!--@click="chooseAuditorShow"></el-button>-->
+              <!--</el-input>-->
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer"
@@ -485,10 +499,10 @@
       </span>
     </el-dialog>
 
-    <choose-auditor ref="chooseAuditor"
-                    @close="setAuditer"
-                    @hideChooseAuditer="chooseAuditorVisible=false"
-                    :visible="chooseAuditorVisible"></choose-auditor>
+    <!--<choose-auditor ref="chooseAuditor"-->
+                    <!--@close="setAuditer"-->
+                    <!--@hideChooseAuditer="chooseAuditorVisible=false"-->
+                    <!--:visible="chooseAuditorVisible"></choose-auditor>-->
     <choose-auditor-fen ref="chooseAuditorFen"
                         @close="setAuditerFen"
                         @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -570,6 +584,7 @@ export default {
       }
     }
     return {
+      firOptions: [],
       loading: false,
       WorkerTotal: 0,
       allowpre: true,
@@ -1229,17 +1244,17 @@ export default {
             this.secOrganize = _this.authUser.Profile.Superior.split(',').map((val) => {
               return parseInt(val)
             })
-            this.auditOrgChang(this.secOrganize)
+            // this.auditOrgChang(this.secOrganize)
           }
         })
         .catch(err => {
           console.error(err)
         })
     },
-    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
         })
@@ -1488,7 +1503,20 @@ export default {
         }
       })
     },
+    getFirAuditerByDept () {
+      let deptid = this.authUser.Profile.DepartmentId
+      this.userOptions = []
+      let auditstepcode = 'FIRST_TRIAL' // 初审人
+      api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+        console.log(res)
+        this.firOptions = res.data.item
+      }).catch(err => {
+        console.error(err)
+      })
+    },
     selectAuditOrg () {
+      this.getFirAuditerByDept()
+      this.changeOrgUnit(this.selectDept)
       if (this.IsCompanyUser === 0) {
         this.dialogVisible = true
       } else if (this.IsCompanyUser === 1) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -297,9 +297,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
@@ -391,6 +405,7 @@
 
     data() {
       return {
+        firOptions: [],
         loading: false,
         btnstatus: '',
         backRemark: '',
@@ -566,7 +581,7 @@
       }
       this.getDictOptions()
       this.initDatas()
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
       // this.getorgtreelist()
       // this.getorgtreelistbydeptid()
     },
@@ -730,11 +745,11 @@
         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)
+        api.getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
@@ -928,7 +943,18 @@
           console.error(err)
         })
       },
-
+      getFirAuditerByDept () {
+        console.log(this.authUser.Profile)
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          console.log(res)
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       AuditEntity (val) {
         this.auditOrgChange()
         this.btnstatus = val
@@ -938,6 +964,8 @@
           this.dialogMakeSure2 = true
         } else if (this.formData.Status === '10') {
           this.dialogVisible = true
+          this.getFirAuditerByDept()
+          this.changeOrgUnit(this.selectDept)
         } else {
           this.dialogMakeSure = true
           this.radioChange()
@@ -976,7 +1004,7 @@
             }
           }
           if (this.formData.Status == '10') {
-            if (this.auditerName === '') {
+            if (this.auditer === '') {
               this.$message({
                 type: 'warning',
                 message: '请选择初审人！'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -309,9 +309,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
@@ -404,6 +418,7 @@
 
     data() {
       return {
+        firOptions: [],
         loading: false,
         btnstatus: '',
         backRemark: '',
@@ -581,7 +596,7 @@
       this.getDictOptions()
       this.initDatas()
       // this.orgtreeChange(this.majorDept)
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
       // this.getorgtreelist()
       // this.getorgtreelistbydeptid()
     },
@@ -661,11 +676,11 @@
         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)
+        api.getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
@@ -948,7 +963,18 @@
           console.error(err)
         })
       },
-
+      getFirAuditerByDept () {
+        console.log(this.authUser.Profile)
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          console.log(res)
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       AuditEntity (val) {
         this.auditOrgChange()
         this.btnstatus = val
@@ -957,6 +983,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
@@ -995,7 +1023,7 @@
             }
           }
           if (this.formData.Status == '10') {
-            if (this.auditerName === '') {
+            if (this.auditer === '') {
               this.$message({
                 type: 'warning',
                 message: '请选择初审人！'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -295,9 +295,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
@@ -389,6 +403,7 @@
 
     data() {
       return {
+        firOptions: [],
         loading: false,
         btnstatus: '',
         backRemark: '',
@@ -731,7 +746,7 @@
       },
       auditOrgChang(val) {
         let auditstepcode = "SECOND_TRIAL";
-        api.getAuditerByFirst(val, auditstepcode, this.$axios)
+        api.getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
@@ -926,7 +941,18 @@
           console.error(err)
         })
       },
-
+      getFirAuditerByDept () {
+        console.log(this.authUser.Profile)
+        let deptid = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          console.log(res)
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       AuditEntity (val) {
         this.auditOrgChange()
         this.btnstatus = val
@@ -935,6 +961,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
@@ -974,7 +1001,7 @@
             }
           }
           if (this.formData.Status == '10') {
-            if (this.auditerName === '') {
+            if (this.auditer === '') {
               this.$message({
                 type: 'warning',
                 message: '请选择初审人！'

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -1627,12 +1627,10 @@ export default {
 
 
     changeTypeCode () {
-      console.log(this.importData.Type)
       let params = {
         Type: this.importData.Type
       }
       api.getTableHeaderList(params, this.$axios).then(res => {
-        console.log(res, '============')
         this.TableHeaderList = res.data.item
       })
     },
@@ -1663,7 +1661,6 @@ export default {
       this.getCertSub()
     },
     openfilelist (row) {
-      console.log(row)
       let _this = this
       _this.dialogVisibleSubFile = true
       _this.SupplierId = row.Id

src/dashoo.cn/frontend_web/src/pages/select/components/subfilelist.vue

@@ -121,7 +121,6 @@
           SupplierName: this.SupplierName,
           SupTypeCode: this.SupTypeCode
         }
-        console.log(params)
         api.getBusinessLicenseById(params, this.$axios).then(res => {
           this.importloading = false
           if (res.data.code === 0) {

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -447,18 +447,18 @@
           ContactId: [
             { required: true, validator: checkContactId, trigger: 'change' }
           ],
-          LegalPersonImg: [
-            { required: !this.legalHaspic,
-              message: '请上传法定代表人身份证照片',
-              trigger: 'change'
-            }
-          ],
-          ContactImg: [
-            { required: !this.ContactImg,
-              message: '请上传联系人身份证照片',
-              trigger: 'change'
-            }
-          ],
+          // LegalPersonImg: [
+          //   { required: !this.legalHaspic,
+          //     message: '请上传法定代表人身份证照片',
+          //     trigger: 'change'
+          //   }
+          // ],
+          // ContactImg: [
+          //   { required: !this.ContactImg,
+          //     message: '请上传联系人身份证照片',
+          //     trigger: 'change'
+          //   }
+          // ],
           UserName: [
             { required: true,
               validator: userNameIsExist,