年审保存修改

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

@@ -358,6 +358,153 @@ func (this *AnnualAuditController) AddEntityDirect() {
 	}
 }
 
+// @Title 修改实体
+// @Description 修改实体
+// @Success	200	{object} controllers.Request
+// @router /suppupdate/:id/:type/:instyle [post]
+func (this *AnnualAuditController) UpdateSuppEntity() {
+	id := this.Ctx.Input.Param(":id")
+	typeCode := this.Ctx.Input.Param(":type")
+	instyle := this.Ctx.Input.Param(":instyle")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model supplier.OilSupplier
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+
+	var list []supplier.OilSupplierView
+	service := supplier.GetOilSupplierService(utils.DBE)
+	service.CheckUpdateRepeatApplyInfo(OilSupplierName, OilSupplierCertName, typeCode, strconv.Itoa(model.Id), model.SupplierName, model.CommercialNo, model.OrganCode, model.BankAccount, model.CompanyUrl, &list)
+	if len(list) > 0 {
+		errinfo.Message = "修改失败！ 已存在相关企业的信息，或与其他企业信息重复"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	svc := supplier.GetOilSupplierService(utils.DBE)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	//判断基本信息是否可修改
+	//updateCols := svc.GetUpdateCols(OilSupplierCertName, typeCode, model.Id)
+	updateCols := []string{
+		"SupplierName",
+		"OilCertificateNo",
+		"Grade",
+		"MgrUnit",
+		"OperType",
+		"Country",
+		"MaunAgent",
+		"ConstructTeam",
+		"CommercialNo",
+		"OrganCode",
+		"CountryTaxNo",
+		"LocalTaxNo",
+		"Address",
+		"Province",
+		"City",
+		"Street",
+		"HouseNo",
+		"ZipCode",
+		"QualitySystemCert",
+		"ProductQualityCert",
+		"MaunLicense",
+		"QualifCert",
+		"QualifCertLevel",
+		"SafetyLicense",
+		"TechServiceLic",
+		"TJInNotify",
+		"SpecIndustryCert",
+		"LegalPerson",
+		"CategoryCode",
+		"CategoryName",
+		"RegCapital",
+		"Currency",
+		"ContactName",
+		"CompanyType",
+		"SetupTime",
+		"DepositBank",
+		"BankAccount",
+		"EMail",
+		"BusinessScope",
+		"BankCreditRating",
+		"Mobile",
+		"Telphone",
+		"Fax",
+
+		"CompanyTel",
+
+		"QQ",
+
+		"CompanyUrl",
+
+		"SpecSupplier",
+
+		"SpecTypeCode",
+
+		"SpecTypeName",
+
+		/*"WorkerTotal",
+		"ContractNum ",
+		"UniversityNum",
+		"TechnicalNum",
+		"AboveProfNum",
+		"MiddleProfNum",
+		"NationalRegNum",
+		"NationalCertTotal",
+		"DesignerTotal",
+		"SkillerTotal",*/
+
+		"Remark",
+
+		"IsDelete",
+
+		"CreateOn",
+
+		"CreateUserId",
+
+		"CreateBy",
+
+		"ModifiedOn",
+
+		"ModifiedUserId",
+
+		"ModifiedBy",
+		"LinkAddress",
+		"LinkProvince",
+		"LinkCity",
+		"LinkStreet",
+		"LinkHouseNo",
+		"LinkZipCode",
+		"HseTraining",
+		"CredentialFlag",
+		"SupplierCertificate",
+		"PACNumber",
+	}
+	err := svc.UpdateEntityBytbl(OilSupplierName, id, &model, updateCols)
+	if err == nil {
+		svc.DBE.Exec("update OilSupplierCert set Instyle="+instyle+" where SupplierId="+id+" and SupplierTypeCode="+typeCode+"")
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
 // @Title 添加
 // @Description 新增年审
 // @Success	200	{object} controllers.Request
@@ -696,7 +843,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		step = 2
 		backstatus = suppliercert.NO_THIRD_TRIAL_STATUS
 	} else if list.Status == suppliercert.PROF_AUDIT_STATUS {
-		status = suppliercert.ALL_PASE_STATUS
+		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 3
 		backstatus = suppliercert.NO_PROF_AUDIT_STATUS
 	}

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

@@ -66,6 +66,13 @@ export default {
       params: params
     })
   },
+  supupdateEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/annualaudit/suppupdate/' + entityId + '/' + formData.SupplierTypeCode + '/' + formData.InStyle,
+      method: 'post',
+      data: formData
+    })
+  },
   updateEntity (entityId, formData, myAxios) {
     return myAxios({
       url: '/annualaudit/update/' + entityId,

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

@@ -30,16 +30,16 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="this.formData.Status == '7'">
+        <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
-            <el-input v-model="formData.JSAccessCardNo"  :readonly="this.formData.Status != '7'" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.AccessCardNo"  :readonly="this.formData.Status != '7'||this.formData.Status != '8'||appendStatus" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" v-model="formData.SpecTypeCode"  @change="currentSel" :disabled="this.formData.Status > '0'"
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode"  @change="currentSel" :disabled="this.formData.Status > '0'&&!appendStatus"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
               </el-option>
@@ -49,7 +49,7 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'"
+            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
                          :value="item.Value">
@@ -424,6 +424,10 @@
         type: Boolean,
         default: true
       },
+      appendStatus: {
+        type: Boolean,
+        default: false
+      },
     },
 
     data() {

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

@@ -30,15 +30,15 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="this.formData.Status == '7'">
+        <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
-            <el-input v-model="formData.WZAccessCardNo" :readonly="this.formData.Status != '7'" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.AccessCardNo" :readonly="this.formData.Status != '7'||this.formData.Status != '8'||appendStatus" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="供应商类型">
-            <el-select ref="OperType" v-model="formData.OperType" :disabled="this.formData.Status > '0'"
+            <el-select ref="OperType" v-model="formData.OperType" :disabled="this.formData.Status > '0'&&!appendStatus"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
                          :value="item.Key">
@@ -49,7 +49,7 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" v-model="formData.SpecTypeCode" @change="currentSel" :disabled="this.formData.Status > '0'"
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode" @change="currentSel" :disabled="this.formData.Status > '0'&&!appendStatus"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">
@@ -77,7 +77,7 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select  ref="inStyle" v-model="formData.InStyle" :disabled="this.formData.Status > '0'"
+            <el-select  ref="inStyle" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
                        placeholder="请选择" style="width: 100%" @change="InStyleChange">
               <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">
@@ -88,7 +88,7 @@
 
          <el-col :span="8">
           <el-form-item label="管理单位" >
-            <el-select filterable v-model="formData.MgrUnit" maxlength="255"  clearable :disabled="this.formData.Status > '0'" placeholder="请输入" style="width: 100%">
+            <el-select filterable v-model="formData.MgrUnit" maxlength="255"  clearable :disabled="this.formData.Status > '0'&&!appendStatus" placeholder="请输入" style="width: 100%">
             <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
                          :value="item.Key">
               </el-option>
@@ -98,7 +98,7 @@
 
           <el-col :span="8">
           <el-form-item label="中石油准入证编号" >
-            <el-input v-model="formData.PACNumber" maxlength="255" :readonly="this.formData.Status > '0'" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.PACNumber" maxlength="255" :readonly="this.formData.Status > '0'&&!appendStatus" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -481,7 +481,11 @@
       canUpdateSupplier: {
         type: Boolean,
         default: true
-      }
+      },
+      appendStatus: {
+        type: Boolean,
+        default: false
+      },
     },
     data () {
 

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

@@ -28,9 +28,9 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="this.formData.Status == '7'">
+        <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
-            <el-input v-model="formData.JFAccessCardNo" :readonly="this.formData.Status != '7'" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.AccessCardNo" :readonly="this.formData.Status != '7'||this.formData.Status != '8'||appendStatus" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -38,7 +38,7 @@
         <el-col :span="8">
           <el-form-item label="单位关系">
             <el-select ref="SpecType" v-model="formData.SpecTypeCode"  @change="currentSel"
-                       placeholder="请选择" style="width: 100%" :disabled="this.formData.Status > '0'">
+                       placeholder="请选择" style="width: 100%" :disabled="this.formData.Status > '0'&&!appendStatus">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">
               </el-option>
@@ -48,7 +48,7 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'"
+            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
                          :value="item.Value">
@@ -407,6 +407,10 @@
         type: Boolean,
         default: true
       },
+      appendStatus: {
+        type: Boolean,
+        default: false
+      },
     },
     data () {
         var checkemail= (rule, value, callback) => {

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

@@ -27,9 +27,7 @@
             v-if="auditBtn && this.formData.Status != '6'&& this.formData.Status != '10'">{{auditTitle}}</el-button>
             <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
       <div>

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

@@ -27,9 +27,7 @@
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
             <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
       <div>

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

@@ -27,9 +27,7 @@
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
             <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <router-link :to="'/'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
       <div>

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

@@ -21,14 +21,20 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="annualAudit()"
+          <!-- <el-button type="primary" style="margin-left: 8px;" size="mini" @click="annualAudit()"
             v-if="AnnualStatus == 1 ||AnnualStatus == 2 ||AnnualStatus == 4">审核
           </el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="profAudit()" v-if="AnnualStatus == 3">
-            专业审核分配</el-button>
-          <router-link :to="'/oilsupplier/annualaudit/annualfistaudit'">
-            <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
-          </router-link>
+            专业审核分配</el-button> -->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
+            v-if="auditBtn && AnnualStatus == '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
+            v-if="auditBtn && AnnualStatus == '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="profAudit()"
+            v-if="auditBtn && AnnualStatus == '3'">提交专业审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
+            v-if="auditBtn && AnnualStatus == '4'">专业审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
       <el-tabs tab-position="top" style="margin-top: 10px">
@@ -420,6 +426,8 @@
           instance: '',
           AnnualStatus: ''
         },
+        anndata: [],
+        auditstepcode: '',
       }
     },
     created() {
@@ -430,14 +438,12 @@
       }
 
       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.getorgtreelist()
       //this.getorgtreelistbydeptid()
     },
@@ -453,12 +459,43 @@
           })
         }
       },
+      getannualdata() {
+        annualapi.getEntity(this.annualId, this.$axios).then(res => {
+          this.anndata = res.data
+          this.AnnualStatus
+          if (this.anndata) {
+            this.entrydetail.business = this.anndata[0].BusinessKey + ''
+            this.entrydetail.instance = this.anndata[0].WorkFlowId + ''
+            this.entrydetail.Status = this.anndata[0].Status + ''
+            this.AnnualStatus = this.anndata[0].Status + ''
+            if (this.anndata[0].Status === '1') {
+              this.auditstepcode = 'FIRST_TRIAL'
+            } else if (this.anndata[0].Status === '2') {
+              this.auditstepcode = 'SECOND_TRIAL'
+            } else if (this.anndata[0].Status === '3') {
+              this.auditstepcode = 'PROF_RECE'
+            } else if (this.anndata[0].Status === '4') {
+              this.auditstepcode = 'PROF_AUDIT'
+            }
+          }
+          this.isAccess()
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      isAccess() {
+        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+          this.auditBtn = res.data
+        }).catch(err => {
+          console.log(err)
+        })
+      },
       changeFormData(fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
       },
-      radioChange () {
+      radioChange() {
         if (this.shenheForm.SuccessStatus === 1) {
           this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
         } else {
@@ -580,9 +617,6 @@
             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.annualId
-            this.entrydetail.instance = this.WorkflowId
-            this.backhistroy.classId = this.formData.SupplierTypeCode
             if (this.certId && this.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
             }
@@ -690,8 +724,6 @@
               })
               this.dialogMakeSure = false
               this.dialogProfAudit = false
-              this.AnnualStatus = -1
-              this.entrydetail.AnnualStatus = this.AnnualStatus
             } else {
               this.$message({
                 type: 'warning',

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

@@ -48,7 +48,7 @@
               </span>
             </div>
             <basis-info ref="BasisInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
-              :disabled="savebtn" :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
+              :disabled="savebtn" :canUpdateSupplier="canUpdateSupplier" :appendStatus = "true" @selectcompany="changeFormData" @inputcompany="inputCompany">
             </basis-info>
           </el-card>
         </el-tab-pane>
@@ -781,7 +781,7 @@
       },
 
       updateEntity() {
-        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+        annualapi.supupdateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //更新子表
             this.updateNumberEntity()

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

@@ -49,7 +49,7 @@
               </span>
             </div>
             <goods-info ref="GoodsInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
-              :disabled="savebtn" :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData"
+              :disabled="savebtn" :canUpdateSupplier="canUpdateSupplier" :appendStatus = "true" @selectcompany="changeFormData"
               @inputcompany="inputCompany"></goods-info>
           </el-card>
         </el-tab-pane>
@@ -495,6 +495,7 @@
       if (this.Status > 0) {
         this.add_flat = false
       }
+      this.orgtreeChange(this.majorDept)
     },
     methods: {
       getstatus(annid) {
@@ -617,10 +618,6 @@
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      chooseAuditorShow() {
-        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
-        this.chooseAuditorVisible = true
-      },
       equipmentdialog() {
         this.$refs["equipmentList"].showDialog()
       },
@@ -760,7 +757,6 @@
       saveEntity() {
         let valid1 = false
         let valid2 = false
-        //debugger
         this.$refs['GoodsInfo'].$refs['EntityForm'].validate((valid) => {
           valid1 = valid
         })
@@ -787,7 +783,7 @@
 
       updateEntity() {
         console.log("-----this.formData------",this.formData)
-        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+        annualapi.supupdateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //更新子表
             this.updateNumberEntity()

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

@@ -49,7 +49,7 @@
               </span>
             </div>
             <tech-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
-              :disabled="savebtn" :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData"
+              :disabled="savebtn" :canUpdateSupplier="canUpdateSupplier" :appendStatus = "true" @selectcompany="changeFormData"
               @inputcompany="inputCompany">
             </tech-info>
           </el-card>
@@ -308,6 +308,7 @@
         savebtn: true,
         visbtn: '1',
         fushenauditer: '', //复审人员
+        userOptions: [],
         majorDept: [],
         secauditerOptions: [],
         audithistoryshow: false,
@@ -599,10 +600,6 @@
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      chooseAuditorShow() {
-        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
-        this.chooseAuditorVisible = true
-      },
       equipmentdialog() {
         this.$refs["equipmentList"].showDialog()
       },
@@ -755,7 +752,7 @@
       },
 
       updateEntity() {
-        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+        annualapi.supupdateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //更新子表
             this.updateNumberEntity()

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

@@ -66,7 +66,8 @@
             <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
             <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-            <span v-if="scope.row.Status=='5'" style="color:#67C23A">审核通过</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
           </template>
         </el-table-column>
         <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>

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

@@ -89,6 +89,7 @@
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
             </template>
           </el-table-column>

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

@@ -89,6 +89,7 @@
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
             </template>
           </el-table-column>

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

@@ -19,9 +19,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
             v-if="auditBtn && InfoStatus == '5'">集中评审</el-button>
           <!-- <el-button type="primary" size="mini" @click="submitInfoChange" v-if="InfoStatus > 0">审核</el-button> -->
-          <router-link :to="'/oilsupplier/infochangech/infoaudit'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
       <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
@@ -899,7 +897,7 @@
           .then(res => {
             this.Infomain = res.data.items;
             console.log("this.Infomain", this.Infomain)
-            if (this.Infomain.length > 0) {
+            if (this.Infomain) {
               this.entrydetail.business = this.Infomain[0].BusinessKey + ''
               this.entrydetail.instance = this.Infomain[0].WorkFlowId + ''
               this.entrydetail.Status = this.Infomain[0].Status + ''