是否生成缴费

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

@@ -850,24 +850,42 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
-			supplierCertEntity.Status = status
-			supplierCertEntity.Step = step
-			cols := []string{
-				"Status",
-				"Step",
-			}
-			certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
-			if supplierCertEntity.Status == suppliercert.PAYING_AUDIT_STATUS {//PAYING_AUDIT_STATUS {
-				paysvc := paymentinfo.GetPaymentService(utils.DBE)
-				var Amount float64
-				if supplierCertEntity.SupplierTypeCode == "01" {
-					Amount =  6000
-				}else if supplierCertEntity.SupplierTypeCode == "02"{
-					Amount = 7000
-				}else if supplierCertEntity.SupplierTypeCode == "03" {
-					Amount = 8000
+			if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
+				if supplierCertEntity.InStyle == "1" {
+					paysvc := paymentinfo.GetPaymentService(utils.DBE)
+					var Amount float64
+					if supplierCertEntity.SupplierTypeCode == "01" {
+						Amount = 6000
+					} else if supplierCertEntity.SupplierTypeCode == "02" {
+						Amount = 7000
+					} else if supplierCertEntity.SupplierTypeCode == "03" {
+						Amount = 8000
+					}
+					paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount, "1")
+					supplierCertEntity.Status = status
+					supplierCertEntity.Step = step
+					cols := []string{
+						"Status",
+						"Step",
+					}
+					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+				} else {
+					supplierCertEntity.Status = suppliercert.STOREING_STATUS
+					supplierCertEntity.Step = step
+					cols := []string{
+						"Status",
+						"Step",
+					}
+					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+				}
+			} else {
+				supplierCertEntity.Status = status
+				supplierCertEntity.Step = step
+				cols := []string{
+					"Status",
+					"Step",
 				}
-				paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount,"1")
+				certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 			}
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0
@@ -996,6 +1014,7 @@ func (this *OilSupplierCertController) IsAccess() {
 // @router /createaccesscardno/:type [get]
 func (this *OilSupplierCertController) CreateAccessCardNo() {
 	Id := this.GetString("Id")
+	certId := this.GetString(("SupplierCertId"))
 	typeCode := this.Ctx.Input.Param(":type")
 	codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)
 	var model []supplier.OilSupplier
@@ -1042,6 +1061,10 @@ func (this *OilSupplierCertController) CreateAccessCardNo() {
 		cols = []string{"JSAccessCardNo"}
 	}
 	codecSvc.UpdateEntityByIdCols(Id, &entity, cols)
+	var cert suppliercert.OilSupplierCert
+	certcols := []string{"AccessCardNo"}
+	cert.AccessCardNo = seqStr
+	codecSvc.UpdateEntityByIdCols(certId, &cert, certcols)
 	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 (Id, type, myAxios) {
+  createAccessCardNo (Id, SupplierCertId, type, myAxios) {
     return myAxios({
-      url: '/suppliercert/createaccesscardno/' + type + '?Id=' + Id,
+      url: '/suppliercert/createaccesscardno/' + type + '?Id=' + Id + '&SupplierCertId=' + SupplierCertId,
       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" 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/paymentinfo/_opera/operation.vue

@@ -10,6 +10,7 @@
           <i class="icon icon-table2"></i> 缴费信息
         </span>
         <span style="float: right;">
+          <!--<el-button type="primary" size="mini" style="margin-right: 15px" @click="printBtn" v-if="formData.IsPay == '1'">打印</el-button>-->
           <el-button type="primary" size="mini" style="margin-right: 15px" @click="submitPay" v-if="formData.IsPay == '1'">提交缴费</el-button>
           <router-link :to="'/oilsupplier/paymentinfo'">
             <el-button type="primary" size="mini">返回</el-button>
@@ -81,6 +82,57 @@
         </el-form-item>
       </el-form>
     </el-card>
+    <!--<el-dialog :visible.sync="dialogVisible" width="1024px">-->
+      <!--<el-card class="box-card">-->
+        <!--<div slot="header" class="clearfix">-->
+          <!--<span>打印内容</span>-->
+          <!--<el-button style="float: right; padding: 3px 0" type="text" @click="printinfo">打印</el-button>-->
+        <!--</div>-->
+        <!--<div id="printid">-->
+          <!--<el-row>-->
+            <!--<el-col :span="24">-->
+              <!--<div style="font-size: 18px;height: 30px">单位名称：{{this.formDataSup.SupplierName}}</div>-->
+            <!--</el-col>-->
+            <!--<el-col :span="24">-->
+              <!--<div style="font-size: 18px;height: 30px">税号：{{this.formDataSup.CountryTaxNo}}</div>-->
+            <!--</el-col>-->
+            <!--<el-col :span="24">-->
+              <!--<div style="font-size: 18px;height: 30px">地址、电话：{{this.formDataSup.Address}}&nbsp;&nbsp;&nbsp;&nbsp;{{this.formDataSup.Telphone}}</div>-->
+            <!--</el-col>-->
+            <!--<el-col :span="24">-->
+              <!--<div style="font-size: 18px;height: 30px">开户行及账号：{{this.formDataSup.DepositBank}}&nbsp;&nbsp;&nbsp;&nbsp;{{this.formDataSup.BankAccount}}</div>-->
+            <!--</el-col>-->
+          <!--</el-row>-->
+        <!--</div>-->
+      <!--</el-card>-->
+    <!--</el-dialog>-->
+    <el-dialog
+      title="打印内容"
+      :visible.sync="dialogVisible"
+      width="50%"
+      center>
+      <div id="printid">
+        <el-row>
+          <el-col :span="24">
+            <div style="font-size: 18px;height: 30px">单位名称：{{this.formDataSup.SupplierName}}</div>
+          </el-col>
+          <el-col :span="24">
+            <div style="font-size: 18px;height: 30px">税号：{{this.formDataSup.CommercialNo}}</div>
+          </el-col>
+          <el-col :span="24">
+            <div style="font-size: 18px;height: 30px">地址、电话：{{this.formDataSup.Address}}&nbsp;&nbsp;&nbsp;&nbsp;{{this.formDataSup.Telphone}}</div>
+          </el-col>
+          <el-col :span="24">
+            <div style="font-size: 18px;height: 30px">开户行及账号：{{this.formDataSup.DepositBank}}&nbsp;&nbsp;&nbsp;&nbsp;{{this.formDataSup.BankAccount}}</div>
+          </el-col>
+        </el-row>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="printinfo">打 印</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -89,6 +141,7 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/paymentinfo'
+  import supapi from '@/api/oilsupplier/supplier'
 
   export default {
     computed: {
@@ -100,6 +153,7 @@
 
     data () {
       return {
+        dialogVisible: false,
         serviceId: '',
         formData: {
           SupplierTypeCode: '',
@@ -124,6 +178,7 @@
           ModifiedUserId: '',
           ModifiedBy: ''
         },
+        formDataSup: {},
         PayModeOption: [
           {
             value: '现金'
@@ -142,6 +197,18 @@
       this.initDatas()
     },
     methods: {
+      printBtn () {
+        supapi.getEntity(this.formData.SupplierId, this.$axios).then(res => {
+          this.formDataSup = res.data
+        })
+        this.dialogVisible = true
+      },
+      printinfo () {
+        let bdhtml = window.document.body.innerHTML
+        window.document.body.innerHTML = window.document.getElementById('printid').innerHTML
+        window.print()
+        window.document.body.innerHTML = bdhtml
+      },
       initDatas () {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {

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

@@ -773,6 +773,7 @@
             this.formData.SetupTime = new Date(this.formData.SetupTime)
           }
           // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+          this.formData.RegCapital = parseFloat(this.formData.RegCapital)
           if (!this.formData.Id || !this.certId) {
             this.addEntity()
           } else {

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

@@ -938,6 +938,7 @@ export default {
           this.formData.SetupTime = new Date(this.formData.SetupTime)
         }
         // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+        this.formData.RegCapital = parseFloat(this.formData.RegCapital)
         if (!this.formData.Id || !this.certId) {
           this.addEntity()
         } else {

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

@@ -780,6 +780,7 @@
             this.formData.SetupTime = new Date(this.formData.SetupTime)
           }
           // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+          this.formData.RegCapital = parseFloat(this.formData.RegCapital)
           if (!this.formData.Id || !this.certId) {
             this.addEntity()
           } else {

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

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

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

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

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

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

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

@@ -592,7 +592,7 @@
           })
         }
       },
-      isAccess() {
+      isAccess () {
         apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
           this.auditBtn = res.data
         }).catch(err => {

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

@@ -478,7 +478,7 @@
     },
     methods: {
       createWZAccessCardNo () {
-        apiCert.createAccessCardNo(this.formData.Id, '02', this.$axios).then(res => {
+        apiCert.createAccessCardNo(this.formData.Id, this.formData.CertId, '02', this.$axios).then(res => {
           this.formData.JSAccessCardNo = res.data
         })
       },

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

@@ -480,7 +480,7 @@
     },
     methods: {
       createWZAccessCardNo () {
-        apiCert.createAccessCardNo(this.formData.Id, '01', this.$axios).then(res => {
+        apiCert.createAccessCardNo(this.formData.Id, this.formData.CertId, '01', this.$axios).then(res => {
           this.formData.WZAccessCardNo = res.data
         })
       },

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

@@ -486,7 +486,7 @@
     },
     methods: {
       createJFAccessCardNo () {
-        apiCert.createAccessCardNo(this.formData.Id, '03', this.$axios).then(res => {
+        apiCert.createAccessCardNo(this.formData.Id, this.formData.CertId, '03', this.$axios).then(res => {
           this.formData.JFAccessCardNo = res.data
         })
       },

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

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

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

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

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

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