生成准入编码

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

@@ -3,6 +3,7 @@ package oilsupplier
 import (
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/codecsequence"
+	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/paymentinfo"
 	"encoding/json"
 	"fmt"
@@ -969,43 +970,53 @@ func (this *OilSupplierCertController) IsAccess() {
 // @Success 200 {object} controllers.Request
 // @router /createaccesscardno/:type [get]
 func (this *OilSupplierCertController) CreateAccessCardNo() {
+	Id := this.GetString("Id")
 	typeCode := this.Ctx.Input.Param(":type")
 	codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)
-	var model []suppliercert.OilSupplierCert
-	where := "SupplierTypeCode = '" + typeCode + "'"
+	var model []supplier.OilSupplier
+	var entity supplier.OilSupplier
+	where := "Id = " + Id
 	codecSvc.GetEntities(&model, where)
 	seqStr := ""
-	if (typeCode == "01") {
+	cols := []string{}
+	if (typeCode == "01") {  // 物质
 		seqStr = codecSvc.GetWZAccessCardNo(this.User.AccCode)
 		if model != nil {
 			for i := 0; i < len(model); i++ {
-				if seqStr == model[i].AccessCardNo {
+				if seqStr == model[i].WZAccessCardNo {
 					seqStr = codecSvc.GetWZAccessCardNo(this.User.AccCode)
 					i = 0
 				}
 			}
 		}
-	} else if typeCode == "03" {
-		seqStr = codecSvc.GetJSAccessCardNo(this.User.AccCode)
+		entity.WZAccessCardNo = seqStr
+		cols = []string{"WZAccessCardNo"}
+	} else if typeCode == "03" { //技术服务
+		seqStr = codecSvc.GetJFAccessCardNo(this.User.AccCode)
 		if model != nil {
 			for i := 0; i < len(model); i++ {
-				if seqStr == model[i].AccessCardNo {
-					seqStr = codecSvc.GetJSAccessCardNo(this.User.AccCode)
+				if seqStr == model[i].JFAccessCardNo {
+					seqStr = codecSvc.GetJFAccessCardNo(this.User.AccCode)
 					i = 0
 				}
 			}
 		}
-	} else if typeCode == "02" {
-		seqStr = codecSvc.GetJFAccessCardNo(this.User.AccCode)
+		entity.JFAccessCardNo = seqStr
+		cols = []string{"JFAccessCardNo"}
+	} else if typeCode == "02" { // 基建
+		seqStr = codecSvc.GetJSAccessCardNo(this.User.AccCode)
 		if model != nil {
 			for i := 0; i < len(model); i++ {
-				if seqStr == model[i].AccessCardNo {
-					seqStr = codecSvc.GetJFAccessCardNo(this.User.AccCode)
+				if seqStr == model[i].JSAccessCardNo {
+					seqStr = codecSvc.GetJSAccessCardNo(this.User.AccCode)
 					i = 0
 				}
 			}
 		}
+		entity.JSAccessCardNo = seqStr
+		cols = []string{"JSAccessCardNo"}
 	}
+	codecSvc.UpdateEntityByIdCols(Id, &entity, cols)
 	this.Data["json"] = seqStr
 	this.ServeJSON()
 }

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

@@ -86,9 +86,9 @@ export default {
       method: 'get'
     })
   },
-  createAccessCardNo (type, myAxios) {
+  createAccessCardNo (Id, type, myAxios) {
     return myAxios({
-      url: '/suppliercert/createaccesscardno/' + type,
+      url: '/suppliercert/createaccesscardno/' + type + '?Id=' + Id,
       method: 'GET'
     })
   }

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

@@ -28,6 +28,13 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="准入编码">
+            <el-input v-model="formData.JSAccessCardNo"  :readonly="!canUpdateSupplier" 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" :disabled="!canUpdateSupplier"
@@ -55,8 +62,8 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col> 
-       
+        </el-col>
+
 
         <el-col :span="8">
           <el-form-item label="统一社会信用代码" prop="CommercialNo">
@@ -75,7 +82,7 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'"> 
+          <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
             <el-input v-model="formData.OrganCode" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
               style="width: 100%">
             </el-input>
@@ -366,7 +373,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="营业范围" prop="BusinessScope"> 
+          <el-form-item label="营业范围" prop="BusinessScope">
             <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="请输入" type="textarea"
               style="width: 100%"></el-input>
           </el-form-item>
@@ -503,7 +510,7 @@
         }, {
           value: '2',
           label: '正常'
-        }], 
+        }],
         companyReadonly: false,
         companynames: [],
         UnitRelationOptions: [],
@@ -708,6 +715,7 @@
               _this.formData.EMail = res.data.items[0].EMail
               _this.formData.BankCreditRating = res.data.items[0].BankCreditRating
               _this.formData.Remark = res.data.items[0].Remark
+              _this.formData.JSAccessCardNo = res.data.items[0].JSAccessCardNo
             }
           })
           .catch(err => {

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

@@ -26,6 +26,13 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="准入编码">
+            <el-input v-model="formData.WZAccessCardNo"  :readonly="!canUpdateSupplier" 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" :disabled="!canUpdateSupplier"
@@ -81,8 +88,8 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col> 
-        
+        </el-col>
+
         <el-col :span="8">
           <el-form-item label="统一社会信用代码" prop="CommercialNo" >
             <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
@@ -90,8 +97,8 @@
           </el-form-item>
         </el-col>
 
-     
-        
+
+
         <el-col :span="8">
           <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
             <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
@@ -435,12 +442,12 @@
       canUpdateSupplier: {
         type: Boolean,
         default: true
-      },
+      }
     },
 
     data () {
-       
-       
+
+
       var checkemail= (rule, value, callback) => {
         console.log(value)
           if (value) {
@@ -455,7 +462,7 @@
             callback()
           }
         };
-      
+
       var checkCommercialNo =  (rule, value, callback) => {
          console.log("showorhidflag"+this.showorhidflag)
         if (!value) {
@@ -535,7 +542,7 @@
         }, {
           value: '2',
           label: '正常'
-        }], 
+        }],
         companyReadonly: false,
         companynames: [],
         UnitRelationOptions: [],
@@ -658,13 +665,13 @@
             message: '请输入联系人姓名',
             trigger: 'change'
           }, ],
-        
+
             CompanyTel: [{
             required: true,
             message: '请输入财务电话',
             trigger: 'change'
           }, ],
-         
+
           LinkProvince: [{
             required: true,
             message: '请选择省市区',
@@ -753,6 +760,7 @@
               _this.formData.EMail = res.data.items[0].EMail
               _this.formData.BankCreditRating = res.data.items[0].BankCreditRating
               _this.formData.Remark = res.data.items[0].Remark
+              _this.formData.WZAccessCardNo = res.data.items[0].WZAccessCardNo
             }
           })
           .catch(err => {

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

@@ -26,6 +26,13 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="准入编码">
+            <el-input v-model="formData.JFAccessCardNo"  :readonly="!canUpdateSupplier" 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"
@@ -52,7 +59,7 @@
       <el-row>
 
 
-        
+
         <el-col :span="8">
            <el-form-item label="证件合一">
             <el-select v-model="value" placeholder="请选择"  @change="showorhid" style="width: 100%">
@@ -60,7 +67,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col> 
+        </el-col>
         <el-col :span="8">
           <el-form-item label="统一社会信用代码" prop="CommercialNo" >
             <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
@@ -486,7 +493,7 @@
         }, {
           value: '2',
           label: '正常'
-        }], 
+        }],
         companyReadonly: false,
         companynames: [],
         UnitRelationOptions: [],
@@ -693,6 +700,7 @@
               _this.formData.EMail = res.data.items[0].EMail
               _this.formData.BankCreditRating = res.data.items[0].BankCreditRating
               _this.formData.Remark = res.data.items[0].Remark
+              _this.formData.JFAccessCardNo = res.data.items[0].JFAccessCardNo
             }
           })
           .catch(err => {

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

@@ -414,6 +414,7 @@ export default {
 
   data() {
     return {
+      createBtn: false,
       activeName: "0",
       chooseAuditorVisible: false,
       showReturn: 1,
@@ -593,8 +594,16 @@ export default {
     } else {
       this.initDatas();
     }
+    this.isAccess()
   },
   methods: {
+    isAccess () {
+      apiCert.isAccess('PROF_REGULATION', this.$axios).then(res => {
+        this.createBtn = res.data
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     inputCompany(val) {
       if (!this.certId) {
         api

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

@@ -575,7 +575,7 @@
            sort: true
            },*/
           {
-            prop: "AccessCardNo",
+            prop: "JSAccessCardNo",
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -575,7 +575,7 @@
            },*/
 
           {
-            prop: "AccessCardNo",
+            prop: "WZAccessCardNo",
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -581,7 +581,7 @@
           },*/
 
           {
-            prop: "AccessCardNo",
+            prop: "JFAccessCardNo",
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -24,6 +24,7 @@
             </el-steps>
             <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="confirm">确认入库</el-button>
           <router-link :to="'/oilsupplier/supplierstorage/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
@@ -414,7 +415,8 @@
           SupplierTypeName: '基建类',
           Step: 0,
           HseTraining: 0,
-          AuditIndex: 0
+          AuditIndex: 0,
+          JSAccessCardNo: ''
         },
 
         formDataCert: {
@@ -475,7 +477,19 @@
       }
     },
     methods: {
+      createWZAccessCardNo () {
+        apiCert.createAccessCardNo(this.formData.Id, '02', this.$axios).then(res => {
+          this.formData.JSAccessCardNo = res.data
+        })
+      },
       confirm () {
+        if (this.formData.JSAccessCardNo === '') {
+          this.$message({
+            type: 'warning',
+            message: '准入证编码不能为空！'
+          })
+          return
+        }
         this.$confirm('确认提交入库', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',

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

@@ -24,6 +24,7 @@
             </el-steps>
             <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="confirm">确认入库</el-button>
           <router-link :to="'/oilsupplier/supplierstorage/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
@@ -416,7 +417,8 @@
           SupplierTypeName: '物资类',
           Step: 0,
           HseTraining: 0,
-          AuditIndex: 0
+          AuditIndex: 0,
+          WZAccessCardNo: ''
         },
 
         formDataCert: {
@@ -477,7 +479,19 @@
       }
     },
     methods: {
+      createWZAccessCardNo () {
+        apiCert.createAccessCardNo(this.formData.Id, '01', this.$axios).then(res => {
+          this.formData.WZAccessCardNo = res.data
+        })
+      },
       confirm () {
+        if (this.formData.WZAccessCardNo === '') {
+          this.$message({
+            type: 'warning',
+            message: '准入证编码不能为空！'
+          })
+          return
+        }
         this.$confirm('确认提交入库','提示',{
           confirmButtonText: '确认',
           cancelButtonText: '取消',

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

@@ -24,6 +24,7 @@
             </el-steps>
             <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="createJFAccessCardNo">生成准入编码</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/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
@@ -422,7 +423,8 @@
           SupplierTypeName: '技术服务类',
           Step: 0,
           HseTraining: 0,
-          AuditIndex: 0
+          AuditIndex: 0,
+          JFAccessCardNo: ''
         },
 
         formDataCert: {
@@ -483,7 +485,19 @@
       }
     },
     methods: {
+      createJFAccessCardNo () {
+        apiCert.createAccessCardNo(this.formData.Id, '03', this.$axios).then(res => {
+          this.formData.JFAccessCardNo = res.data
+        })
+      },
       confirm () {
+        if (this.formData.JFAccessCardNo === '') {
+          this.$message({
+            type: 'warning',
+            message: '准入证编码不能为空！'
+          })
+          return
+        }
         this.$confirm('确认提交入库', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',

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

@@ -526,7 +526,7 @@
            sort: true
            },*/
           {
-            prop: "AccessCardNo",
+            prop: "JSAccessCardNo",
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -526,7 +526,7 @@
            }, */
 
           {
-            prop: 'AccessCardNo',
+            prop: 'WZAccessCardNo',
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -532,7 +532,7 @@
           },*/
 
           {
-            prop: "AccessCardNo",
+            prop: "JFAccessCardNo",
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -526,7 +526,7 @@
            sort: true
            },*/
           {
-            prop: "AccessCardNo",
+            prop: "JSAccessCardNo",
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -538,7 +538,7 @@
            }, */
 
           {
-            prop: 'AccessCardNo',
+            prop: 'WZAccessCardNo',
             label: '准入证编号',
             width: 260,
             sort: true

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

@@ -532,7 +532,7 @@
           },*/
 
           {
-            prop: "AccessCardNo",
+            prop: "JFAccessCardNo",
             label: '准入证编号',
             width: 260,
             sort: true