Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/option/warehouse/warehouseRetentionRecord.js

@@ -24,7 +24,7 @@ export const columnList = [
   {
     prop: 'trainNumber',
     label: '车次号',
-    type: 1,
+    type:2,
     values: '',
     width: '180',
     checkarr: [],
@@ -34,7 +34,7 @@ export const columnList = [
   {
     prop: 'reservationCode',
     label: '预约编号',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -44,7 +44,7 @@ export const columnList = [
   {
     prop: 'waybillNumber',
     label: '运单号',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -66,7 +66,7 @@ export const columnList = [
   {
     prop: 'orderPackageCode',
     label: '包条码',
-    type: 1,
+    type:2,
     values: '',
     width: '180',
     checkarr: [],
@@ -101,7 +101,7 @@ export const columnList = [
   {
     prop: 'retentionScanTime',
     label: '滞留扫描时间',
-    type: 1,
+    type: 4,
     values: '',
     width: '180',
     checkarr: [],
@@ -111,7 +111,7 @@ export const columnList = [
   {
     prop: 'retentionScanUsername',
     label: '滞留操作人',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -132,7 +132,7 @@ export const columnList = [
   {
     prop: 'warehouseName',
     label: '仓库名称',
-    type: 1,
+    type:2,
     values: '',
     width: '180',
     checkarr: [],

src/views/reportforms/DeliveryCustomers.vue

@@ -13,11 +13,12 @@
               <el-date-picker
                v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
+              :default-time="defaultTime2"
                @change="Toptiem"
             />
             </el-form-item>
@@ -196,6 +197,7 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -283,6 +285,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */

src/views/reportforms/DeliveryDetails.vue

@@ -13,15 +13,26 @@
               <el-date-picker
               v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
-                @change="Toptiem"
+              :default-time="defaultTime2"
+            />
+            </el-form-item>
+            <el-form-item label="扫描签收时间">
+              <el-date-picker
+              v-model="TopQuery.Signfor"
+              type="datetimerange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
             </el-form-item>
-
             <el-form-item label="仓库">
               <el-select
                 multiple
@@ -216,6 +227,7 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -303,6 +315,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */
@@ -368,6 +381,15 @@ const searchChange = () => {
     delete queryCarn.value.startTaskTime;
     delete queryCarn.value.endTaskTime;
   }
+
+  // 签收扫描时间
+  if (TopQuery.value.Signfor?.length) {
+    queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+  } else {
+    delete queryCarn.value.startTaskTime;
+    delete queryCarn.value.endTaskTime;
+  }
   // 仓库处理
   if (TopQuery.value.warehouseNameRange?.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');

src/views/reportforms/DeliveryTrainNumber.vue

@@ -13,11 +13,12 @@
             <el-date-picker
               v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
+              :default-time="defaultTime2"
               @change="Toptiem"
             />
             </el-form-item>
@@ -206,6 +207,7 @@ const details = reactive({
   /** 表格搜索条件 */
   query: {},
   /** 时间快捷选择设置 */
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   shortcuts: [
     {
       text: '最近一周',
@@ -292,6 +294,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */

src/views/reportforms/InventoryOutbound.vue

@@ -13,12 +13,12 @@
               <el-date-picker
               v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
-                @change="Toptiem"
+              :default-time="defaultTime2"
             />
             </el-form-item>
             <el-form-item label="仓库">
@@ -207,6 +207,7 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -294,6 +295,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */

src/views/reportforms/InventoryReceipt.vue

@@ -13,12 +13,12 @@
               <el-date-picker
               v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
-                @change="Toptiem"
+              :default-time="defaultTime2"
             />
             </el-form-item>
 
@@ -208,6 +208,7 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -295,6 +296,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */

src/views/reportforms/Selfpickupreport.vue

@@ -14,11 +14,12 @@
               <el-date-picker
               v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
             </el-form-item>
 
@@ -171,6 +172,7 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -258,6 +260,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */

src/views/reportforms/Selfpickuptask.vue

@@ -13,12 +13,12 @@
               <el-date-picker
               v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
-                @change="Toptiem"
+              :default-time="defaultTime2"
             />
             </el-form-item>
 
@@ -207,6 +207,7 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -294,6 +295,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */

src/views/reportforms/Stockordertable.vue

@@ -13,12 +13,12 @@
               <el-date-picker
               v-model="TopQuery.time"
               type="datetimerange"
-                start-placeholder="开始日期"
+              unlink-panels
-                end-placeholder="结束日期"
+              range-separator="至"
-                format="YYYY-MM-DD"
+              start-placeholder="开始时间"
-                date-format="YYYY/MM/DD"
+              end-placeholder="结束时间"
-                time-format="A"
+              :shortcuts="shortcuts"
-                @change="Toptiem"
+              :default-time="defaultTime2"
             />
             </el-form-item>
 
@@ -192,6 +192,7 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -279,6 +280,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  defaultTime2,
 } = toRefs(details);
 
 /** 展开列表控件 */

src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue

@@ -249,6 +249,7 @@ const currentChange = val => {
 // 刷新按钮
 const searchChangeS = () => {
   details.search = false; //关闭搜索
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {
@@ -276,9 +277,13 @@ const onLoad = () => {
     size: details.page.pageSize,
     ...details.query,
   };
+  
+  details.loadingObj.list = true;
   $_warehouseRetentionRecordPage(data).then(res => {
     console.log(res, '返回值');
-    details.data = res.data.data.records;
+    if (res.data.code == 200) {
+      details.data = res.data.data.records || [];
+      if (details.data?.length) {
         details.data.forEach(item => {
           if (item.retentionWay == 1) {
             item.retentionWayNameS = '扫描';
@@ -293,9 +298,14 @@ const onLoad = () => {
             item.scanTypeNameS = '托盘';
           }
         });
-    details.page.total = res.data.data.total;
+      }
+      details.page.total = res.data.data.total||0;
+    }
+  }).catch(()=>{
+
+  }).finally(()=>{
     details.loadingObj.list = false;
-  });
+  })
 };
 onLoad();
 const view = row => {