From d43719dbc21c1aa44dbe8714ac16ef65e8d13752 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 15 May 2024 17:28:13 +0800
Subject: [PATCH] md

---
 .../emis/emisCustomerUser/moneyUserList.vue   | 34 ++++++++--
 .../emis/emisCustomerUser/monthUserForm.vue   |  5 +-
 .../emis/emisCustomerUser/monthUserList.vue   | 67 +++++++++++++++----
 3 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue
index 08533a52..c61a6e6a 100644
--- a/src/views/emis/emisCustomerUser/moneyUserList.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserList.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item label="" prop="customerName">
+      <el-form-item label="客户名称" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
           :placeholder="$t('客户名称')"
@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="phone">
+      <el-form-item label="电话" prop="phone">
         <el-input
           v-model="queryParams.phone"
           :placeholder="$t('电话')"
@@ -18,6 +18,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="所属国家" prop="country">
+          <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" ></CountryPicker>
+      </el-form-item>
+      <el-form-item label="省份" prop="province">
+        <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>
+      </el-form-item>
+      <el-form-item label="销售联系人" prop="salesmen" >
+          <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></EmisUserSimplePicker2>
+      </el-form-item>
+
       <!-- <el-form-item label="" prop="company">
         <el-input
           v-model="queryParams.company"
@@ -204,9 +217,22 @@ import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmis
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import moneyUserForm from '@/views/emis/emisCustomerUser/moneyUserForm';
 
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+
 export default {
   name: "moneyUserList",
-  components: { elDateSimplePicker,moneyUserForm },
+  components: { elDateSimplePicker,moneyUserForm ,CountryPicker,
+    EmisSiteSimplePicker,ProvincePicker,CityPicker,
+    EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
+  },
   dicts: [
   ],
   data() {
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index c453afde..420ae994 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -45,12 +45,11 @@
             </el-form-item>
           </el-col> -->
 
-          <!-- <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="英文简称" prop="customerNameEn">
               <el-input v-model="form.customerNameEn" placeholder="请输入英文简称" />
             </el-form-item>
-          </el-col> -->
-
+          </el-col>
 
             <el-col :span="8">
             <el-form-item label="邮箱" prop="email">
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 4e141f71..b13b15f5 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-      <el-form-item label="" prop="company">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form-item label="客户名称" prop="company">
         <el-input
           v-model="queryParams.company"
           :placeholder="$t('客户名称')"
@@ -10,7 +10,7 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="customerName">
+      <el-form-item label="寄件人" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
           :placeholder="$t('寄件人')"
@@ -19,7 +19,7 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="phone">
+      <el-form-item label="电话" prop="phone">
         <el-input
           v-model="queryParams.phone"
           :placeholder="$t('电话')"
@@ -28,6 +28,18 @@
           @input="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="国家" prop="country">
+          <CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" ></CountryPicker>
+      </el-form-item>
+      <el-form-item label="省份" prop="province">
+        <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>
+      </el-form-item>
+      <el-form-item label="销售联系人" prop="salesmen" >
+          <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></EmisUserSimplePicker2>
+      </el-form-item>
 
     </SearchForm>
 
@@ -128,11 +140,12 @@
       <!-- <el-table-column :label="$t('union_id')" align="center" prop="unionId" min-width="100" /> -->
       <!-- <el-table-column :label="$t('登录账号')" align="center" prop="userName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('登录密码')" align="center" prop="password" min-width="100" /> -->
-      <el-table-column :label="$t('国家')" align="center" prop="countryName" min-width="100" />
-      <el-table-column :label="$t('省份')" align="center" prop="provinceName" min-width="130" :show-overflow-tooltip="true" >
+      <el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
+      <el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('城市')" align="left" prop="citeName" min-width="130" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
             <div >
-              {{ scope.row.provinceName }} {{ scope.row.cityName }} {{ scope.row.countyName }}
+              {{ scope.row.cityName }} {{ scope.row.countyName }}
             </div>
          </template>
       </el-table-column>
@@ -140,7 +153,7 @@
       <!-- <el-table-column :label="$t('城市')" align="center" prop="city" min-width="100" /> -->
       <!-- <el-table-column :label="$t('区县')" align="center" prop="county" min-width="100" /> -->
       <!-- <el-table-column :label="$t('镇')" align="center" prop="town" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('地址')" align="center" prop="address" min-width="100" /> -->
+      <el-table-column :label="$t('地址')" align="center" prop="address" min-width="100" show-overflow-tooltip="true" />
       <!-- <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" /> -->
       <!-- <el-table-column :label="$t('发件国')" align="center" prop="sendCountry" min-width="100" /> -->
       <!-- <el-table-column :label="$t('发件省')" align="center" prop="sendProvince" min-width="100" /> -->
@@ -150,16 +163,32 @@
       <!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
       <!-- <el-table-column :label="$t('启用状态')" align="center" prop="status" min-width="100" /> -->
       <!-- <el-table-column :label="$t('真实姓名')" align="center" prop="realName" min-width="100" /> -->
-      <el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="100" />
+      <el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="150" show-overflow-tooltip="true"/>
       <el-table-column :label="$t('回款联系人')" align="center" prop="payeeName" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmenName" min-width="100" />
-      <!-- <el-table-column :label="$t('是否开通oms')" align="center" prop="blOpenOms" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('是否短信')" align="center" prop="blSms" min-width="100" /> -->
+      <el-table-column :label="$t('开通oms')" align="center" prop="blOpenOms" min-width="100" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blOpenOms==1" type="success">是</el-tag>
+              <el-tag v-if="scope.row.blOpenOms==0" type="danger">否</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('是否短信')" align="center" prop="blSms" min-width="100" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blSms==1" type="success">是</el-tag>
+              <el-tag v-if="scope.row.blSms==0" type="danger">否</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
+              <el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
+          </template>
+        </el-table-column>
       <el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" />
       <!-- <el-table-column :label="$t('微信昵称')" align="center" prop="nickName" min-width="120" /> -->
       <!-- <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" /> -->
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
-      <el-table-column :label="$t('最近下单时间')" align="center" prop="loginDate" min-width="100" />
+      <el-table-column :label="$t('最近下单时间')" align="center" prop="loginDate" min-width="170" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
       <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
       <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
@@ -203,10 +232,22 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import monthUserForm from '@/views/emis/emisCustomerUser/monthUserForm';
 import batchUpdateForm from '@/views/emis/emisCustomerUser/batchUpdateForm';
 
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
 
 export default {
   name: "monthUserList",
-  components: { elDateSimplePicker,monthUserForm,batchUpdateForm },
+  components: { elDateSimplePicker,monthUserForm,batchUpdateForm,CountryPicker,
+    EmisSiteSimplePicker,ProvincePicker,CityPicker,
+    EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
+  },
   dicts: [
   ],
   data() {