2
3
Prechádzať zdrojové kódy

bug

Signed-off-by: lijunqing <lijunqing@dashoo.cn>
lijunqing 6 rokov pred
rodič
commit
32a20e87e9

+ 104 - 108
src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -368,7 +368,7 @@
           </el-form-item>
         </el-col>-->
         <el-col :span="8">
-          <el-form-item label="安全生产许可证">
+          <el-form-item label="安全生产许可证证书编号">
             <el-input v-model="formData.SafetyLicense" :readonly="this.formData.Status > '0'" maxlength="200" placeholder="请输入" type="textarea"
                       style="width: 100%">
             </el-input>
@@ -376,7 +376,7 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="行业特殊要求的认证证书">
+          <el-form-item label="行业特殊要求的认证证书编号">
             <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
                       style="width: 100%">
             </el-input>
@@ -427,11 +427,11 @@
       appendStatus: {
         type: Boolean,
         default: false
-      },
+      }
     },
 
-    data() {
-      var checkemail= (rule, value, callback) => {
+    data () {
+      var checkemail = (rule, value, callback) => {
         if (value) {
           let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
@@ -439,40 +439,38 @@
           } else {
             callback()
           }
-        }
-        else{
+        } else {
           callback()
         }
-      };
-      var checkCommercialNo =  (rule, value, callback) => {
+      }
+      var checkCommercialNo = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入统一社会信用代码'));
+          callback(new Error('请输入统一社会信用代码'))
         } else {
-          if(this.showorhidflag=='hid'){
+          if (this.showorhidflag == 'hid') {
             let re = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
             if (!re.test(value)) {
               callback(new Error('请输入正确的统一社会信用代码'))
             } else {
               callback()
             }
-          }
-          else{
+          } else {
             callback()
           }
         }
-      };
-      //查找是否有公司信息,若有则补全信息。
-      var checkSupplierName =  (rule, value, callback) => {
+      }
+      // 查找是否有公司信息,若有则补全信息。
+      var checkSupplierName = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入供方名称'));
+          callback(new Error('请输入供方名称'))
         } else {
-          callback();
+          callback()
         }
-      };
-      //检查邮编格式
-      var checkZipCode =  (rule, value, callback) => {
+      }
+      // 检查邮编格式
+      var checkZipCode = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入邮编'));
+          callback(new Error('请输入邮编'))
         } else {
           let re = /^[1-9]\d{5}$/
           if (!re.test(value)) {
@@ -481,11 +479,11 @@
             callback()
           }
         }
-      };
-      //检查手机号
-      var checkMobile =  (rule, value, callback) => {
+      }
+      // 检查手机号
+      var checkMobile = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入手机号码'));
+          callback(new Error('请输入手机号码'))
         } else {
           let re = /^1[3456789]\d{9}$/
           if (!re.test(value)) {
@@ -494,12 +492,12 @@
             callback()
           }
         }
-      };
+      }
 
-      //固话检验
-      var checkTelphone =  (rule, value, callback) => {
+      // 固话检验
+      var checkTelphone = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入固话号码'));
+          callback(new Error('请输入固话号码'))
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
           if (!re.test(value)) {
@@ -508,12 +506,12 @@
             callback()
           }
         }
-      };
+      }
 
-      //传真检验
-      var checkFax =  (rule, value, callback) => {
+      // 传真检验
+      var checkFax = (rule, value, callback) => {
         if (!value) {
-          callback();
+          callback()
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
           if (!re.test(value)) {
@@ -522,22 +520,22 @@
             callback()
           }
         }
-      };
+      }
 
       return {
-        showorhidflag:'hid',
+        showorhidflag: 'hid',
         selectoptions: [{
           value: '1',
           label: '三证合一'
         }, {
           value: '2',
-          label: '五证合一',
+          label: '五证合一'
         }, {
           value: '3',
           label: '常规'
         }],
-        address:[],
-        linkaddress:[],
+        address: [],
+        linkaddress: [],
         companyReadonly: false,
         companynames: [],
         UnitRelationOptions: [],
@@ -562,7 +560,7 @@
         }],
 
         rulesform: {
-          BusinessScope:[{
+          BusinessScope: [{
             required: true,
             message: '请输入营业范围',
             trigger: 'change'
@@ -571,12 +569,12 @@
             required: true,
             validator: checkSupplierName,
             trigger: 'change'
-          }, ],
+          } ],
           CommercialNo: [{
             required: true,
             validator: checkCommercialNo,
             trigger: 'change'
-          }, ],
+          } ],
           CountryTaxNo: [{
             required: true,
             message: '请输入税务登记证编号',
@@ -586,22 +584,22 @@
             required: true,
             message: '请选择公司类型',
             trigger: 'change'
-          }, ],
+          } ],
           LegalPerson: [{
             required: true,
             message: '请输入法定代表人姓名',
             trigger: 'change'
-          }, ],
+          } ],
           Province: [{
             required: true,
             message: '请选择省市区',
             trigger: 'blur'
-          }, ],
+          } ],
           Address: [{
             required: true,
             message: '请输入注册地址',
             trigger: 'change'
-          }, ],
+          } ],
           EMail: [{
             required: false,
             validator: checkemail,
@@ -611,51 +609,51 @@
             required: true,
             message: '请输入组织机构代码',
             trigger: 'change'
-          }, ],
+          } ],
 
           RegCapital: [{
             required: true,
             message: '请输入注册资本',
             trigger: 'change'
-          }, ],
+          } ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',
             trigger: 'change'
-          }, ],
+          } ],
           BankAccount: [{
             required: true,
             message: '请输入银行账号',
             trigger: 'change'
-          }, ],
+          } ],
           ContactName: [{
             required: true,
             message: '请输入联系人姓名',
             trigger: 'change'
-          }, ],
+          } ],
           Mobile: [{
             required: true,
             validator: checkMobile,
             trigger: 'change'
-          }, ],
+          } ],
 
           Telphone: [{
             required: true,
             validator: checkTelphone,
             trigger: 'blur'
-          }, ],
+          } ],
 
-           Fax: [{
+          Fax: [{
             required: false,
             validator: checkFax,
             trigger: 'blur'
-          }, ],
+          } ],
 
           CompanyTel: [{
             required: true,
             message: '请输入财务电话',
             trigger: 'change'
-          }, ],
+          } ],
           ZipCode: [{
             required: true,
             validator: checkZipCode,
@@ -670,51 +668,50 @@
             required: true,
             message: '请选择省市区',
             trigger: 'blur'
-          }, ],
+          } ],
           LinkAddress: [{
             required: true,
             message: '请输入通信地址',
             trigger: 'change'
-          }, ],
+          } ],
           realname: [{
             required: true,
             message: '用户名',
             trigger: 'blur'
           }]
-        },
+        }
       }
     },
-    created() {
+    created () {
       //   if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
       //   this.inputCompanyName(this.authUser.Profile.Realname)
       // }
     },
     watch: {
       dictData: {
-        handler(newName, oldName) {
+        handler (newName, oldName) {
           this.getDictOptions()
         },
         immediate: true
       }
     },
     methods: {
-       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'
+      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){
-          this.formData.InStyle='5'
+      currentSel (event) {
+        if (event == 2) {
+          this.formData.InStyle = '5'
           // for(let item of this.$refs.inStyle.options) {
           //   if(item.value=='5'){
           //       console.log(item.style)
@@ -722,16 +719,16 @@
           //      //隐藏
           //   }
           // }
-          }else{
-            this.formData.InStyle='1'
-            }
+        } else {
+          this.formData.InStyle = '1'
+        }
       },
       // commnoChange () {
       //   this.formData.CountryTaxNo = this.formData.CommercialNo
       //   this.formData.OrganCode = this.formData.CommercialNo
       // },
-      //查找是否有公司信息,若有则补全信息
-      searchSupplierName() {
+      // 查找是否有公司信息,若有则补全信息
+      searchSupplierName () {
         let _this = this
         _this.$axios.get('/register/getcompanyinfo/' + _this.formData.SupplierName, {})
           .then(res => {
@@ -767,10 +764,10 @@
               _this.formData.DepositBank = res.data.items[0].DepositBank
               _this.formData.BankAccount = res.data.items[0].BankAccount
               _this.formData.ContactName = res.data.items[0].ContactName
-              if(res.data.items[0].Mobile!=null&&res.data.items[0].Mobile!=""){
-                  _this.formData.Mobile = res.data.items[0].Mobile
-              }else{
-                 _this.formData.Mobile = res.data.items[0].UserTelephone
+              if (res.data.items[0].Mobile != null && res.data.items[0].Mobile != '') {
+                _this.formData.Mobile = res.data.items[0].Mobile
+              } else {
+                _this.formData.Mobile = res.data.items[0].UserTelephone
               }
               _this.formData.Telphone = res.data.items[0].Telphone
               _this.formData.Fax = res.data.items[0].Fax
@@ -785,7 +782,7 @@
             console.error(err)
           })
       },
-      getDictOptions() {
+      getDictOptions () {
         if (this.dictData) {
           this.UnitRelationOptions = this.dictData['UnitRelation']
           this.InOptions = this.dictData['InOptions']
@@ -805,42 +802,42 @@
           // }
         }
       },
-      getCityList(val) {
+      getCityList (val) {
         let resultData = JSON.parse(val)
         let countstr = JSON.stringify(resultData.districts[0].districts)
         countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
         this.countryoptions = JSON.parse(countstr)
       },
-      unitRelationChange(value) {
+      unitRelationChange (value) {
         this.formData.SpecTypeCode = value.join(',')
       },
-      handleAreaChange(value) {
+      handleAreaChange (value) {
         this.formData.Province = value[0]
         this.formData.City = value[1]
         this.formData.Street = value[2]
-        //this.formData.ZipCode = value[2]
+        // this.formData.ZipCode = value[2]
         this.address = this.$refs['cascaderAdd'].currentLabels
-        this.formData.AllAddress= this.address[0]+'/'+this.address[1]+'/'+this.address[2]
+        this.formData.AllAddress = this.address[0] + '/' + this.address[1] + '/' + this.address[2]
       },
-      handleLinkAreaChange(value) {
+      handleLinkAreaChange (value) {
         this.formData.LinkProvince = value[0]
         this.formData.LinkCity = value[1]
         this.formData.LinkStreet = value[2]
-        //this.formData.LinkZipCode = value[2]
+        // this.formData.LinkZipCode = value[2]
         this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
-        this.formData.LinkAllAddress= this.linkaddress[0]+'/'+this.linkaddress[1]+'/'+this.linkaddress[2]
+        this.formData.LinkAllAddress = this.linkaddress[0] + '/' + this.linkaddress[1] + '/' + this.linkaddress[2]
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       },
 
       // /** ----------------------- */querySearch(queryString, cb) {
@@ -848,7 +845,7 @@
       //   // 调用 callback 返回建议列表的数据
       //   cb(results)
       // },
-      createFilter(queryString) {
+      createFilter (queryString) {
         return (restaurant) => {
           return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
         }
@@ -856,13 +853,12 @@
       // handleSelect(item) {
       //   this.$emit('selectcompany', item)
       // },
-      inputCompanyName(val) {
+      inputCompanyName (val) {
         this.$emit('inputcompany', val)
-      },
+      }
 
     }
   }
-
 </script>
 <style>
 .formDataInfo .el-input__inner[readonly]{

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

@@ -2,8 +2,12 @@
   <div>
     <!--startprint1-->
     <!--打印内容开始-->
-    <el-form class="formDataInfo" label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform"
-      :disabled="disabled">
+    <el-form class="formDataInfo"
+             label-width="135px"
+             ref="EntityForm"
+             :model="formData"
+             :rules="rulesform"
+             :disabled="disabled">
       <el-row>
         <!--<el-col :span="8">
           <el-form-item label="DEMO">
@@ -19,33 +23,50 @@
         </el-col>-->
 
         <el-col :span="16">
-          <el-form-item label="供方名称" prop="SupplierName">
+          <el-form-item label="供方名称"
+                        prop="SupplierName">
             <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
                              :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
             </el-autocomplete> -->
-            <el-input v-model="formData.SupplierName" :maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
+            <el-input v-model="formData.SupplierName"
+                      :maxlength="255"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%"
+                      v-if="authUser && authUser.Profile.IsCompanyUser == 1">
             </el-input>
-            <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
-              :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"
-              v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
+            <el-input v-model="formData.SupplierName"
+                      :maxlength="255"
+                      @change="inputCompanyName"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%"
+                      v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
             </el-input>
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
+        <el-col :span="8"
+                v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
             <el-input v-model="formData.AccessCardNo"
-              :readonly="this.formData.Status != '7'" placeholder="请输入"
-              style="width: 100%">
+                      :readonly="this.formData.Status != '7'"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="供应商类型">
-            <el-select ref="OperType" v-model="formData.OperType" :disabled="this.formData.Status > '0'&&!appendStatus"
-              placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key" :value="item.Key">
+            <el-select ref="OperType"
+                       v-model="formData.OperType"
+                       :disabled="this.formData.Status > '0'&&!appendStatus"
+                       placeholder="请选择"
+                       style="width: 100%">
+              <el-option v-for="item in OperTypeOptions"
+                         :key="item.Id"
+                         :label="item.Key"
+                         :value="item.Key">
               </el-option>
             </el-select>
           </el-form-item>
@@ -53,21 +74,35 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" v-model="formData.SpecTypeCode" @change="currentSel"
-              :disabled="this.formData.Status > '0'&&!appendStatus" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
+            <el-select ref="SpecType"
+                       v-model="formData.SpecTypeCode"
+                       @change="currentSel"
+                       :disabled="this.formData.Status > '0'&&!appendStatus"
+                       placeholder="请选择"
+                       style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions"
+                         :key="item.Id"
+                         :label="item.Key"
+                         :value="item.Value">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="国家" prop="Country">
+          <el-form-item label="国家"
+                        prop="Country">
             <!--<el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
             </el-input>-->
-            <el-select v-model="formData.Country" :disabled="!canUpdateSupplier" filterable placeholder="请选择"
-              style="width: 100%">
-              <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value" :value="item.value">
+            <el-select v-model="formData.Country"
+                       :disabled="!canUpdateSupplier"
+                       filterable
+                       placeholder="请选择"
+                       style="width: 100%">
+              <el-option v-for="item in countryListOptions"
+                         :key="item.key"
+                         :label="item.value"
+                         :value="item.value">
                 <span style="float: left">{{ item.value }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
               </el-option>
@@ -77,9 +112,16 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select ref="inStyle" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
-              placeholder="请选择" style="width: 100%" @change="InStyleChange">
-              <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" :value="item.Value">
+            <el-select ref="inStyle"
+                       v-model="formData.InStyle"
+                       :disabled="this.formData.Status > '0'&&!appendStatus"
+                       placeholder="请选择"
+                       style="width: 100%"
+                       @change="InStyleChange">
+              <el-option v-for="item in InOptions"
+                         :key="item.Id"
+                         :label="item.Key"
+                         :value="item.Value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -87,9 +129,17 @@
 
         <el-col :span="8">
           <el-form-item label="管理单位">
-            <el-select filterable v-model="formData.MgrUnit" maxlength="255" clearable
-              :disabled="this.formData.Status > '0'&&!appendStatus" placeholder="请输入" style="width: 100%">
-              <el-option v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key" :value="item.Key">
+            <el-select filterable
+                       v-model="formData.MgrUnit"
+                       maxlength="255"
+                       clearable
+                       :disabled="this.formData.Status > '0'&&!appendStatus"
+                       placeholder="请输入"
+                       style="width: 100%">
+              <el-option v-for="item in ManagementUnitOptions"
+                         :key="item.Value"
+                         :label="item.Key"
+                         :value="item.Key">
               </el-option>
             </el-select>
           </el-form-item>
@@ -97,46 +147,65 @@
 
         <el-col :span="8">
           <el-form-item label="中石油准入证编号">
-            <el-input v-model="formData.PACNumber" maxlength="255" :readonly="this.formData.Status > '0'&&!appendStatus"
-              placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.PACNumber"
+                      maxlength="255"
+                      :readonly="this.formData.Status > '0'&&!appendStatus"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
-
-
         <el-col :span="8">
           <el-form-item label="证件合一">
-            <el-select v-model="formData.CredentialFlag" :disabled="!canUpdateSupplier" placeholder="请选择"
-              @change="showorhid" style="width: 100%">
-              <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
+            <el-select v-model="formData.CredentialFlag"
+                       :disabled="!canUpdateSupplier"
+                       placeholder="请选择"
+                       @change="showorhid"
+                       style="width: 100%">
+              <el-option v-for="item in selectoptions"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="统一社会信用代码" prop="CommercialNo">
-            <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+          <el-form-item label="统一社会信用代码"
+                        prop="CommercialNo">
+            <el-input v-model="formData.CommercialNo"
+                      maxlength="50"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
-
-
         <el-col :span="8">
-          <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
-            <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+          <el-form-item label="税务登记证编号"
+                        prop="CountryTaxNo"
+                        v-if="showorhidflag=='show'">
+            <el-input v-model="formData.CountryTaxNo"
+                      maxlength="50"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
-            <el-input v-model="formData.OrganCode" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+          <el-form-item label="组织机构代码"
+                        prop="OrganCode"
+                        v-if="showorhidflag=='show'">
+            <el-input v-model="formData.OrganCode"
+                      maxlength="50"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -148,51 +217,79 @@
           </el-form-item>
         </el-col>-->
         <el-col :span="16">
-          <el-form-item label="注册地址" prop="Province">
+          <el-form-item label="注册地址"
+                        prop="Province">
             <el-row>
               <el-col :span="10">
-                <el-cascader ref="cascaderAdd" :options="countryoptions" :props="countryprops" maxlength="20"
-                  :disabled="!canUpdateSupplier" placeholder="省市区" v-model="CityAry" style="width: 100%"
-                  @change="handleAreaChange">
+                <el-cascader ref="cascaderAdd"
+                             :options="countryoptions"
+                             :props="countryprops"
+                             maxlength="20"
+                             :disabled="!canUpdateSupplier"
+                             placeholder="省市区"
+                             v-model="CityAry"
+                             style="width: 100%"
+                             @change="handleAreaChange">
                 </el-cascader>
               </el-col>
               <el-col :span="14">
-                <el-input v-model="formData.Address" maxlength="500" placeholder="详细地址" :readonly="!canUpdateSupplier"
-                  style="width: 100%">
+                <el-input v-model="formData.Address"
+                          maxlength="500"
+                          placeholder="详细地址"
+                          :readonly="!canUpdateSupplier"
+                          style="width: 100%">
                 </el-input>
               </el-col>
             </el-row>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="邮编" prop="ZipCode">
-            <el-input v-model="formData.ZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+          <el-form-item label="邮编"
+                        prop="ZipCode">
+            <el-input v-model="formData.ZipCode"
+                      maxlength="20"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="16">
-          <el-form-item label="通信地址" prop="LinkProvince">
+          <el-form-item label="通信地址"
+                        prop="LinkProvince">
             <el-row>
               <el-col :span="10">
-                <el-cascader ref="cascaderAddrLink" :options="countryoptions" :props="countryprops"
-                  :disabled="!canUpdateSupplier" placeholder="省市区" v-model="LinkCityAry" maxlength="20"
-                  style="width: 100%" @change="handleLinkAreaChange">
+                <el-cascader ref="cascaderAddrLink"
+                             :options="countryoptions"
+                             :props="countryprops"
+                             :disabled="!canUpdateSupplier"
+                             placeholder="省市区"
+                             v-model="LinkCityAry"
+                             maxlength="20"
+                             style="width: 100%"
+                             @change="handleLinkAreaChange">
                 </el-cascader>
               </el-col>
               <el-col :span="14">
-                <el-input v-model="formData.LinkAddress" maxlength="500" :readonly="!canUpdateSupplier"
-                  placeholder="详细地址" style="width: 100%">
+                <el-input v-model="formData.LinkAddress"
+                          maxlength="500"
+                          :readonly="!canUpdateSupplier"
+                          placeholder="详细地址"
+                          style="width: 100%">
                 </el-input>
               </el-col>
             </el-row>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="邮编" prop="LinkZipCode">
-            <el-input v-model="formData.LinkZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+          <el-form-item label="邮编"
+                        prop="LinkZipCode">
+            <el-input v-model="formData.LinkZipCode"
+                      maxlength="20"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -223,7 +320,6 @@
       </el-row>
       <el-row>
 
-
         <!--<el-col :span="8">
           <el-form-item label="外地企业进津备案通知书">
             <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
@@ -231,20 +327,33 @@
         </el-col>-->
         <el-row>
           <el-col :span="8">
-            <el-form-item label="法定代表人姓名" prop="LegalPerson">
-              <el-input v-model="formData.LegalPerson" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-                style="width: 100%">
+            <el-form-item label="法定代表人姓名"
+                          prop="LegalPerson">
+              <el-input v-model="formData.LegalPerson"
+                        maxlength="20"
+                        :readonly="!canUpdateSupplier"
+                        placeholder="请输入"
+                        style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="公司类型" prop="CompanyType">
+            <el-form-item label="公司类型"
+                          prop="CompanyType">
               <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
-              <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create
-                :disabled="!canUpdateSupplier" placeholder="请选择" style="width: 100%;">
-                <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
-                  style="width: 100%">
+              <el-select v-model="formData.CompanyType"
+                         maxlength="50"
+                         filterable
+                         allow-create
+                         :disabled="!canUpdateSupplier"
+                         placeholder="请选择"
+                         style="width: 100%;">
+                <el-option v-for="item in CompanyTypeOptions"
+                           :key="item.Id"
+                           :label="item.Key"
+                           :value="item.Value"
+                           style="width: 100%">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -254,8 +363,13 @@
             <el-form-item label="成立时间">
               <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
                 style="width: 100%"> </el-date>-->
-              <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier"
-                format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
+              <el-date-picker v-model="formData.SetupTime"
+                              type="date"
+                              :readonly="!canUpdateSupplier"
+                              format="yyyy 年 MM 月 dd 日"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择日期"
+                              style="width: 100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -276,9 +390,14 @@
         <el-row>
 
           <el-col :span="8">
-            <el-form-item label="注册资本" prop="RegCapital">
-              <el-input type="number" v-model="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier"
-                placeholder="请输入" style="width: 100%">
+            <el-form-item label="注册资本"
+                          prop="RegCapital">
+              <el-input type="number"
+                        v-model="formData.RegCapital"
+                        :min="1"
+                        :readonly="!canUpdateSupplier"
+                        placeholder="请输入"
+                        style="width: 100%">
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>
@@ -286,18 +405,27 @@
 
           <el-col :span="8">
             <el-form-item label="币种">
-              <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
-                style="width: 100%;">
-                <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
+              <el-select v-model="formData.Currency"
+                         :disabled="!canUpdateSupplier"
+                         placeholder="请选择"
+                         style="width: 100%;">
+                <el-option v-for="item in CurrencyOptions"
+                           :key="item.Value"
+                           :label="item.Key"
+                           :value="item.Value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="开户银行" prop="DepositBank">
-              <el-input v-model="formData.DepositBank" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-                style="width: 100%">
+            <el-form-item label="开户银行"
+                          prop="DepositBank">
+              <el-input v-model="formData.DepositBank"
+                        maxlength="50"
+                        :readonly="!canUpdateSupplier"
+                        placeholder="请输入"
+                        style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
@@ -306,56 +434,83 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="联系人姓名" prop="ContactName">
-              <el-input v-model="formData.ContactName" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-                style="width: 100%">
+            <el-form-item label="联系人姓名"
+                          prop="ContactName">
+              <el-input v-model="formData.ContactName"
+                        maxlength="20"
+                        :readonly="!canUpdateSupplier"
+                        placeholder="请输入"
+                        style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="移动电话" prop="Mobile">
-              <el-input v-model="formData.Mobile" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-                style="width: 100%"></el-input>
+            <el-form-item label="移动电话"
+                          prop="Mobile">
+              <el-input v-model="formData.Mobile"
+                        maxlength="20"
+                        :readonly="!canUpdateSupplier"
+                        placeholder="请输入"
+                        style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="银行账号" prop="BankAccount">
-              <el-input v-model="formData.BankAccount" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-                style="width: 100%">
+            <el-form-item label="银行账号"
+                          prop="BankAccount">
+              <el-input v-model="formData.BankAccount"
+                        maxlength="50"
+                        :readonly="!canUpdateSupplier"
+                        placeholder="请输入"
+                        style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-col :span="8">
-          <el-form-item label="固定电话" prop="Telphone">
-            <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
-              style="width: 100%">
+          <el-form-item label="固定电话"
+                        prop="Telphone">
+            <el-input v-model="formData.Telphone"
+                      maxlength="20"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="区号-0000000"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
-
         <el-col :span="8">
-          <el-form-item label="传真" prop="Fax">
-            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
-              style="width: 100%"></el-input>
+          <el-form-item label="传真"
+                        prop="Fax">
+            <el-input v-model="formData.Fax"
+                      maxlength="20"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="区号-0000000"
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="财务电话" prop="CompanyTel">
-            <el-input v-model="formData.CompanyTel" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="20"
-              style="width: 100%">
+          <el-form-item label="财务电话"
+                        prop="CompanyTel">
+            <el-input v-model="formData.CompanyTel"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      maxlength="20"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="电子邮箱" prop="EMail">
-            <el-input v-model="formData.EMail" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%"></el-input>
+          <el-form-item label="电子邮箱"
+                        prop="EMail">
+            <el-input v-model="formData.EMail"
+                      maxlength="50"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
@@ -367,8 +522,11 @@
 
         <el-col :span="8">
           <el-form-item label="银行信用等级">
-            <el-input v-model="formData.BankCreditRating" maxlength="10" :readonly="!canUpdateSupplier"
-              placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.BankCreditRating"
+                      maxlength="10"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="请输入"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -384,47 +542,69 @@
             </el-input>
           </el-form-item>
         </el-col>-->
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="HSE审查培训">
-            <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-            <el-select v-model="formData.HseTraining" :disabled="!canUpdateSupplier" placeholder="请选择"
-              style="width: 100%;">
-              <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
-                style="width: 100%">
+            <el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>
+            <el-select v-model="formData.HseTraining"
+                       :disabled="!canUpdateSupplier"
+                       placeholder="请选择"
+                       style="width: 100%;">
+              <el-option v-for="item in HSEOptions"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value"
+                         style="width: 100%">
               </el-option>
             </el-select>
 
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
       </el-row>
     </el-form>
 
-    <el-form class="formDataInfo" label-position="top" ref="EntityFormCert" :rules="rulesform" :model="formData"
-      :disabled="disabled">
+    <el-form class="formDataInfo"
+             label-position="top"
+             ref="EntityFormCert"
+             :rules="rulesform"
+             :model="formData"
+             :disabled="disabled">
       <el-row :gutter="60">
         <el-col :span="8">
           <el-form-item label="质量管理体系认证情况及认证机构">
-            <el-input v-model="formData.QualitySystemCert" :readonly="this.formData.Status > '0'" maxlength="200"
-              placeholder="请输入" type="textarea" style="width: 100%"></el-input>
+            <el-input v-model="formData.QualitySystemCert"
+                      :readonly="this.formData.Status > '0'"
+                      maxlength="200"
+                      placeholder="请输入"
+                      type="textarea"
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产品质量认证情况及认证机构">
-            <el-input v-model="formData.ProductQualityCert" :readonly="this.formData.Status > '0'" placeholder="请输入"
-              maxlength="200" type="textarea"></el-input>
+            <el-input v-model="formData.ProductQualityCert"
+                      :readonly="this.formData.Status > '0'"
+                      placeholder="请输入"
+                      maxlength="200"
+                      type="textarea"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="生产/制造许可证获证情况及编号">
-            <el-input v-model="formData.MaunLicense" placeholder="请输入" :readonly="this.formData.Status > '0'"
-              maxlength="200" type="textarea"></el-input>
+            <el-input v-model="formData.MaunLicense"
+                      placeholder="请输入"
+                      :readonly="this.formData.Status > '0'"
+                      maxlength="200"
+                      type="textarea"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="所代理制造商名称">
-            <el-input v-model="formData.MaunAgent" maxlength="255" :readonly="this.formData.Status > '0'"
-              placeholder="请输入" type="textarea">
+            <el-input v-model="formData.MaunAgent"
+                      maxlength="255"
+                      :readonly="this.formData.Status > '0'"
+                      placeholder="请输入"
+                      type="textarea">
             </el-input>
           </el-form-item>
         </el-col>
@@ -449,30 +629,47 @@
           </el-form-item>
         </el-col>-->
         <el-col :span="8">
-          <el-form-item label="安全生产许可证">
-            <el-input v-model="formData.SafetyLicense" :readonly="this.formData.Status > '0'" maxlength="200"
-              placeholder="请输入" type="textarea" style="width: 100%">
+          <el-form-item label="安全生产许可证证书编号">
+            <el-input v-model="formData.SafetyLicense"
+                      :readonly="this.formData.Status > '0'"
+                      maxlength="200"
+                      placeholder="请输入"
+                      type="textarea"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="行业特殊要求的认证证书">
-            <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入"
-              maxlength="200" type="textarea" style="width: 100%">
+          <el-form-item label="行业特殊要求的认证证书编号">
+            <el-input v-model="formData.SpecIndustryCert"
+                      :readonly="this.formData.Status > '0'"
+                      placeholder="请输入"
+                      maxlength="200"
+                      type="textarea"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="营业范围" prop="BusinessScope">
-            <el-input v-model="formData.BusinessScope" maxlength="200" :readonly="!canUpdateSupplier"
-              placeholder="营业执照上的信息" type="textarea" style="width: 100%"></el-input>
+          <el-form-item label="营业范围"
+                        prop="BusinessScope">
+            <el-input v-model="formData.BusinessScope"
+                      maxlength="200"
+                      :readonly="!canUpdateSupplier"
+                      placeholder="营业执照上的信息"
+                      type="textarea"
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="16">
           <el-form-item label="备注">
-            <el-input v-model="formData.Remark" maxlength="500" :readonly="this.formData.Status > '0'" placeholder="请输入"
-              type="textarea" style="width: 100%">
+            <el-input v-model="formData.Remark"
+                      maxlength="500"
+                      :readonly="this.formData.Status > '0'"
+                      placeholder="请输入"
+                      type="textarea"
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -485,526 +682,523 @@
 </template>
 
 <script>
-  export default {
-    name: 'goodsinfo',
-    props: {
-      formData: {
-        type: Object,
-        default: null
-      },
-      dictData: {
-        type: Object,
-        default: {}
-      },
-      authUser: {
-        type: Object,
-        default: null
-      },
-      disabled: {
-        type: Boolean,
-        default: false
-      },
-      canUpdateSupplier: {
-        type: Boolean,
-        default: true
-      },
-      appendStatus: {
-        type: Boolean,
-        default: false
-      },
+export default {
+  name: 'goodsinfo',
+  props: {
+    formData: {
+      type: Object,
+      default: null
     },
-    data() {
-
-
-      var checkemail = (rule, value, callback) => {
-        if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
-          if (!re.test(value)) {
-            callback(new Error('请输入正确的邮箱地址'))
-          } else {
-            callback()
-          }
+    dictData: {
+      type: Object,
+      default: {}
+    },
+    authUser: {
+      type: Object,
+      default: null
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    canUpdateSupplier: {
+      type: Boolean,
+      default: true
+    },
+    appendStatus: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    var checkemail = (rule, value, callback) => {
+      if (value) {
+        let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+        if (!re.test(value)) {
+          callback(new Error('请输入正确的邮箱地址'))
         } else {
           callback()
         }
-      };
+      } else {
+        callback()
+      }
+    }
 
-      var checkCommercialNo = (rule, value, callback) => {
-        if (!value) {
-          callback(new Error('请输入统一社会信用代码'));
-        } else {
-          if (this.showorhidflag == 'hid') {
-            let re = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的统一社会信用代码'))
-            } else {
-              callback()
-            }
+    var checkCommercialNo = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入统一社会信用代码'))
+      } else {
+        if (this.showorhidflag === 'hid') {
+          let re = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的统一社会信用代码'))
           } else {
             callback()
           }
-        }
-      };
-      //查找是否有公司信息,若有则补全信息。
-      var checkSupplierName = (rule, value, callback) => {
-        if (!value) {
-          callback(new Error('请输入供方名称'));
         } else {
-          callback();
+          callback()
         }
-      };
-      //检查邮编格式
-      var checkZipCode = (rule, value, callback) => {
-        if (!value) {
-          callback(new Error('请输入邮编'));
+      }
+    }
+    // 查找是否有公司信息,若有则补全信息。
+    var checkSupplierName = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入供方名称'))
+      } else {
+        callback()
+      }
+    }
+    // 检查邮编格式
+    var checkZipCode = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入邮编'))
+      } else {
+        let re = /^[1-9]\d{5}$/
+        if (!re.test(value)) {
+          callback(new Error('请输入正确的邮编'))
         } else {
-          let re = /^[1-9]\d{5}$/
-          if (!re.test(value)) {
-            callback(new Error('请输入正确的邮编'))
-          } else {
-            callback()
-          }
+          callback()
         }
-      };
-      //检查手机号
-      var checkMobile = (rule, value, callback) => {
-        if (!value) {
-          callback(new Error('请输入手机号码'));
+      }
+    }
+    // 检查手机号
+    var checkMobile = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入手机号码'))
+      } else {
+        let re = /^1[3456789]\d{9}$/
+        if (!re.test(value)) {
+          callback(new Error('请输入正确的手机号码'))
         } else {
-          let re = /^1[3456789]\d{9}$/
-          if (!re.test(value)) {
-            callback(new Error('请输入正确的手机号码'))
-          } else {
-            callback()
-          }
+          callback()
         }
-      };
+      }
+    }
 
-      //固话检验
-      var checkTelphone = (rule, value, callback) => {
-        if (!value) {
-          callback(new Error('请输入固话号码'));
+    // 固话检验
+    var checkTelphone = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入固话号码'))
+      } else {
+        let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
+        if (!re.test(value)) {
+          callback(new Error('请输入正确的固话格式为:区号-0000000'))
         } else {
-          let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
-          if (!re.test(value)) {
-            callback(new Error('请输入正确的固话格式为:区号-0000000'))
-          } else {
-            callback()
-          }
+          callback()
         }
-      };
+      }
+    }
 
-      //传真检验
-      var checkFax = (rule, value, callback) => {
-        if (!value) {
-          callback();
+    // 传真检验
+    var checkFax = (rule, value, callback) => {
+      if (!value) {
+        callback()
+      } else {
+        let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
+        if (!re.test(value)) {
+          callback(new Error('请输入正确的传真格式为:区号-0000000'))
         } else {
-          let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
-          if (!re.test(value)) {
-            callback(new Error('请输入正确的传真格式为:区号-0000000'))
-          } else {
-            callback()
-          }
+          callback()
         }
-      };
-
-      return {
-        address: [],
-        linkaddress: [],
-        showorhidflag: 'hid',
-        selectoptions: [{
-          value: '1',
-          label: '三证合一'
-        }, {
-          value: '2',
-          label: '五证合一',
-        }, {
-          value: '3',
-          label: '常规'
+      }
+    }
+
+    return {
+      address: [],
+      linkaddress: [],
+      showorhidflag: 'hid',
+      selectoptions: [{
+        value: '1',
+        label: '三证合一'
+      }, {
+        value: '2',
+        label: '五证合一'
+      }, {
+        value: '3',
+        label: '常规'
+      }],
+      companyReadonly: false,
+      companynames: [],
+      ManagementUnitOptions: [],
+      UnitRelationOptions: [],
+      OperTypeOptions: [],
+      InOptions: [],
+      CompanyTypeOptions: [],
+      CurrencyOptions: [],
+      UnitRelationAry: [],
+      countryoptions: [],
+      countryListOptions: [],
+      countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+      },
+      CityAry: [],
+      LinkCityAry: [],
+      // HSEOptions: [{
+      //   value: '1',
+      //   label: '是'
+      // }, {
+      //   value: '0',
+      //   label: '否'
+      // }],
+
+      rulesform: {
+        Mobile: [{
+          required: true,
+          validator: checkMobile,
+          trigger: 'change'
+        }],
+
+        Telphone: [{
+          required: true,
+          validator: checkTelphone,
+          trigger: 'blur'
+        }],
+        Fax: [{
+          required: false,
+          validator: checkFax,
+          trigger: 'blur'
+        }],
+        BusinessScope: [{
+          required: true,
+          message: '请输入营业范围',
+          trigger: 'change'
+        }],
+        ZipCode: [{
+          required: true,
+          validator: checkZipCode,
+          trigger: 'change'
+        }],
+        LinkZipCode: [{
+          required: true,
+          validator: checkZipCode,
+          trigger: 'change'
+        }],
+        SupplierName: [{
+          required: true,
+          validator: checkSupplierName,
+          trigger: 'change'
+        }],
+        Country: [{
+          required: true,
+          message: '请输入国家',
+          trigger: 'change'
+        }],
+        CommercialNo: [{
+          required: true,
+          validator: checkCommercialNo,
+          trigger: 'change'
+        }],
+        CountryTaxNo: [{
+          required: true,
+          message: '请输入税务登记证编号',
+          trigger: 'change'
+        }],
+        CompanyType: [{
+          required: true,
+          message: '请选择公司类型',
+          trigger: 'change'
+        }],
+        LegalPerson: [{
+          required: true,
+          message: '请输入法定代表人姓名',
+          trigger: 'change'
+        }],
+        Province: [{
+          required: true,
+          message: '请选择省市区',
+          trigger: 'blur'
+        }],
+        Address: [{
+          required: true,
+          message: '请输入注册地址',
+          trigger: 'change'
+        }],
+        EMail: [{
+          required: false,
+          validator: checkemail,
+          trigger: 'change'
+        }],
+        OrganCode: [{
+          required: true,
+          message: '请输入组织机构代码',
+          trigger: 'change'
+        }],
+
+        RegCapital: [{
+          required: true,
+          message: '请输入注册资本',
+          trigger: 'change'
         }],
-        companyReadonly: false,
-        companynames: [],
-        ManagementUnitOptions: [],
-        UnitRelationOptions: [],
-        OperTypeOptions: [],
-        InOptions: [],
-        CompanyTypeOptions: [],
-        CurrencyOptions: [],
-        UnitRelationAry: [],
-        countryoptions: [],
-        countryListOptions: [],
-        countryprops: {
-          value: 'adcode',
-          label: 'name',
-          children: 'districts'
-        },
-        CityAry: [],
-        LinkCityAry: [],
-        HSEOptions: [{
-          value: '1',
-          label: '是'
-        }, {
-          value: '0',
-          label: '否'
+        DepositBank: [{
+          required: true,
+          message: '请输入开户银行',
+          trigger: 'change'
+        }],
+        BankAccount: [{
+          required: true,
+          message: '请输入银行账号',
+          trigger: 'change'
+        }],
+        ContactName: [{
+          required: true,
+          message: '请输入联系人姓名',
+          trigger: 'change'
+        }],
+        CompanyTel: [{
+          required: true,
+          message: '请输入财务电话',
+          trigger: 'change'
         }],
 
-        rulesform: {
-          Mobile: [{
-            required: true,
-            validator: checkMobile,
-            trigger: 'change'
-          }],
-
-          Telphone: [{
-            required: true,
-            validator: checkTelphone,
-            trigger: 'blur'
-          }],
-          Fax: [{
-            required: false,
-            validator: checkFax,
-            trigger: 'blur'
-          }],
-          BusinessScope: [{
-            required: true,
-            message: '请输入营业范围',
-            trigger: 'change'
-          }],
-          ZipCode: [{
-            required: true,
-            validator: checkZipCode,
-            trigger: 'change'
-          }],
-          LinkZipCode: [{
-            required: true,
-            validator: checkZipCode,
-            trigger: 'change'
-          }],
-          SupplierName: [{
-            required: true,
-            validator: checkSupplierName,
-            trigger: 'change'
-          }],
-          Country: [{
-            required: true,
-            message: '请输入国家',
-            trigger: 'change'
-          }],
-          CommercialNo: [{
-            required: true,
-            validator: checkCommercialNo,
-            trigger: 'change'
-          }],
-          CountryTaxNo: [{
-            required: true,
-            message: '请输入税务登记证编号',
-            trigger: 'change'
-          }],
-          CompanyType: [{
-            required: true,
-            message: '请选择公司类型',
-            trigger: 'change'
-          }],
-          LegalPerson: [{
-            required: true,
-            message: '请输入法定代表人姓名',
-            trigger: 'change'
-          }],
-          Province: [{
-            required: true,
-            message: '请选择省市区',
-            trigger: 'blur'
-          }],
-          Address: [{
-            required: true,
-            message: '请输入注册地址',
-            trigger: 'change'
-          }],
-          EMail: [{
-            required: false,
-            validator: checkemail,
-            trigger: 'change'
-          }],
-          OrganCode: [{
-            required: true,
-            message: '请输入组织机构代码',
-            trigger: 'change'
-          }],
-
-          RegCapital: [{
-            required: true,
-            message: '请输入注册资本',
-            trigger: 'change'
-          }],
-          DepositBank: [{
-            required: true,
-            message: '请输入开户银行',
-            trigger: 'change'
-          }],
-          BankAccount: [{
-            required: true,
-            message: '请输入银行账号',
-            trigger: 'change'
-          }],
-          ContactName: [{
-            required: true,
-            message: '请输入联系人姓名',
-            trigger: 'change'
-          }],
-          CompanyTel: [{
-            required: true,
-            message: '请输入财务电话',
-            trigger: 'change'
-          }],
-
-          LinkProvince: [{
-            required: true,
-            message: '请选择省市区',
-            trigger: 'blur'
-          }],
-          LinkAddress: [{
-            required: true,
-            message: '请输入通信地址',
-            trigger: 'change'
-          }],
-          realname: [{
-            required: true,
-            message: '用户名',
-            trigger: 'blur'
-          }],
-        },
+        LinkProvince: [{
+          required: true,
+          message: '请选择省市区',
+          trigger: 'blur'
+        }],
+        LinkAddress: [{
+          required: true,
+          message: '请输入通信地址',
+          trigger: 'change'
+        }],
+        realname: [{
+          required: true,
+          message: '用户名',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  created () {
+    // if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
+    //   this.inputCompanyName(this.authUser.Profile.Realname)
+    // }
+  },
+  watch: {
+    dictData: {
+      handler (newName, oldName) {
+        this.getDictOptions()
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    InStyleChange (val) {
+      if (val === '2') {
+        this.formData.MgrUnit = '中国石油天然气股份有限公司'
       }
     },
-    created() {
-      // if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
-      //   this.inputCompanyName(this.authUser.Profile.Realname)
-      // }
-    },
-    watch: {
-      dictData: {
-        handler(newName, oldName) {
-          this.getDictOptions()
-        },
-        immediate: true
+    currentSel (event) {
+      if (event === 2) {
+        this.formData.InStyle = '5'
+        // for(let item of this.$refs.inStyle.options) {
+        //   if(item.value=='5'){
+        //       console.log(item.style)
+        //   }else{
+        //      //隐藏
+        //   }
+        // }
+      } else {
+        this.formData.InStyle = '1'
       }
     },
-    methods: {
-      InStyleChange(val) {
-        if (val === '2') {
-          this.formData.MgrUnit = '中国石油天然气股份有限公司'
-        }
-      },
-      currentSel(event) {
-        if (event == 2) {
-          this.formData.InStyle = '5'
-          // for(let item of this.$refs.inStyle.options) {
-          //   if(item.value=='5'){
-          //       console.log(item.style)
-          //   }else{
-          //      //隐藏
-          //   }
-          // }
-        } else {
-          this.formData.InStyle = '1'
-        }
-      },
 
-      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'
+    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
         }
-      },
-      //注释原因:三证合一,五证合一,取消自动填充
-      // commnoChange () {
-      //   this.formData.CountryTaxNo = this.formData.CommercialNo
-      //   this.formData.OrganCode = this.formData.CommercialNo
-      // },
-
-      //查找是否有公司信息,若有则补全信息
-      searchSupplierName() {
-        let _this = this
-        _this.$axios.get('/register/getcompanyinfo/' + _this.formData.SupplierName, {})
-          .then(res => {
-            if (res.data.items && res.data.items.length == 1) {
-              _this.formData.SupplierName = res.data.items[0].SupplierName
-              _this.formData.CredentialFlag = res.data.items[0].CredentialFlag
-              _this.formData.CommercialNo = res.data.items[0].CommercialNo
-              _this.formData.CountryTaxNo = res.data.items[0].CountryTaxNo
-              _this.formData.OrganCode = res.data.items[0].OrganCode
-              _this.formData.LocalTaxNo = res.data.items[0].LocalTaxNo
-              _this.formData.Address = res.data.items[0].Address
-              _this.formData.Province = res.data.items[0].Province
-              _this.formData.City = res.data.items[0].City
-              _this.formData.Street = res.data.items[0].Street
-              _this.CityAry = []
-              _this.CityAry.push(_this.formData.Province)
-              _this.CityAry.push(_this.formData.City)
-              _this.CityAry.push(_this.formData.Street)
-              _this.formData.ZipCode = res.data.items[0].ZipCode
-              _this.formData.LinkAddress = res.data.items[0].LinkAddress
-              _this.formData.LinkProvince = res.data.items[0].LinkProvince
-              _this.formData.LinkCity = res.data.items[0].LinkCity
-              _this.formData.LinkStreet = res.data.items[0].LinkStreet
-              _this.LinkCityAry = []
-              _this.LinkCityAry.push(_this.formData.LinkProvince)
-              _this.LinkCityAry.push(_this.formData.LinkCity)
-              _this.LinkCityAry.push(_this.formData.LinkStreet)
-              _this.formData.LinkZipCode = res.data.items[0].LinkZipCode
-              _this.formData.LegalPerson = res.data.items[0].LegalPerson
-              _this.formData.CompanyType = res.data.items[0].CompanyType
-              _this.formData.RegCapital = res.data.items[0].RegCapital
-              _this.formData.SetupTime = res.data.items[0].SetupTime
-              _this.formData.DepositBank = res.data.items[0].DepositBank
-              _this.formData.BankAccount = res.data.items[0].BankAccount
-              _this.formData.ContactName = res.data.items[0].ContactName
-              if (res.data.items[0].Mobile != null && res.data.items[0].Mobile != "") {
-                _this.formData.Mobile = res.data.items[0].Mobile
-              } else {
-                _this.formData.Mobile = res.data.items[0].UserTelephone
-              }
-              _this.formData.Telphone = res.data.items[0].Telphone
-              _this.formData.Fax = res.data.items[0].Fax
-              _this.formData.CompanyTel = res.data.items[0].CompanyTel
-              _this.formData.EMail = res.data.items[0].EMail
-              _this.formData.BankCreditRating = res.data.items[0].BankCreditRating
-              _this.formData.Remark = res.data.items[0].Remark
-              _this.formData.WZAccessCardNo = res.data.items[0].WZAccessCardNo
+        this.showorhidflag = 'show'
+      }
+    },
+    // 注释原因:三证合一,五证合一,取消自动填充
+    // commnoChange () {
+    //   this.formData.CountryTaxNo = this.formData.CommercialNo
+    //   this.formData.OrganCode = this.formData.CommercialNo
+    // },
+
+    // 查找是否有公司信息,若有则补全信息
+    searchSupplierName () {
+      let _this = this
+      _this.$axios.get('/register/getcompanyinfo/' + _this.formData.SupplierName, {})
+        .then(res => {
+          if (res.data.items && res.data.items.length === 1) {
+            _this.formData.SupplierName = res.data.items[0].SupplierName
+            _this.formData.CredentialFlag = res.data.items[0].CredentialFlag
+            _this.formData.CommercialNo = res.data.items[0].CommercialNo
+            _this.formData.CountryTaxNo = res.data.items[0].CountryTaxNo
+            _this.formData.OrganCode = res.data.items[0].OrganCode
+            _this.formData.LocalTaxNo = res.data.items[0].LocalTaxNo
+            _this.formData.Address = res.data.items[0].Address
+            _this.formData.Province = res.data.items[0].Province
+            _this.formData.City = res.data.items[0].City
+            _this.formData.Street = res.data.items[0].Street
+            _this.CityAry = []
+            _this.CityAry.push(_this.formData.Province)
+            _this.CityAry.push(_this.formData.City)
+            _this.CityAry.push(_this.formData.Street)
+            _this.formData.ZipCode = res.data.items[0].ZipCode
+            _this.formData.LinkAddress = res.data.items[0].LinkAddress
+            _this.formData.LinkProvince = res.data.items[0].LinkProvince
+            _this.formData.LinkCity = res.data.items[0].LinkCity
+            _this.formData.LinkStreet = res.data.items[0].LinkStreet
+            _this.LinkCityAry = []
+            _this.LinkCityAry.push(_this.formData.LinkProvince)
+            _this.LinkCityAry.push(_this.formData.LinkCity)
+            _this.LinkCityAry.push(_this.formData.LinkStreet)
+            _this.formData.LinkZipCode = res.data.items[0].LinkZipCode
+            _this.formData.LegalPerson = res.data.items[0].LegalPerson
+            _this.formData.CompanyType = res.data.items[0].CompanyType
+            _this.formData.RegCapital = res.data.items[0].RegCapital
+            _this.formData.SetupTime = res.data.items[0].SetupTime
+            _this.formData.DepositBank = res.data.items[0].DepositBank
+            _this.formData.BankAccount = res.data.items[0].BankAccount
+            _this.formData.ContactName = res.data.items[0].ContactName
+            if (res.data.items[0].Mobile != null && res.data.items[0].Mobile !== '') {
+              _this.formData.Mobile = res.data.items[0].Mobile
+            } else {
+              _this.formData.Mobile = res.data.items[0].UserTelephone
             }
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
+            _this.formData.Telphone = res.data.items[0].Telphone
+            _this.formData.Fax = res.data.items[0].Fax
+            _this.formData.CompanyTel = res.data.items[0].CompanyTel
+            _this.formData.EMail = res.data.items[0].EMail
+            _this.formData.BankCreditRating = res.data.items[0].BankCreditRating
+            _this.formData.Remark = res.data.items[0].Remark
+            _this.formData.WZAccessCardNo = res.data.items[0].WZAccessCardNo
+          }
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
 
-      getDictOptions() {
-        if (this.dictData) {
-          this.ManagementUnitOptions = this.dictData['ManagementUnit']
-          this.UnitRelationOptions = this.dictData['UnitRelation']
-          this.OperTypeOptions = this.dictData['OperType']
-          this.InOptions = this.dictData['InOptions']
-          this.CompanyTypeOptions = this.dictData['CompanyType']
-          this.CurrencyOptions = this.dictData['CurrencyType']
-          this.getCityList(this.dictData['GaodeMapChinaAreas'])
-          this.getCountryList(this.dictData['CountryList'])
-          let suppliers = this.dictData['CompanyNames']
-          // for (let idx in suppliers) {
-          //   suppliers[idx]['value'] = suppliers[idx].SupplierName
-          //   this.companynames.push(suppliers[idx])
-          // }
-          // if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
-          //   if (!this.formData.Id) {
-          //     this.formData.SupplierName = ''
-          //   }
-          //   this.companyReadonly = true
-          // }
-        }
-      },
-      getCityList(val) {
-        let resultData = JSON.parse(val)
-        let countstr = JSON.stringify(resultData.districts[0].districts)
-        countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
-        this.countryoptions = JSON.parse(countstr)
-      },
-      getCountryList(val) {
-        let tmpJson = JSON.parse(val)
-        this.countryListOptions = []
-        for (let idx in tmpJson) {
-          this.countryListOptions.push({
-            label: tmpJson[idx].split('-')[0],
-            value: tmpJson[idx].split('-')[1],
-            code: tmpJson[idx].split('-')[2],
-            key: tmpJson[idx]
-          })
-        }
-      },
-      unitRelationChange(value) {
-        this.formData.SpecTypeCode = value.join(',')
-      },
-      handleAreaChange(value) {
-        this.formData.Province = value[0]
-        this.formData.City = value[1]
-        this.formData.Street = value[2]
-        //this.formData.ZipCode = value[2]
-        this.address = this.$refs['cascaderAdd'].currentLabels
-        this.formData.AllAddress = this.address[0] + '/' + this.address[1] + '/' + this.address[2]
-      },
-      handleLinkAreaChange(value) {
-        this.formData.LinkProvince = value[0]
-        this.formData.LinkCity = value[1]
-        this.formData.LinkStreet = value[2]
-        //this.formData.LinkZipCode = value[2]
-        this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
-        this.formData.LinkAllAddress = this.linkaddress[0] + '/' + this.linkaddress[1] + '/' + this.linkaddress[2]
-      },
+    getDictOptions () {
+      if (this.dictData) {
+        this.ManagementUnitOptions = this.dictData['ManagementUnit']
+        this.UnitRelationOptions = this.dictData['UnitRelation']
+        this.OperTypeOptions = this.dictData['OperType']
+        this.InOptions = this.dictData['InOptions']
+        this.CompanyTypeOptions = this.dictData['CompanyType']
+        this.CurrencyOptions = this.dictData['CurrencyType']
+        this.getCityList(this.dictData['GaodeMapChinaAreas'])
+        this.getCountryList(this.dictData['CountryList'])
+        // let suppliers = this.dictData['CompanyNames']
+        // for (let idx in suppliers) {
+        //   suppliers[idx]['value'] = suppliers[idx].SupplierName
+        //   this.companynames.push(suppliers[idx])
+        // }
+        // if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
+        //   if (!this.formData.Id) {
+        //     this.formData.SupplierName = ''
+        //   }
+        //   this.companyReadonly = true
+        // }
+      }
+    },
+    getCityList (val) {
+      let resultData = JSON.parse(val)
+      let countstr = JSON.stringify(resultData.districts[0].districts)
+      // eslint-disable-next-line no-useless-escape
+      countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+      this.countryoptions = JSON.parse(countstr)
+    },
+    getCountryList (val) {
+      let tmpJson = JSON.parse(val)
+      this.countryListOptions = []
+      for (let idx in tmpJson) {
+        this.countryListOptions.push({
+          label: tmpJson[idx].split('-')[0],
+          value: tmpJson[idx].split('-')[1],
+          code: tmpJson[idx].split('-')[2],
+          key: tmpJson[idx]
+        })
+      }
+    },
+    unitRelationChange (value) {
+      this.formData.SpecTypeCode = value.join(',')
+    },
+    handleAreaChange (value) {
+      this.formData.Province = value[0]
+      this.formData.City = value[1]
+      this.formData.Street = value[2]
+      // this.formData.ZipCode = value[2]
+      this.address = this.$refs['cascaderAdd'].currentLabels
+      this.formData.AllAddress = this.address[0] + '/' + this.address[1] + '/' + this.address[2]
+    },
+    handleLinkAreaChange (value) {
+      this.formData.LinkProvince = value[0]
+      this.formData.LinkCity = value[1]
+      this.formData.LinkStreet = value[2]
+      // this.formData.LinkZipCode = value[2]
+      this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
+      this.formData.LinkAllAddress = this.linkaddress[0] + '/' + this.linkaddress[1] + '/' + this.linkaddress[2]
+    },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
-      },
+    formatDateTime (date) {
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+    },
 
-      /** ----------------------- */
-      // querySearch (queryString, cb) {
-      //   var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
-      //   // 调用 callback 返回建议列表的数据
-      //   cb(results)
-      // },
-      createFilter(queryString) {
-        return (restaurant) => {
-          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
-        }
-      },
-      // handleSelect (item) {
-      //   this.$emit('selectcompany', item)
-      // },
-      inputCompanyName(val) {
-        this.$emit('inputcompany', val)
-      },
+    /** ----------------------- */
+    // querySearch (queryString, cb) {
+    //   var results = queryString ? this.companynames.filter(this.createFilter(queryString)) : this.companynames
+    //   // 调用 callback 返回建议列表的数据
+    //   cb(results)
+    // },
+    createFilter (queryString) {
+      return (restaurant) => {
+        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+      }
+    },
+    // handleSelect (item) {
+    //   this.$emit('selectcompany', item)
+    // },
+    inputCompanyName (val) {
+      this.$emit('inputcompany', val)
     }
   }
-
+}
 </script>
 <style>
-  .formDataInfo .el-input__inner[readonly] {
-    border-color: #DCDFE6;
-  }
-
-  .formDataInfo .el-input__inner[readonly]:focus {
-    border-color: #DCDFE6;
-  }
-
-  .formDataInfo .el-textarea__inner[readonly] {
-    border-color: #DCDFE6;
-  }
-
-  .formDataInfo .el-textarea__inner[readonly]:focus {
-    border-color: #DCDFE6;
-  }
-
-  .formDataInfo .el-input__inner[disabled] {
-    color: black;
-    opacity: 1;
-    background-color: white;
-  }
-
-  .formDataInfo .el-textarea__inner[disabled] {
-    color: black;
-    opacity: 1;
-    background-color: white;
-  }
-
+.formDataInfo .el-input__inner[readonly] {
+  border-color: #dcdfe6;
+}
+
+.formDataInfo .el-input__inner[readonly]:focus {
+  border-color: #dcdfe6;
+}
+
+.formDataInfo .el-textarea__inner[readonly] {
+  border-color: #dcdfe6;
+}
+
+.formDataInfo .el-textarea__inner[readonly]:focus {
+  border-color: #dcdfe6;
+}
+
+.formDataInfo .el-input__inner[disabled] {
+  color: black;
+  opacity: 1;
+  background-color: white;
+}
+
+.formDataInfo .el-textarea__inner[disabled] {
+  color: black;
+  opacity: 1;
+  background-color: white;
+}
 </style>

+ 123 - 127
src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -350,7 +350,7 @@
         </el-form-item>
       </el-col>-->
       <el-col :span="8">
-        <el-form-item label="安全生产许可证">
+        <el-form-item label="安全生产许可证证书编号">
           <el-input v-model="formData.SafetyLicense" maxlength="200" :readonly="this.formData.Status > '0'" placeholder="请输入" type="textarea"
                     style="width: 100%">
           </el-input>
@@ -358,7 +358,7 @@
       </el-col>
 
       <el-col :span="8">
-        <el-form-item label="行业特殊要求的认证证书">
+        <el-form-item label="行业特殊要求的认证证书编号">
           <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
                     style="width: 100%">
           </el-input>
@@ -410,111 +410,109 @@
       appendStatus: {
         type: Boolean,
         default: false
-      },
+      }
     },
     data () {
-        var checkemail= (rule, value, callback) => {
-          if (value) {
-            let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的邮箱地址'))
-            } else {
-              callback()
-            }
-          }
-          else{
+      var checkemail = (rule, value, callback) => {
+        if (value) {
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的邮箱地址'))
+          } else {
             callback()
           }
-        };
-        var checkCommercialNo =  (rule, value, callback) => {
+        } else {
+          callback()
+        }
+      }
+      var checkCommercialNo = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入统一社会信用代码'));
+          callback(new Error('请输入统一社会信用代码'))
         } else {
-          if(this.showorhidflag=='hid'){
+          if (this.showorhidflag == 'hid') {
             let re = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
             if (!re.test(value)) {
               callback(new Error('请输入正确的统一社会信用代码'))
             } else {
               callback()
             }
-          }
-          else{
+          } else {
             callback()
           }
         }
-      };
-      //查找是否有公司信息,若有则补全信息。
-      var checkSupplierName =  (rule, value, callback) => {
+      }
+      // 查找是否有公司信息,若有则补全信息。
+      var checkSupplierName = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入供方名称'));
+          callback(new Error('请输入供方名称'))
         } else {
-          callback();
+          callback()
         }
-      };
-       //检查邮编格式
-      var checkZipCode =  (rule, value, callback) => {
+      }
+      // 检查邮编格式
+      var checkZipCode = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入邮编'));
+          callback(new Error('请输入邮编'))
         } else {
           let re = /^[1-9]\d{5}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的邮编'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的邮编'))
+          } else {
+            callback()
+          }
         }
-      };
-      //检查手机号
-       var checkMobile =  (rule, value, callback) => {
+      }
+      // 检查手机号
+      var checkMobile = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入手机号码'));
+          callback(new Error('请输入手机号码'))
         } else {
           let re = /^1[3456789]\d{9}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的手机号码'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的手机号码'))
+          } else {
+            callback()
+          }
         }
-      };
+      }
 
-        //固话检验
-       var checkTelphone =  (rule, value, callback) => {
+      // 固话检验
+      var checkTelphone = (rule, value, callback) => {
         if (!value) {
-          callback(new Error('请输入固话号码'));
+          callback(new Error('请输入固话号码'))
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的固话格式为:区号-0000000'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的固话格式为:区号-0000000'))
+          } else {
+            callback()
+          }
         }
-      };
+      }
 
-        //传真检验
-       var checkFax =  (rule, value, callback) => {
+      // 传真检验
+      var checkFax = (rule, value, callback) => {
         if (!value) {
-          callback();
+          callback()
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的传真格式为:区号-0000000'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的传真格式为:区号-0000000'))
+          } else {
+            callback()
+          }
         }
-      };
+      }
       return {
-        address:[],
-        linkaddress:[],
-         showorhidflag:'hid',
-         selectoptions: [{
+        address: [],
+        linkaddress: [],
+        showorhidflag: 'hid',
+        selectoptions: [{
           value: '1',
           label: '三证合一'
         }, {
           value: '2',
-          label: '五证合一',
+          label: '五证合一'
         }, {
           value: '3',
           label: '常规'
@@ -543,7 +541,7 @@
         }],
 
         rulesform: {
-          BusinessScope:[{
+          BusinessScope: [{
             required: true,
             message: '请输入营业范围',
             trigger: 'change'
@@ -552,37 +550,37 @@
             required: true,
             validator: checkSupplierName,
             trigger: 'change'
-          }, ],
+          } ],
           CommercialNo: [{
             required: true,
             validator: checkCommercialNo,
             trigger: 'change'
-          }, ],
+          } ],
           CountryTaxNo: [{
             required: true,
             message: '请输入税务登记证编号',
             trigger: 'change'
-          }, ],
+          } ],
           CompanyType: [{
             required: true,
             message: '请选择公司类型',
             trigger: 'change'
-          }, ],
+          } ],
           LegalPerson: [{
             required: true,
             message: '请输入法定代表人姓名',
             trigger: 'change'
-          }, ],
+          } ],
           Province: [{
             required: true,
             message: '请选择省市区',
             trigger: 'blur'
-          }, ],
+          } ],
           Address: [{
             required: true,
             message: '请输入注册地址',
             trigger: 'change'
-          }, ],
+          } ],
           EMail: [{
             required: false,
             validator: checkemail,
@@ -592,52 +590,52 @@
             required: true,
             message: '请输入组织机构代码',
             trigger: 'change'
-          }, ],
+          } ],
 
           RegCapital: [{
             required: true,
             message: '请输入注册资本',
             trigger: 'change'
-          }, ],
+          } ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',
             trigger: 'change'
-          }, ],
+          } ],
           BankAccount: [{
             required: true,
             message: '请输入银行账号',
             trigger: 'change'
-          }, ],
+          } ],
           ContactName: [{
             required: true,
             message: '请输入联系人姓名',
             trigger: 'change'
-          }, ],
-         Mobile: [{
+          } ],
+          Mobile: [{
             required: true,
             validator: checkMobile,
             trigger: 'change'
           } ],
 
-           Telphone: [{
+          Telphone: [{
             required: true,
             validator: checkTelphone,
             trigger: 'blur'
           }],
 
-           Fax: [{
+          Fax: [{
             required: false,
             validator: checkFax,
             trigger: 'blur'
-          }, ],
+          } ],
 
           CompanyTel: [{
             required: true,
             message: '请输入财务电话',
             trigger: 'change'
-          }, ],
-           ZipCode: [{
+          } ],
+          ZipCode: [{
             required: true,
             validator: checkZipCode,
             trigger: 'change'
@@ -651,18 +649,18 @@
             required: true,
             message: '请选择省市区',
             trigger: 'blur'
-          }, ],
+          } ],
           LinkAddress: [{
             required: true,
             message: '请输入通信地址',
             trigger: 'change'
-          }, ],
+          } ],
           realname: [{
             required: true,
             message: '用户名',
             trigger: 'blur'
           }]
-        },
+        }
       }
     },
 
@@ -680,23 +678,22 @@
       }
     },
     methods: {
-         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'
+      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){
-          this.formData.InStyle='5'
+      currentSel (event) {
+        if (event == 2) {
+          this.formData.InStyle = '5'
           // for(let item of this.$refs.inStyle.options) {
           //   if(item.value=='5'){
           //       console.log(item.style)
@@ -704,16 +701,16 @@
           //      //隐藏
           //   }
           // }
-          }else{
-            this.formData.InStyle='1'
-            }
+        } else {
+          this.formData.InStyle = '1'
+        }
       },
       // commnoChange () {
       //   this.formData.CountryTaxNo = this.formData.CommercialNo
       //   this.formData.OrganCode = this.formData.CommercialNo
       // },
-      //查找是否有公司信息,若有则补全信息
-      searchSupplierName() {
+      // 查找是否有公司信息,若有则补全信息
+      searchSupplierName () {
         let _this = this
         _this.$axios.get('/register/getcompanyinfo/' + _this.formData.SupplierName, {})
           .then(res => {
@@ -749,10 +746,10 @@
               _this.formData.DepositBank = res.data.items[0].DepositBank
               _this.formData.BankAccount = res.data.items[0].BankAccount
               _this.formData.ContactName = res.data.items[0].ContactName
-              if(res.data.items[0].Mobile!=null&&res.data.items[0].Mobile!=""){
-                  _this.formData.Mobile = res.data.items[0].Mobile
-              }else{
-                 _this.formData.Mobile = res.data.items[0].UserTelephone
+              if (res.data.items[0].Mobile != null && res.data.items[0].Mobile != '') {
+                _this.formData.Mobile = res.data.items[0].Mobile
+              } else {
+                _this.formData.Mobile = res.data.items[0].UserTelephone
               }
               _this.formData.Telphone = res.data.items[0].Telphone
               _this.formData.Fax = res.data.items[0].Fax
@@ -794,14 +791,14 @@
         countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
         this.countryoptions = JSON.parse(countstr)
       },
-      unitRelationChange(value) {
+      unitRelationChange (value) {
         this.formData.SpecTypeCode = value.join(',')
       },
-      handleAreaChange(value) {
+      handleAreaChange (value) {
         this.formData.Province = value[0]
         this.formData.City = value[1]
         this.formData.Street = value[2]
-        //this.formData.ZipCode = value[2]
+        // this.formData.ZipCode = value[2]
         this.address = this.$refs['cascaderAdd'].currentLabels
         this.formData.AllAddress = this.address[0] + '/' + this.address[1] + '/' + this.address[2]
       },
@@ -809,21 +806,21 @@
         this.formData.LinkProvince = value[0]
         this.formData.LinkCity = value[1]
         this.formData.LinkStreet = value[2]
-        //this.formData.LinkZipCode = value[2]
+        // this.formData.LinkZipCode = value[2]
         this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
-        this.formData.LinkAllAddress= this.linkaddress[0]+'/'+this.linkaddress[1]+'/'+this.linkaddress[2]
+        this.formData.LinkAllAddress = this.linkaddress[0] + '/' + this.linkaddress[1] + '/' + this.linkaddress[2]
       },
 
       formatDateTime (date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       },
 
       /** ----------------------- */
@@ -846,7 +843,6 @@
 
     }
   }
-
 </script>
 <style>
 .formDataInfo .el-input__inner[readonly]{

+ 9 - 28
src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymentsure.vue

@@ -18,36 +18,18 @@
         <el-row>
           <el-col :span="4" class="table-cell-title">单位名称</el-col>
           <el-col :span="4" class="table-cell-title">税号</el-col>
-          <el-col :span="4" class="table-cell-title">地址</el-col>
-          <el-col :span="4" class="table-cell-title">电话</el-col>
-          <el-col :span="4" class="table-cell-title">法人姓名</el-col>
-          <el-col :span="4" class="table-cell-title">成立时间</el-col>
+          <el-col :span="4" class="table-cell-title">注册地址</el-col>
+           <el-col :span="4" class="table-cell-title">开户银行</el-col>
+          <el-col :span="4" class="table-cell-title">银行账号</el-col>
+          <el-col :span="4" class="table-cell-title">财务电话</el-col>
         </el-row>
 
         <el-row>
           <el-col :span="4" class="table-cell">{{this.formDataSup.SupplierName}}</el-col>
           <el-col :span="4" class="table-cell">{{this.formDataSup.CommercialNo}}</el-col>
           <el-col :span="4" class="table-cell">{{this.formDataSup.Address}}</el-col>
-          <el-col :span="4" class="table-cell">{{this.formDataSup.Telphone}}</el-col>
-          <el-col :span="4" class="table-cell">{{this.formDataSup.LegalPerson}}</el-col>
-          <el-col :span="4" class="table-cell">{{this.jstimehandle(this.formDataSup.SetupTime)}}</el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="4" class="table-cell-title">注册资本</el-col>
-          <el-col :span="4" class="table-cell-title">开户银行</el-col>
-          <el-col :span="4" class="table-cell-title">银行账号</el-col>
-          <el-col :span="4" class="table-cell-title">联系人姓名</el-col>
-          <el-col :span="4" class="table-cell-title">移动电话</el-col>
-          <el-col :span="4" class="table-cell-title">财务电话</el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="4" class="table-cell">{{this.formDataSup.RegCapital}} 万元</el-col>
-          <el-col :span="4" class="table-cell">{{this.formDataSup.DepositBank}}</el-col>
+            <el-col :span="4" class="table-cell">{{this.formDataSup.DepositBank}}</el-col>
           <el-col :span="4" class="table-cell">{{this.formDataSup.BankAccount}}</el-col>
-          <el-col :span="4" class="table-cell">{{this.formDataSup.ContactName}}</el-col>
-          <el-col :span="4" class="table-cell">{{this.formDataSup.Mobile}}</el-col>
           <el-col :span="4" class="table-cell">{{this.formDataSup.CompanyTel}}</el-col>
         </el-row>
       </div>
@@ -126,10 +108,10 @@
             <div class="table-cell2">{{this.formDataSup.CommercialNo}}&nbsp;</div>
           </el-col>
           <el-col :span="8">
-            <div class="table-cell-title2">地址、电话:</div>
+            <div class="table-cell-title2">地址、财务电话:</div>
           </el-col>
           <el-col :span="16">
-            <div class="table-cell2">{{this.formDataSup.Address}}&nbsp;&nbsp;&nbsp;&nbsp;{{this.formDataSup.Telphone}}</div>
+            <div class="table-cell2">{{this.formDataSup.Address}}&nbsp;&nbsp;&nbsp;&nbsp;{{this.formDataSup.CompanyTel}}</div>
           </el-col>
           <el-col :span="8">
             <div class="table-cell-title2">开户行及账号:</div>
@@ -153,7 +135,6 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/paymentinfo'
-  import supapi from '@/api/oilsupplier/supplier'
 
   export default {
     computed: {
@@ -272,7 +253,7 @@
         })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (!val) {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -283,7 +264,7 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
 
     }
   }

+ 7 - 7
src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -92,9 +92,9 @@
         <!--<el-table-column label="最后一次年审" width="100px" prop="AuditDate" align="center">-->
           <!--<template slot-scope="scope">{{ jstimehandle(scope.row.AuditDate) }}</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="有效期至" width="100px" prop="ApplyTime" align="center">
+        <!-- <el-table-column label="有效期至" width="100px" prop="ApplyTime" align="center">
           <template slot-scope="scope">{{ jstimehandle(scope.row.ApplyTime) }}</template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="状态" prop="InFlag" width="100px" align="center">
           <template slot-scope="scope">
             <el-alert
@@ -691,7 +691,7 @@ export default {
     this.getDictOptions()
     this.initDatas()
     this.initNftOptions()
-    //watermark.set("大港油田企业法规处")
+    // watermark.set("大港油田企业法规处")
   },
   data () {
     return {
@@ -876,7 +876,7 @@ export default {
       }
       return wbout
     },
-    //导出到Word文件
+    // 导出到Word文件
     toWord (val) {
       dataapi.docexport(val.Id, this.$axios)
         .then(res => {
@@ -899,7 +899,7 @@ export default {
           console.error(err)
         })
     },
-    //导出准入范围到pdf
+    // 导出准入范围到pdf
     toPdf (val) {
       dataapi.pdfexport(val.Id, val.SupplierTypeCode, this.$axios)
         .then(res => {
@@ -938,8 +938,8 @@ export default {
             }
           }
         }).catch(err => {
-        console.error(err)
-      })
+          console.error(err)
+        })
     },
     // 列表排序功能
     orderby (column) {