Jelajahi Sumber

bug解决 企业信息录入

Signed-off-by: lijunqing <lijunqing@dashoo.cn>
lijunqing 6 tahun lalu
induk
melakukan
61e7471318

+ 1 - 1
src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -76,6 +76,7 @@ type OilSupplier struct {
 	ModifiedUserId     int       `xorm:"INT(10)"`
 	ModifiedBy         string    `xorm:"VARCHAR(50)"`
 	PACNumber          string    `xorm:"comment('中石油准入证编号') VARCHAR(50)"`
+	SupplierCertificate string   `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`
 }
 
 type OilSupplierView struct {
@@ -122,7 +123,6 @@ type OilSupplierView struct {
 	InternalFlag      string    `xorm:"comment('国内采购') VARCHAR(255)"`
 	ImportFlag        string    `xorm:"comment('进口采购') VARCHAR(255)"`
 	OutsideFlog       string    `xorm:"comment('境外项目') VARCHAR(255)"`
-	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
 	ThirdAudit        string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete          int       `xorm:"default 0 comment('删除状态,0正常,1已删除') INT(10)"`
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`

+ 1 - 0
src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierSession.go

@@ -162,6 +162,7 @@ func (s *OilSupplierSession) GetUpdateCols(oilSupplierCertTableName string, supp
 		"LinkZipCode",
 		"HseTraining",
 		"CredentialFlag",
+		"SupplierCertificate",
 	}
 
 	if !canEdit {

+ 1 - 1
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -388,7 +388,7 @@
         </el-col>
          <el-col :span="8">
           <el-form-item label="所代理制造商名称" >
-            <el-input v-model="formData.AgentManufacturer" maxlength="255" placeholder="请输入" type="textarea">
+            <el-input v-model="formData.MaunAgent" maxlength="255" placeholder="请输入" type="textarea">
             </el-input>
           </el-form-item>
         </el-col>

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

@@ -496,7 +496,7 @@
           NationalCertTotal: 0,
           DesignerTotal: 0,
           SkillerTotal: 0,
-          // Remark: '',
+          Remark: '',
           // IsDelete: '',
           // CreateOn: '',
           // CreateUserId: '',

+ 4 - 3
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -498,7 +498,7 @@
           NationalCertTotal: 0,
           DesignerTotal: 0,
           SkillerTotal: 0,
-          // Remark: "",
+          Remark: "",
           // IsDelete: 0,
           // CreateOn: "",
           // CreateUserId: "",
@@ -512,7 +512,8 @@
           Step: 0,
           HseTraining: '0',
           AuditIndex: 0,
-          PACNumber: ""
+          PACNumber: "",
+          SupplierCertificate:""
         },
 
         formDataCert: {
@@ -949,7 +950,7 @@
             return
           }
         } else if (this.formData.OperType === '代理商') {
-          if (!this.formData.AgentManufacturer) {
+          if (!this.formData.MaunAgent) {
             valid1 = false
             this.$message({
               type: 'warning',

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

@@ -491,7 +491,7 @@
           NationalCertTotal: 0,
           DesignerTotal: 0,
           SkillerTotal: 0,
-          // Remark: '',
+          Remark: '',
           // IsDelete: '',
           // CreateOn: '',
           // CreateUserId: '',