huahaiyan пре 6 година
родитељ
комит
f8acbbde72

+ 3 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -500,7 +500,8 @@ func (this *OilSupplierCertController) DeleteEntity() {
 // @router /audit/:id [post]
 func (this *OilSupplierCertController) AuditEntity() {
 	certId := this.Ctx.Input.Param(":id")
-	firstAudit := this.GetString("firstAudit")
+	firstAudit := this.GetString("FirstAuditName")
+	AuditRemark := this.GetString("AuditRemark")
 
 	//取出审批列表
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
@@ -557,7 +558,7 @@ func (this *OilSupplierCertController) AuditEntity() {
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
-	ActiComplete.Remarks = ""
+	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
 

+ 4 - 3
src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

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

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

@@ -26,16 +26,16 @@
         </span>
       </div>
 
-      <el-steps :active="formData.Step" simple align-center finish-status="success">
+      <!-- <el-steps :active="formData.Step" simple align-center finish-status="success">
         <el-step title="填信息"></el-step>
         <el-step title="待审批"></el-step>
         <el-step title="已审批"></el-step>
         <el-step title="待交费"></el-step>
         <el-step title="待入库"></el-step>
         <el-step title="完成"></el-step>
-      </el-steps>
+      </el-steps> -->
 
-      <el-tabs tab-position="right" style="margin-top: 20px">
+      <el-tabs tab-position="right" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">

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

@@ -25,16 +25,16 @@
         </span>
       </div>
 
-      <el-steps :active="formData.Step" simple align-center finish-status="success">
+      <!-- <el-steps :active="formData.Step" simple align-center finish-status="success">
         <el-step title="填信息"></el-step>
         <el-step title="待审批"></el-step>
         <el-step title="已审批"></el-step>
         <el-step title="待交费"></el-step>
         <el-step title="待入库"></el-step>
         <el-step title="完成"></el-step>
-      </el-steps>
+      </el-steps> -->
 
-      <el-tabs tab-position="right" style="margin-top: 20px">
+      <el-tabs tab-position="top" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">

+ 21 - 16
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -26,16 +26,16 @@
         </span>
       </div>
 
-      <el-steps :active="formData.Step" simple align-center finish-status="success">
+      <!-- <el-steps :active="formData.Step" simple align-center finish-status="success">
         <el-step title="填信息"></el-step>
         <el-step title="待审批"></el-step>
         <el-step title="已审批"></el-step>
         <el-step title="待交费"></el-step>
         <el-step title="待入库"></el-step>
         <el-step title="完成"></el-step>
-      </el-steps>
+      </el-steps> -->
 
-      <el-tabs tab-position="right" style="margin-top: 20px">
+      <el-tabs tab-position="top" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -178,8 +178,8 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat" height="360px"
-            style="margin-top: 20px"></business-list>
+          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat"
+            height="360px" style="margin-top: 20px"></business-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
@@ -228,10 +228,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="说明">
-              <el-input
-                type="textarea"
-                placeholder="请输入说明内容"
-              >
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
               </el-input>
             </el-form-item>
           </el-col>
@@ -243,7 +240,8 @@
       </span>
     </el-dialog>
 
-    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false" :visible="chooseAuditorVisible"></choose-auditor>
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+      :visible="chooseAuditorVisible"></choose-auditor>
 
   </div>
 </template>
@@ -317,6 +315,11 @@
         serviceId: '',
         certId: '',
         classId: '03',
+        auditform: {
+          FirstAuditName: '',
+          CertId: '',
+          AuditRemark: ''
+        },
         orgtreeprops: {
           value: 'id',
           label: 'Fullname',
@@ -605,7 +608,7 @@
           })
         }
       },
-      getbuslist(){
+      getbuslist() {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
 
@@ -772,16 +775,16 @@
       selectAuditOrg() {
         this.dialogVisible = true
       },
-      chooseAuditorShow () {
+      chooseAuditorShow() {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer (val, name) {
+      setAuditer(val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      AuditEntity () {
+      AuditEntity() {
         //this.auditer = val
         if (this.auditer === '') {
           this.$message({
@@ -791,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()