状态修改

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

@@ -691,7 +691,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		step = 2
 		backstatus = suppliercert.NO_THIRD_TRIAL_STATUS
 	} else if list.Status == suppliercert.PROF_AUDIT_STATUS {
-		status = suppliercert.CENT_AUDIT_STATUS
+		status = suppliercert.ALL_PASE_STATUS
 		step = 3
 		backstatus = suppliercert.NO_PROF_AUDIT_STATUS
 	}

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

@@ -771,7 +771,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		}
 	} else if supplierCertAppendEntity.Status == suppliercert.CENT_AUDIT_STATUS {
 		userIds = utils.ToStr(dataother.Auditer)
-		status = suppliercert.PAYING_AUDIT_STATUS
+		status = suppliercert.ALL_PASE_STATUS
 		step = 3
 		backstatus = suppliercert.NO_CENT_AUDIT_STATUS
 	}

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

@@ -760,14 +760,15 @@
       saveEntity() {
         let valid1 = false
         let valid2 = false
-
+        //debugger
         this.$refs['GoodsInfo'].$refs['EntityForm'].validate((valid) => {
           valid1 = valid
         })
 
-        this.$refs["GoodsInfo"].$refs["EntityFormCert"].validate(vvalid => {
-          valid2 = vvalid
+        this.$refs['GoodsInfo'].$refs['EntityFormCert'].validate((valid) => {
+          valid2 = valid
         })
+        
 
         if (valid1 && valid2) {
           if (!this.formData.SetupTime) {
@@ -785,6 +786,7 @@
       },
 
       updateEntity() {
+        console.log("-----this.formData------",this.formData)
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //更新子表

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

@@ -89,7 +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=='5'" style="color:#67C23A">审核通过</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"

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

@@ -89,7 +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=='5'" style="color:#67C23A">审核通过</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"

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

@@ -86,7 +86,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=='5'" style="color:#67C23A">审核通过</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"

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

@@ -89,7 +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=='5'" style="color:#67C23A">审核通过</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"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -88,6 +88,7 @@
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>
             </template>
           </el-table-column>
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -86,6 +86,7 @@
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>
             </template>
           </el-table-column>
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

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

@@ -95,6 +95,7 @@
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>
             </template>
           </el-table-column>
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -90,6 +90,7 @@
               <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>
             </template>
           </el-table-column>
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

src/dashoo.cn/frontend_web/src/pages/select/suppsubselect/index.vue

@@ -3,14 +3,14 @@
     <!--顶部显示-->
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>业务申请上报情况</el-breadcrumb-item>
+      <el-breadcrumb-item>准入项目情况</el-breadcrumb-item>
     </el-breadcrumb>
 
     <!--内框顶部显示-->
     <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 业务申请上报情况
+          <i class="icon icon-table2"></i> 准入项目情况
         </span>
 
         <el-form
@@ -19,7 +19,7 @@
           :inline="true"
           style="float: right;position:absolute;right:15px;top:10.5px"
         >
-          <el-form-item label="推荐单位">
+          <el-form-item label="企业名称">
             <el-input size="mini" v-model="searchForm.FullName" placeholder="请输入内容"></el-input>
           </el-form-item>
           <el-form-item>
@@ -54,12 +54,12 @@
         @sort-change="orderby"
       >
         <!--内框表格剩余栏显示-->
-        <el-table-column label="推荐单位" prop="FullName" align="center"></el-table-column>
-        <el-table-column label="准入类别" prop="SupplierTypeName" align="center"></el-table-column>
-        <el-table-column label="上报数量" prop="ZongShu" align="center"></el-table-column>
-        <el-table-column label="合格数量" prop="HeGe" align="center"></el-table-column>
+        <el-table-column label="分类编码" prop="FullName" align="center"></el-table-column>
+        <el-table-column label="分类名称" prop="SupplierTypeName" align="center"></el-table-column>
+        <el-table-column label="备注" prop="ZongShu" align="center"></el-table-column>
+        <!-- <el-table-column label="合格数量" prop="HeGe" align="center"></el-table-column>
         <el-table-column label="不合格数量" prop="BuHeGe" align="center"></el-table-column>
-        <el-table-column label="不合格原因" prop="Reason" align="center"></el-table-column>
+        <el-table-column label="不合格原因" prop="Reason" align="center"></el-table-column> -->
       </el-table>
 
       <!-- 分页 -->