Przeglądaj źródła

企业用户分办修改

huahaiyan 6 lat temu
rodzic
commit
06715e116b

+ 188 - 0
src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditorfenban.vue

@@ -0,0 +1,188 @@
+<template>
+  <div>
+    <el-dialog title="选择审核人员" :visible="visible" @close="hideChooseAuditer" top="5vh" width="800px">
+      <el-form label-width="110px" ref="EntityForm" :model="formData">
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-card style="width: 100%;height: calc(100vh - 253px);overflow: auto">
+              <div slot="header" class="clearfix">
+                <span>请选择部门</span>
+              </div>
+              <el-tree :data="orgtreelist" :props="orgtreeprops" @node-click="handleNodeClick"></el-tree>
+            </el-card>
+          </el-col>
+
+          <el-col :span="12">
+            <el-card style="width: 100%;height: calc(100vh - 253px);overflow: auto">
+              <el-table :data="userOptions" style="width: 100%" ref="multipleTable"
+                        @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column prop="realname" label="可选用户">
+                  <template slot="header" slot-scope="scope">
+                    <el-button type="primary" style="float: right;" size="small" @click="toggleSelection">
+                      选择审核人 <el-icon class="el-icon-d-arrow-right"></el-icon>
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-card style="width: 100%;height: calc(100vh - 253px);overflow: auto">
+              <div slot="header" class="clearfix">
+                <span>
+                  请选择用户
+                </span>
+                <span style="float: right;">
+                  <el-button style="float: right;margin-top: -10px" type="text" @click="toggleSelection">确定</el-button>
+                </span>
+              </div>
+              <el-form :model="AuditorForm" label-width="90px" size="mini">
+                <el-row>
+                  <el-col :span="24">
+                    <el-select v-model="AuditorForm.UserId" clearable style="width:100%" placeholder="请选择">
+                      <el-option v-for="item in userOptions" :label="item.realname" :value="item.id" :key="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-card>
+          </el-col> -->
+        </el-row>
+      </el-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/system/auditsetting'
+  import supapi from '@/api/oilsupplier/supplier'
+  import ElCol from "../../../node_modules/element-ui/packages/col/src/col";
+  import ElIcon from "../../../node_modules/element-ui/packages/icon/src/icon";
+  export default {
+    components: {
+      ElIcon,
+      ElCol
+    },
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'chooseAuditorFenban',
+    props: {
+      visible: {
+        type: Boolean,
+        default: false
+      }
+    },
+    /*watch: {
+      visible(val) {
+        this.selfVisible = val
+        if (this.visible) {
+          this.createoptions
+        }
+      },
+      selfVisible(val) {
+        this.$emit('update:visible', val)
+      }
+    },*/
+    data() {
+      return {
+        userOptions: [],
+        selectedOptions: {},
+        orgtreelist: [],
+        orgtreeprops: {
+          value: 'id',
+          label: 'Fullname',
+          children: 'children'
+        },
+        formData: {},
+        AuditorForm: {
+          UserId: ''
+        },
+        selfVisible: this.visible, // 避免vue双向绑定警告
+        SupplierTypeCode: ''
+      }
+    },
+    created() {},
+    methods: {
+      getorgtreelist(SupplierTypeCode) {
+        let _this = this
+        let params = {
+          IsInnerOrganize: 1,
+          // ParentId: 0
+        }
+        _this.$axios.get('organizes/orgalllist', {
+            params
+          })
+          .then(res => {
+            _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
+            console.log("_-this.orgtreelist--",this.orgtreelist)
+            _this.SupplierTypeCode = SupplierTypeCode
+            if (SupplierTypeCode == '01') { //物资类
+              _this.handleNodeClick(_this.orgtreelist[0].children[11])
+            } else if (SupplierTypeCode == '02') { //基建类
+              _this.handleNodeClick(_this.orgtreelist[0].children[17])
+            } else {
+              _this.handleNodeClick(_this.orgtreelist[0].children[0])
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      handleNodeClick(data) {
+        // this.userOptions = []
+        // api.getAuditerByDept(data.id, this.$axios).then(res => {
+        //   if (res.data.code === 1) {
+        //     this.userOptions = res.data.item
+        //     if (res.data.item.length > 0) {
+        //       this.AuditorForm.UserId = res.data.item[0].id
+        //     }
+        //   }
+        // }).catch(err => {
+        //   console.error(err)
+        // })
+
+        let deptid = data.id
+        this.userOptions = []
+        let auditstepcode = 'SUB_OFFICE' // 分办人
+        supapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.userOptions = res.data.item
+          console.log("---this.userOptions--",this.userOptions)
+          if (res.data.item != null && res.data.item.length > 0) {
+            this.AuditorForm.UserId = res.data.item[0].id
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      handleSelectionChange(row) {
+        this.selectedOptions = row[row.length-1]
+        if (row.length <= 1) {
+          return
+        } else {
+          this.$refs.multipleTable.clearSelection()
+          this.$refs.multipleTable.toggleRowSelection(row[row.length-1])
+        }
+      },
+      toggleSelection () {
+        this.$emit('close', this.selectedOptions.id, this.selectedOptions.realname)
+      },
+      hideChooseAuditer () {
+        this.$emit('hideChooseAuditer')
+      },
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

+ 52 - 40
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -278,8 +278,8 @@
         <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 ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
@@ -299,6 +299,8 @@
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+    <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
   </div>
 </template>
 
@@ -321,6 +323,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 FloatImgBtn from '@/components/floatButton/index'
 
@@ -332,6 +335,7 @@
       WfMultiHistory,
       WfBackHistory,
       SupplierCertEdit,
+      ChooseAuditorFen,
 
       EquipmentList, // 企业主要情况
       PerformanceList, // 近三年主要业绩列表
@@ -375,6 +379,7 @@
       return {
         activeName: '0',
         chooseAuditorVisible: false,
+        chooseAuditorVisibleFen: false,
         showReturn: 1,
         IsCompanyUser: 0,
         fushenauditer: '', //复审人员
@@ -526,24 +531,18 @@
         },
         flag: '02',
         rules: {
-          WorkerTotal: [
-            {
-              validator: checkWorkerTotal,
-              trigger: 'blur'
-            }
-          ],
-          TechnicalNum: [
-            {
-              validator: checkTechnicalNum,
-              trigger: 'blur'
-            }
-          ],
-          SkillerTotal: [
-            {
-              validator: checkSkillerTotal,
-              trigger: 'blur'
-            }
-          ]
+          WorkerTotal: [{
+            validator: checkWorkerTotal,
+            trigger: 'blur'
+          }],
+          TechnicalNum: [{
+            validator: checkTechnicalNum,
+            trigger: 'blur'
+          }],
+          SkillerTotal: [{
+            validator: checkSkillerTotal,
+            trigger: 'blur'
+          }]
         }
       }
     },
@@ -562,7 +561,7 @@
         this.formData.Id = 0
       }
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-      console.log("----this.IsCompanyUser----",this.IsCompanyUser)
+      console.log("----this.IsCompanyUser----", this.IsCompanyUser)
       this.getDictOptions()
       //this.getorgtreelist()
       if (this.IsCompanyUser && this.serviceId === 'add') {
@@ -734,14 +733,16 @@
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this.formDataCert.InStyle)
+            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
+              .formDataCert.InStyle)
           }).catch(err => {
             console.error(err)
           })
         }
       },
       getbuslist() {
-        this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this.formDataCert.InStyle)
+        this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
+          .formDataCert.InStyle)
       },
       nextTab() {
         let totalTab = 3
@@ -953,21 +954,22 @@
               return false
             }
             this.formDataCert.InStyle = this.formData.InStyle
-            api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                // 保存成功后,初始化数据,变成修改
-                this.initDatas()
-                this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-              } else {
-                this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            }).catch(err => {
+            api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(
+              res => {
+                if (res.data.code === 0) {
+                  // 保存成功后,初始化数据,变成修改
+                  this.initDatas()
+                  this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                } else {
+                  this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              }).catch(err => {
               console.error(err)
             })
           } else {
@@ -976,10 +978,10 @@
         })
       },
       selectAuditOrg() {
-        console.log("----this.IsCompanyUser",this.IsCompanyUser)
+        console.log("----this.IsCompanyUser", this.IsCompanyUser)
         if (this.IsCompanyUser === 0) {
           this.dialogVisible = true
-        }else if (this.IsCompanyUser === 1){
+        } else if (this.IsCompanyUser === 1) {
           this.dialogVisibleCom = true
         }
       },
@@ -994,6 +996,16 @@
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
+      chooseAuditorShowFen() {
+        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
       AuditEntity(val) {
         if (this.auditer === "") {
           this.$message({

+ 85 - 175
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -31,12 +31,7 @@
             @click="nextTab"
           >下一步</el-button>-->
           <el-popover>
-            <el-steps
-              :active="formData.Step"
-              direction="vertical"
-              align-center
-              finish-status="success"
-            >
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
               <el-step title="待审批"></el-step>
               <el-step title="已审批"></el-step>
@@ -47,13 +42,8 @@
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
           <router-link :to="'/oilsupplier/annualaudit'">
-            <el-button
-              type="primary"
-              plain
-              size="mini"
-              style="margin-right:3px"
-              :disabled="formDataCert.Status == 0"
-            >年审申请</el-button>
+            <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0">
+              年审申请</el-button>
           </router-link>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
@@ -83,15 +73,9 @@
                 </el-button>
               </span>
             </div>
-            <goods-info
-              ref="GoodsInfo"
-              :formData.sync="formData"
-              :dictData.sync="dictData"
-              :authUser="authUser"
-              :canUpdateSupplier="canUpdateSupplier"
-              @selectcompany="changeFormData"
-              @inputcompany="inputCompany"
-            ></goods-info>
+            <goods-info ref="GoodsInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
+              :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
+            </goods-info>
           </el-card>
         </el-tab-pane>
 
@@ -111,34 +95,22 @@
 
                   <!--修改为必填-->
                   <el-form-item label="企业员工总数" prop="WorkerTotal">
-                    <el-input-number
-                      v-model="formDataCert.WorkerTotal"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同化用工数量">
-                    <el-input-number
-                      v-model="formDataCert.ContractNum"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="大学及以上学历人员数量">
-                    <el-input-number
-                      v-model="formDataCert.UniversityNum"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
@@ -146,78 +118,50 @@
 
                   <!--修改为必填-->
                   <el-form-item label="技术、管理人员数量" prop="TechnicalNum">
-                    <el-input-number
-                      v-model="formDataCert.TechnicalNum"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="高级及以上职称人员数量">
-                    <el-input-number
-                      v-model="formDataCert.AboveProfNum"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="中级职称人员数量">
-                    <el-input-number
-                      v-model="formDataCert.MiddleProfNum"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格人员数量">
-                    <el-input-number
-                      v-model="formDataCert.NationalRegNum"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="具有国家注册执业资格证书总数">
-                    <el-input-number
-                      v-model="formDataCert.NationalCertTotal"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="设计人员总数">
-                    <el-input-number
-                      v-model="formDataCert.DesignerTotal"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="技术工人总数" prop="SkillerTotal">
-                    <el-input-number
-                      v-model="formDataCert.SkillerTotal"
-                      controls-position="right"
-                      :min="0"
-                      style="width: 100%"
-                    ></el-input-number>
+                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -230,15 +174,8 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
                 v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
-            <equipment-list
-              ref="equipmentList"
-              :data.sync="equipmentList"
-              :SupplierCertId="certId+''"
-              :SupplierTypeCode="classId"
-              :canadd="add_flat"
-              height="360px"
-              style="margin-top: 20px"
-            ></equipment-list>
+            <equipment-list ref="equipmentList" :data.sync="equipmentList" :SupplierCertId="certId+''"
+              :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></equipment-list>
           </el-card>
 
           <el-card class="box-card" style="margin-top: 10px;">
@@ -247,14 +184,8 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
                 v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
-            <performance-list
-              ref="performanceList"
-              :data.sync="performanceList"
-              :SupplierCertId="certId+''"
-              :SupplierTypeCode="classId"
-              :canadd="add_flat"
-              style="margin-top: 20px"
-            ></performance-list>
+            <performance-list ref="performanceList" :data.sync="performanceList" :SupplierCertId="certId+''"
+              :SupplierTypeCode="classId" :canadd="add_flat" style="margin-top: 20px"></performance-list>
           </el-card>
 
           <el-card class="box-card" style="margin-top: 10px;">
@@ -263,15 +194,8 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
                 v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
-            <patent-list
-              ref="patentList"
-              :data.sync="patentList"
-              :SupplierCertId="certId+''"
-              :SupplierTypeCode="classId"
-              :canadd="add_flat"
-              height="360px"
-              style="margin-top: 20px"
-            ></patent-list>
+            <patent-list ref="patentList" :data.sync="patentList" :SupplierCertId="certId+''"
+              :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></patent-list>
           </el-card>
 
           <el-card class="box-card" style="margin-top: 10px;">
@@ -280,36 +204,18 @@
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
                 v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
-            <winning-list
-              ref="winningList"
-              :data.sync="winningList"
-              :SupplierCertId="certId+''"
-              :SupplierTypeCode="classId"
-              :canadd="add_flat"
-              height="360px"
-              style="margin-top: 20px"
-            ></winning-list>
+            <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId+''"
+              :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></winning-list>
           </el-card>
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <goods-list
-            ref="goodsList"
-            :data.sync="goodsList"
-            @close="getbuslist"
-            :canadd="add_flat"
-            height="360px"
-            style="margin-top: 20px"
-          ></goods-list>
+          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" height="360px"
+            style="margin-top: 20px"></goods-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
-          <subfile-list
-            ref="subfileList"
-            :data.sync="subfileList"
-            :canadd="add_flat"
-            :flag="flag"
-            @close="selectAuditOrg"
-          ></subfile-list>
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" :flag="flag"
+            @close="selectAuditOrg"></subfile-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
@@ -377,8 +283,8 @@
         <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 ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
@@ -396,12 +302,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"
+      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
   </div>
 </template>
 
@@ -423,7 +327,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 FloatImgBtn from '@/components/floatButton/index'
 
@@ -434,6 +338,7 @@
       WfMultiHistory,
       WfBackHistory,
       SupplierCertEdit,
+      ChooseAuditorFen,
 
       EquipmentList, // 企业主要情况
       PerformanceList, // 近三年主要业绩列表
@@ -476,6 +381,7 @@
       };
       return {
         chooseAuditorVisible: false,
+        chooseAuditorVisibleFen: false,
         createBtn: false,
         activeName: "0",
         fushenauditer: '', //复审人员
@@ -629,43 +535,37 @@
         },
         flag: "01",
         rules: {
-          WorkerTotal: [
-            {
-              validator: checkWorkerTotal,
-              trigger: 'blur'
-            }
-          ],
-          TechnicalNum: [
-            {
-              validator: checkTechnicalNum,
-              trigger: 'blur'
-            }
-          ],
-          SkillerTotal: [
-            {
-              validator: checkSkillerTotal,
-              trigger: 'blur'
-            }
-          ]
+          WorkerTotal: [{
+            validator: checkWorkerTotal,
+            trigger: 'blur'
+          }],
+          TechnicalNum: [{
+            validator: checkTechnicalNum,
+            trigger: 'blur'
+          }],
+          SkillerTotal: [{
+            validator: checkSkillerTotal,
+            trigger: 'blur'
+          }]
         }
       };
     },
-  mounted() {
-    this.serviceId = this.$route.params.opera + "";
-    if (this.$route.query.rtn) {
-      this.showReturn = 0;
-    }
-    if (this.$route.query.certid) {
-      this.certId = this.$route.query.certid + "";
-    }
-    if (this.serviceId !== "add" && this.serviceId > 0) {
-      this.formData.Id = this.serviceId;
-    } else {
-      this.formData.Id = 0;
-    }
-    this.getDictOptions();
-    //this.getorgtreelist();
-    this.IsCompanyUser = this.authUser.Profile.IsCompanyUser;
+    mounted() {
+      this.serviceId = this.$route.params.opera + "";
+      if (this.$route.query.rtn) {
+        this.showReturn = 0;
+      }
+      if (this.$route.query.certid) {
+        this.certId = this.$route.query.certid + "";
+      }
+      if (this.serviceId !== "add" && this.serviceId > 0) {
+        this.formData.Id = this.serviceId;
+      } else {
+        this.formData.Id = 0;
+      }
+      this.getDictOptions();
+      //this.getorgtreelist();
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser;
 
       if (this.IsCompanyUser && this.serviceId === "add") {
         apiCert
@@ -1170,6 +1070,16 @@
         this.chooseAuditorVisible = false;
         this.auditOrgChang(this.auditer)
       },
+      chooseAuditorShowFen() {
+        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
       AuditEntity(val) {
         if (this.auditer === "") {
           this.$message({

+ 39 - 29
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -277,8 +277,8 @@
         <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 ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
@@ -298,6 +298,8 @@
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+    <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+      :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
 
   </div>
 </template>
@@ -320,7 +322,7 @@
   import TechList from '@/components/oilsupplier/techlist'
   import SubfileList from '@/components/oilsupplier/subfilelist'
   import TechInfo from '@/components/oilsupplier/techinfo'
-
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import FloatImgBtn from '@/components/floatButton/index'
 
@@ -332,7 +334,7 @@
       WfMultiHistory,
       WfBackHistory,
       SupplierCertEdit,
-
+      ChooseAuditorFen,
       EquipmentList, // 企业主要情况
       PerformanceList, // 近三年主要业绩列表
       PatentList, // 拥有专利、专有技术及工法列表
@@ -375,6 +377,7 @@
       return {
         activeName: '0',
         chooseAuditorVisible: false,
+        chooseAuditorVisibleFen: false,
         showReturn: 1,
         IsCompanyUser: 0,
         dialogVisible: false,
@@ -524,26 +527,20 @@
           classId: '03',
           workflowId: ''
         },
-        flag:'03',
+        flag: '03',
         rules: {
-          WorkerTotal: [
-            {
-              validator: checkWorkerTotal,
-              trigger: 'blur'
-            }
-          ],
-          TechnicalNum: [
-            {
-              validator: checkTechnicalNum,
-              trigger: 'blur'
-            }
-          ],
-          SkillerTotal: [
-            {
-              validator: checkSkillerTotal,
-              trigger: 'blur'
-            }
-          ]
+          WorkerTotal: [{
+            validator: checkWorkerTotal,
+            trigger: 'blur'
+          }],
+          TechnicalNum: [{
+            validator: checkTechnicalNum,
+            trigger: 'blur'
+          }],
+          SkillerTotal: [{
+            validator: checkSkillerTotal,
+            trigger: 'blur'
+          }]
         }
       }
     },
@@ -734,14 +731,16 @@
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['techList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this.formDataCert.InStyle)
+            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
+              .formDataCert.InStyle)
           }).catch(err => {
             console.error(err)
           })
         }
       },
       getbuslist() {
-        this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this.formDataCert.InStyle)
+        this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
+          .formDataCert.InStyle)
       },
 
       getDictOptions() {
@@ -782,7 +781,7 @@
           })
       },
       auditOrgChang(val) {
-          console.log("------val", val)
+        console.log("------val", val)
         let auditstepcode = "SECOND_TRIAL";
         api
           .getAuditerByFirst(val, auditstepcode, this.$axios)
@@ -957,7 +956,8 @@
               return false
             }
             this.formDataCert.InStyle = this.formData.InStyle
-            api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(res => {
+            api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(
+            res => {
               if (res.data.code === 0) {
                 // 保存成功后,初始化数据,变成修改
                 this.initDatas()
@@ -980,10 +980,10 @@
         })
       },
       selectAuditOrg() {
-        console.log("----this.IsCompanyUser",this.IsCompanyUser)
+        console.log("----this.IsCompanyUser", this.IsCompanyUser)
         if (this.IsCompanyUser === 0) {
           this.dialogVisible = true
-        }else if (this.IsCompanyUser === 1){
+        } else if (this.IsCompanyUser === 1) {
           this.dialogVisibleCom = true
         }
       },
@@ -997,6 +997,16 @@
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
+      chooseAuditorShowFen() {
+        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
+      setAuditerFen(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
       AuditEntity() {
         //this.auditer = val
         if (this.auditer === '') {