资质变更，信息变更审核修改，年审页面修改

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

@@ -616,7 +616,8 @@ func (this *InfoChangeController) GetAuditer() {
 // @router /audit/:id [post]
 func (this *InfoChangeController) AuditEntity() {
 	suppId := this.Ctx.Input.Param(":id")
-	firstAudit := this.GetString("firstAudit")
+	firstAudit := this.GetString("auditer")
+	Remark := this.GetString("Remark")
 
 	//取出审批列表
 	svc := infochange.GetInfoChangeService(utils.DBE)
@@ -668,7 +669,7 @@ func (this *InfoChangeController) AuditEntity() {
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
-	ActiComplete.Remarks = "信息变更二级单位初审"
+	ActiComplete.Remarks = Remark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
@@ -736,12 +737,21 @@ func (this *InfoChangeController) InfoAudit() {
 			this.ServeJSON()
 		}
 	}()
+	var userIds string
+	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var users []userRole.Base_RoleList
+	certSrv.GetAuditUser("100000178", workflow.PROF_REGULATION, &users)
+
+	for _, tmpUser := range users {
+		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+	}
+	userIds = strings.Trim(userIds, ",")
 	step := 2
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_INFO_CHANGE
 	ActiComplete.BusinessKey = utils.ToStr(infoid)
-	ActiComplete.UserNames = utils.ToStr(dataother.Auditer)
+	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Remarks = dataother.AuditorRemark
 	ActiComplete.CallbackUrl = ""

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

@@ -498,8 +498,8 @@ func (this *QualChangeController) EditQualChange() {
 // @router /audit/:id [post]
 func (this *QualChangeController) AuditEntity() {
 	suppId := this.Ctx.Input.Param(":id")
-	firstAudit := this.GetString("firstAudit")
-
+	firstAudit := this.GetString("auditer")
+	Remark := this.GetString("Remark")
 	//取出审批列表
 	svc := qualchange.GetQualChangeService(utils.DBE)
 	var suppentity supplier.OilSupplier
@@ -536,7 +536,7 @@ func (this *QualChangeController) AuditEntity() {
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
-	ActiComplete.Remarks = "资质变更二级单位初审"
+	ActiComplete.Remarks = Remark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
@@ -614,12 +614,21 @@ func (this *QualChangeController) QualAudit() {
 			this.ServeJSON()
 		}
 	}()
+	var userIds string
+	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var users []userRole.Base_RoleList
+	certSrv.GetAuditUser("100000178", workflow.PROF_REGULATION, &users)
+
+	for _, tmpUser := range users {
+		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+	}
+	userIds = strings.Trim(userIds, ",")
 	step := 2
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_QUAL_CHANGE
 	ActiComplete.BusinessKey = utils.ToStr(qualid)
-	ActiComplete.UserNames = utils.ToStr(dataother.Auditer)
+	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Remarks = dataother.AuditorRemark
 	ActiComplete.CallbackUrl = ""

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

@@ -51,10 +51,11 @@ export default {
       data: shenheform
     })
   },
-  auditEntity (entityId, FirstAudit, myAxios) {
+  auditEntity (entityId, params, myAxios) {
     return myAxios({
-      url: '/infochange/audit/' + entityId + '?firstAudit=' + FirstAudit,
-      method: 'post'
+      url: '/infochange/audit/' + entityId,
+      method: 'post',
+      params: params
     })
   },
   getAuditer(myAxios) {

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

@@ -51,10 +51,11 @@ export default {
       method: 'delete'
     })
   },
-  auditEntity (entityId, FirstAudit, myAxios) {
+  auditEntity (entityId, params, myAxios) {
     return myAxios({
-      url: '/qualchange/audit/' + entityId + '?firstAudit=' + FirstAudit,
-      method: 'post'
+      url: '/qualchange/audit/' + entityId,
+      method: 'post',
+      params: params
     })
   },
   // 专业审批

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

@@ -10,7 +10,11 @@
       </el-table-column> -->
       <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
       <!-- <el-table-column prop="NeedFileCode" label="分类编码" show-overflow-tooltip></el-table-column> -->
-      <el-table-column prop="FileName" label="文件名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="FileName" label="文件名称" show-overflow-tooltip>
+        <template slot-scope="scope">
+            <a :href="'http://'+fileurlcut(scope.row.FileUrl)" target="_blank" class="buttonText">{{scope.row.FileName}}</a>
+          </template>
+      </el-table-column>
       <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ jstimehandle(scope.row.EffectDate+'') }}
@@ -361,6 +365,11 @@
         }
         _this.doclist.push(params)
       },
+      fileurlcut(val) {
+        let fileurlall = val
+        let fileurl = fileurlall.split("|")
+        return fileurl[0]
+      },
 
       beforeAvatarUpload(file) {
         let isLt50m = file.size / 1024 / 1024 / 50 < 1

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

@@ -9,8 +9,9 @@
       <div slot="header" class="clearfix">
         <span>年审基本信息表</span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-popover>
-            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+            <el-steps :active="Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
               <el-step title="待审批"></el-step>
               <el-step title="已审批"></el-step>
@@ -18,14 +19,14 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+            <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button>
           </el-popover>
           <el-button type="primary" size="mini" @click="annualAudit()" v-if="AnnualStatus == 0 ||AnnualStatus == 3">审核
           </el-button>
           <el-button type="primary" size="mini" @click="profAudit()" v-if="AnnualStatus == 1">专业审核分配</el-button>
           <router-link :to="'/oilsupplier/annualaudit/annualfistaudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
-        </router-link>
+          </router-link>
         </span>
       </div>
       <el-tabs tab-position="top" style="margin-top: 10px">
@@ -167,15 +168,14 @@
           </el-card>
         </el-tab-pane>
 
-       
+
         <el-tab-pane label="准入范围" :disabled="!certId">
           <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
             style="margin-top: 20px"></business-list>
         </el-tab-pane>
 
-        <el-tab-pane label="企业资质">
-          <auditbus-list ref="auditbusList" :data="auditbusList" :SupplierCertId="certId" :SupplierId="serviceId+''"
-                         :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px"></auditbus-list>
+        <el-tab-pane label="企业资质" :disabled="!certId">
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
 
@@ -237,6 +237,9 @@
         <el-button size="mini" type="primary" @click="checkstatus()">确定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </el-dialog>
   </div>
 </template>
 
@@ -258,6 +261,7 @@
   import BusinessList from '@/components/oilsupplier/businesslist'
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
+  import SubfileList from '@/components/oilsupplier/subfilelist'
 
 
   export default {
@@ -270,7 +274,7 @@
       SupplierFileTable,
       WfHistory,
       SupplierCertEdit,
-
+      SubfileList, // 选择企业资质
       EquipmentList, //企业主要装备情况
       PerformanceList, //近三年主要工程业绩列表
       PatentList, //拥有专利、专有技术及工法列表
@@ -283,6 +287,7 @@
 
     data() {
       return {
+        audithistoryshow: false,
         dialogProfAudit: false,
         canUpdateSupplier: true,
         dictData: null,
@@ -303,6 +308,7 @@
         annualId: '',
         WorkflowId: '',
         ProfAuditThen: '',
+        Step: 0,
         formData: {
           Id: '',
           SupplierName: '',
@@ -383,6 +389,11 @@
           Step: 0,
           HseTraining: 0,
         },
+        backhistroy: {
+          certId: '',
+          classId: '01',
+          workflowId: ''
+        },
         AnnualStatus: '',
         dialogMakeSure: false,
         shenheForm: {
@@ -413,7 +424,7 @@
           process: 'oil_audit_apply',
           business: '',
           instance: '',
-          AnnualStatus:''
+          AnnualStatus: ''
         },
       }
     },
@@ -422,17 +433,20 @@
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
-      
+
       this.AnnualStatus = this.$route.query.AnnualStatus
       this.entrydetail.AnnualStatus = this.AnnualStatus
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.annualId = this.$route.query.annualId
+      this.Step = parseInt(this.$route.query.Step)
       this.getDictOptions()
       this.formData.Id = this.serviceId
       this.initDatas()
+      this.backhistroy.certId = this.annualId
+      this.backhistroy.workflowId = this.WorkflowId
+      
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
-      console.log("---this.AnnualStatusa---", this.AnnualStatus)
     },
     methods: {
       inputCompany(val) {
@@ -498,7 +512,6 @@
         this.formData.CompanyUrl = fdata.CompanyUrl
         this.formData.HseTraining = fdata.HseTraining
         this.formData.SpecTypeCode = fdata.SpecTypeCode
-        console.log("---this.formData.Step---",this.formData.Step)
         this.$refs["TechInfo"].CityAry = []
         this.$refs["TechInfo"].CityAry.push(this.formData.Province)
         this.$refs["TechInfo"].CityAry.push(this.formData.City)
@@ -535,10 +548,8 @@
       initDatas() {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
-          console.log("---this.certId----", this.certId)
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
-            console.log("---res.data----", res.data)
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
             this.formDataCert.UniversityNum = this.formData.UniversityNum
@@ -568,13 +579,13 @@
             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.entrydetail.business = this.certId
             this.entrydetail.instance = this.WorkflowId
+            this.backhistroy.classId = this.formData.SupplierTypeCode
             if (this.certId && this.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
             }
-            console.log("---this.entrydetail----", this.entrydetail)
 
           }).catch(err => {
             console.error(err)
@@ -582,6 +593,11 @@
         }
       },
 
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
+
       getDictOptions() {
         annualapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
@@ -589,6 +605,9 @@
           console.error(err)
         })
       },
+      getbuslist() {
+        this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
+      },
 
       getorgtreelist() {
         let _this = this
@@ -628,7 +647,6 @@
           })
       },
       auditOrgChange(val) {
-        console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.AnnualStatus === '1') {
           auditstepcode = 'PROF_AUDIT'
@@ -636,7 +654,6 @@
           return
         }
         let deptid = val[val.length - 1]
-        console.log(deptid)
         this.auditerOptions = []
         api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.secauditerOptions = res.data.item
@@ -656,7 +673,6 @@
       //审核通过
       makeSure() {
         //审核通过的具体操作(未编写)
-        console.log("----this.shenheForm---", this.shenheForm)
         this.$confirm("确认审核结果！", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -679,7 +695,6 @@
           ProfAuditUserId = this.majorDept[this.majorDept.length - 1]
         }
         let params = this.shenheForm
-        console.log("---this.shenheForm----", this.shenheForm)
         this.$axios.put('/annualaudit/auditfirst?ProfAudit=' + ProfAuditUserId, params)
           .then(res => {
             // response

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

@@ -9,7 +9,8 @@
       <div slot="header" class="clearfix">
         <span>年审基本信息表</span>
         <span style="float: right;">
-          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
+          <!-- <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button> -->
           <el-popover>
             <el-steps :active="Step" direction="vertical" align-center finish-status="success">
               <el-step title="填写信息"></el-step>
@@ -18,7 +19,7 @@
               <el-step title="供方交费"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button>
           </el-popover>
           <el-button type="primary" size="mini" @click="addshow =true" v-if="Status == '2'">提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit'">
@@ -180,10 +181,8 @@
             style="margin-top: 20px"></business-list>
         </el-tab-pane>
 
-        <el-tab-pane label="企业资质">
-          <auditbus-list ref="auditbusList" :data="auditbusList" :SupplierCertId="certId" :SupplierId="serviceId+''"
-            :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px">
-          </auditbus-list>
+        <el-tab-pane label="企业资质" :disabled="!certId">
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
         <el-tab-pane label="提交审批">
@@ -212,13 +211,13 @@
                 </el-option>
               </el-select>
             </el-form-item> -->
-             <el-form-item label="审批人">
+            <el-form-item label="审批人">
               <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
                 <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
               </el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="说明">
               <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
               </el-input>
@@ -234,6 +233,9 @@
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
+    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </el-dialog>
   </div>
 </template>
 
@@ -256,6 +258,8 @@
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import SubfileList from '@/components/oilsupplier/subfilelist'
 
 
   export default {
@@ -268,7 +272,7 @@
       SupplierFileTable,
       WfHistory,
       SupplierCertEdit,
-
+      SubfileList, // 选择企业资质
       EquipmentList, //企业主要装备情况
       PerformanceList, //近三年主要工程业绩列表
       PatentList, //拥有专利、专有技术及工法列表
@@ -276,12 +280,15 @@
       BusinessList, //选择准入范围
       AuditbusList, // 待审核业务
       TechInfo,
+      WfBackHistory,
       ChooseAuditor
     },
     name: 'oiltechnologyserviceEdit',
 
     data() {
       return {
+        visbtn: '1',
+        audithistoryshow: false,
         chooseAuditorVisible: false,
         activeName: '0',
         orgtreelist: [],
@@ -290,7 +297,13 @@
           label: 'Fullname',
           children: 'children'
         },
+        backhistroy: {
+          certId: '',
+          classId: '01',
+          workflowId: ''
+        },
         Step: '',
+        subfileList: [], // 资质
         auditbusList: [], // 待审核业务
         organizeOption: [], // 审批部门
         auditerOption: [],
@@ -417,6 +430,7 @@
           Status: ''
         },
         Status: '',
+        annualId: '',
         rules: {
           auditer: [{
             required: true,
@@ -433,12 +447,15 @@
       }
       this.Status = this.$route.query.Status + ''
       this.Step = parseInt(this.$route.query.Step)
+      this.annualId = this.$route.query.annualId
       this.WorkflowId = this.$route.query.WorkflowId + ''
-      this.getDictOptions();
+      this.getDictOptions()
       this.getorgtreelist()
       this.formData.Id = this.serviceId
-      this.initDatas();
-      console.log("---this.Status---", this.Status)
+      this.initDatas()
+      this.backhistroy.certId = this.annualId
+      this.backhistroy.workflowId = this.WorkflowId
+      console.log("---this.backhistroy---", this.backhistroy)
       // console.log(this.serviceId);
       // if(this.serviceId != 'add' && this.serviceId>0) {
       //   this.formData.Id = this.serviceId;
@@ -464,14 +481,14 @@
           this.SetFormData(fdata)
         }
       },
-      nextTab() {
-        let activeIdx = parseInt(this.activeName)
-        if (activeIdx < 4) {
-          this.activeName = (activeIdx + 1) + ''
-        } else {
-          this.activeName = '1'
-        }
-      },
+      // nextTab() {
+      //   let activeIdx = parseInt(this.activeName)
+      //   if (activeIdx < 4) {
+      //     this.activeName = (activeIdx + 1) + ''
+      //   } else {
+      //     this.activeName = '1'
+      //   }
+      // },
       SetFormData(fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
@@ -541,8 +558,10 @@
           console.error(err)
         })
       },
+      getbuslist() {
+        this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
+      },
       setAuditer(val, name) {
-        console.log("------",val,name)
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
@@ -566,10 +585,8 @@
       initDatas() {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
-          console.log("---this.certId----", this.certId)
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
-            console.log("---res.data----", res.data)
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
             this.formDataCert.UniversityNum = this.formData.UniversityNum
@@ -599,12 +616,13 @@
             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.entrydetail.business = this.certId
             this.entrydetail.instance = this.WorkflowId
+            this.backhistroy.classId = this.formData.SupplierTypeCode
             if (this.certId && this.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
             }
-            console.log("---this.entrydetail----", this.entrydetail)
 
           }).catch(err => {
             console.error(err)
@@ -614,13 +632,11 @@
 
       auditOrgChang(val) {
         let deptid = val[val.length - 1]
-        console.log(deptid)
         this.auditerOption = []
         this.auditer = ''
         let auditstepcode = 'FIRST_TRIAL'
         api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.auditerOption = res.data.item
-          console.log("------this.auditerOption----", this.auditerOption)
         }).catch(err => {
           console.error(err)
         })
@@ -658,10 +674,8 @@
           if (valid) {
             this.entityForm.SupplierId = parseInt(this.certId)
             this.entityForm.SupplierTypeName = this.formData.SupplierTypeCode
-            console.log("----this.entityForm--", this.entityForm)
             annualapi.commitauditEntity(this.entityForm, this.auditer, this.$axios).then(res => {
               if (res.data.code === 0) {
-                console.log("--------res.data----", res.data)
                 //保存成功后，初始化数据，变成修改
                 this.entityForm.Id = res.data.item;
                 //this.initDatas();
@@ -684,6 +698,11 @@
         })
       },
 
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
+
       AuditEntity() {
         this.applyLoading = true
         apiCert.auditEntity(this.certId, this.$axios).then(res => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -35,7 +35,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="180" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/auditoperation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&AnnualStatus='+scope.row.Status+'&annualId='+scope.row.Id">
+            <router-link :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/auditoperation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&AnnualStatus='+scope.row.Status+'&annualId='+scope.row.Id+'&Step='+scope.row.Step">
               <el-button type="primary" plain title="审核" size="mini" v-if="scope.row.Status == 0 ||scope.row.Status == 3">审核</el-button>
               <el-button type="primary" plain title="专业审核分配" size="mini" v-if="scope.row.Status == 1">分配</el-button>
             </router-link>

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

@@ -40,7 +40,7 @@
         <el-table-column label="操作" min-width="180" align="center" fixed>
           <template slot-scope="scope">
             <router-link
-              :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/operation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step">
+              :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/operation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&Status='+scope.row.Status+'&Step='+scope.row.Step+'&annualId='+scope.row.Id">
               <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
             </router-link>
             <el-dropdown @command="MoreCmdClick">

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

@@ -36,13 +36,13 @@
       <el-form label-width="120px" :model="entityForm" :rules="rules" ref="EntityFormref">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="提交审批人" v-if="InfoStatus == '1'" prop="auditer" required>
+            <!-- <el-form-item label="提交审批人" v-if="InfoStatus == '1'" prop="auditer" required>
               <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
                 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-form-item>
+            </el-form-item> -->
             <el-form-item label="审核状态">
               <template>
                 <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/_opera/operation.vue

@@ -11,459 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="submitInfoChange" v-if="(InfoStatus == 0 || InfoStatus == '') && !butnab">提交申请</el-button>
+          <el-button type="primary" size="mini" @click="submitInfoChange"
+            v-if="(InfoStatus == 0 || InfoStatus == '') && butnab">提交申请</el-button>
           <router-link :to="'/oilsupplier/infochange'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
       </div>
-      <!-- <el-form label-width="240px" ref="EntityForm" :model="formData">
-        <div slot="header" class="clearfix">
-          <span>供方基本信息表</span>
-          <span style="float: right;">
-            <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          </span>
-        </div>
-        <el-form label-width="140px" ref="EntityForm" :model="formData">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="曾用供方名称">
-                <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="单位关系">
-                <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable placeholder="请选择"
-                  style="width: 100%" :disabled = "true">
-                  <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable placeholder="请选择"
-                  style="width: 100%" >
-                  <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="统一社会信用代码">
-                <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="税务登记证编号">
-                <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="组织机构代码">
-                <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="注册地址" prop="Province">
-                <el-row>
-                  <el-col :span="10">
-                    <el-cascader :options="countryoptions" :props="countryprops" maxlength="20" placeholder="省市区"
-                      v-model="CityAry" style="width: 100%" @change="handleAreaChange" :disabled = "true">
-                    </el-cascader>
-                  </el-col>
-                  <el-col :span="14">
-                    <el-input v-model="formData.Address" maxlength="500" :disabled = "true"
-                      placeholder="详细地址" style="width: 100%">
-                    </el-input>
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：" prop="Province">
-                <el-row>
-                  <el-col :span="10">
-                    <el-cascader :options="countryoptions" :props="countryprops" maxlength="20" placeholder="省市区"
-                      v-model="CityAry" style="width: 100%" @change="handleAreaChange">
-                    </el-cascader>
-                  </el-col>
-                  <el-col :span="14">
-                    <el-input v-model="formData.Address" maxlength="500"
-                      placeholder="详细地址" style="width: 100%">
-                    </el-input>
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="邮编" prop="ZipCode">
-                <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入" :disabled = "true"
-                  style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：" prop="ZipCode">
-                <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入"
-                  style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="通信地址" prop="LinkProvince">
-                <el-row>
-                  <el-col :span="10">
-                    <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="LinkCityAry"
-                       maxlength="20" style="width: 100%" @change="handleLinkAreaChange" :disabled = "true">
-                    </el-cascader>
-                  </el-col>
-                  <el-col :span="14">
-                    <el-input v-model="formData.LinkAddress" maxlength="500" :disabled = "true"
-                      placeholder="详细地址" style="width: 100%">
-                    </el-input>
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="现变更为：" prop="LinkProvince">
-                <el-row>
-                  <el-col :span="10">
-                    <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="LinkCityAry"
-                       maxlength="20" style="width: 100%" @change="handleLinkAreaChange">
-                    </el-cascader>
-                  </el-col>
-                  <el-col :span="14">
-                    <el-input v-model="formData.LinkAddress" maxlength="500"
-                      placeholder="详细地址" style="width: 100%">
-                    </el-input>
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="邮编" prop="LinkZipCode">
-                <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入" :disabled = "true"
-                  style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="现变更为：" prop="LinkZipCode">
-                <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入"
-                  style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-
-
-          </el-row>
-        </el-form>
-
-        <el-form label-width="140px" ref="EntityFormLic" :model="formData">
-          <el-row>
-
-            <el-col :span="12">
-              <el-form-item label="法定代表人姓名">
-                <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="行业类别">
-                <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="注册资本">
-                <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系人姓名">
-                <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="币种">
-                <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="公司类型">
-                <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="成立时间">
-                <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="开户银行">
-                <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="银行账号">
-                <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="移动电话">
-                <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="固定电话">
-                <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="传真">
-                <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
 
-            <el-col :span="12">
-              <el-form-item label="公司电话">
-                <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="电子邮箱">
-                <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="QQ号码">
-                <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="银行信用等级">
-                <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="公司网址">
-                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="HSE审查培训">
-                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-          </el-row>
-        </el-form>
-
-        <el-form label-position="top" ref="EntityFormCert" :model="formData">
-          <el-row :gutter="60">
-            <el-col :span="12">
-              <el-form-item label="质量管理体系认证情况">
-                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="企业资质证书(编号  级别)">
-                <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="安全生产许可证">
-                <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="行业特殊要求的认证证书">
-                <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="营业范围">
-                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="现变更为：">
-                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-form> -->
       <el-card>
         <div slot="header" class="clearfix" style="height:10px">
           <span style="font-weight:bold;">信息变更</span>
-          <el-button style="float: right;" size="mini" type="primary" @click="addchange" :disabled="butnab">添加变更</el-button>
+          <el-button style="float: right;" size="mini" type="primary" @click="addchange" :disabled="butnab">添加变更
+          </el-button>
         </div>
         <el-table :data="InfoData" border style="width: 100%">
           <el-table-column label="操作" min-width="90" align="center" fixed>
@@ -512,29 +72,26 @@
       </div>
     </el-dialog>
     <el-dialog title="提交申请" :visible.sync="commitshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+      <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="审批单位" prop="FirstAudit" required>
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                filterable @change="auditOrgChang" style="width: 100%" v-model="entityForm.FirstAudit"
-                placeholder="请选择组织"></el-cascader>
-              <!-- <el-select ref="selectauditOrg" v-model="entityForm.FirstAudit" placeholder="请选择" style="width: 100%"
-                @change="auditOrgChang" filterable allow-create default-first-option>
-                <el-option v-for="item in organizeOption" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select> -->
+            <el-form-item label="审批人" prop="auditer">
+              <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-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批人" prop="auditer" required>
+            <!-- <el-form-item label="审批人" prop="auditer" required>
               <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
                 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-form-item> -->
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -545,6 +102,8 @@
       </span>
       <br>
     </el-dialog>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
 
   </div>
 </template>
@@ -555,7 +114,11 @@
   } from 'vuex'
   import supplierapi from '@/api/oilsupplier/supplier';
   import api from '@/api/oilsupplier/infochange';
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   export default {
+    components: {
+      ChooseAuditor
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -587,7 +150,10 @@
           label: 'Fullname',
           children: 'children'
         },
-        supplierId:'',
+        chooseAuditorVisible: false,
+        auditer: '',
+        auditerName: '',
+        supplierId: '',
         auditerOption: [],
         commitshow: false,
         InfoData: [],
@@ -619,29 +185,18 @@
           SupplierTypeName: '',
           FirstAudit: '',
           auditer: '',
-        },
-        rules: {
-          FirstAudit: [{
-            required: true,
-            message: '请选择初审单位',
-            trigger: 'blur'
-          }],
-          auditer: [{
-            required: true,
-            message: '请选择审批人',
-            trigger: 'blur'
-          }]
+          Remark: ''
         },
         InfoStatus: '',
-        butnab: false,
+        butnab: true,
       }
     },
     created() {
       this.serviceId = this.$route.params.opera
       this.supplierId = this.serviceId
       this.InfoStatus = this.$route.query.InfoStatus
-      if (this.InfoStatus != 0){
-        this.butnab = true
+      if (this.QualStatus > 0) {
+        this.butnab = false
       }
       this.initDatas()
     },
@@ -712,6 +267,7 @@
             //保存成功后，初始化数据，变成修改
             this.infochangeForm.Id = res.data.item;
             this.initDatas();
+            this.butnab = true
             this.AddChangeShow = false
             this.$message({
               type: 'success',
@@ -728,6 +284,15 @@
           console.error(err)
         });
       },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist()
+        this.chooseAuditorVisible = true
+      },
       getorgtreelist() {
         let _this = this
         let params = {
@@ -743,38 +308,20 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
-        console.log("------val----", val)
-        this.auditerOption = []
-        this.entityForm.auditer = ''
-        let auditstepcode = 'FIRST_TRIAL'
-        supplierapi.getAuditerByDept(val[val.length - 1], auditstepcode, this.$axios).then(res => {
-          // if (res.data.item.length === 0) {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '该单位未设置审批人员！'
-          //   })
-          //   return
-          // }
-          console.log("---res.data.item--", res.data.item)
-          this.auditerOption = res.data.item
-        }).catch(err => {
-          console.error(err)
-        })
-      },
       //提交信息变更审核
       submitInfoChange() {
         this.getorgtreelist()
         this.commitshow = true
       },
       addInfoChangeAudit() {
-        console.log("==this.supplierId====",this.supplierId)
-        api.auditEntity(this.supplierId, this.entityForm.auditer, this.$axios).then(res => {
+        this.entityForm.auditer = this.auditer
+        console.log("==this.supplierId====", this.supplierId)
+        api.auditEntity(this.supplierId, this.entityForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.initDatas()
             this.commitshow = false
-            this.butnab = true
+            this.butnab = false
             this.$message({
               type: 'success',
               message: res.data.message
@@ -809,19 +356,6 @@
           console.error(err)
         });
       },
-
-      // handleAreaChange(value) {
-      //   this.formData.Province = value[0]
-      //   this.formData.City = value[1]
-      //   this.formData.Street = value[2]
-      //   //this.formData.ZipCode = value[2]
-      // },
-      // handleLinkAreaChange(value) {
-      //   this.formData.LinkProvince = value[0]
-      //   this.formData.LinkCity = value[1]
-      //   this.formData.LinkStreet = value[2]
-      //   //this.formData.LinkZipCode = value[2]
-      // },
       getCityList(val) {
         let resultData = JSON.parse(val)
         let countstr = JSON.stringify(resultData.districts[0].districts)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/infoaudit.vue

@@ -42,7 +42,7 @@
             <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/auditoperation?InfoStatus='+ scope.row.Status">
               <el-button type="primary" plain title="审核" size="mini">审核</el-button>
             </router-link>
-             <el-button type="primary" style="margin-left: 8px;" plain title="审批历史" size="mini" @click="getvalues(scope.row)">审批历史</el-button>
+             <el-button type="primary" style="margin-left: 8px;" plain title="审批流程" size="mini" @click="getvalues(scope.row)">审批流程</el-button>
           </template>
         </el-table-column>
 

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

@@ -87,13 +87,13 @@
       <el-form label-width="120px" :model="entityForm" :rules="rules" ref="EntityFormref">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="提交审批人" v-if="QualStatus == '1'" prop="auditer" required>
+            <!-- <el-form-item label="提交审批人" v-if="QualStatus == '1'" prop="auditer" required>
               <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
                 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-form-item>
+            </el-form-item> -->
             <el-form-item label="审核状态">
               <template>
                 <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/operation.vue

@@ -35,7 +35,7 @@
       <el-table :data="subfileList" border>
         <el-table-column label="操作" width="150" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)">变更</el-button>
+            <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)" :disabled="butnab">变更</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
@@ -94,24 +94,26 @@
       </el-dialog>
     </el-card>
     <el-dialog title="提交申请" :visible.sync="commitshow" width="360px">
-      <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
+      <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="审批单位" prop="FirstAudit" required>
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                filterable @change="auditOrgChang" style="width: 100%" v-model="entityForm.FirstAudit"
-                placeholder="请选择组织"></el-cascader>
+            <el-form-item label="审批人" prop="auditer">
+              <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-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批人" prop="auditer" required>
+            <!-- <el-form-item label="审批人" prop="auditer" required>
               <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
                 filterable allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
+               <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
               </el-select>
+            </el-form-item> -->
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -122,6 +124,8 @@
       </span>
       <br>
     </el-dialog>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
 
   </div>
 </template>
@@ -135,6 +139,7 @@
   import uploadajax from '@/assets/js//uploadajax.js'
   import quaapi from '@/api/oilsupplier/qualchange'
   import axios from 'axios'
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
  // import uploadajax from '../../assets/js/uploadajax.js'
   export default {
     computed: {
@@ -143,6 +148,9 @@
         session: 'session'
       })
     },
+    components: {
+      ChooseAuditor
+    },
     // components: {
     //   BusinessList,
     //   SubfileList, //文档
@@ -151,6 +159,9 @@
 
     data() {
       return {
+        chooseAuditorVisible: false,
+        auditer: '',
+        auditerName: '',
         businessList: [], //准入业务
         serviceId: '',
         certId: '',
@@ -175,6 +186,7 @@
           SupplierTypeName: '',
           FirstAudit: '',
           auditer: '',
+          Remark: ''
         },
         Title: '',
         SubfileForm: {
@@ -200,22 +212,10 @@
         },
         visible: false,
         selfVisible: this.visible, // 避免vue双向绑定警告
-        rules: {
-          FirstAudit: [{
-            required: true,
-            message: '请选择初审单位',
-            trigger: 'blur'
-          }],
-          auditer: [{
-            required: true,
-            message: '请选择审批人',
-            trigger: 'blur'
-          }]
-        },
         waituploads: [], // 等待上传的附件列表
         doclist: [],
         QualStatus: '',
-        butnab: false,
+        butnab: true,
         commitshow: false,
         auditerOption: [],
       }
@@ -275,17 +275,6 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
-        this.auditerOption = []
-        this.entityForm.auditer = ''
-        let auditstepcode = 'FIRST_TRIAL'
-        supplierapi.getAuditerByDept(val[val.length - 1], auditstepcode, this.$axios).then(res => {
-          console.log("---res.data.item--", res.data)
-          this.auditerOption = res.data.item
-        }).catch(err => {
-          console.error(err)
-        })
-      },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.wellNoOptions = res.data.items['WellNo']
@@ -459,8 +448,9 @@
         this.commitshow = true
       },
       addQualChangeAudit() {
+        this.entityForm.auditer = this.auditer
         console.log("==this.SupplierId====", this.SupplierId)
-        quaapi.auditEntity(this.SupplierId, this.entityForm.auditer, this.$axios).then(res => {
+        quaapi.auditEntity(this.SupplierId, this.entityForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.initData()
@@ -480,6 +470,15 @@
           console.error(err)
         })
       },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist()
+        this.chooseAuditorVisible = true
+      },
 
       fileurlcut(val) {
         let fileurlall = val