基础信息（厂商管理、挂靠公司），供应链（车型、常用配置）

anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue

@@ -7,10 +7,10 @@
         <div class="searchcon">
         <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
         <div v-show="isSearchShow" class="search">
-          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="90px" class="tab-header">
+          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
             <el-form-item label="厂商名称">
               <el-select v-model="listQuery.params.manufacturerName" filterable class="filter-item" clearable
-                         placeholder="请选择状态">
+                         placeholder="请选择厂商名称">
                 <el-option v-for="item in YongHu" :key="item.sid" :label="item.manufacturerName"
                            :value="item.manufacturerName"/>
               </el-select>
@@ -28,8 +28,8 @@
                            :value="item.sid"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="办公电话">
-              <el-input v-model="listQuery.params.contactTelePhone" maxlength="125" placeholder=""
+            <el-form-item label="厂商办公电话">
+              <el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder=""
                         class="addinputw" clearable/>
             </el-form-item>
             <el-form-item label="联系人">

anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue

@@ -7,6 +7,7 @@
       </div>
       <div>
         <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
+        <el-button type="primary" size="small" @click="handleSubmit()">提交</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
@@ -37,7 +38,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item>
+            <el-form-item prop="supplierType">
               <span slot="label">分类：</span>
               <el-select v-model="temp.supplierType" class="addinputw" placeholder="" @change="getSupplierType">
                 <el-option v-for="(item, index) in supplierType_list" :key="index.dictKey" :label="item.dictValue"
@@ -63,7 +64,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item>
+            <el-form-item prop="manufacturerFax">
               <span slot="label">传真：</span>
               <el-input v-model="temp.manufacturerFax" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
@@ -99,15 +100,15 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item prop="zipCode">
+            <el-form-item prop="">
               <span slot="label">邮编：</span>
-              <el-input v-model="temp.zipCode" maxlength="20" placeholder="" class="addinputw" clearable />
+              <el-input v-model="temp.zipCode" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="email">
+            <el-form-item prop="">
               <span slot="label">邮箱：</span>
-              <el-input v-model="temp.email" maxlength="20" placeholder="" class="addinputw" clearable />
+              <el-input v-model="temp.email" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -295,7 +296,8 @@
           <el-col :span="12">
             <el-form-item prop="bankAccount">
               <span slot="label">银行账号：</span>
-              <el-input v-model="temp2.bankAccount" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp2.bankAccount" maxlength="125" placeholder="" class="addinputw" clearable
+                        @keyup.native="temp2.bankAccount = oninput(temp2.bankAccount,2)"/>
             </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -329,7 +331,8 @@
             <el-col :span="12">
               <el-form-item prop="paymentLines">
                 <span slot="label">联行号：</span>
-                <el-input v-model="temp2.paymentLines" maxlength="125" placeholder="" class="addinputw" clearable />
+                <el-input v-model="temp2.paymentLines" maxlength="125" placeholder="" class="addinputw" clearable
+                          @keyup.native="temp2.paymentLines = oninput(temp2.paymentLines,2)"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -368,7 +371,7 @@ import {details, SaveList, selectListOrg, Update,} from "@/api/jichuxinxi/basema
 import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区
 import {typeValues} from "@/api/jichuxinxi/dictcommons";
 import {getLook, getXiu, setuser} from "@/utils/baocun";
-import {getListOrg, getPathSidByUserSid, fetchBySid} from "@/api/jichuxinxi/brandManagement";
+import {fetchBySid, getListOrg, getPathSidByUserSid} from "@/api/jichuxinxi/brandManagement";
 
 export default {
   name: "ChangshangguanliAdd1",
@@ -410,6 +413,17 @@ export default {
       }
       callback(new Error("请输入办公电话"));
     };
+    var checkChuanzhen = (rule, value, callback) => {
+      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/;
+      if (value) {
+        // 如果没有通过验证！！
+        if (!BanGongDianHua.test(value)) {
+          callback(new Error("请输入正确的传真格式"));
+        }
+      } else {
+        callback();
+      }
+    };
     var checkSubmit = (rule, value, callback) => {
       const Submit = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
       if (Submit.test(value)) {
@@ -504,26 +518,31 @@ export default {
       grouping: [],
       supplierType_list:[], //分类
       rules: {
-        email: [{
-          required: true,
-          validator: checkEamil,
-          trigger: 'blur'
-        }],
+        // email: [{
+        //   required: true,
+        //   validator: checkEamil,
+        //   trigger: 'blur'
+        // }],
         weChatID: [{
           required: true,
           message: '请填写微信号',
           trigger: 'blur'
         }],
-        zipCode: [{
-          required: true,
-          validator: checkYouBian,
-          trigger: 'blur'
-        }],
+        // zipCode: [{
+        //   required: true,
+        //   validator: checkYouBian,
+        //   trigger: 'blur'
+        // }],
         manufacturerName: [{
           required: true,
           message: '请填写厂商名称',
           trigger: 'blur'
         }],
+        supplierType: [{
+          required: true,
+          message: '请选择分类',
+          trigger: 'change'
+        }],
         manufacturerAddress: [{
           required: true,
           message: '请填写厂商通讯地址',
@@ -534,6 +553,11 @@ export default {
           validator: checkBanGongDianHua,
           trigger: 'blur'
         }],
+        manufacturerFax: [{
+          // required: true,
+          validator: checkChuanzhen,
+          trigger: 'blur'
+        }],
         contactName: [{
           required: true,
           message: '请填写联系人名字',
@@ -577,6 +601,25 @@ export default {
     // this.init();
   },
   methods: {
+    // 输入数字正则
+    oninput(val, limit = 0) {
+      val = val.replace(/[^\d.]/g, ""); //保留数字
+      // val = val.replace(/^00/, "0."); //开头不能有两个0
+      // val = val.replace(/^\./g, "0."); //开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, "."); //两个以上的小数点转换成一个
+      val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); //只保留一个小数点
+      // /^0\d+/.test(val) ? val = val.slice(1) : ''; //两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     setDetaList() {
       typeValues({
         type: this.supplierType
@@ -1081,7 +1124,9 @@ export default {
         }
       });
     },
+    handleSubmit() {
 
+    },
     getHangYe(value) {
       let bb = null
       this.industryons.forEach((e) => {

anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue

@@ -101,7 +101,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span>成立日期</span>
+            <span><span style="color: red">*</span>成立日期</span>
           </el-col>
           <el-col :span="4">
             <el-form-item prop="setUpTime">

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue

@@ -14,42 +14,22 @@
           <el-col :span="4" class="tleftb">
             <span><span class="icon">*</span>品牌</span>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="20">
             <el-form-item prop="carBrand">
-              <el-select v-model="temp.carBrand" placeholder="请选择" filterable clearable class="addinputw"
+              <el-select v-model="temp.carBrand" placeholder="请选择" filterable clearable
+                         style="width: 31%;padding-right: 3px;"
                          @change="getPinpai">
                 <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName"
                            :value="item.sid"/>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>系别</span>
-<!--            <span>车型编码</span>-->
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="">
-              <el-form-item>
-                <el-select
-                  v-model="temp.department"
-                  placeholder="请选择"
-                  clearable
-                  filterable
-                  class="addinputw"
-                  @change="getXiBie"
-                >
-                  <el-option
-                    v-for="item in department_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
-                </el-select>
-              </el-form-item>
-<!--              <el-input v-model="temp.vehicleTypeCode" maxlength="125" placeholder="请输入" clearable class="addinputw"-->
-<!--                        clearable/>-->
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="4" class="tleftb">-->
+          <!--           -->
+          <!--          </el-col>-->
+          <!--          <el-col :span="8">-->
+          <!--            -->
+          <!--          </el-col>-->
           <el-col :span="4" class="tleftb">
             <span><span class="icon">*</span>功能</span>
           </el-col>
@@ -163,8 +143,28 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
+            <span>系别</span>
           </el-col>
           <el-col :span="8">
+            <el-form-item prop="">
+              <el-form-item>
+                <el-select
+                  v-model="temp.department"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  class="addinputw"
+                  @change="getXiBie"
+                >
+                  <el-option
+                    v-for="item in department_list"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -181,43 +181,40 @@
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import {
-    SaveList,
-    getAll,
-    getOrg,
-    selectByOrgSid,
-    namesDownBySid,
-    brandDown, getPathSidByUserSid
-  } from '@/api/cheliang/basevehiclemodel'
-  import {
-    typeValues
-  } from '@/api/cheliang/dictcommons'
-  import Upload from '@/components/uploadFile/uploadImg.vue'
+import { mapGetters } from 'vuex'
+import {
+  brandDown,
+  getAll,
+  getOrg,
+  getPathSidByUserSid,
+  namesDownBySid,
+  SaveList,
+  selectByOrgSid
+} from '@/api/cheliang/basevehiclemodel'
+import { typeValues } from '@/api/cheliang/dictcommons'
+import Upload from '@/components/uploadFile/uploadImg.vue'
 
-  export default {
-    name: 'PinpaiAdd',
-    components: { Upload },
-    data() {
-      return {
-        viewTitle: '',
-        // --字段展示-------
-        fieldShow: 0, // 0.所有 1.欧曼 2.陕汽
-        // --按钮菜单-------
-        imgList: [],
-        menuState: {
-          add: false, // 添加
-          edit: false, // 编辑
-          delete: false, // 删除
-          view: false, // 查看
-          audit: false, // 审核
-          input: false, // 导入
-          output: false, // 导出
-          upload: false, // 同步
-          release: false // 下发
-        },
+export default {
+  name: 'PinpaiAdd',
+  components: { Upload },
+  data() {
+    return {
+      viewTitle: '',
+      // --字段展示-------
+      fieldShow: 0, // 0.所有 1.欧曼 2.陕汽
+      // --按钮菜单-------
+      imgList: [],
+      menuState: {
+        add: false, // 添加
+        edit: false, // 编辑
+        delete: false, // 删除
+        view: false, // 查看
+        audit: false, // 审核
+        input: false, // 导入
+        output: false, // 导出
+        upload: false, // 同步
+        release: false // 下发
+      },
         FormLoading: false,
         listLoading: false,
         // useOrgArry: [], // 使用组织

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue

@@ -13,19 +13,12 @@
           <el-col :span="4">
             <span>品牌</span>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="20">
             <el-form-item>
               <span>{{ temp.brandName }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <span>系别</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item>
-              <span>{{ temp.departmentValue }}</span>
-            </el-form-item>
-          </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="4">
@@ -127,11 +120,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-<!--            <span>系别</span>-->
+            <span>系别</span>
           </el-col>
           <el-col :span="8">
             <el-form-item>
-<!--              <span>{{ temp.departmentValue }}</span>-->
+              <span>{{ temp.departmentValue }}</span>
             </el-form-item>
           </el-col>
         </el-row>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue

@@ -13,19 +13,19 @@
           <el-col :span="4">
             <span>品牌</span>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="20">
             <el-form-item>
               <span>{{ temp.brandName }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <span>车型编码</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item>
-              <span>{{ temp.vehicleTypeCode }}</span>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="4">-->
+<!--            <span>车型编码</span>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item>-->
+<!--              <span>{{ temp.vehicleTypeCode }}</span>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="4">