Fix: 74

src/views/modules/cus/customer-add-or-update.vue

@@ -6,88 +6,144 @@
   <div>
     <div class="my-title">{{ !id ? '新增' : display ? '详情' : '编辑' }}</div>
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px">
-      <h4>基础信息</h4>
-      <el-form-item label="客户名称" prop="customerName">
-        <el-input v-model="dataForm.customerName" :disabled="display" placeholder="客户名称"></el-input>
-      </el-form-item>
-      <el-form-item label="客户类型" prop="customerType">
-        <el-select
-          v-model="dataForm.customerType"
-          :disabled="display"
-          placeholder="请选择">
-          <el-option v-for="item in optionsCT"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="客户级别" prop="level">
-        <el-select
-          v-model="dataForm.level"
-          :disabled="display"
-          remote
-          placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.code"
-            :label="item.value"
-            :value="item.code">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="详细地址" prop="address">
-        <el-input v-model="dataForm.address" :disabled="display" placeholder="详细地址"></el-input>
-      </el-form-item>
-      <el-form-item label="电话" prop="tel">
-        <el-input v-model="dataForm.tel" :disabled="display" placeholder="电话"></el-input>
-      </el-form-item>
-      <el-form-item label="邮编">
-        <el-input v-model="dataForm.zipCode" :disabled="display" placeholder="邮编"></el-input>
-      </el-form-item>
-      <el-form-item label="传真">
-        <el-input v-model="dataForm.fax" :disabled="display" placeholder="传真"></el-input>
-      </el-form-item>
-      <el-form-item label="网址">
-        <el-input v-model="dataForm.url" :disabled="display" placeholder="网址"></el-input>
-      </el-form-item>
-      <el-form-item label="公司简介">
-        <el-input v-model="dataForm.introduction" :disabled="display" type="textarea" placeholder="公司简介"></el-input>
-      </el-form-item>
-      <h4>业务联系人</h4>
-      <el-form-item label="联系人" prop="contact">
-        <el-input v-model="dataForm.contact" :disabled="display" placeholder="联系人"></el-input>
-      </el-form-item>
-      <el-form-item label="手机号码" prop="contactTel">
-        <el-input v-model="dataForm.contactTel" :disabled="display" placeholder="手机号码"></el-input>
-      </el-form-item>
-      <el-form-item label="职位">
-        <el-input v-model="dataForm.contactPosition" :disabled="display" placeholder="职位"></el-input>
-      </el-form-item>
-      <el-form-item label="邮箱">
-        <el-input v-model="dataForm.contactEmail" :disabled="display" placeholder="邮箱"></el-input>
-      </el-form-item>
-      <el-form-item label="对接业务员" prop="bizManager">
-<!--        @userSelected="change"-->
-        <user-component v-model="dataForm.bizManager" :disabled="display" :user-id.sync="dataForm.bizManager"/>
-        <!-- <el-input v-model="dataForm.bizManager"  placeholder="对接业务员"></el-input> -->
-      </el-form-item>
-      <h4>财务信息</h4>
-      <el-form-item label="企业税号" prop="taxNumber">
-        <el-input v-model="dataForm.taxNumber" :disabled="display" placeholder="企业税号"></el-input>
-      </el-form-item>
-      <el-form-item label="发票抬头" prop="invoiceTitle">
-        <el-input v-model="dataForm.invoiceTitle" :disabled="display" placeholder="发票抬头"></el-input>
-      </el-form-item>
-      <el-form-item label="开户银行" prop="bank">
-        <el-input v-model="dataForm.bank" :disabled="display" placeholder="开户银行"></el-input>
-      </el-form-item>
-      <el-form-item label="银行账号" prop="account">
-        <el-input v-model="dataForm.account" :disabled="display" placeholder="银行账号"></el-input>
-      </el-form-item>
-      <el-form-item label="单位地址" prop="billingAddr">
-        <el-input v-model="dataForm.billingAddr" :disabled="display" placeholder="单位地址"></el-input>
-      </el-form-item>
+      <el-row>
+        <h4>基础信息</h4>
+      </el-row>
+      <el-row class="my-row">
+        <el-col :span="8">
+          <el-form-item label="客户名称" prop="customerName">
+            <el-input v-model="dataForm.customerName" :disabled="display" placeholder="客户名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="客户类型" prop="customerType">
+            <el-select
+              v-model="dataForm.customerType"
+              :disabled="display"
+              placeholder="请选择">
+              <el-option v-for="item in optionsCT"
+                         :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="level">
+            <el-select
+              v-model="dataForm.level"
+              :disabled="display"
+              remote
+              placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.code"
+                :label="item.value"
+                :value="item.code">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="my-row">
+        <el-col :span="8">
+          <el-form-item label="电话" prop="tel">
+            <el-input v-model="dataForm.tel" :disabled="display" placeholder="电话"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="邮编">
+            <el-input v-model="dataForm.zipCode" :disabled="display" placeholder="邮编"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="传真">
+            <el-input v-model="dataForm.fax" :disabled="display" placeholder="传真"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="my-row">
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="dataForm.address" :disabled="display" placeholder="详细地址"></el-input>
+        </el-form-item>
+      </el-row>
+      <el-row class="my-row">
+        <el-form-item label="网址">
+          <el-input v-model="dataForm.url" :disabled="display" placeholder="网址"></el-input>
+        </el-form-item>
+      </el-row>
+      <el-row class="my-row">
+        <el-form-item label="公司简介">
+          <el-input v-model="dataForm.introduction" :disabled="display" type="textarea" placeholder="公司简介"></el-input>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <h4>业务联系人</h4>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="联系人" prop="contact">
+            <el-input v-model="dataForm.contact" :disabled="display" placeholder="联系人"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="手机号码" prop="contactTel">
+            <el-input v-model="dataForm.contactTel" :disabled="display" placeholder="手机号码"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="职位">
+            <el-input v-model="dataForm.contactPosition" :disabled="display" placeholder="职位"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="邮箱">
+            <el-input v-model="dataForm.contactEmail" :disabled="display" placeholder="邮箱"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="对接业务员" prop="bizManager">
+            <!--        @userSelected="change"-->
+            <user-component v-model="dataForm.bizManager" :disabled="display" :user-id.sync="dataForm.bizManager"/>
+            <!-- <el-input v-model="dataForm.bizManager"  placeholder="对接业务员"></el-input> -->
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <h4>财务信息</h4>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="企业税号" prop="taxNumber">
+            <el-input v-model="dataForm.taxNumber" :disabled="display" placeholder="企业税号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="发票抬头" prop="invoiceTitle">
+            <el-input v-model="dataForm.invoiceTitle" :disabled="display" placeholder="发票抬头"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="开户银行" prop="bank">
+            <el-input v-model="dataForm.bank" :disabled="display" placeholder="开户银行"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="银行账号" prop="account">
+            <el-input v-model="dataForm.account" :disabled="display" placeholder="银行账号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="单位地址" prop="billingAddr">
+            <el-input v-model="dataForm.billingAddr" :disabled="display" placeholder="单位地址"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="onChose">取消</el-button>
@@ -135,8 +191,8 @@
         dataForm: {},
         dataRule: {
           customerName: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
-          customerType: [{required: true, message: '客户类型不能为空', trigger: 'blur'}],
-          level: [{ required: true, message: '客户级别不能为空', trigger: 'blur' }],
+          customerType: [{required: true, message: '客户类型不能为空', trigger: 'change'}],
+          level: [{ required: true, message: '客户级别不能为空', trigger: 'change' }],
           address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
           tel: [
             { required: true, message: '电话不能为空', trigger: 'blur' },

src/views/modules/sale/supplier-add-or-update.vue

@@ -159,7 +159,8 @@
   import { getSupplierDetail } from '@/api/sale'
   import SupplierComponent from '../common/supplier-component'
   import { getDictList } from '@/api/dict'
-  import { isEmail, isMobile } from '@/utils/validate'
+  // import { isEmail, isMobile } from '@/utils/validate'
+  import { isMobile } from '@/utils/validate'
 
   export default {
     name: 'supplier-add-or-update',
@@ -181,13 +182,13 @@
       }
     },
     data () {
-      let validateEmail = (rule, value, callback) => {
-        if (value !== null && value !== '' && !isEmail(value)) {
-          callback(new Error('邮箱格式错误'))
-        } else {
-          callback()
-        }
-      }
+      // let validateEmail = (rule, value, callback) => {
+      //   if (value !== null && value !== '' && !isEmail(value)) {
+      //     callback(new Error('邮箱格式错误'))
+      //   } else {
+      //     callback()
+      //   }
+      // }
       let validateMobile = (rule, value, callback) => {
         if (!isMobile(value)) {
           callback(new Error('手机号格式错误'))