传真验证, 营业执照PLACEHOLDER

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

@@ -279,7 +279,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="固定电话" prop="Telphone">
-            <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+            <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -287,7 +287,7 @@
 
         <el-col :span="8">
           <el-form-item label="传真" prop="Fax">
-            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
                       style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
@@ -382,7 +382,7 @@
         </el-col>
         <el-col :span="16">
           <el-form-item label="营业范围" prop="BusinessScope">
-            <el-input v-model="formData.BusinessScope" maxlength="200" :readonly="!canUpdateSupplier" placeholder="请输入" type="textarea"
+            <el-input v-model="formData.BusinessScope" maxlength="200" :readonly="!canUpdateSupplier" placeholder="营业执照上的信息" type="textarea"
                       style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
@@ -498,14 +498,29 @@
         if (!value) {
           callback(new Error('请输入固话号码'));
         } else {
-          let re = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/
+          let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
           if (!re.test(value)) {
-            callback(new Error('请输入正确的固话格式为：0000-0000000'))
+            callback(new Error('请输入正确的固话格式为：区号-0000000'))
           } else {
             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 {
+            callback()
+          }
+        }
+      };
+
       return {
         showorhidflag:'hid',
         selectoptions: [{
@@ -624,6 +639,13 @@
             validator: checkTelphone,
             trigger: 'change'
           }, ],
+
+           Fax: [{
+            required: false,
+            validator: checkFax,
+            trigger: 'change'
+          }, ],
+
           CompanyTel: [{
             required: true,
             message: '请输入财务电话',

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

@@ -313,7 +313,7 @@
 
         <el-col :span="8">
           <el-form-item label="固定电话" prop="Telphone" >
-            <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -321,7 +321,7 @@
 
         <el-col :span="8">
           <el-form-item label="传真" prop="Fax" >
-            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"></el-input>
+            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
@@ -437,7 +437,7 @@
         </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"
+            <el-input v-model="formData.BusinessScope" maxlength="200" :readonly="!canUpdateSupplier" placeholder="营业执照上的信息" type="textarea"
                       style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
@@ -559,7 +559,7 @@
         if (!value) {
           callback(new Error('请输入固话号码'));
         } else {
-          let re = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/
+          let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
             if (!re.test(value)) {
               callback(new Error('请输入正确的固话格式为：0000-0000000'))
             } else {
@@ -567,6 +567,21 @@
             }
         }
       };
+
+      //传真检验
+       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 {
+              callback()
+            }
+        }
+      };
+
       return {
         showorhidflag:'hid',
         selectoptions: [{
@@ -617,6 +632,11 @@
             validator: checkTelphone,
             trigger: 'change'
           }],
+          Fax: [{
+            required: false,
+            validator: checkFax,
+            trigger: 'change'
+          }],
           BusinessScope:[{
             required: true,
             message: '请输入营业范围',

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

@@ -270,14 +270,14 @@
         <el-row>
         <el-col :span="8">
           <el-form-item label="固定电话" prop="Telphone" >
-            <el-input v-model="formData.Telphone" :readonly="!canUpdateSupplier" maxlength="20" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.Telphone" :readonly="!canUpdateSupplier" maxlength="20" 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" :readonly="!canUpdateSupplier" maxlength="20" placeholder="请输入" style="width: 100%"></el-input>
+            <el-input v-model="formData.Fax" :readonly="!canUpdateSupplier" maxlength="20" placeholder="区号-0000000" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
@@ -364,7 +364,7 @@
       </el-col>
       <el-col :span="16">
         <el-form-item label="营业范围" prop="BusinessScope">
-          <el-input v-model="formData.BusinessScope" :readonly="!canUpdateSupplier" maxlength="200" placeholder="请输入" type="textarea"
+          <el-input v-model="formData.BusinessScope" :readonly="!canUpdateSupplier" maxlength="200" placeholder="营业执照上的信息" type="textarea"
                     style="width: 100%"></el-input>
         </el-form-item>
       </el-col>
@@ -480,9 +480,23 @@
         if (!value) {
           callback(new Error('请输入固话号码'));
         } else {
-          let re = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/
+          let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
             if (!re.test(value)) {
-              callback(new Error('请输入正确的固话格式为：0000-0000000'))
+              callback(new Error('请输入正确的固话格式为：区号-0000000'))
+            } else {
+              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 {
               callback()
             }
@@ -606,6 +620,13 @@
             validator: checkTelphone,
             trigger: 'change'
           }],
+
+           Fax: [{
+            required: false,
+            validator: checkFax,
+            trigger: 'change'
+          }, ],
+          
           CompanyTel: [{
             required: true,
             message: '请输入财务电话',

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

@@ -81,7 +81,7 @@
 
         <el-tab-pane label="企业情况" :disabled="!certId">
           <el-card class="box-card">
-            <div slot="header" class="clearfix">
+            <div slot="header" class="clearfix" style="padding:2px">
               <span>企业人员结构情况</span>
               <span style="float: right;">
                 <el-button type="primary" size="mini" @click="updateNumberEntity()" v-if="formDataCert.Status <= 0">