准入编码手动修改

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

@@ -1019,8 +1019,8 @@ func (this *OilSupplierCertController) CreateAccessCardNo() {
 	codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)
 	var model []supplier.OilSupplier
 	var entity supplier.OilSupplier
-	where := "Id = " + Id
-	codecSvc.GetEntities(&model, where)
+	//where := "Id = " + Id
+	codecSvc.GetEntities(&model, "")
 	seqStr := ""
 	cols := []string{}
 	if (typeCode == "01") {  // 物质
@@ -1092,4 +1092,50 @@ func (this *OilSupplierCertController) UpdataInFlag() {
 			svc.UpdateEntityByIdCols(certentitys[i].Id, &certentity, cols)
 		}
 	}
+}
+
+// @Title 保存准入编码
+// @Description 保存准入编码
+// @Success 200 {object} controllers.Request
+// @router /saveaccesscardno/:Id [get]
+func (this *OilSupplierCertController) SaveAccessCardNo() {
+	id := this.Ctx.Input.Param(":Id")
+	certId := this.GetString(("SupplierCertId"))
+	typeCode := this.GetString("typeCode")
+	accessCardNo := this.GetString("AccessCardNo")
+
+	var model []suppliercert.OilSupplierCert
+	var supplier supplier.OilSupplier
+	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
+	where := "AccessCardNo='" + accessCardNo + "'"
+	svc.GetEntities(&model, where)
+	supcols := []string{}
+	if model == nil || len(model) == 0 {
+		if (typeCode == "01") {  // 物质
+			supplier.WZAccessCardNo = accessCardNo
+			supcols = []string{"WZAccessCardNo"}
+		} else if typeCode == "03" { //技术服务
+			supplier.JFAccessCardNo = accessCardNo
+			supcols = []string{"JFAccessCardNo"}
+		} else if typeCode == "02" { // 基建
+			supplier.JSAccessCardNo = accessCardNo
+			supcols = []string{"JSAccessCardNo"}
+		}
+		svc.UpdateEntityByIdCols(id, &supplier, supcols)
+		var cert suppliercert.OilSupplierCert
+		certcols := []string{"AccessCardNo"}
+		cert.AccessCardNo = accessCardNo
+		svc.UpdateEntityByIdCols(certId, &cert, certcols)
+		var errinfo ErrorDataInfo
+		errinfo.Message = "保存成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		var errinfo ErrorDataInfo
+		errinfo.Message = "准入编码已经存在！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
 }

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

@@ -98,4 +98,10 @@ export default {
       method: 'GET'
     })
   },
+  saveAccessCardNo (Id, SupplierCertId, AccessCardNo, type, myAxios) {
+    return myAxios({
+      url: '/suppliercert/saveaccesscardno/' + Id + '?AccessCardNo=' + AccessCardNo + '&SupplierCertId=' + SupplierCertId + '&typeCode=' + type,
+      method: 'GET'
+    })
+  }
 }

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

@@ -30,7 +30,7 @@
 
         <el-col :span="8">
           <el-form-item label="准入编码">
-            <el-input v-model="formData.WZAccessCardNo"  :readonly="!canUpdateSupplier || this.formData.Status != '7'" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.WZAccessCardNo"  :readonly="!canUpdateSupplier && this.formData.Status != '7'" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>

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

@@ -56,45 +56,19 @@
         </el-table-column>
         <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-alert v-if="scope.row.Status=='0' || scope.row.Status==''" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待提交" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待初审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="初审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待复审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='-2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="复审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待专业处室分办" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待专业处室审批" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='-4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="专业处室审批未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待集中评审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='-5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="集中评审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待缴费" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="待入库" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
-                      title="已入库" type="success">
-            </el-alert>
+            <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
+            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+            <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=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
+            <span v-if="scope.row.Status=='5'" 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=='7'" style="color:#E6A23C">待入库</span>
+            <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"

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

@@ -25,6 +25,7 @@
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>
           <router-link :to="'/oilsupplier/supplierstorage/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
@@ -479,6 +480,23 @@
       }
     },
     methods: {
+      saveAccessCardNo () {
+        console.log(this.formData, 'this.formData.WZAccessCardNo')
+        apiCert.saveAccessCardNo(this.formData.Id, this.formData.CertId, this.formData.WZAccessCardNo, '01', this.$axios).then(res => {
+          console.log(res.data, 'res.data')
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+      },
       createWZAccessCardNo () {
         apiCert.createAccessCardNo(this.formData.Id, this.formData.CertId, '01', this.$axios).then(res => {
           this.formData.WZAccessCardNo = res.data