准入增项审批人修改

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

@@ -73,11 +73,11 @@
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+        <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
           <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
             style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
@@ -103,16 +103,20 @@
     </el-dialog>
     <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
-            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
-          </el-cascader>
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
         </el-form-item>
-        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+        <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
             filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
@@ -121,28 +125,26 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="审核状态">
-          <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
-          </template>
-        </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
+          </el-cascader>
         </el-form-item>
+        
+        
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
-        <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
+        <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人部门">
+        <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
             filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
@@ -150,6 +152,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogAllocation = false">取 消</el-button>
@@ -213,9 +218,10 @@
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
+        companyid:'',
         orgtreeprops: {
           value: 'id',
-          label: 'Fullname',
+          label: 'name',
           children: 'children'
         },
         auditBtn: false,
@@ -297,6 +303,7 @@
       }
     },
     created() {
+      this.companyid = this.authUser.Profile.Superior
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
       this.AppendId = this.serviceId
@@ -381,6 +388,7 @@
       },
 
       AuditEntity() {
+        this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
@@ -396,8 +404,9 @@
         }
         suppapi.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          this.organizeOption = res.data.items['Organizes']
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          // this.auditerOptions = res.data.items['Auditer']
+          // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
           console.error(err)
         })
@@ -442,7 +451,9 @@
         } else {
           return
         }
-        let deptid = val[val.length - 1]
+        let deplist = []
+        deplist = this.companyid.split(",")
+        let deptid = deplist[deplist.length - 1]
         console.log(deptid)
         this.auditerOptions = []
         this.auditer = ''

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

@@ -80,11 +80,11 @@
     </el-card>
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+        <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
           <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
             style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
@@ -110,16 +110,20 @@
     </el-dialog>
     <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
-            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
-          </el-cascader>
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
         </el-form-item>
-        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+        <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
             filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
@@ -128,28 +132,26 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="审核状态">
-          <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
-          </template>
-        </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
+          </el-cascader>
         </el-form-item>
+        
+        
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
-        <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
+        <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人部门">
+        <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
             filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
@@ -157,6 +159,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogAllocation = false">取 消</el-button>
@@ -221,9 +226,10 @@
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
+        companyid:'',
         orgtreeprops: {
           value: 'id',
-          label: 'Fullname',
+          label: 'name',
           children: 'children'
         },
         auditBtn: false,
@@ -305,6 +311,7 @@
       }
     },
     created() {
+      this.companyid = this.authUser.Profile.Superior
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
       this.AppendId = this.serviceId
@@ -388,6 +395,7 @@
       },
 
       AuditEntity() {
+        this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
@@ -403,8 +411,9 @@
         }
         suppapi.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          this.organizeOption = res.data.items['Organizes']
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          // this.auditerOptions = res.data.items['Auditer']
+          // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
           console.error(err)
         })
@@ -439,7 +448,8 @@
             console.error(err)
           })
       },
-      auditOrgChange(val) {
+      auditOrgChange() {
+        
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
@@ -449,7 +459,9 @@
         } else {
           return
         }
-        let deptid = val[val.length - 1]
+        let deplist = []
+        deplist = this.companyid.split(",")
+        let deptid = deplist[deplist.length - 1]
         console.log(deptid)
         this.auditerOptions = []
         this.auditer = ''

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

@@ -79,11 +79,11 @@
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+        <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
           <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
             style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
@@ -109,16 +109,20 @@
     </el-dialog>
     <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
-            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
-          </el-cascader>
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
         </el-form-item>
-        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+        <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
             filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
@@ -127,28 +131,25 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="审核状态">
-          <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
-          </template>
-        </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
+          </el-cascader>
         </el-form-item>
+        
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
-        <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
+        <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人部门">
+        <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
             filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
@@ -156,6 +157,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogAllocation = false">取 消</el-button>
@@ -225,9 +229,10 @@
         auditBtn: false,
         auditstepcode: '',
         dictData: null,
+        companyid:'',
         orgtreeprops: {
           value: 'id',
-          label: 'Fullname',
+          label: 'name',
           children: 'children'
         },
         FirstAudit: '',
@@ -325,6 +330,7 @@
       }
     },
     created() {
+      this.companyid = this.authUser.Profile.Superior
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
       this.AppendId = this.serviceId
@@ -408,6 +414,7 @@
       },
 
       AuditEntity() {
+        this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
@@ -423,8 +430,9 @@
         }
         suppapi.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          this.organizeOption = res.data.items['Organizes']
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          // this.auditerOptions = res.data.items['Auditer']
+          // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
           console.error(err)
         })
@@ -460,7 +468,7 @@
           })
       },
       auditOrgChange(val) {
-        console.log(this.formData.Status, 'status')
+         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
           auditstepcode = 'SECOND_TRIAL'
@@ -469,7 +477,9 @@
         } else {
           return
         }
-        let deptid = val[val.length - 1]
+        let deplist = []
+        deplist = this.companyid.split(",")
+        let deptid = deplist[deplist.length - 1]
         console.log(deptid)
         this.auditerOptions = []
         this.auditer = ''

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

@@ -47,7 +47,7 @@
         <el-step title="完成"></el-step>
       </el-steps> -->
 
-      <el-tabs tab-position="top" style="margin-top: -10px">
+      <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -315,6 +315,7 @@
 
     data() {
       return {
+        activeName: '1',
         chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,

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

@@ -46,7 +46,7 @@
         <el-step title="完成"></el-step>
       </el-steps> -->
 
-      <el-tabs tab-position="top" style="margin-top: -10px">
+      <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -316,6 +316,7 @@
 
     data() {
       return {
+        activeName: '1',
         chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,

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

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-right: 3px" @click="selectAuditOrg"
+          <el-button type="primary" size="mini" style="margin-right: 3px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">

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

@@ -14,12 +14,17 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"-->
-            <!--v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '3'">提交专业审批</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '4'">专业审批</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '5'">集中审批</el-button>
+          <!--v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '3'">提交专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '4'">专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+            v-if="auditBtn && this.formData.Status == '5'">集中审批</el-button>
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -216,7 +221,6 @@
     </el-dialog>
     <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-
         <el-form-item label="审核状态">
           <template>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
@@ -226,24 +230,31 @@
         <el-form-item label="意见">
           <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
         </el-form-item>
-        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
-                       style="width: 100%" v-model="majorDept" placeholder="请选择组织">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+        <el-divider></el-divider>
+        <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                       filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
+            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="aduitlabel"
-                      v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
-                     default-first-option>
+            default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-divider></el-divider>
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <!-- <el-select ref="selectAuditer" v-model="majorDept" placeholder="请选择" style="width: 90%" filterable allow-create
+            default-first-option>
+            <el-option v-for="item in orgtreelist" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select> -->
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
@@ -252,18 +263,21 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人部门">
+        <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
             filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="审批人">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable allow-create
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogAllocation = false">取 消</el-button>
@@ -328,7 +342,7 @@
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
-        majorDept: [],
+        majorDept: [100000180,100000210],
         serviceId: '',
         certId: '',
         classId: '02',
@@ -342,9 +356,10 @@
         auditTitle: '审批',
         auditstepcode: '',
         auditBtn: false,
+        companyid: '',
         orgtreeprops: {
           value: 'id',
-          label: 'Fullname',
+          label: 'name',
           children: 'children'
         },
         shenheForm: {
@@ -457,6 +472,7 @@
       }
     },
     created() {
+      this.companyid = this.authUser.Profile.Superior
       this.serviceId = this.$route.params.opera + ''
       this.certId = this.$route.query.certid + ''
       if (this.serviceId !== 'add' && this.serviceId > 0) {
@@ -464,10 +480,10 @@
       } else {
         this.formData.Id = 0
       }
-      // this.getDictOptions()
+      this.getDictOptions()
       this.initDatas()
-      this.getorgtreelist()
-      this.getorgtreelistbydeptid()
+      // this.getorgtreelist()
+      // this.getorgtreelistbydeptid()
     },
     methods: {
       equipmentdialog() {
@@ -529,7 +545,6 @@
             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.getDictOptions()
             this.isAccess()
           }).catch(err => {
             console.error(err)
@@ -551,8 +566,9 @@
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          this.organizeOption = res.data.items['Organizes']
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          // this.auditerOptions = res.data.items['Auditer']
+          // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
           console.error(err)
         })
@@ -598,7 +614,9 @@
         } else {
           return
         }
-        let deptid = val[val.length - 1]
+        let deplist = []
+        deplist = this.companyid.split(",")
+        let deptid = deplist[deplist.length - 1]
         console.log(deptid)
         this.auditerOptions = []
         this.auditer = ''
@@ -715,6 +733,7 @@
       },
 
       AuditEntity() {
+        this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {

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

@@ -239,45 +239,23 @@
 
         <el-divider></el-divider>
 
-        <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
-          <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>
-            <el-option
-              v-for="item in secauditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
-            </el-option>
-          </el-select>-->
-        </el-form-item>
-
-        <!--<el-form-item label="复审部门" v-if="this.formData.Status == '1'">
-          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                       filterable style="width: 100%" @change="auditOrgChange"
-                       placeholder="请选择组织">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                     style="width: 100%" filterable allow-create default-first-option>
-            <el-option
-              v-for="item in secauditerOptions"
-              :key="item.id"
-              :label="item.realname"
-              :value="item.id">
+        <el-form-item :label="aduitlabel"
+          v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
+            default-first-option>
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
-        </el-form-item>-->
-
+        </el-form-item>
         <el-divider></el-divider>
-
         <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                       filterable style="width: 100%" v-model="majorDept"
-                       placeholder="请选择组织">
+          <!-- <el-select ref="selectAuditer" v-model="majorDept" placeholder="请选择" style="width: 90%" filterable allow-create
+            default-first-option>
+            <el-option v-for="item in orgtreelist" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select> -->
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
         </el-form-item>
 
@@ -289,15 +267,15 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人部门">
+        <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
                        filterable style="width: 100%" @change="auditOrgChange"
                        placeholder="请选择组织">
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                     style="width: 90%" filterable allow-create default-first-option>
+                     style="width: 100%" filterable allow-create default-first-option>
             <el-option
               v-for="item in secauditerOptions"
               :key="item.id"
@@ -306,6 +284,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogAllocation = false">取 消</el-button>
@@ -378,7 +359,7 @@
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
-        majorDept: [],
+        majorDept: [100000180,100000192],
         serviceId: '',
         certId: '',
         classId: '01',
@@ -390,9 +371,10 @@
         aduitlabel: '审核人',
         auditTitle: '审批',
         auditBtn: false,
+        companyid:'',
         orgtreeprops: {
           value: 'id',
-          label: 'Fullname',
+          label: 'name',
           children: 'children'
         },
         shenheForm: {
@@ -506,6 +488,7 @@
       }
     },
     created () {
+      this.companyid = this.authUser.Profile.Superior
       this.serviceId = this.$route.params.opera + ''
       this.certId = this.$route.query.certid + ''
       if (this.serviceId !== 'add' && this.serviceId > 0) {
@@ -513,10 +496,10 @@
       } else {
         this.formData.Id = 0
       }
-      // this.getDictOptions()
+      this.getDictOptions()
       this.initDatas()
-      this.getorgtreelist()
-      this.getorgtreelistbydeptid()
+      // this.getorgtreelist()
+      // this.getorgtreelistbydeptid()
     },
     methods: {
       equipmentdialog () {
@@ -589,7 +572,6 @@
             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.getDictOptions()
             this.isAccess()
           }).catch(err => {
             console.error(err)
@@ -611,8 +593,9 @@
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          this.auditerOptions = res.data.items['Auditer']
-          this.organizeOption = res.data.items['Organizes']
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          //this.auditerOptions = res.data.items['Auditer']
+          //this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
           console.error(err)
         })
@@ -647,7 +630,7 @@
             console.error(err)
           })
       },
-      auditOrgChange (val) {
+      auditOrgChange () {
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
@@ -657,7 +640,9 @@
         } else {
           return
         }
-        let deptid = val[val.length - 1]
+        let deplist = []
+        deplist = this.companyid.split(",")
+        let deptid = deplist[deplist.length - 1]
         console.log(deptid)
         this.auditerOptions = []
         this.auditer = ''
@@ -774,6 +759,7 @@
       },
 
       AuditEntity () {
+        this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {