From e74c0ef64462be17ca25bcc89d7c2f7bc2a6327a Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Thu, 6 Jun 2024 09:14:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E4=BB=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderEntryAndReceiptPictureManagement.vue | 32 ++++++++++++--
 .../centralProblemInquiry.vue                 | 44 ++++---------------
 .../receivedProblemInquiries.vue              | 13 +++++-
 .../registrationProblemInquiry.vue            | 14 ++++--
 4 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
index f2fc893c..1cd21cdb 100644
--- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
+++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
@@ -8,7 +8,7 @@
             <div slot="label">
               <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
                 <el-radio label="1">运单号</el-radio>
-                <el-radio label="0">订单号</el-radio>
+                <!-- <el-radio label="0">订单号</el-radio> -->
               </el-radio-group>
             </div>
             <!-- <el-input
@@ -57,7 +57,6 @@
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
            :total="attachmentList.length"
-           @queryTable="getList"
            @selection-change="handleSelectionChange"
            v-if="tableHeight" :max-height="tableHeight + 'px'"
            >
@@ -121,6 +120,7 @@ import { delEmisWaybillAttachment, listEmisWaybillAttachment } from "@/api/emis/
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import { parseTime, dateToStr } from "@/utils/custom";
+import { formatSearchStr,deepClone } from '@/utils/index'
 
 export default {
   name: "OrderEntryAndReceiptPictureManagement",
@@ -242,7 +242,30 @@ export default {
     getList() {
       this.loading = true;
       console.log("---->this.queryParams,", this.queryParams);
-      let queryParams = Object.assign({},this.queryParams);
+      // let queryParams = Object.assign({},this.queryParams);
+      let queryParams=deepClone(this.queryParams);
+      // if(queryParams.billCode){
+      //   if(this.queryParams.params.queryOrderType != "1"){
+      //       queryParams.orderSn=formatSearchStr(queryParams.billCode);
+      //       queryParams.billCode=null;
+      //   }else{
+      //     // 处理子单号
+      //     let qBillCode=formatSearchStr(queryParams.billCode);
+      //     let billArr = qBillCode.split(",");
+      //     let newBillCodeStr="";
+      //     billArr.forEach(item=>{
+      //         if(item.startsWith("T")){
+      //           let mainBillCode=item.substr(0,14);
+      //           newBillCodeStr=newBillCodeStr+mainBillCode+",";
+      //         }else{
+      //           newBillCodeStr=newBillCodeStr+item+",";
+      //         }
+      //     });
+      //     queryParams.billCode=newBillCodeStr;
+
+      //   }
+      // }
+
       if (null != this.dateTimeRange && '' != this.dateTimeRange) {
         queryParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
         queryParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
@@ -256,7 +279,8 @@ export default {
         queryParams.orderSN=this.queryParams.billCode;
         queryParams.billCode=null;
       }
-
+      // queryParams.billCode=null
+      // queryParams.params.billCode="T7080300008583,T7080300008599"
       listEmisWaybillAttachment(queryParams).then(response => {
         this.attachmentList = [];
         this.loading = false;
diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
index ae271121..436ebf1a 100644
--- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
@@ -11,13 +11,6 @@
                 <el-radio label="0">订单号</el-radio>
               </el-radio-group>
             </div>
-            <!-- <el-input
-              v-model="queryParams.billCode"
-              :placeholder="$t('多个流水号逗号或换行隔开')"
-              clearable
-              type="textarea"
-              rows="2"
-            /> -->
             <XdTextareaInput
               v-model="queryParams.billCode"
               :placeholder="$t('多个流水号逗号或换行隔开')"
@@ -29,12 +22,9 @@
         <el-col :span="16">
           <el-col :span="16">
             <el-form-item label="登记时间" prop="dateTimeRange" label-width="90px">
-              <elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
           </el-col>
-
-
-
           <el-col :span="8">
             <el-form-item :label="$t('登记网点')" prop="registerSiteCode" label-width="90px">
               <EmisSiteSimplePicker v-model="queryParams.registerSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
@@ -75,29 +65,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item :label="$t('录入网点')" prop="registerSiteCode" label-width="80px">
-              <EmisSiteSimplePicker v-model="queryParams.registerSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('签收图片')" prop="isSignPic" label-width="80px">
-              <el-select v-model="queryParams.isSignPic" :placeholder="$t('全部')" value="0">
-                <el-option :label="$t('未上传')" value="1"></el-option>
-                <el-option :label="$t('已上传')" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('派件员')" prop="dispatchManCode" label-width="80px">
-              <EmisUserSimplePicker v-model="queryParams.dispatchManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('收件国家')" prop="receiveCountry" label-width="80px">
-              <CountryPicker v-model="queryParams.receiveCountry"  @onChange="onCountrySelect"  ></CountryPicker>
-            </el-form-item>
-          </el-col> -->
         </el-col>
       </el-form>
       <!-- </search-form> -->
@@ -334,6 +301,13 @@ export default {
       this.tableHeight = window.innerHeight - tableH;
     });
   },
+  mounted() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
+  },
   methods: {
     /** 查询扫描记录列表 */
     getList() {
@@ -358,7 +332,7 @@ export default {
       }
       // listEmisTmsScanRecord(this.queryParams).then(response => {
       // listEmisWaybillProblemInfo(this.queryParams).then(response => {
-      listEmisWaybill(this.queryParams).then(response => {
+      listEmisWaybillProblemInfo(this.queryParams).then(response => {
         this.emisElectronicPagApplyList = [];
         // this.total = 0;
         this.loading = false;
diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
index 47cb0e30..50b15c93 100644
--- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
+++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
@@ -29,7 +29,7 @@
         <el-col :span="16">
           <el-col :span="16">
             <el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
-              <elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -239,6 +239,7 @@
 </template>
 
 <script>
+import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
 import { listEmisWaybill } from "@/api/emis/emisWaybill";
 import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
 
@@ -378,6 +379,13 @@ export default {
       this.tableHeight = window.innerHeight - tableH;
     });
   },
+  mounted() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
+  },
   methods: {
     /** 查询扫描记录列表 */
     getList() {
@@ -403,7 +411,8 @@ export default {
       }
       // listEmisTmsScanRecord(this.queryParams).then(response => {
       // (this.queryParams).then(response => {
-      listEmisWaybill(this.queryParams).then(response => {
+      // listEmisWaybill(this.queryParams).then(response => {
+        listEmisWaybillProblemInfo(this.queryParams).then(response => {
         this.emisElectronicPagApplyList = [];
         // this.total = 0;
         this.loading = false;
diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
index dc097ee8..9713d2b7 100644
--- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
@@ -29,7 +29,7 @@
         <el-col :span="16">
           <el-col :span="16">
             <el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
-              <elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -195,6 +195,7 @@
 </template>
 
 <script>
+import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
 import { listEmisWaybill } from "@/api/emis/emisWaybill";
 import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
 
@@ -334,6 +335,13 @@ export default {
       this.tableHeight = window.innerHeight - tableH;
     });
   },
+  mounted() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
+  },
   methods: {
     /** 查询扫描记录列表 */
     getList() {
@@ -358,8 +366,8 @@ export default {
         this.queryParams.billCode="";
       }
       // listEmisTmsScanRecord(this.queryParams).then(response => {
-      // listEmisWaybillProblemInfo(this.queryParams).then(response => {
-      listEmisWaybill(this.queryParams).then(response => {
+      listEmisWaybillProblemInfo(this.queryParams).then(response => {
+      // listEmisWaybill(this.queryParams).then(response => {
         this.emisElectronicPagApplyList = [];
         // this.total = 0;
         this.loading = false;