Merge branch 'dev' into pre-production

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1301,13 +1301,36 @@ const ResetTableSearch = async () => {
   PublicDataRequest(TabPermissions.value, true);
 };
 //清空
+// const searchReset = () => {
+//   TopQuery.value = {};
+//   let _Obj = MatchCurrentMenu();
+//   _Obj.currentPage = 1;
+//   TabList.value.forEach(item => {
+//     item.query = {};
+//   });
+//   const TabcolumnList = [
+//     columnList,
+//     columnList1,
+//     columnList2,
+//     columnList3,
+//     columnList4,
+//     columnList5,
+//     columnList6,
+//     columnList7,
+//     columnList8,
+//     columnList9,
+//     columnList10,
+//   ];
+
+//   TabcolumnList.forEach(item => {
+//     handleClearTableQuery(item);
+//   });
+//   details.search = false; // 关闭搜索
+//   updateMenuAndData(); //获取最新数据
+//   autoscaling();
+// };
+
 const searchReset = () => {
-  TopQuery.value = {};
-  let _Obj = MatchCurrentMenu();
-  _Obj.currentPage = 1;
-  TabList.value.forEach(item => {
-    item.query = {};
-  });
   const TabcolumnList = [
     columnList,
     columnList1,
@@ -1321,14 +1344,19 @@ const searchReset = () => {
     columnList9,
     columnList10,
   ];
-
-  TabcolumnList.forEach(item => {
-    handleClearTableQuery(item);
-  });
+  TopQuery.value = {};
+  let _Obj = MatchCurrentMenu();
+  _Obj.currentPage = 1;
+  const TabListLength = TabList.value.length;
+  for (let i = 0; i < TabListLength; i++) {
+    TabList.value[i].query = {};
+    handleClearTableQuery(TabcolumnList[i]);
+  }
   details.search = false; // 关闭搜索
-  updateMenuAndData(); //获取最新数据
+  updateMenuAndData();
   autoscaling();
 };
+
 // 顶部搜索
 const searchHide = () => {
   console.log(details);

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -1059,9 +1059,9 @@ export default {
       const currentDate = dayjs();
       // 计算一个月前的日期
       // 获取当前月份的第一天
-      const startDate = currentDate.startOf('month');
+      const startDate = currentDate.subtract(23, 'day');
       // 获取当前月份的最后一天
-      const endDate = currentDate.endOf('month');
+      const endDate = currentDate.add(7, 'day');
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
       this.Deliverydate = [];

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -990,9 +990,9 @@ export default {
       // 获取当前日期
       const currentDate = dayjs();
       // 获取当前月份的第一天
-      const startDate = currentDate.startOf('month');
+      const startDate = currentDate.subtract(23, 'day');
       // 获取当前月份的最后一天
-      const endDate = currentDate.endOf('month');
+      const endDate = currentDate.add(7, 'day');
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
       this.query.taskTimeArr = [];

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -779,9 +779,10 @@ export default {
       // 获取当前日期
       const currentDate = dayjs();
       // 获取当前月份的第一天
-      const startDate = currentDate.startOf('month');
+      const startDate = currentDate.subtract(23, 'day');
       // 获取当前月份的最后一天
-      const endDate = currentDate.endOf('month');
+      const endDate = currentDate.add(7, 'day');
+
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
       this.query.taskTimeArr = [];

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -1134,9 +1134,10 @@ export default {
       // 获取当前日期
       const currentDate = dayjs();
       // 获取当前月份的第一天
-      const startDate = currentDate.startOf('month');
+      const startDate = currentDate.subtract(23, 'day');
+
       // 获取当前月份的最后一天
-      const endDate = currentDate.endOf('month');
+      const endDate = currentDate.add(7, 'day');
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
       this.Deliverytime = [];

src/views/distribution/reservation/reservation.vue

@@ -333,14 +333,16 @@
   </el-dialog>
 
   <el-dialog title="预约取消" v-model="dialogCancelReservation" style="width: 30%; height: 40%">
-    <el-form :model="cancel">
-      <el-form-item label="原因:">
-        <el-input v-model="cancel.message" autocomplete="off"></el-input>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="dialogCancelReservation = false">取 消</el-button>
-      <el-button type="primary" @click="cancelReservationConfirm(row)">确 定</el-button>
+    <div v-loading="dialogCancelReservationloading" element-loading-text="Loading..." class="el_gCancelReservation">
+      <el-form :model="cancel">
+        <el-form-item label="原因:">
+          <el-input     :rows="4"   type="textarea" v-model="cancel.message" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogCancelReservation = false">关 闭</el-button>
+        <el-button type="primary" @click="cancelReservationConfirm(row)" :disabled="dialogCancelReservationloading">确 定</el-button>
+      </div>
     </div>
   </el-dialog>
 
@@ -387,6 +389,7 @@ export default {
   data() {
     return {
       // 弹出框是否显示
+      dialogCancelReservationloading: false,
       dialogVisible: false,
       // 打印模版的html
       html: '',
@@ -1100,6 +1103,7 @@ export default {
         this.$message.warning('请输入取消原因!!');
         return;
       }
+      this.dialogCancelReservationloading = true;
       let data = {};
       if (this.cancelReservationRow) {
         data = this.cancelReservationRow;
@@ -1108,11 +1112,19 @@ export default {
         this.$message.error('请稍后再试!!');
         return;
       }
-      cancelReservation(data).then(res => {
-        this.onLoad(this.page);
-        this.cancelReservationRow = {};
-        this.dialogCancelReservation = false;
-      });
+      cancelReservation(data)
+        .then(res => {
+          this.onLoad(this.page);
+          this.cancelReservationRow = {};
+          this.dialogCancelReservation = false;
+        })
+        .catch(err => {
+          console.log(err);
+          
+        })
+        .finally(() => {
+          this.dialogCancelReservationloading = false;
+        });
     },
     ddd() {
       this.form.deliveryType === '';
@@ -1746,4 +1758,10 @@ export default {
 .avue-crud {
   height: 100%;
 }
+.el_gCancelReservation{
+  .el-form-item{
+    width: 100%;
+    flex-direction: column;
+  }
+}
 </style>

src/views/reportforms/DeliveryDetailsReport.vue

@@ -283,9 +283,13 @@ function updateDictionary(targetArray, dictionaryType) {
 
 // 页面初始化
 const onLoad = async () => {
-  console.log($route, '地址栏数据');
   try {
     details.loadingObj.list = true;
+    if ($route.query.deliveryType) {
+      details.columnList.find(item => item.prop == 'deliveryType').type = 1;
+    } else {
+      details.columnList.find(item => item.prop == 'deliveryType').type = 3;
+    }
     let submit = {
       current: details.page.currentPage,
       size: details.page.pageSize,

src/views/reportforms/DeliveryStatisticsReport.vue

@@ -182,7 +182,7 @@ const queryCarn = ref({});
 const DeliveryTypeList = ref([
   {
     label: '全部',
-    value: '商配,市配',
+    value: '商配,市配,自提',
   },
   {
     label: '商配',
@@ -192,6 +192,10 @@ const DeliveryTypeList = ref([
     label: '市配',
     value: '市配',
   },
+  {
+    label: '自提',
+    value: '自提',
+  },
 ]);
 const TopQuery = ref({
   warehouseNameRange: [],