From 25b307156395a788ebab51686a9ab391b292f2fd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 15 May 2024 08:48:55 +0800
Subject: [PATCH] md

---
 .../emis/emisCustomerUser/moneyUserForm.vue   |  8 +--
 .../emis/emisCustomerUser/moneyUserList.vue   | 15 +++--
 .../emis/emisCustomerUser/monthUserForm.vue   | 60 ++++++++---------
 .../emis/emisCustomerUser/monthUserList.vue   | 64 +++++++++++--------
 .../emis/emisWaybill/emisWaybillRecord.vue    | 22 +++----
 .../emis/emisWaybill/waybillIsPrinted.vue     |  2 -
 6 files changed, 91 insertions(+), 80 deletions(-)

diff --git a/src/views/emis/emisCustomerUser/moneyUserForm.vue b/src/views/emis/emisCustomerUser/moneyUserForm.vue
index 1061dd04..cdb7750e 100644
--- a/src/views/emis/emisCustomerUser/moneyUserForm.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserForm.vue
@@ -9,12 +9,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="客户名称" prop="customerName">
+            <el-form-item label="寄件人" prop="customerName">
               <el-input v-model="form.customerName" placeholder="请输入客户名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="电话号码" prop="phone" label-width="80px">
+            <el-form-item label="手机号码" prop="phone" label-width="80px">
               <el-input v-model="form.phone" placeholder="请输入电话" />
             </el-form-item>
           </el-col>
@@ -267,8 +267,8 @@
           <el-col :span="12">
             <el-form-item label="启用状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
+                <el-radio :label="1">启用</el-radio>
+                <el-radio :label="0">停用</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue
index b7d849b5..08533a52 100644
--- a/src/views/emis/emisCustomerUser/moneyUserList.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserList.vue
@@ -95,12 +95,12 @@
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerCode}}</div>
          </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="left" prop="customerName" width="120" :show-overflow-tooltip="true" >
+      <el-table-column :label="$t('寄件人')" align="left" prop="customerName" width="120" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div>
          </template>
       </el-table-column>
-      <el-table-column :label="$t('电话号码')" align="center" prop="phone" width="100" />
+      <el-table-column :label="$t('手机号码')" align="center" prop="phone" width="100" />
       <el-table-column :label="$t('公司名称')" align="left" prop="company" width="120" :show-overflow-tooltip="true"/>
 
       <!-- <el-table-column :label="$t('英文简称')" align="center" prop="customerNameEn" min-width="100" /> -->
@@ -118,10 +118,11 @@
       <!-- <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="ownerSiteName" min-width="100" />
-      <el-table-column :label="$t('所属地区')" align="center" prop="country" min-width="100" >
+      <el-table-column :label="$t('所属国家')" align="center" prop="country" min-width="100" />
+      <el-table-column :label="$t('所属省份')" align="center" prop="provinceName" min-width="110" >
         <template slot-scope="scope">
             <div >
-              {{ scope.row.countryName }}-{{ scope.row.provinceName }}
+            {{ scope.row.provinceName }}
             </div>
          </template>
       </el-table-column>
@@ -144,14 +145,14 @@
       <!-- <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('专属业务员')" align="center" prop="opEmpName" min-width="100" />
-      <el-table-column :label="$t('微信昵称')" align="center" prop="customerName" width="100" />
-      <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" >
+      <!-- <el-table-column :label="$t('微信昵称')" align="center" prop="customerName" width="100" /> -->
+      <!-- <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" >
         <template slot-scope="scope">
             <div >
               {{ scope.row.openid }}
             </div>
          </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" >
         <template slot-scope="scope">
             <div v-if="scope.row.dataFrom" >
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index 443adac6..68656d24 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -1,25 +1,29 @@
 <template>
   <div >
-        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
           <el-row :gutter="0"  style="display: flex;flex-wrap: wrap;">
-
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="客户编码" prop="customerCode">
               <el-input v-model="form.customerCode" placeholder="自动生成" disabled />
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+          </el-col> -->
+          <el-col :span="16">
+            <el-form-item label="客户名称" prop="company">
+              <el-input v-model="form.company" placeholder="" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="电话号码" prop="phone" label-width="80px">
-              <el-input v-model="form.phone" placeholder="请输入电话" />
+            <el-form-item label="寄件人" prop="customerName">
+              <el-input v-model="form.customerName" placeholder="" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="所属站点" prop="ownerSite">
+            <el-form-item label="手机号码" prop="phone" >
+              <el-input v-model="form.phone" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="主所属网点" prop="ownerSite">
               <EmisSiteSimplePicker :placeholder="$t('所属站点')"  v-model="form.ownerSite" ></EmisSiteSimplePicker>
             </el-form-item>
           </el-col>
@@ -74,11 +78,7 @@
               <el-input v-model="form.monthlyPayCode" placeholder="月结卡号" />
             </el-form-item>
           </el-col>
-          <el-col :span="16">
-            <el-form-item label="所属公司" prop="company">
-              <el-input v-model="form.company" placeholder="请输入所属公司" />
-            </el-form-item>
-          </el-col>
+
           <el-col :span="8">
             <el-form-item label="所属国家" prop="country">
                 <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
@@ -103,18 +103,18 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="专属业务员" prop="opEmpCode" label-width="100px">
+            <el-form-item label="专属业务员" prop="opEmpCode" >
               <EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode"  ></EmisUserSimplePicker0>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="回款联系人" prop="payee" label-width="90px">
+            <el-form-item label="回款联系人" prop="payee" >
               <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker1>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <!-- postCode="OP" -->
-            <el-form-item label="销售联系人" prop="salesmen" label-width="90px">
+            <el-form-item label="销售联系人" prop="salesmen" >
               <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker2>
             </el-form-item>
           </el-col>
@@ -125,7 +125,7 @@
           </el-col> -->
 
           <el-col :span="12">
-            <el-form-item label="开通OMS" prop="blOpenOms" label-width="80px">
+            <el-form-item label="开通OMS" prop="blOpenOms" >
               <el-radio-group v-model="form.blOpenOms">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -212,9 +212,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        customerName: [
+        company: [
           { required: true, message: "客户名称不能为空", trigger: "blur" }
         ],
+        customerName: [
+          { required: true, message: "寄件人不能为空", trigger: "blur" }
+        ],
         phone: [
           { required: true, message: "电话不能为空", trigger: "blur" }
         ],
@@ -228,14 +231,13 @@ export default {
           { required: true, message: "主月结卡号不能为空", trigger: "blur" }
         ],
         ownerSite: [
-          { required: true, message: "归属站点不能为空", trigger: "blur" }
+          { required: true, message: "归属站点不能为空", trigger:["blur",'change'] }
         ],
         areaInfo: [
-          { required: true, message: "省份不能为空", trigger: "blur" },
           { validator: this.validateMuti, trigger: ["blur",'change'] }
         ],
         country: [
-          { required: true, message: "国家不能为空", trigger: "blur" }
+          { required: true, message: "国家不能为空", trigger: ["blur",'change'] }
         ],
         // province: [
         //   { required: true, message: "省份不能为空", trigger: "blur" }
@@ -244,22 +246,22 @@ export default {
           { required: true, message: "地址不能为空", trigger: "blur" }
         ],
         status: [
-          { required: true, message: "启用状态不能为空", trigger: "blur" }
+          { required: true, message: "启用状态不能为空", trigger: ["blur",'change'] }
         ],
         payee: [
-          { required: true, message: "回款联系人不能为空", trigger: "blur" }
+          { required: true, message: "回款联系人不能为空", trigger: ["blur",'change'] }
         ],
         salesmen: [
-          { required: true, message: "销售联系人不能为空", trigger: "blur" }
+          { required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
         ],
         blOpenOms: [
-          { required: true, message: "是否开通oms不能为空", trigger: "blur" }
+          { required: true, message: "是否开通oms不能为空", trigger: ["blur",'change'] }
         ],
         blSms: [
-          { required: true, message: "是否短信不能为空", trigger: "blur" }
+          { required: true, message: "是否短信不能为空", trigger: ["blur",'change'] }
         ],
         opEmpCode: [
-          { required: true, message: "专属业务员不能为空", trigger: "blur" }
+          { required: true, message: "专属业务员不能为空", trigger: ["blur",'change'] }
         ],
       }
     };
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 20be121b..48efae2d 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -1,13 +1,22 @@
 <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="customerName">
+      <el-form-item label="" prop="company">
         <el-input
-          v-model="queryParams.customerName"
+          v-model="queryParams.company"
           :placeholder="$t('客户名称')"
           clearable
           @keyup.enter.native="handleQuery"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          :placeholder="$t('寄件人')"
+          clearable
+          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
       <el-form-item label="" prop="phone">
@@ -16,16 +25,10 @@
           :placeholder="$t('电话')"
           clearable
           @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="company">
-        <el-input
-          v-model="queryParams.company"
-          :placeholder="$t('所属公司')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
     </SearchForm>
 
 
@@ -53,7 +56,7 @@
                   v-hasPermi="['emis:emisCustomerUser:add']"
                 >新增客户</el-button>
               </el-col>
-              <!--
+
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -61,10 +64,10 @@
                   icon="el-icon-edit"
                   size="mini"
                   :disabled="single"
-                  @click="handleUpdate"
+                  @click="handleBatchUpdate"
                   v-hasPermi="['emis:emisCustomerUser:edit']"
-                >修改</el-button>
-              </el-col> -->
+                >批量修改</el-button>
+              </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="danger"
@@ -90,18 +93,27 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" >
-        <template slot-scope="scope">
+      <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" >
+      <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerCode}}</div>
          </template>
+      </el-table-column> -->
+      <el-table-column :label="$t('客户名称')" align="left" prop="company" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.company}}</div>
+         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="left" prop="customerName" width="120" :show-overflow-tooltip="true" >
+
+      <el-table-column :label="$t('主归属网点')" align="center" prop="ownerSiteName" min-width="100" />
+
+      <el-table-column :label="$t('月结卡号')" align="center"  prop="monthlyPayCode" min-width="100" />
+
+      <el-table-column :label="$t('寄件人')" align="left" prop="customerName" width="120" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div>
          </template>
       </el-table-column>
-      <el-table-column :label="$t('电话号码')" align="center" prop="phone" width="100" />
-      <el-table-column :label="$t('公司名称')" align="left" prop="company" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('手机号码')" align="center" prop="phone" width="100" />
 
       <!-- <el-table-column :label="$t('英文简称')" align="center" prop="customerNameEn" min-width="100" /> -->
       <!-- <el-table-column :label="$t('手机号')" align="center" prop="mobile" min-width="100" /> -->
@@ -114,14 +126,13 @@
       <!-- <el-table-column :label="$t('最后登录ip')" align="center" prop="loginIp" min-width="100" /> -->
       <!-- <el-table-column :label="$t('最后登录日期')" align="center" prop="loginDate" min-width="100" /> -->
       <!-- <el-table-column :label="$t('union_id')" align="center" prop="unionId" min-width="100" /> -->
-      <el-table-column :label="$t('月结卡号')" align="center"  prop="monthlyPayCode" 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="ownerSiteName" min-width="100" />
-      <el-table-column :label="$t('所属地区')" align="center" prop="country" 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" >
         <template slot-scope="scope">
             <div >
-              {{ scope.row.countryName }}  {{ scope.row.provinceName }} {{ scope.row.cityName }} {{ scope.row.countyName }}
+              {{ scope.row.provinceName }} {{ scope.row.cityName }} {{ scope.row.countyName }}
             </div>
          </template>
       </el-table-column>
@@ -139,13 +150,14 @@
       <!-- <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="ownerSiteName" min-width="100" />
       <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('专属业务员')" 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="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="dataFrom" min-width="100" />
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 020103c6..36bf4221 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -21,6 +21,7 @@
                       </div>
                     </el-form-item>
                 </el-col>
+
                   <el-col :span="6">
                     <el-form-item label="目的国" prop="reciever.country">
                         <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
@@ -31,15 +32,13 @@
                       <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
                     </el-form-item>
                   </el-col> -->
-                  <el-col :span="12">
+                  <el-col :span="8">
                     <el-form-item label="产品类型" prop="productType">
                       <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
                       <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
                     </el-form-item>
                   </el-col>
-                  <el-col :span="6">
-                  </el-col>
-                  <el-col :span="6">
+                  <el-col :span="5">
                     <el-form-item label="报关方式" prop="customsEclaration">
                       <el-select v-model="form.customsEclaration" placeholder="请选择">
                         <el-option
@@ -51,7 +50,7 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="6">
+                  <el-col :span="5">
                     <el-form-item label="清关方式" prop="customsClear">
                       <el-select v-model="form.customsClear" placeholder="请选择">
                         <el-option
@@ -63,6 +62,11 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+                  <el-col :span="6">
+                      <el-form-item label="寄件网点" prop="sendSiteName">
+                        <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
+                      </el-form-item>
+                </el-col>
                   <el-col :span="6">
                     <el-form-item label="取件方式" prop="pickupMethod">
                       <el-select v-model="form.pickupMethod" placeholder="请选择">
@@ -181,11 +185,7 @@
                         <el-input v-model="form.sender.company" placeholder="" />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="寄件网点" prop="sendSiteName">
-                        <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
-                      </el-form-item>
-                    </el-col>
+
                     <el-col :span="24">
                       <el-form-item label="" prop="blMessage">
                         <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
@@ -943,8 +943,6 @@ methods: {
   },
   initData() {
       this.reset();
-      // this.timer=setInterval(this.showLocalTime, 1000);
-
       this.form.sendDate =  parseTime(new Date());
       this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
       this.form.sendSiteName=this.$store.getters.ownerSiteName;
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index a5360cba..2e31f61e 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -18,8 +18,6 @@
               />
             </el-form-item>
 
-
-
             <el-form-item label="收件人" prop="receiveName">
               <el-input
                 v-model="queryParams.receiveName"