合同接口

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -76,7 +76,7 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	企业资质证书编号 AS QualifCert,
 	企业资质证书级别 AS QualifCertLevel,
 	安全生产许可证 AS SafetyLicense,
-	服务类准入许可证 AS TechServiceLic,
+	技术服务类准入许可证 AS TechServiceLic,
 	外地企业进津备案通知书 AS TJInNotify,
 	行业特殊要求的认证证书 AS SpecIndustryCert,
 	法定代表人姓名 AS LegalPerson,
@@ -314,7 +314,7 @@ func (s *TmpzcgtSession) InsertOilInfoChange () error {
 	"select '11' as Status, 准入证号 as AccessCardNo, 企业名称 as SupplierName, 曾用名 as OldSupplierName, 准入类别 as SupplierTypeName,(case 准入类别 when '物资类' then '01' when '基建类' then '02' when '服务类' then '03' end) SupplierTypeCode, "+
 		"中石油供应商证书号 as OilCertificateNo, 级别 as Grade, 经营方式 as OperType, 国家 as Country, 所代理制造商名称 as MaunAgent, 施工队伍名称 as ConstructTeam, 工商注册号 as CommercialNo, 组织机构代码 as OrganCode, "+
 		"税务登记证国税编号 as CountryTaxNo, 税务登记证地税编号 as LocalTaxNo, 单位地址 as Address, 邮编 AS ZipCode, 质量管理体系认证情况及认证机构 AS QualitySystemCert, 产品质量认证情况及认证机构 AS ProductQualityCert, "+
-		"生产制造许可证获证情况及编号 AS MaunLicense, 企业资质证书编号 AS QualifCert, 企业资质证书级别 AS QualifCertLevel, 安全生产许可证 AS SafetyLicense, 服务类准入许可证 AS TechServiceLic, 外地企业进津备案通知书 AS TJInNotify, "+
+		"生产制造许可证获证情况及编号 AS MaunLicense, 企业资质证书编号 AS QualifCert, 企业资质证书级别 AS QualifCertLevel, 安全生产许可证 AS SafetyLicense, 技术服务类准入许可证 AS TechServiceLic, 外地企业进津备案通知书 AS TJInNotify, "+
 		"行业特殊要求的认证证书 AS SpecIndustryCert, 法定代表人姓名 AS LegalPerson, 行业类别代码 AS CategoryCode, 行业类别名称 AS CategoryName, 注册资本 AS RegCapital, 币种 AS Currency, 联系人姓名 AS ContactName, 公司类型 AS CompanyType, "+
 		"开户银行 AS DepositBank, 银行账号 AS BankAccount, 电子邮箱 AS EMail, 银行信用等级 AS BankCreditRating, 移动电话 AS Mobile, 固定电话 AS Telphone, 传真 AS Fax, 公司电话 AS CompanyTel, QQ号码 AS QQ, 公司网址 AS CompanyUrl, "+
 		"申请变更原因及内容 AS Remark, 审核日期 as  CreateOn, 录入员 as CreateBy,ID AS HouseNo from tmp_biangenxinxi "

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

@@ -334,6 +334,23 @@ func (this *SelectController) GetInfoByPage() {
 		stringi := strconv.Itoa(i)
 		where := " where 1 = 1 limit "+ stringi + ",1"
 		svc.GetInfoByCompId(where,&infoInte.SupplierInfo)
+
+		var cert1 suppliercert.OilSupplierCert
+		where = "SupplierId=" + strconv.Itoa(infoInte.SupplierInfo.Id) + " and SupplierTypeCode= '01'"
+		svc.GetEntityByWhere(OilSupplierCertName, where, &cert1)
+		infoInte.SupplierInfo.WZStatus = cert1.InFlag
+		infoInte.SupplierInfo.WZDate = cert1.ApplyTime.Format("2006-01-02")
+		var cert2 suppliercert.OilSupplierCert
+		where = "SupplierId=" + strconv.Itoa(infoInte.SupplierInfo.Id) + " and SupplierTypeCode= '02'"
+		svc.GetEntityByWhere(OilSupplierCertName, where, &cert2)
+		infoInte.SupplierInfo.JSStatus = cert2.InFlag
+		infoInte.SupplierInfo.JSDate = cert2.ApplyTime.Format("2006-01-02")
+		var cert3 suppliercert.OilSupplierCert
+		where = "SupplierId=" + strconv.Itoa(infoInte.SupplierInfo.Id) + " and SupplierTypeCode= '03'"
+		svc.GetEntityByWhere(OilSupplierCertName, where, &cert3)
+		infoInte.SupplierInfo.JFStatus = cert3.InFlag
+		infoInte.SupplierInfo.JFDate = cert3.ApplyTime.Format("2006-01-02")
+
 		if infoInte.SupplierInfo.SupplierName != "" {
 
 			where = "where SupplierId=" + strconv.Itoa(infoInte.SupplierInfo.Id) + " and SupplierTypeCode='01'"

src/dashoo.cn/frontend_web/src/pages/system/tmpzcgf.vue

@@ -144,54 +144,54 @@
           .then(res => {
           })
       },
-      start () {
-        this.datadialogVisible = true
-        this.time = setInterval(this.timer, 50)
-      },
-      stop () {
-        clearInterval(this.time)
-      },
+      // start () {
+      //   this.datadialogVisible = true
+      //   this.time = setInterval(this.timer, 50)
+      // },
+      // stop () {
+      //   clearInterval(this.time)
+      // },
 
-      reset () {
-        console.log(this.str, '时间=======')
-        clearInterval(this.time)
-        this.h = 0
-        this.m = 0
-        this.ms = 0
-        this.s = 0
-        this.str = '00:00:00:00'
-        this.datadialogVisible = false
-      },
-      timer () { // 定义计时函数
-        this.ms = this.ms + 50 // 毫秒
-        if (this.ms >= 1000) {
-          this.ms = 0
-          this.s = this.s + 1
-        }
-        if (this.s >= 60) {
-          this.s = 0
-          this.m = this.m + 1
-        }
-        if (this.m >= 60) {
-          this.m = 0
-          this.h = this.h + 1
-        }
-        this.str = this.toDub(this.h) + ':' + this.toDub(this.m) + ':' + this.toDub(this.s) + ':' + this.toDubms(this.ms) + '毫秒'
-      },
-      toDub (n) { // 补0操作
-        if (n < 10) {
-          return '0' + n
-        } else {
-          return '' + n
-        }
-      },
-      toDubms (n) {
-        if (n < 10) {
-          return '00' + n
-        } else {
-          return '0' + n
-        }
-      },
+      // reset () {
+      //   console.log(this.str, '时间=======')
+      //   clearInterval(this.time)
+      //   this.h = 0
+      //   this.m = 0
+      //   this.ms = 0
+      //   this.s = 0
+      //   this.str = '00:00:00:00'
+      //   this.datadialogVisible = false
+      // },
+      // timer () { // 定义计时函数
+      //   this.ms = this.ms + 50 // 毫秒
+      //   if (this.ms >= 1000) {
+      //     this.ms = 0
+      //     this.s = this.s + 1
+      //   }
+      //   if (this.s >= 60) {
+      //     this.s = 0
+      //     this.m = this.m + 1
+      //   }
+      //   if (this.m >= 60) {
+      //     this.m = 0
+      //     this.h = this.h + 1
+      //   }
+      //   this.str = this.toDub(this.h) + ':' + this.toDub(this.m) + ':' + this.toDub(this.s) + ':' + this.toDubms(this.ms) + '毫秒'
+      // },
+      // toDub (n) { // 补0操作
+      //   if (n < 10) {
+      //     return '0' + n
+      //   } else {
+      //     return '' + n
+      //   }
+      // },
+      // toDubms (n) {
+      //   if (n < 10) {
+      //     return '00' + n
+      //   } else {
+      //     return '0' + n
+      //   }
+      // },
 
       insertsuppler () {
         this.$confirm('是否继续?', '提示', {
@@ -201,23 +201,24 @@
         })
           .then(() => {
             // this.fullscreenLoading = true
+            this.datadialogVisible = true
             this.dialogtitle = '导入OilSuppler'
-            this.start()
+            // this.start()
             this.$axios.get('tmpzcgf/insertsupplier')
               .then(res => {
                 // this.fullscreenLoading = false
-                this.reset()
+                // this.reset()
                 this.insertSupplerCert()
               })
           })
       },
       insertSupplerCert () {
         this.dialogtitle = '导入OilSupplerCert'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/insertsuppliercert')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.updateSupplerCert()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -238,11 +239,11 @@
       },
       updateSupplerCert () {
         this.dialogtitle = '更新SupplierTypeCodeAndInFlag'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/updatecerttypeandinflag')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.updateSupplerId()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -263,11 +264,11 @@
       },
       updateSupplerId () {
         this.dialogtitle = '更新Cert表的SupplierID'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/updatesupplierid')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.insertfilename()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -288,10 +289,10 @@
       },
       insertfilename () {
         this.dialogtitle = '导入资质名称'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/insertFileName')
           .then(res => {
-            this.reset()
+            // this.reset()
             this.insertCertSub()
           })
       },
@@ -313,11 +314,11 @@
       },
       insterAnnualAudit () {
         this.dialogtitle = '导入年审表'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/insterannualaudit')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.updateAnnualAudit()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -413,11 +414,11 @@
       },
       insertCertSub () {
         this.dialogtitle = '导入CertSub表'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/insertCertSub')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.updateCertSub()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -438,11 +439,11 @@
       },
       updateCertSub () {
         this.dialogtitle = '更新CertSub表'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/updateOilSupplierCertSub')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.insertOilSupplierCertAppend()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -477,11 +478,11 @@
       },
       updateOilSupplierCertAppend () {
         this.dialogtitle = '跟新OilSupplierCertAppend表的SupplierId和CerId'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/updateOilSupplierCertAppend')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.insertOilSupplierCertSub()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -502,11 +503,11 @@
       },
       insertOilSupplierCertAppend () {
         this.dialogtitle = '导入增项申请'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/insertOilSupplierCertAppend')
           .then(res => {
             // this.fullscreenLoading = false
-            this.reset()
+            // this.reset()
             this.updateOilSupplierCertAppend()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -527,10 +528,10 @@
       },
       insertOilSupplierCertSub () {
         this.dialogtitle = '导入增项的准入范围'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/insertOilSupplierCertSub')
           .then(res => {
-            this.reset()
+            // this.reset()
             this.updateCertAppendIsType2()
           })
         // this.$confirm('是否继续?', '提示', {
@@ -605,10 +606,10 @@
       },
       updateCertAppendIsType2 () {
         this.dialogtitle = '更新增项准入范围'
-        this.start()
+        // this.start()
         this.$axios.get('tmpzcgf/updateCertSubIsType1')
           .then(res => {
-            this.reset()
+            // this.reset()
             // this.insterAnnualAudit()
           })
         // this.$confirm('是否继续?', '提示', {