模板-增项

src/dashoo.cn/backend/api/conf/app.conf

@@ -86,9 +86,9 @@ callbackHost=http://36dcae10.ngrok.io
 goodsModuleHost=http://weed1.labsop.cn:9390/1,2c23a61ef2ef
 basisModuleHost=http://weed1.labsop.cn:9390/2,2c25b72356e5
 techModuleHost=http://weed1.labsop.cn:9390/5,2c242309037d
-goodsPdfHost=http://weed1.labsop.cn:9390/4,272c38746f9a
-basisPdfHost=http://weed1.labsop.cn:9390/6,272dc8ca68d1
-techPdfHost=http://weed1.labsop.cn:9390/1,272e1bdabf62
+goodsPdfHost=http://weed1.labsop.cn:9390/3,2c46abdb949f
+basisPdfHost=http://weed1.labsop.cn:9390/6,2c592f01a6f8
+techPdfHost=http://weed1.labsop.cn:9390/1,2c58b7c861d3
 OriginUrl=http://47.92.212.59:8081/acti-api/api
 AposeUrl=http://47.92.212.59:8081/acti-api/api/apose
 BaseUrl=http://47.92.212.59:8081/acti-api/api/acti

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

@@ -13,6 +13,7 @@ import (
 	"dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/userRole"
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -252,12 +253,18 @@ func (this *PaymentInfoController) GetBillInfo() {
 	regSvc := register.GetOilCorporateInfoService(utils.DBE)
 	supplierSvc := supplier.GetOilSupplierService(utils.DBE)
 
-	var corporateInfo register.OilCorporateInfo
-	regSvc.GetEntity(&corporateInfo, "UserId='"+this.User.Id+"'")
 
-	var supplierEntity supplier.OilSupplier
-	supplierSvc.GetEntity(&supplierEntity, "CommercialNo='"+corporateInfo.CommercialNo+"'")
+	commercialNo := this.GetString("commercialNo")
+	fmt.Println(commercialNo)
+
+	if this.User.IsCompanyUser == 1 {
+		var corporateInfo register.OilCorporateInfo
+		regSvc.GetEntity(&corporateInfo, "UserId='"+this.User.Id+"'")
+		commercialNo = corporateInfo.CommercialNo
+	}
 
+	var supplierEntity supplier.OilSupplier
+	supplierSvc.GetEntity(&supplierEntity, "CommercialNo='"+commercialNo+"'")
 	billInfoSure := new(BillInfoSure)
 	billInfoSure.SupplierEntity = supplierEntity
 

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

@@ -343,8 +343,7 @@ func (this *SupplierDataEntryController) PdfExport() {
 	svc.GetEntitysByOrderbyWhere(OilSupplierCertSubName, where4, "1", &tabledata2)
 
 
-	datamap := StructToMapDemo(model1)
-
+	datamap := StructToMapDemo(model1.OilSupplier)
 	if model2.SupplierTypeCode == "01" {
 		Url = utils.Cfg.MustValue("workflow", "goodsPdfHost")
 		fileName = "物资类准入范围.docx"
@@ -368,15 +367,38 @@ func (this *SupplierDataEntryController) PdfExport() {
 	} else {
 		datamap["HseTraining"] = "否"
 	}
+	if model1.OperType != "" {
+		if model1.OperType == "1" || model1.OperType == "制造商"{
+			datamap["OperType"] = "√制造商 □代理商 □贸易商"
+		}else if model1.OperType == "2" || model1.OperType == "代理商"{
+			datamap["OperType"] = "□制造商 √代理商 □贸易商"
+		}else if model1.OperType == "3" || model1.OperType == "代理商"{
+			datamap["OperType"] = "□制造商 □代理商 √贸易商"
+		}else {
+			datamap["OperType"] = "□制造商 □代理商 □贸易商"
+		}
+	}
+	if model1.SpecTypeCode != "" {
+		if model1.SpecTypeCode == "1"{
+			datamap["SpecTypeCode"] = "√一般外部 □多元企业"
+		}else if model1.SpecTypeCode == "2"{
+			datamap["SpecTypeCode"] = "□一般外部 √多元企业"
+		}else {
+			datamap["SpecTypeCode"] = "□一般外部 □多元企业"
+		}
+	}
+	if model1.Grade == "1"{
+		datamap["Grade"] = "一级"
+	}else if model1.SpecTypeCode == "2"{
+		datamap["Grade"] = "二级"
+	}
 	datamap["Fax"] = model1.Fax
 	datamap["CompanyTel"] = model1.CompanyTel
 	datamap["SupplierName"] = model1.SupplierName
-	datamap["SpecTypeCode"] = model1.SpecTypeName
 	datamap["Country"] = model1.Country
 	datamap["MaunAgent"] = model1.MaunAgent
 	datamap["SupplierCertificate"] = model1.SupplierCertificate
 	datamap["MgrUnit"] = model1.MgrUnit
-	datamap["Grade"] = model1.Grade
 	datamap["CommercialNo"] = model1.CommercialNo
 	datamap["CountryTaxNo"] = model1.CountryTaxNo
 	datamap["OrganCode"] = model1.OrganCode
@@ -398,7 +420,7 @@ func (this *SupplierDataEntryController) PdfExport() {
 	datamap["BankCreditRating"] = model1.BankCreditRating
 	datamap["BusinessScope"] = model1.BusinessScope
 	datamap["Telphone"] = model1.Telphone
-
+	datamap["AccessCardNo"] = model2.AccessCardNo
 	//获取准入项不良记录
 	if len(tabledata2) != 0{
 		var badRecord  BadRecord.BadRecord

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

@@ -406,6 +406,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
           } else if (this.formData.Status === '5') {
             this.auditTitle = '集中评审'
             this.auditstepcode = 'PROF_REGULATION'
+            this.shenheForm.AuditorRemark = '集中评审通过'
           }
           this.inStyle = this.formData.InStyle
           this.getFileList()

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

@@ -410,6 +410,7 @@
           } else if (this.formData.Status === '5') {
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
+            this.shenheForm.AuditorRemark = '集中评审通过'
           }
           this.inStyle = this.formData.InStyle
           this.getFileList()

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

@@ -409,7 +409,7 @@
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = _this.AppendId
           this.entrydetail.instance = this.formData.WorkFlowId
-        this.entrydetail.status = this.formData.Status
+          this.entrydetail.status = this.formData.Status
           if (_this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -426,6 +426,7 @@
           } else if (_this.formData.Status === '5') {
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
+            this.shenheForm.AuditorRemark = '集中评审通过'
           }
           this.inStyle = this.formData.InStyle
           this.getSortList()

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymentsure.vue

@@ -10,8 +10,18 @@
           <i class="icon icon-table2"></i> 缴费确认
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-right: 15px" @click="printBtn">打印</el-button>
-          <el-button type="primary" plain title="查看详情" size="mini" v-if="entityList && entityList.length > 0" :loading="sureLoading" @click="BillSureClickConfirm">确认缴费单</el-button>
+          <el-form ref="form" :inline="true" style="margin-top: -10px">
+            <el-form-item label="组织机构代码" v-if="authUser.Profile.IsCompanyUser == 0">
+              <el-input v-model="searchForm.commercialNo" size="small" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+            <el-form-item v-if="authUser.Profile.IsCompanyUser == 0">
+              <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">获取账单</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" size="mini" style="margin-right: 15px" @click="printBtn">打印</el-button>
+              <el-button type="primary" plain title="查看详情" size="mini" v-if="entityList && entityList.length > 0" :loading="sureLoading" @click="BillSureClickConfirm">确认缴费单</el-button>
+            </el-form-item>
+          </el-form>
         </span>
       </div>
       <div class="table-layout" style="margin-top: 0px">
@@ -175,13 +185,19 @@
           Order: '',
           Prop: ''
         },
-        formDataSup: {}
+        formDataSup: {},
+        searchForm: {
+          commercialNo: ''
+        }
       }
     },
     created () {
       this.initDatas()
     },
     methods: {
+      handleSearch () {
+        this.initDatas()
+      },
       printBtn () {
         this.dialogVisible = true
       },
@@ -254,6 +270,8 @@
           Order: this.Column.Order,
           Prop: this.Column.Prop
         }
+        Object.assign(params, this.searchForm)
+        console.log(params, 'params')
         api.getBillList(params, this.$axios).then(res => {
           this.formDataSup = res.data.SupplierEntity
           this.entityList = res.data.DataInfos[0].items