bug修改

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

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -336,9 +336,9 @@ func (this *OilCorporateInfoController) ComAudit() {
 		//编辑短信内容
 		//查找审批人联系方式
 		var sPerson userRole.Base_User
-		svc.GetEntity(&sPerson,"Id="+model.CheckUserId)
+		svc.GetEntity(&sPerson,"Id ="+ this.User.Id)
 		toMobile:=model.UserTelephone
-		msg:="市场管理信息系统账号注册失败，因“"+Remark+"”，请按照要求重新注册，联系人："+model.CheckUserName+"，联系电话："+sPerson.Mobile+""
+		msg:="市场管理信息系统账号注册失败，因“"+Remark+"”，请按照要求重新注册，联系人："+sPerson.Realname+"，联系电话："+sPerson.Mobile+""
 
 		//调用短信接口发送短信
 		msgService:=msg2.GetMsgService(utils.DBE)

src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -692,13 +692,19 @@
       }
     },
     methods: {
-      showorhid(val){
-        if(val=='1'||val=='2'){
-          this.showorhidflag='hid'
-        }
-        else{
-          this.showorhidflag='show'
-        }
+       showorhid(val){
+          if(val=='1'||val=='2'){
+            this.showorhidflag='hid'
+            this.formData.OrganCode=""
+            this.formData.CountryTaxNo=""
+          }
+          else{
+            if(this.formData.CommercialNo!=""){
+              this.formData.OrganCode=this.formData.CommercialNo
+              this.formData.CountryTaxNo=this.formData.CommercialNo
+            }
+             this.showorhidflag='show'
+          }
       },
         currentSel (event) {
         if (event==2){

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -782,8 +782,14 @@
       showorhid(val){
           if(val=='1'||val=='2'){
             this.showorhidflag='hid'
+            this.formData.OrganCode=""
+            this.formData.CountryTaxNo=""
           }
           else{
+            if(this.formData.CommercialNo!=""){
+              this.formData.OrganCode=this.formData.CommercialNo
+              this.formData.CountryTaxNo=this.formData.CommercialNo
+            }
              this.showorhidflag='show'
           }
       },

src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -674,11 +674,17 @@
       }
     },
     methods: {
-       showorhid(val){
+         showorhid(val){
           if(val=='1'||val=='2'){
             this.showorhidflag='hid'
+            this.formData.OrganCode=""
+            this.formData.CountryTaxNo=""
           }
           else{
+            if(this.formData.CommercialNo!=""){
+              this.formData.OrganCode=this.formData.CommercialNo
+              this.formData.CountryTaxNo=this.formData.CommercialNo
+            }
              this.showorhidflag='show'
           }
       },

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

@@ -15,7 +15,7 @@
                             <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
           <!--</el-form-item>-->
           <el-form-item label="公司名称">
-            <el-input v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
           <el-form-item label="项目类别">
             <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">

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

@@ -807,6 +807,7 @@
          this.formData.SpecTypeCode = fdata.SpecTypeCode
         }
         this.formData.QualitySystemCert = fdata.QualitySystemCert
+        this.formData.QualifCert = fdata.QualifCert
         this.formData.SafetyLicense = fdata.SafetyLicense
         this.formData.SpecIndustryCert = fdata.SpecIndustryCert
         this.formData.BusinessScope = fdata.BusinessScope

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

@@ -800,6 +800,7 @@
          this.formData.SpecTypeCode = fdata.SpecTypeCode
         }
         this.formData.QualitySystemCert = fdata.QualitySystemCert
+        this.formData.QualifCert = fdata.QualifCert
         this.formData.SafetyLicense = fdata.SafetyLicense
         this.formData.SpecIndustryCert = fdata.SpecIndustryCert
         this.formData.BusinessScope = fdata.BusinessScope