From 8c73bbc99f2a716505164816b83536e8a4dc8aaa Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 20 May 2024 03:20:08 +0800
Subject: [PATCH] md

---
 .../emis/EmisBaseTools/SalemanPicker.vue      |  2 +-
 .../emis/emisCustomerUser/batchUpdateForm.vue | 13 +++++++++++--
 .../emis/emisCustomerUser/moneyUserForm.vue   | 13 +++++++++++--
 .../emis/emisCustomerUser/monthUserForm.vue   | 12 ++++++++++--
 .../emis/emisCustomerUser/monthUserList.vue   | 19 ++++++++++++++-----
 .../emis/emisWaybill/emisWaybillRecord.vue    |  3 +++
 6 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/SalemanPicker.vue b/src/views/emis/EmisBaseTools/SalemanPicker.vue
index 9315edcb..09037737 100644
--- a/src/views/emis/EmisBaseTools/SalemanPicker.vue
+++ b/src/views/emis/EmisBaseTools/SalemanPicker.vue
@@ -72,7 +72,7 @@
         let queryParams = {
           searchValue:val
         };
-        getPayeeList(queryParams).then(response => {
+        getSalemanList(queryParams).then(response => {
           this.optionItems =response.rows;
         });
       },
diff --git a/src/views/emis/emisCustomerUser/batchUpdateForm.vue b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
index cb6c1777..0fb960be 100644
--- a/src/views/emis/emisCustomerUser/batchUpdateForm.vue
+++ b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
@@ -21,12 +21,16 @@
           </el-col> -->
           <el-col :span="12">
             <el-form-item label="回款联系人" prop="payee" >
-              <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker1>
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
+
+              <!-- <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker1> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="销售联系人" prop="salesmen" >
-              <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker2>
+              <SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
+
+              <!-- <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker2> -->
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -98,6 +102,9 @@ import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue';
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
 
 export default {
   name: "emisCustomerUserForm",
@@ -107,6 +114,8 @@ export default {
     },
   },
   components: {
+    PayeePicker,
+    SalemanPicker,
     CountryPicker,
     EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
     EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,
diff --git a/src/views/emis/emisCustomerUser/moneyUserForm.vue b/src/views/emis/emisCustomerUser/moneyUserForm.vue
index a5ca1e18..1c48a047 100644
--- a/src/views/emis/emisCustomerUser/moneyUserForm.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserForm.vue
@@ -205,14 +205,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="回款联系人" prop="payee" label-width="100px">
-              <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker1>
+              <!-- <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker1> -->
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
 
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <!-- postCode="OP" -->
             <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
-              <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker2>
+              <SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
+              <!-- <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker2> -->
             </el-form-item>
           </el-col>
           <!-- <el-col :span="8">
@@ -283,6 +285,11 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
+
+
 export default {
   name: "emisCustomerUserForm",
   props:{
@@ -295,6 +302,8 @@ export default {
     }
   },
   components: {
+    PayeePicker,
+    SalemanPicker,
     CountryPicker,
     EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
     EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index 42dd7fb7..d4870523 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -115,13 +115,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="回款联系人" prop="payee" >
-              <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" :siteCode="form.ownerSite" v-model="form.payee"  ></EmisUserSimplePicker1>
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
+
+              <!-- <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" :siteCode="form.ownerSite" v-model="form.payee"  ></EmisUserSimplePicker1> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <!-- postCode="OP" -->
             <el-form-item label="销售联系人" prop="salesmen" >
-              <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" :siteCode="form.ownerSite" v-model="form.salesmen"  ></EmisUserSimplePicker2>
+              <SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
+              <!-- <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" :siteCode="form.ownerSite" v-model="form.salesmen"  ></EmisUserSimplePicker2> -->
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -208,6 +211,10 @@ import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue';
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
+
 
 export default {
   name: "emisCustomerUserForm",
@@ -221,6 +228,7 @@ export default {
     }
   },
   components: {
+    PayeePicker,SalemanPicker,
     CountryPicker,
     EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
     EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 0a80f73c..b622fbdf 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -35,11 +35,15 @@
         <ProvincePicker v-model="queryParams.province" :countryCode="queryParams.country" ></ProvincePicker>
       </el-form-item>
       <el-form-item label="回款联系人" prop="payee" >
-        <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></EmisUserSimplePicker1>
+        <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+
+        <!-- <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></EmisUserSimplePicker1> -->
       </el-form-item>
       <el-form-item label="销售联系人" prop="salesmen" >
-          <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></EmisUserSimplePicker2>
-      </el-form-item>
+          <!-- <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></EmisUserSimplePicker2> -->
+          <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+
+        </el-form-item>
 
     </SearchForm>
 
@@ -240,10 +244,15 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
 
 export default {
-  name: "monthUserList",
-  components: { elDateSimplePicker,monthUserForm,batchUpdateForm,CountryPicker,
+  name: "MonthUserList",
+  components: {
+    PayeePicker,SalemanPicker,
+     elDateSimplePicker,monthUserForm,batchUpdateForm,CountryPicker,
     EmisSiteSimplePicker,ProvincePicker,CityPicker,
     EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
   },
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 8bf6df26..756e75a9 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -626,13 +626,16 @@
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="回款联系人" prop="payee" label-width="80px">
+                        <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" disabled ></PayeePicker>
                         <PayeePicker :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
 
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="销售联系人" prop="salesmen" label-width="80px">
+                        <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" disabled ></SalemanPicker>
                         <SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
+
                       </el-form-item>
                     </el-col>