From 79a925bbc463d9f1209aab075539bac8e426e43c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 6 Jul 2024 11:58:10 +0800
Subject: [PATCH] md

---
 .../EmisBaseTools/AjustApplyTypePicker.vue    | 26 ++++++--
 .../WaybillAjustCenterConfirm.vue             | 61 +++++++++----------
 .../WaybillAjustDestConfirm.vue               | 38 ++++--------
 .../WaybillAjustStatList.vue                  | 51 ++++++----------
 4 files changed, 81 insertions(+), 95 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue b/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue
index 59af4b8a..a2330d93 100644
--- a/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue
+++ b/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue
@@ -1,19 +1,26 @@
 <template>
   <el-select
+    ref="selectRef"
+    v-model="svalue"
     :disabled="disabled"
+
     multiple
+
     collapse-tags
     clearable
     filterable
-    ref="selectRef"
-    v-model="svalue"
+
     :placeholder="placeholder"
+    @visible-change="visibleChange"
+
     @blur="onBlur"
     @focus="onFocus"
     style="width:100%"
     class="mutiSelect"
     :popper-append-to-body="false"
-    @change="onChange">
+    @change="onChange"
+
+    >
    <div style="padding: 0px 8px 0 20px;width:100%;line-height:34px;display:inline-flex">
        <div style="width:50%">
         <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
@@ -26,11 +33,9 @@
        <el-option v-for="item in optionItems" :key="item.typeCode" :label="item.typeName" :value="item.typeCode">
            <el-checkbox  style="pointer-events: none"  :key="item.typeCode"  :label="item.typeCode+''">{{item.typeName}}</el-checkbox>
        </el-option>
-       <!-- style="pointer-events: none" -->
    </el-checkbox-group>
   </el-select>
 
-  <!-- style="width:100%" multiple-->
 </template>
 <script>
   import emitter from 'element-ui/src/mixins/emitter';
@@ -76,6 +81,7 @@
 
     },
     created() {
+      this.searchTypeCode=null;
       this.queryData();
     },
     methods: {
@@ -89,7 +95,14 @@
         this.$emit("input", this.svalue?this.svalue.join(','):null);
         this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
       },
+      visibleChange(boolean){
+        if(boolean){
+          this.searchTypeCode=null;
+          this.queryData();
+        }
+      },
       handleCheckAllChange(isCheckAll){
+
         if(isCheckAll){
           const data = this.optionItems.map(item => {
             return item.typeCode
@@ -101,6 +114,7 @@
 
         this.$emit("input", this.svalue?this.svalue.join(','):null);
         this.isIndeterminate = false;
+
       },
       onChange(val) {
         console.log(val)
@@ -121,11 +135,13 @@
       },
       queryData() {
         this.optionItems=[];
+
         let queryParams = {
           pageNum: 1,
           pageSize: 300,
           typeCode:this.searchTypeCode,
         };
+
         listEmisWaybillAjustType(queryParams).then(response => {
             this.optionItems = response.rows;
         });
diff --git a/src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue b/src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue
index b540e0d1..db51852f 100644
--- a/src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue
+++ b/src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="6">
+        <el-col :span="4">
           <el-form-item label="运单号" prop="billCode" >
             <XdTextareaInput
                         v-model="queryParams.billCode"
@@ -20,19 +20,25 @@
               </el-form-item>
             </el-col>
 
+            <el-form-item label="登记网点" prop="applySiteCode">
+              <EmisSiteSimplePicker1  v-model="queryParams.applySiteCode"  ></EmisSiteSimplePicker1>
+            </el-form-item>
+
+            <el-form-item label="确认网点" prop="destConfirmSiteCode">
+              <EmisSiteSimplePicker2  v-model="queryParams.destConfirmSiteCode"  ></EmisSiteSimplePicker2>
+            </el-form-item>
+
             <el-form-item label="状态" prop="processStatus">
-                <el-select clearable="" v-model="queryParams.processStatus" placeholder="请选择">
+                <el-select clearable v-model="queryParams.params.processStatus" placeholder="请选择">
                   <el-option label="未确认" :value="1"></el-option>
                   <el-option label="已确认" :value="2"></el-option>
-                  <el-option label="中心已审核" :value="2"></el-option>
-                  <el-option label="网点驳回" :value="2"></el-option>
-                  <el-option label="中心驳回" :value="2"></el-option>
+                  <el-option label="中心已审核" :value="3"></el-option>
+                  <el-option label="网点驳回" :value="4"></el-option>
+                  <el-option label="中心驳回" :value="5"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="修改项目" prop="applyType">
-                <el-select clearable="" v-model="queryParams.applyType" placeholder="请选择">
-                  <el-option label="运费" value="001"></el-option>
-                </el-select>
+              <AjustApplyTypePicker v-model="queryParams.applyType"></AjustApplyTypePicker>
             </el-form-item>
            </el-row>
         </el-col>
@@ -224,10 +230,20 @@ import { listEmisWaybillAjustApply, auditCenterPass,auditCenterNoPass} from "@/a
 
 import emisWaybillAjustApplyForm from '@/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm';
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
+
 
 export default {
   name: "EmisWaybillAjustApply",
-  components: { elDateSimplePicker,emisWaybillAjustApplyForm },
+  components: {
+    elDateSimplePicker,
+    emisWaybillAjustApplyForm,
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    AjustApplyTypePicker
+  },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
         'emis_calc_fee_type','emis_print_type'],
@@ -295,6 +311,9 @@ export default {
         centerConfirmNote: null,
         remark: null,
         delFlag: null,
+        params:{
+          processStatus:null,
+        }
       },
     };
   },
@@ -305,28 +324,8 @@ export default {
     /** 查询运单调整申请列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeApplyDate && '' != this.daterangeApplyDate) {
-        this.queryParams.params["beginApplyDate"] = this.daterangeApplyDate[0];
-        this.queryParams.params["endApplyDate"] = this.daterangeApplyDate[1];
-      }
-      if (null != this.daterangeDestConfirmDate && '' != this.daterangeDestConfirmDate) {
-        this.queryParams.params["beginDestConfirmDate"] = this.daterangeDestConfirmDate[0];
-        this.queryParams.params["endDestConfirmDate"] = this.daterangeDestConfirmDate[1];
-      }
-      if (null != this.daterangeCenterConfirmDate && '' != this.daterangeCenterConfirmDate) {
-        this.queryParams.params["beginCenterConfirmDate"] = this.daterangeCenterConfirmDate[0];
-        this.queryParams.params["endCenterConfirmDate"] = this.daterangeCenterConfirmDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisWaybillAjustApply(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,'applyDate');
+      listEmisWaybillAjustApply(this.queryParams).then(response => {
         this.emisWaybillAjustApplyList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue b/src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue
index 3e7eb50f..db29faf3 100644
--- a/src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue
+++ b/src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="6">
+        <el-col :span="4">
           <el-form-item label="运单号" prop="billCode" >
             <XdTextareaInput
                         v-model="queryParams.billCode"
@@ -21,12 +21,12 @@
             </el-col>
 
             <el-form-item label="状态" prop="processStatus">
-                <el-select clearable="" v-model="queryParams.processStatus" placeholder="请选择">
+                <el-select clearable v-model="queryParams.params.processStatus" placeholder="请选择">
                   <el-option label="未确认" :value="1"></el-option>
                   <el-option label="已确认" :value="2"></el-option>
-                  <el-option label="中心已审核" :value="2"></el-option>
-                  <el-option label="网点驳回" :value="2"></el-option>
-                  <el-option label="中心驳回" :value="2"></el-option>
+                  <el-option label="中心已审核" :value="3"></el-option>
+                  <el-option label="网点驳回" :value="4"></el-option>
+                  <el-option label="中心驳回" :value="5"></el-option>
                 </el-select>
             </el-form-item>
             <!-- <el-form-item label="修改项目" prop="applyType">
@@ -295,6 +295,9 @@ export default {
         centerConfirmNote: null,
         remark: null,
         delFlag: null,
+        params:{
+          processStatus:null,
+        }
       },
     };
   },
@@ -305,28 +308,9 @@ export default {
     /** 查询运单调整申请列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeApplyDate && '' != this.daterangeApplyDate) {
-        this.queryParams.params["beginApplyDate"] = this.daterangeApplyDate[0];
-        this.queryParams.params["endApplyDate"] = this.daterangeApplyDate[1];
-      }
-      if (null != this.daterangeDestConfirmDate && '' != this.daterangeDestConfirmDate) {
-        this.queryParams.params["beginDestConfirmDate"] = this.daterangeDestConfirmDate[0];
-        this.queryParams.params["endDestConfirmDate"] = this.daterangeDestConfirmDate[1];
-      }
-      if (null != this.daterangeCenterConfirmDate && '' != this.daterangeCenterConfirmDate) {
-        this.queryParams.params["beginCenterConfirmDate"] = this.daterangeCenterConfirmDate[0];
-        this.queryParams.params["endCenterConfirmDate"] = this.daterangeCenterConfirmDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisWaybillAjustApply(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      this.queryParams.destConfirmSiteCode=this.$store.getters.ownerSiteCode;
+      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,'applyDate');
+      listEmisWaybillAjustApply(this.queryParams).then(response => {
         this.emisWaybillAjustApplyList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue b/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
index 118cc6cb..300eccf8 100644
--- a/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
+++ b/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
@@ -8,7 +8,7 @@
                         v-model="queryParams.billCode"
                         :placeholder="$t('多个流水号逗号或换行隔开')"
                         clearable
-                        :rows="6"
+                        :rows="4"
                       />
           </el-form-item>
         </el-col>
@@ -20,19 +20,21 @@
               </el-form-item>
             </el-col>
 
+            <el-form-item label="登记网点" prop="applySiteCode">
+              <EmisSiteSimplePicker1  v-model="queryParams.applySiteCode"  ></EmisSiteSimplePicker1>
+            </el-form-item>
+
             <el-form-item label="状态" prop="processStatus">
-                <el-select clearable="" v-model="queryParams.processStatus" placeholder="请选择">
+                <el-select clearable v-model="queryParams.params.processStatus" placeholder="请选择">
                   <el-option label="未确认" :value="1"></el-option>
                   <el-option label="已确认" :value="2"></el-option>
-                  <el-option label="中心已审核" :value="2"></el-option>
-                  <el-option label="网点驳回" :value="2"></el-option>
-                  <el-option label="中心驳回" :value="2"></el-option>
+                  <el-option label="中心已审核" :value="3"></el-option>
+                  <el-option label="网点驳回" :value="4"></el-option>
+                  <el-option label="中心驳回" :value="5"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="修改项目" prop="applyType">
-                <el-select clearable="" v-model="queryParams.applyType" placeholder="请选择">
-                  <el-option label="运费" value="001"></el-option>
-                </el-select>
+              <AjustApplyTypePicker v-model="queryParams.applyType"></AjustApplyTypePicker>
             </el-form-item>
            </el-row>
         </el-col>
@@ -131,7 +133,7 @@
       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
       <el-table-column :label="$t('确认网点')" align="center" prop="destConfirmSiteName" min-width="100" :show-overflow-tooltip="true"  >
         <template slot-scope="scope">
-              <div v-if="scope.row.blCenterConfirmed==1" >{{ scope.row.destConfirmSiteName }}</div>
+              <div  >{{ scope.row.destConfirmSiteName }}</div>
           </template>
       </el-table-column>
 
@@ -213,10 +215,12 @@ import { listEmisWaybillAjustApply, getEmisWaybillAjustApply, delEmisWaybillAjus
 // import emisWaybillAjustApplyView from '@/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyView';
 import emisWaybillAjustApplyForm from '@/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
 
 export default {
   name: "EmisWaybillAjustApply",
-  components: { elDateAdvPicker,emisWaybillAjustApplyForm },
+  components: { elDateAdvPicker,emisWaybillAjustApplyForm,EmisSiteSimplePicker1,AjustApplyTypePicker },
   dicts: [
   ],
   data() {
@@ -283,6 +287,9 @@ export default {
         centerConfirmNote: null,
         remark: null,
         delFlag: null,
+        params:{
+          processStatus:null,
+        }
       },
     };
   },
@@ -293,28 +300,8 @@ export default {
     /** 查询运单调整申请列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeApplyDate && '' != this.daterangeApplyDate) {
-        this.queryParams.params["beginApplyDate"] = this.daterangeApplyDate[0];
-        this.queryParams.params["endApplyDate"] = this.daterangeApplyDate[1];
-      }
-      if (null != this.daterangeDestConfirmDate && '' != this.daterangeDestConfirmDate) {
-        this.queryParams.params["beginDestConfirmDate"] = this.daterangeDestConfirmDate[0];
-        this.queryParams.params["endDestConfirmDate"] = this.daterangeDestConfirmDate[1];
-      }
-      if (null != this.daterangeCenterConfirmDate && '' != this.daterangeCenterConfirmDate) {
-        this.queryParams.params["beginCenterConfirmDate"] = this.daterangeCenterConfirmDate[0];
-        this.queryParams.params["endCenterConfirmDate"] = this.daterangeCenterConfirmDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisWaybillAjustApply(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,'applyDate');
+      listEmisWaybillAjustApply(this.queryParams).then(response => {
         this.emisWaybillAjustApplyList = response.rows;
         this.total = response.total;
         this.loading = false;