修复部分bug

src/views/basicdata/TripartiteMaterial/list.vue

@@ -215,7 +215,7 @@
             />
           </el-select>
         </el-form-item>
-   
+
         <el-form-item label="一级品">
           <el-input placeholder="请输入一级品" v-model.trim="details.form.firsts"></el-input>
         </el-form-item>
@@ -382,16 +382,16 @@ const details = reactive<any>({
   brandArr: [],
   /** 物料数据 */
   materialArr: [],
-  typeList:[
+  typeList: [
     {
-    label:'收入',
-    value:1
+      label: '收入',
+      value: 1,
     },
     {
-    label:'成本',
-    value:2
+      label: '成本',
+      value: 2,
     },
-  ]
+  ],
 });
 
 /** 表格实例 */
@@ -420,13 +420,13 @@ const onLoad = debounce(async (params = {}) => {
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = data.records;
-    details.data.forEach((item)=>{
-      if(item.type==1){
-        item.typeNameS ='收入'
-      }else if(item.type == 2){
-             item.typeNameS ='成本'
+    details.data.forEach(item => {
+      if (item.type == 1) {
+        item.typeNameS = '收入';
+      } else if (item.type == 2) {
+        item.typeNameS = '成本';
       }
-    })
+    });
     details.page.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);
@@ -514,7 +514,7 @@ const sizeChange = (pageSize: number) => {
 
 /** 页码改变执行的回调 */
 const currentChange = current => {
-  details.pageNum = current;
+  details.page.pageNum = current;
   onLoad();
 };
 

src/views/distribution/artery/TripartiteTransfer.vue

@@ -11,7 +11,7 @@
 
           <el-form-item label="承运时间:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.carrierTimeArr"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -23,9 +23,23 @@
             />
           </el-form-item>
 
-          <el-form-item label="发车时间:" class="el-times">
+          <el-form-item label="实际发车:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.startArr"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              value-format="YYYY-MM-DD"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="到车时间:" class="el-times">
+            <el-date-picker
+              v-model="details.query.arriveTimeArr"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -39,7 +53,7 @@
 
           <el-form-item label="创建时间:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.createTimeArr"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -53,7 +67,7 @@
 
           <el-form-item label="签收时间:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.signTimeArr"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -859,6 +873,38 @@ const onLoad = debounce(async (params = {}) => {
     // 开启loading
     details.loadingObj.list = true;
 
+    const { carrierTimeArr, startArr, createTimeArr, arriveTimeArr, signTimeArr } = details.query;
+
+    // 承运时间
+    if (getObjType(carrierTimeArr) === 'array' && carrierTimeArr.length > 0) {
+      params.carrierTimeStartStr = startArr[0];
+      params.carrierTimeEndStr = startArr[1];
+    }
+
+    // 发车时间
+    if (getObjType(startArr) === 'array' && startArr.length > 0) {
+      params.startDate = startArr[0];
+      params.endDate = startArr[1];
+    }
+
+    // 到车时间
+    if (getObjType(arriveTimeArr) === 'array' && arriveTimeArr.length > 0) {
+      params.arriveTimeStartStr = arriveTimeArr[0];
+      params.arriveTimeEndStr = arriveTimeArr[1];
+    }
+
+    // 创建时间
+    if (getObjType(createTimeArr) === 'array' && createTimeArr.length > 0) {
+      params.createTimeStartStr = createTimeArr[0];
+      params.createTimeEndStr = createTimeArr[1];
+    }
+
+    // 签收时间
+    if (getObjType(signTimeArr) === 'array' && signTimeArr.length > 0) {
+      params.signTimeStartStr = signTimeArr[0];
+      params.signTimeEndStr = signTimeArr[1];
+    }
+
     // 请求页面数据
     const res = await postTripartiteTransferPageList({
       ...details.page,

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -5,28 +5,12 @@
       <div v-h5uShow="search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
-          <!-- <el-form-item label="车次号:">
-            <el-input v-model="query.serviceNumber" placeholder="请输入车次号" clearable></el-input>
-          </el-form-item> -->
-          <el-form-item label="预计发车:" class="el-times">
-            <el-date-picker
-              v-model="stockupDate"
-              type="daterange"
-              unlink-panels
-              range-separator="-"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              :shortcuts="shortcuts"
-              value-format="YYYY-MM-DD"
-              clearable
-            />
-          </el-form-item>
           <el-form-item label="实际发车:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.startArr"
               type="daterange"
               unlink-panels
-              range-separator="-"
+              range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
@@ -34,12 +18,13 @@
               clearable
             />
           </el-form-item>
+
           <el-form-item label="到车时间:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.arriveTimeArr"
               type="daterange"
               unlink-panels
-              range-separator="-"
+              range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
@@ -47,12 +32,13 @@
               clearable
             />
           </el-form-item>
+
           <el-form-item label="创建时间:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.createTimeArr"
               type="daterange"
               unlink-panels
-              range-separator="-"
+              range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
@@ -819,6 +805,26 @@ const onLoad = debounce(async (params = {}) => {
     // 开启loading
     details.loadingObj.list = true;
 
+    const { startArr, createTimeArr, arriveTimeArr } = details.query;
+
+    // 发车时间
+    if (getObjType(startArr) === 'array' && startArr.length > 0) {
+      params.startDate = startArr[0];
+      params.endDate = startArr[1];
+    }
+
+    // 到车时间
+    if (getObjType(arriveTimeArr) === 'array' && arriveTimeArr.length > 0) {
+      params.arriveTimeStartStr = arriveTimeArr[0];
+      params.arriveTimeEndStr = arriveTimeArr[1];
+    }
+
+    // 创建时间
+    if (getObjType(createTimeArr) === 'array' && createTimeArr.length > 0) {
+      params.createTimeStartStr = createTimeArr[0];
+      params.createTimeEndStr = createTimeArr[1];
+    }
+
     // 请求页面数据
     const res = await postloadArriveCarsPageList(details.page, { ...details.query, ...params });
     const { code, data } = res.data;

src/views/distribution/artery/VehicleStowage.vue

@@ -8,9 +8,10 @@
           <!-- <el-form-item label="车次号:">
             <el-input v-model="query.serviceNumber" placeholder="请输入车次号" clearable></el-input>
           </el-form-item> -->
-          <el-form-item label="提货时间:" class="el-times">
+
+          <el-form-item label="实际发车:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.startArr"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -22,9 +23,9 @@
             />
           </el-form-item>
 
-          <el-form-item label="实际发车:" class="el-times">
+          <el-form-item label="到车时间:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.arriveTimeArr"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -38,7 +39,7 @@
 
           <el-form-item label="创建时间:" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="details.query.createTimeArr"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -536,6 +537,7 @@ import {
   handleClearTableQuery,
   handleTranslationDataSeclect,
   computeNumber,
+  getObjType,
 } from '@/utils/util';
 import { columnList, packageColumnList } from '@/option/distribution/VehicleStowage';
 import {
@@ -759,6 +761,25 @@ const onLoad = debounce(async (params = {}) => {
     // 开启loading
     details.loadingObj.list = true;
 
+    const { startArr, createTimeArr, arriveTimeArr } = details.query;
+
+    // 发车时间
+    if (getObjType(startArr) === 'array' && startArr.length > 0) {
+      params.startDate = startArr[0];
+      params.endDate = startArr[1];
+    }
+
+    // 到车时间
+    if (getObjType(arriveTimeArr) === 'array' && arriveTimeArr.length > 0) {
+      params.arriveTimeStartStr = arriveTimeArr[0];
+      params.arriveTimeEndStr = arriveTimeArr[1];
+    }
+
+    // 创建时间
+    if (getObjType(createTimeArr) === 'array' && createTimeArr.length > 0) {
+      params.createTimeStartStr = createTimeArr[0];
+      params.createTimeEndStr = createTimeArr[1];
+    }
     // 请求页面数据
     const res = await postloadCarsPageList(details.page, { ...details.query, ...params });
     const { code, data } = res.data;

src/views/distribution/artery/zeroAdditionalRecording.vue

@@ -8,10 +8,9 @@
         <!-- 列表模块 -->
         <div style="width: 49%">
           <el-divider content-position="left">运单池</el-divider>
-          <div v-if="!search">
-            <el-form :inline="true" label-width="80px" :model="details.oldQuery" class="el-fr-d">
-              <div class="fo-fl">
-                <!-- <el-form-item label="关键词" class="el-times">
+          <div v-h5uShow="!search">
+            <el-form :inline="true" label-width="100px" :model="details.oldQuery" class="el-fr-d">
+              <!-- <el-form-item label="关键词" class="el-times">
                   <el-input></el-input>
                 </el-form-item>
                 <el-form-item label="目的网点" class="el-times">
@@ -25,30 +24,29 @@
                 </el-form-item>
                 <el-form-item label="备注" class="el-times">
                   <el-input></el-input>
-                </el-form-item>
-                <el-form-item label="托盘码" class="el-times">
-                  <el-input></el-input>
-                </el-form-item> -->
-                <el-form-item label="开单时间" class="el-times">
-                  <el-date-picker
-                    v-model="stockupDate"
-                    type="daterange"
-                    unlink-panels
-                    range-separator="-"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间"
-                    :shortcuts="shortcuts"
-                    value-format="YYYY-MM-DD"
-                    clearable
-                  />
-                </el-form-item>
-                <!-- <el-form-item>
-                  <el-button type="primary" icon="el-icon-search" @click="searchReset()"
-                    >搜 索</el-button
-                  >
-                  <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
                 </el-form-item> -->
-              </div>
+              <el-form-item label="合同号" class="el-times">
+                <el-input v-model="details.oldQuery.orderCodes"></el-input>
+              </el-form-item>
+              <el-form-item label="开单时间" class="el-times">
+                <el-date-picker
+                  v-model="stockupDate"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="-"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  value-format="YYYY-MM-DD"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="searchReset()"
+                  >搜 索</el-button
+                >
+                <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
+              </el-form-item>
             </el-form>
           </div>
 
@@ -786,9 +784,9 @@ watch(
   height: 100% !important;
 }
 
-:deep(.el-form--inline .el-form-item) {
-  margin-right: 0;
-}
+// :deep(.el-form--inline .el-form-item) {
+//   margin-right: 0;
+// }
 
 // 新增行
 .add_row {

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -853,7 +853,7 @@
         </div>
       </el-dialog>
 
-      <el-dialog
+      <!-- <el-dialog
         title="二维码"
         :visible.sync="dialogVisibleF"
         width="70vw"
@@ -866,11 +866,11 @@
           <el-button @click="dialogVisibleF = false">关 闭</el-button>
           <el-button type="primary" icon="Printer" @click="printTemplate">打 印</el-button>
         </span>
-      </el-dialog>
+      </el-dialog> -->
     </div>
 
     <!-- 打印模块 -->
-    <el-dialog title="二维码" :visible.sync="isShowPrint" width="780px" v-model="isShowPrint">
+    <!-- <el-dialog title="二维码" :visible.sync="isShowPrint" width="780px" v-model="isShowPrint">
       <div class="BarCode">
         <div v-html="html"></div>
       </div>
@@ -878,7 +878,9 @@
         <el-button @click="isShowPrint = false">关 闭</el-button>
         <el-button type="primary" icon="Printer" @click="printTemplatePackage">打 印</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
+    <MyPrint :html="html" v-model="isShowPrint" type="titlePrint" width="780px"></MyPrint>
+    <MyPrint :html="html" v-model="dialogVisibleF" width="70%"></MyPrint>
 
     <el-dialog
       title="异常装车包件列表"
@@ -4754,7 +4756,7 @@ export default {
         });
         return;
       }
-      let temp =false;
+      let temp = false;
       temp = this.selectionList.every(item => item.signingStatusName == '待签收');
       console.log(temp, '批量签收状态');
       if (!temp) {
@@ -5694,13 +5696,13 @@ export default {
     },
     // 零担
     zeroChange(pageSize) {
-      console.log(pageSize,'pageSize')
+      console.log(pageSize, 'pageSize');
       this.zeroPg.pageSize = pageSize;
       this.truckload(this.zeroPg);
     },
     // 零担
     zerocurrentChange(currentPage) {
-      console.log(currentPage,'currentPage')
+      console.log(currentPage, 'currentPage');
       this.zeroPg.currentPage = currentPage;
       console.log(this.zeroPg.currentPag);
       this.truckload(this.zeroPg);

src/views/distribution/inventory/CreateOrder.vue

@@ -2028,6 +2028,9 @@ const onLoad = async (idsArr = []) => {
     details.query.transportType = details.query.transportType || '1';
     details.query.deliveryWay = details.query.defaultDeliveryWay || '1';
 
+    if (!details.query.defaultDeliveryWay && !details.query.consigneeId)
+      details.query.deliveryWay = '2';
+
     handleFindPrice();
   } catch (error) {
     console.log('error :>> ', error);