bug解决 0520

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -114,7 +114,6 @@ type OilSupplierView struct {
 	SupplierStatus    string    `xorm:"comment('供应商状态（null:正常，1中止，2终止）') VARCHAR(255)"`
 	MgrType           string    `xorm:"comment('供应商管理类型') VARCHAR(255)"`
 	Type              string    `xorm:"comment('供应商类型') VARCHAR(255)"`
-	MgrUnit           string    `xorm:"comment('管理单位') VARCHAR(255)"`
 	AddinTime         string    `xorm:"comment('准入日期') VARCHAR(255)"`
 	EffectTime        string    `xorm:"comment('生效日期') VARCHAR(255)"`
 	ApplyTime         time.Time `xorm:"comment('年审日期') DATETIME"`

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierSession.go

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

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

@@ -322,7 +322,7 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 
 	var supplierModel supplier.OilSupplier
 	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
-	svcSupplier.GetEntityById(datamain.SupplierCertId, &supplierModel)
+	svcSupplier.GetEntityById(datamain.SupplierId, &supplierModel)
 
 	for n := 0; n < len(dataother.CheckList); n++ {
 		where_sub := "SupplierTypeCode = 01 and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
@@ -431,7 +431,7 @@ func (this *OilSupplierCertSubController) AddTechBus() {
 
 	var supplierModel supplier.OilSupplier
 	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
-	svcSupplier.GetEntityById(datamain.SupplierCertId, &supplierModel)
+	svcSupplier.GetEntityById(datamain.SupplierId, &supplierModel)
 
 	for n := 0; n < len(dataother.CheckList); n++ {
 		where_sub := "SupplierTypeCode = 03 and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
@@ -552,7 +552,7 @@ func (this *OilSupplierCertSubController) AddBusiness() {
 
 	var supplierModel supplier.OilSupplier
 	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
-	svcSupplier.GetEntityById(model.SupplierCertId, &supplierModel)
+	svcSupplier.GetEntityById(model.SupplierId, &supplierModel)
 
 	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
 	filesvc := supplierfile.GetSupplierfileService(utils.DBE)

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

@@ -721,6 +721,9 @@
             if ((this.formData.Status > 0 ) && (this.formData.Status !=4)) {
               this.delete_flat = false
             }
+              if(this.formData.CredentialFlag!=""){
+                this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
+              }
             this.$refs['BasisInfo'].CityAry = []
             this.$refs['BasisInfo'].CityAry.push(this.formData.Province)
             this.$refs['BasisInfo'].CityAry.push(this.formData.City)

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

@@ -742,7 +742,10 @@
               if ((this.formData.Status > 0 ) && (this.formData.Status !=4)) {
               this.delete_flat = false
               }
-
+              
+              if(this.formData.CredentialFlag!=""){
+                this.$refs["GoodsInfo"].showorhid(this.formData.CredentialFlag)
+              }
               this.$refs["GoodsInfo"].CityAry = [];
               this.$refs["GoodsInfo"].CityAry.push(this.formData.Province);
               this.$refs["GoodsInfo"].CityAry.push(this.formData.City);

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

@@ -714,6 +714,9 @@
             if ((this.formData.Status > 0 ) && (this.formData.Status !=4)) {
               this.delete_flat = false
             }
+              if(this.formData.CredentialFlag!=""){
+                this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
+              }
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             this.$refs["TechInfo"].CityAry = []
             this.$refs["TechInfo"].CityAry.push(this.formData.Province)