调整我的客户、客户、销售线索转客户必填项

src/Form/publicCustomer/add.vue

@@ -153,12 +153,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="电话:" prop="contact">
-                <el-input v-model="form.telephone" placeholder="请输入电话" style="width: 100%"></el-input>
+              <el-form-item label="联系电话:" prop="telephone">
+                <el-input v-model="form.telephone" placeholder="请输入联系电话" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="省市县:" >
+              <el-form-item label="省市县:" prop="province">
                 <el-cascader
                     style="width: 100%"
                     v-model="value"
@@ -325,7 +325,16 @@ export default {
         ],
         sa_customerpoolid:[
           { required: true, message: '请选择公海池', trigger: 'blur'}
-        ]
+        ],
+        contact: [
+          { required: true, message: '请输入法人', trigger: 'change,blur' },
+        ],
+        telephone: [
+          { required: true, message: '请输入联系电话', trigger: 'change,blur' },
+        ],
+        province: [
+          { required: true, message: '请选择省市县', trigger: 'change,blur' },
+        ],
       },
       customerParam:{
         "id": 20220920083901,
@@ -545,11 +554,12 @@ export default {
       this.businessShow = false
     },
     cascaderChange (val) {
+      this.form.province = val[0]
       if (val.length === 1)
         return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
-
+      this.$refs.form.validateField('province')
     },
     async customerList(){
       const res = await this.$api.requested(this.customerParam)

src/Form/publicCustomer/edit.vue

@@ -150,8 +150,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="电话:" prop="contact">
-                <el-input v-model="form.telephone" placeholder="请输入电话" style="width: 100%"></el-input>
+              <el-form-item label="联系电话:" prop="telephone">
+                <el-input v-model="form.telephone" placeholder="请输入联系电话" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -321,6 +321,15 @@ export default {
         source:[
           { required: true, message: '请填写客户来源', trigger: 'blur'}
         ],
+        contact: [
+          { required: true, message: '请输入法人', trigger: 'change,blur' },
+        ],
+        telephone: [
+          { required: true, message: '请输入联系电话', trigger: 'change,blur' },
+        ],
+        province: [
+          { required: true, message: '请选择省市县', trigger: 'change,blur' },
+        ],
       },
       customerParam:{
         "id": 20220920083901,
@@ -493,11 +502,12 @@ export default {
       this.checkResults = ''
     },
     cascaderChange (val) {
+      this.form.province = val[0]
       if (val.length === 1)
         return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
-
+      this.$refs.form.validateField('province')
     },
     async customerList(){
       const res = await this.$api.requested(this.customerParam)

src/Form/salerPrivatecustomer/add.vue

@@ -154,12 +154,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="电话:" prop="contact">
-                <el-input v-model="form.telephone" placeholder="请输入电话" style="width: 100%"></el-input>
+              <el-form-item label="联系电话:" prop="telephone">
+                <el-input v-model="form.telephone" placeholder="请输入联系电话" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="省市县:" >
+              <el-form-item label="省市县:" prop="province">
                 <el-cascader
                     style="width: 100%"
                     v-model="value"
@@ -330,11 +330,20 @@ export default {
       },
       rules:{
         enterprisename: [
-          { required: true, message: '输入客户名称', trigger: 'change,blur' },
+          { required: true, message: '请输入客户名称', trigger: 'change,blur' },
         ],
         type: [
           { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
+        contact: [
+          { required: true, message: '请输入法人', trigger: 'change,blur' },
+        ],
+        telephone: [
+          { required: true, message: '请输入联系电话', trigger: 'change,blur' },
+        ],
+        province: [
+          { required: true, message: '请选择省市县', trigger: 'change,blur' },
+        ],
       },
       customerParam:{
         "id": 20220920083901,
@@ -616,10 +625,12 @@ export default {
     },*/
     /*省市县*/
     cascaderChange (val) {
+      this.form.province = val[0]
       if (val.length === 1)
         return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+      this.$refs.form.validateField('province')
 
     },
     /*客户分类*/

src/Form/salerPrivatecustomer/edit.vue

@@ -149,12 +149,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="电话:" prop="contact">
-                <el-input v-model="form.telephone" placeholder="请输入电话" style="width: 100%"></el-input>
+              <el-form-item label="联系电话:" prop="telephone">
+                <el-input v-model="form.telephone" placeholder="请输入联系电话" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="省市县:" >
+              <el-form-item label="省市县:" prop="province">
                 <el-cascader
                     style="width: 100%"
                     v-model="form.value"
@@ -274,6 +274,15 @@ export default {
         type: [
           { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
+        contact: [
+          { required: true, message: '请输入法人', trigger: 'change,blur' },
+        ],
+        telephone: [
+          { required: true, message: '请输入联系电话', trigger: 'change,blur' },
+        ],
+        province: [
+          { required: true, message: '请选择省市县', trigger: 'change,blur' },
+        ],
       }
     }
   },
@@ -491,11 +500,12 @@ export default {
     },*/
     /*省市县*/
     cascaderChange (val) {
+      this.form.province = val[0]
       if (val.length === 1)
         return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
-
+      this.$refs.form.validateField('province')
     },
     /*客户分类*/
     async gradeList(){

src/HDrpManagement/dispatch/modules/edit.vue

@@ -111,7 +111,7 @@
       <div class="mt-10">
         <p class="normal-title inline-16">备注</p>
       </div>
-      <el-input style="margin-bottom:10px" v-model="defaultData.remarks" type="textarea" placeholder="请输入备注"></el-input>
+      <el-input style="margin-bottom:10px" v-model="defaultData.remarks"  placeholder="请输入备注"></el-input>
       <div class="mt-10">
         <div>
           <p class="normal-title inline-16">发货单产品</p>

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -5,7 +5,7 @@
         <slot name="operation"></slot>
 <!--        <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>-->
         <addProduct style="margin:0 0 10px 10px" v-if="type !== 'confirmdate' && data.status === '新建' " :drawer="drawer" :data="data"  ref="addProduct"
-                    :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加" :tradefield="data.tradefield"
+                    :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
                     @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="listData();$emit('onSuccess')"
         ></addProduct>
         <excel style="margin:0 0 10px 10px" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>

src/HManagement/clueManage/clue_rule/modules/setRule.vue

@@ -4,13 +4,13 @@
       <slot name="save"></slot>
     </div>
     <div style="overflow-x:hidden">
-      <el-row :gutter="50">
-        <el-col :span="9">
-          <el-card class="box-card">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-card class="box-card" >
             <div slot="header" class="clearfix">
               <p class="font-16">分配规则</p>
             </div>
-            <div class="normal-margin">
+            <div class="normal-margin" style="min-height: 110px;max-height: 110px;">
               <div class="switch" style="display:flex">
                 <p class="font-16" style="font-size:14px">自动分配:&emsp;</p>
                 <el-switch
@@ -30,12 +30,12 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="15">
-          <el-card class="box-card">
+        <el-col :span="14">
+          <el-card class="box-card" >
             <div slot="header" class="clearfix">
               <p class="font-16">到期规则</p>
             </div>
-            <div class="normal-margin" style="padding-bottom:35px">
+            <div class="normal-margin" style="min-height: 110px;max-height: 110px">
               <el-row>
                 <el-col :span="12">
                   <p class="normal-margin font-16" style="font-size:14px">未分配到期时间:</p>

src/HManagement/marketing2/agent/details/modules/address/add.vue

@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="地址">
-              <el-input v-model="form.address" type="textarea" :rows="3" autocomplete="on" placeholder="输入地址"></el-input>
+              <el-input v-model="form.address" autocomplete="on" placeholder="输入地址"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="12">
@@ -78,7 +78,7 @@
           </el-col> -->
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remarks" autocomplete="on" type="textarea" :rows="3" placeholder="输入联系人备注"></el-input>
+              <el-input v-model="form.remarks" autocomplete="on"  placeholder="输入联系人备注"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -5,8 +5,8 @@
       <slot name="operation"></slot>
 <!--      <el-button v-if="data.status === '新建'" class="inline-16" :disabled="data.type === '特殊订单'" size="small" type="primary"  @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>-->
       <addProduct  class="inline-16" v-if="type !== 'confirmdate' && data.status === '新建' && data.type !== '特殊订单' " :drawer="drawer" :data="data"  ref="addProduct"
-                  :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加" :tradefield="data.tradefield"
-                  @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="listData();$emit('onSuccess')"
+                  :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
+                   @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="listData();$emit('onSuccess')"
       ></addProduct>
       <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
       <uploadAllData

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -5,7 +5,7 @@
       <slot name="operation"></slot>
 <!--      <el-button :disabled="data.type === '特殊订单'"  v-if="data.status === '新建'" class="inline-16" size="small" type="primary" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>-->
       <addProduct class="inline-16"  v-if="type !== 'confirmdate' && data.status === '新建' && data.type !== '特殊订单' " :drawer="drawer" :data="data"  ref="addProduct"
-                  :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加" :tradefield="data.tradefield"
+                  :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加" :tradefield="data.tradefield" :querySa_brandid="data.sa_brandid"
                   @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="listData();$emit('onSuccess')"
       ></addProduct>
       <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -102,12 +102,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="电话:" prop="contact">
-                <el-input v-model="form.telephone" placeholder="请输入电话" style="width: 100%"></el-input>
+              <el-form-item label="联系电话:" prop="telephone">
+                <el-input v-model="form.telephone" placeholder="请输入联系电话" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="省市县:" >
+              <el-form-item label="省市县:" prop="province">
                 <el-cascader
                     style="width: 100%"
                     v-model="value"
@@ -221,6 +221,15 @@ export default {
         type: [
           { required: true, message: '请选择客户类型', trigger: 'change' }
         ],
+        contact: [
+          { required: true, message: '请输入法人', trigger: 'change,blur' },
+        ],
+        telephone: [
+          { required: true, message: '请输入联系电话', trigger: 'change,blur' },
+        ],
+        province: [
+          { required: true, message: '请选择省市县', trigger: 'change,blur' },
+        ],
       },
       form:{
         "sat_orderclueid": '',
@@ -432,11 +441,13 @@ export default {
     },
     /*省市县*/
     cascaderChange (val) {
+      this.form.province = val[0]
       if (val.length === 1)
         return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
 
+      this.$refs.form.validateField('province')
     },
     /*客户分类*/
     async gradeList(){

vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'http://192.168.3.9:8090',  // target host*!
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://192.168.3.9:8090',  // target host*!
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites