提交初审修改

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertService.go

@@ -133,7 +133,8 @@ func (s *OilSupplierCertService) IsCanApplyByExtOrganizeUser(applyType, departme
 }
 
 func (s *OilSupplierCertService) GetAuditUser(organizeId, auditstepcode string, entitiesPtr interface{}){
-	where := "a.DepartmentId=" + organizeId + " and AuditStepCode='" + auditstepcode + "'"
+	where := "a.DepartmentId=" + organizeId + " OR a.CompanyId=" + organizeId + " and AuditStepCode='" + auditstepcode + "'"
+	//where := "a.DepartmentId=" + organizeId + " and AuditStepCode='" + auditstepcode + "'"
 	sql := "SELECT a.UserId Id, a.UserName RealName FROM Base_OilAuditSetting o LEFT JOIN OilAuditUser a ON o.Id = a.SettingId where " + where
 	s.DBE.SQL(sql).Find(entitiesPtr)
 	return

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

@@ -405,7 +405,8 @@ func (this *OilSupplierCertAppendController) GetMyTaskEntityList() {
 // @router /audit/:id [post]
 func (this *OilSupplierCertAppendController) AuditEntity() {
 	certappendId := this.Ctx.Input.Param(":id")
-	firstAudit := this.GetString("firstAudit")
+	firstAudit := this.GetString("FirstAuditName")
+	AuditRemark := this.GetString("AuditRemark")
 
 	//取出审批列表
 	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
@@ -439,7 +440,7 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
-	ActiComplete.Remarks = ""
+	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
 

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplierappend.js

@@ -40,10 +40,11 @@ export default {
     })
   },
   //提交审批
-  auditEntity (entityId, FirstAudit, myAxios) {
+  auditEntity (entityId, params, myAxios) {
     return myAxios({
-      url: '/suppliercertappend/audit/' + entityId + '?firstAudit=' + FirstAudit,
-      method: 'post'
+      url: '/suppliercertappend/audit/' + entityId ,
+      method: 'post',
+      params: params
     })
   },
   auditEntityFir (entityId, params, myAxios) {

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

@@ -35,7 +35,7 @@
         <el-step title="完成"></el-step>
       </el-steps> -->
 
-      <el-tabs tab-position="right" style="margin-top: -10px">
+      <el-tabs tab-position="top" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -205,23 +205,32 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-    <!-- <el-dialog title="选择审批单位" :visible.sync="dialogVisible" width="520px">
-      <el-form ref="searchForm" label-width="110px">
+    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+      <el-form ref="searchForm" label-width="70px">
         <el-row>
-          <el-col :span="24">
+          <!--<el-col :span="24">
             <el-form-item label="二级单位">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
                 filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
               </el-cascader>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
+              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
                 allow-create default-first-option>
                 <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
-              </el-select>
+              </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-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -230,9 +239,10 @@
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
-    </el-dialog> -->
+    </el-dialog>
 
-    <choose-auditor ref="chooseAuditor" @close="AuditEntity" :visible.sync="dialogVisible"></choose-auditor>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -282,6 +292,7 @@
 
     data() {
       return {
+        chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,
         dialogVisible: false,
@@ -299,10 +310,16 @@
         secOrganize: [],
         orgtreelist: [],
         auditer: '',
+        auditerName: '',
         firstAudit: '',
         serviceId: '',
         certId: '',
         classId: '02',
+        auditform: {
+          FirstAuditName: '',
+          CertId: '',
+          AuditRemark: ''
+        },
         orgtreeprops: {
           value: 'id',
           label: 'Fullname',
@@ -755,13 +772,20 @@
           console.error(err)
         })
       },
-
       selectAuditOrg() {
-        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.dialogVisible = true
       },
-      AuditEntity(val) {
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        console.log("------",val,name)
         this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+      AuditEntity(val) {
         if (this.auditer === '') {
           this.$message({
             type: 'warning',
@@ -770,8 +794,10 @@
           return
         }
         this.applyLoading = true
-        this.firstAudit = this.auditer
-        apiCert.auditEntity(this.certId, this.firstAudit, this.$axios).then(res => {
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.certId
+        console.log("--this.auditform---",this.auditform)
+        apiCert.auditEntity(this.certId, this.auditform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.initDatas()

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

@@ -207,23 +207,32 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-    <!-- <el-dialog title="选择审批单位" :visible.sync="dialogVisible" width="520px">
-      <el-form ref="searchForm" label-width="110px">
+   <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+      <el-form ref="searchForm" label-width="70px">
         <el-row>
-          <el-col :span="24">
+          <!--<el-col :span="24">
             <el-form-item label="二级单位">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
                 filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
               </el-cascader>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
+              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
                 allow-create default-first-option>
                 <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
-              </el-select>
+              </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-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -232,9 +241,10 @@
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
-    </el-dialog> -->
+    </el-dialog>
 
-    <choose-auditor ref="chooseAuditor" @close="AuditEntity" :visible.sync="dialogVisible"></choose-auditor>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -261,6 +271,7 @@
   export default {
 
     components: {
+      chooseAuditorVisible: false,
       SupplierFileTable,
       WfHistory,
       SupplierCertEdit,
@@ -284,6 +295,7 @@
 
     data() {
       return {
+        chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,
         dialogVisible: false,
@@ -301,10 +313,16 @@
         orgtreelist: [],
         secOrganize: [],
         auditer: '',
+        auditerName: '',
         serviceId: '',
         certId: '',
         classId: '01',
         FirstAudit: '',
+        auditform: {
+          FirstAuditName: '',
+          CertId: '',
+          AuditRemark: ''
+        },
         orgtreeprops: {
           value: 'id',
           label: 'Fullname',
@@ -456,6 +474,7 @@
           })
         }
       },
+      
       changeFormData(fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
@@ -629,6 +648,7 @@
             console.error(err)
           })
       },
+      
       auditOrgChang(val) {
         let deptid = val[val.length - 1]
         console.log(deptid)
@@ -759,11 +779,18 @@
         })
       },
       selectAuditOrg() {
-        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.dialogVisible = true
       },
-      AuditEntity(val) {
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
         this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+      AuditEntity(val) {
         if (this.auditer === '') {
           this.$message({
             type: 'warning',
@@ -772,8 +799,9 @@
           return
         }
         this.applyLoading = true
-        this.FirstAudit = this.auditer
-        apiCert.auditEntity(this.certId, this.FirstAudit, this.$axios).then(res => {
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.certId
+        apiCert.auditEntity(this.certId, this.auditform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.initDatas()

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

@@ -796,7 +796,6 @@
         this.applyLoading = true
         this.auditform.FirstAuditName = this.auditer
         this.auditform.CertId = this.certId
-        console.log("---this.auditform--",this.auditform)
         apiCert.auditEntity(this.certId, this.auditform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

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

@@ -144,23 +144,32 @@
       </el-pagination>
     </el-dialog>
 
-    <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
-      <el-form ref="searchForm" label-width="110px">
+   <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="70px">
         <el-row>
-          <el-col :span="24">
+          <!--<el-col :span="24">
             <el-form-item label="二级单位">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                filterable style="width: 100%" @change="auditOrgChang" placeholder="请选择组织">
+                filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
               </el-cascader>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
+              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
                 allow-create default-first-option>
                 <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
-              </el-select>
+              </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-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -171,6 +180,8 @@
       </span>
     </el-dialog>
 
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -181,8 +192,12 @@
   import suppapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
+    components: {
+      ChooseAuditor
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -206,6 +221,7 @@
         }
       }
       return {
+        chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
         AuditdialogShow: false, //提交审核弹框
         organizeOption: [], // 审批部门
@@ -215,6 +231,13 @@
           label: 'Fullname',
           children: 'children'
         },
+        auditform: {
+          FirstAuditName: '',
+          CertId: '',
+          AuditRemark: ''
+        },
+        auditer: '',
+        auditerName: '',
         FirstAudit: '',
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
@@ -637,9 +660,32 @@
           .catch(() => {})
       },
 
+      selectAuditOrg() {
+        this.dialogVisible = true
+      },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+
       //提交审批
       AuditEntity() {
-        api2.auditEntity(this.formData.Id, this.FirstAudit, this.$axios).then(res => {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择审批人！'
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.formData.Id
+        api2.auditEntity(this.formData.Id, this.auditform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.getEntityById()

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

@@ -122,23 +122,32 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
-      <el-form ref="searchForm" label-width="110px">
+   <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="70px">
         <el-row>
-          <el-col :span="24">
+          <!--<el-col :span="24">
             <el-form-item label="二级单位">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                filterable style="width: 100%" @change="auditOrgChang" placeholder="请选择组织">
+                filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
               </el-cascader>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
+              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
                 allow-create default-first-option>
                 <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
-              </el-select>
+              </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-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -148,6 +157,9 @@
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
     </el-dialog>
+
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -158,8 +170,12 @@
   import suppapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
+    components: {
+      ChooseAuditor
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -190,6 +206,7 @@
         }
       }
       return {
+        chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
         AuditdialogShow: false, //提交审核弹框
         organizeOption: [], // 审批部门
@@ -199,6 +216,13 @@
           label: 'Fullname',
           children: 'children'
         },
+        auditform: {
+          FirstAuditName: '',
+          CertId: '',
+          AuditRemark: ''
+        },
+        auditer: '',
+        auditerName: '',
         FirstAudit: '',
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
@@ -698,9 +722,33 @@
           })
           .catch(() => {})
       },
+      selectAuditOrg() {
+        this.dialogVisible = true
+      },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+
       //提交审批
       AuditEntity() {
-        api2.auditEntity(this.formData.Id, this.FirstAudit, this.$axios).then(res => {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择审批人！'
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.formData.Id
+        console.log("---this.auditform---",this.auditform)
+        api2.auditEntity(this.formData.Id, this.auditform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.getEntityById()

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="AuditdialogShow = true"
+          <el-button type="primary" size="mini" style="margin-right: 3px" @click="selectAuditOrg"
             v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
@@ -122,23 +122,32 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="选择审批单位" :visible.sync="AuditdialogShow" width="520px">
-      <el-form ref="searchForm" label-width="110px">
+    <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="70px">
         <el-row>
-          <el-col :span="24">
+          <!--<el-col :span="24">
             <el-form-item label="二级单位">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                filterable style="width: 100%" @change="auditOrgChang" placeholder="请选择组织">
+                filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
               </el-cascader>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
+              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
                 allow-create default-first-option>
                 <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
-              </el-select>
+              </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-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -149,6 +158,9 @@
       </span>
     </el-dialog>
 
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
+
   </div>
 </template>
 
@@ -160,8 +172,12 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
+    components: {
+      ChooseAuditor
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -192,6 +208,7 @@
         }
       }
       return {
+        chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
         AuditdialogShow: false, //提交审核弹框
         organizeOption: [], // 审批部门
@@ -201,6 +218,13 @@
           label: 'Fullname',
           children: 'children'
         },
+        auditform: {
+          FirstAuditName: '',
+          CertId: '',
+          AuditRemark: ''
+        },
+        auditer: '',
+        auditerName: '',
         FirstAudit: '',
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
@@ -632,9 +656,33 @@
           .catch(() => {})
       },
 
+      selectAuditOrg() {
+        this.dialogVisible = true
+      },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+
       //提交审批
       AuditEntity() {
-        api2.auditEntity(this.formData.Id, this.FirstAudit, this.$axios).then(res => {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择审批人！'
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.formData.Id
+        console.log("---this.auditform---",this.auditform)
+        api2.auditEntity(this.formData.Id, this.auditform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.getEntityById()
@@ -649,6 +697,7 @@
               message: res.data.message
             })
           }
+          this.applyLoading = false
         }).catch(err => {
           console.error(err)
         })