修复已知bug

src/views/aftersales/aftersalesWorkOrder.vue

@@ -112,7 +112,11 @@
               @click="WorkOrderAssignment"
               >工单指派</el-button
             >
-            <el-button type="primary" icon="User" v-if="ButtonPermissions.applyArbitration"
+            <el-button
+              type="primary"
+              icon="User"
+              v-if="ButtonPermissions.applyArbitration"
+              @click="CustomerServiceIntervention"
               >客服介入</el-button
             >
             <el-button
@@ -371,6 +375,44 @@
       </template>
     </el-dialog>
 
+    <!-- 客服介入 -->
+    <el-dialog
+      v-model="CustomerServiceForm.loadingCustomer"
+      :close-on-click-modal="false"
+      title="客服介入"
+      width="35%"
+      class="el_Customer"
+    >
+      <el-form
+        :model="CustomerServiceForm"
+        v-loading="CustomerServiceForm.dialog"
+        element-loading-text="正在处理中..."
+        label-position="top"
+      >
+        <el-form-item label="介入原因">
+          <el-input
+            v-model="CustomerServiceForm.reasonRemarks"
+            :autosize="{ minRows: 6, maxRows: 6 }"
+            type="textarea"
+            placeholder="请输入介入原因"
+          />
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="CustomerServiceForm.loadingCustomer = false">关闭</el-button>
+          <el-button
+            type="primary"
+            @click="InterventionSubmission"
+            :disabled="CustomerServiceForm.dialog"
+          >
+            提交
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+
     <!-- 搜索弹窗 -->
     <div class="Searchboxpop-upwindow">
       <el-dialog
@@ -437,7 +479,7 @@
         content="从服务器导出数据,数据量大时可能会导致卡顿"
         placement="top-start"
       >
-        <el-button type="primary" @click="NetworkExport"> 网络导出 </el-button>
+        <el-button class="el_title_a" type="primary" @click="NetworkExport"> 全部导出 </el-button>
       </el-tooltip>
       <el-tooltip
         class="box-item"
@@ -445,7 +487,7 @@
         content="从本地导出,导出当前页面支持自【定义导出字段】和【自定义表名】"
         placement="top-end"
       >
-        <el-button type="primary" @click="LocalExport"> 本地导出 </el-button>
+        <el-button class="el_title_b" type="primary" @click="LocalExport"> 本地导出 </el-button>
       </el-tooltip>
     </el-dialog>
 
@@ -615,6 +657,7 @@ import {
   MallassignmentColumnList,
   customerserviceColumnList,
 } from '@/option/aftersales/vueTvemp.js';
+import { objectKeys } from '@antfu/utils';
 const Tableexportcomponent = defineAsyncComponent(() =>
   import('@/components/Tableexportcomponent/Tableexportcomponent.vue')
 );
@@ -660,6 +703,11 @@ const ExportObjects = ref({
   tcTableexport: false, //本地导出
   ExportSelection: false, //导出选择弹窗
 });
+// 客服介入
+const CustomerServiceForm = ref({
+  loadingCustomer: false,
+  dialog: false,
+});
 // 钉钉号
 const DingTalkfilling = ref({
   dialogDingTalk: false,
@@ -1230,6 +1278,8 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = async () => {
+  let _Obj = MatchCurrentMenu(); //匹配出当前菜单
+  _Obj.currentPage = 1;
   await ProcessSearch();
   updateMenuAndData(); //获取最新数据
 };
@@ -1241,6 +1291,7 @@ const searchChangeS = () => {
 // 重置表格搜索
 const ResetTableSearch = async () => {
   let _Obj = MatchCurrentMenu();
+  _Obj.currentPage = 1;
   console.log(TabPermissions.value, '123123123');
   _Obj.request = true;
   console.log(_Obj, 'Obj');
@@ -1251,6 +1302,8 @@ const ResetTableSearch = async () => {
 //清空
 const searchReset = () => {
   TopQuery.value = {};
+  let _Obj = MatchCurrentMenu();
+  _Obj.currentPage = 1;
   TabList.value.forEach(item => {
     item.query = {};
   });
@@ -1722,6 +1775,27 @@ const updateMenuAndData = () => {
   }
   PublicDataRequest(TabPermissions.value); // 请求数据
 };
+/**
+ * @description: 处理空白数据
+ * @param {object} data - 包含记录的数据对象
+ * @returns {array} - 处理后的记录数组
+ */
+const replaceNullWithSlash = data => {
+  const newRecords = [];
+  const records = data.records;
+
+  for (let i = 0; i < records.length; i++) {
+    const newRecord = { ...records[i] };
+    for (const key in newRecord) {
+      if (newRecord[key] === null || newRecord[key] === '') {
+        newRecord[key] = '/';
+      }
+    }
+    newRecords.push(newRecord);
+  }
+
+  return newRecords;
+};
 /**
  * @description 通用函数用于处理数据请求（包含待回复、理赔金额未出、申诉、超时未处理）
  * @param {Function} fetchFunction - 用于执行具体数据请求的函数
@@ -1743,8 +1817,8 @@ const fetchData = async (fetchFunction, reset) => {
     if (code !== 200) {
       return;
     }
-
     DataAndStateProcessing(data); // 对数据和状态处理
+    details.data = replaceNullWithSlash(data);
   } catch (error) {
     console.log(error);
   }
@@ -1792,6 +1866,8 @@ const Publicaccessdata = async Reset => {
       return;
     }
     DataAndStateProcessing(data); //对数据和状态处理
+    details.data = replaceNullWithSlash(data);
+
     console.log(_res, '公共数据菜单=:' + TabPermissions.value);
     console.log(TabList.value, '公共菜单');
   } catch (error) {
@@ -2493,6 +2569,60 @@ const WorkOrderAssignment = () => {
   assignFrom.value = { ...assignFrom.value, businessDepartment: '', dialogassign: true };
 };
 
+/**
+ * @description 客服介入
+ * @return {void} 无返回值
+ */
+const CustomerServiceIntervention = () => {
+
+  if (!details.selectionList.length) {
+    // 提示用户选择数据
+    ElMessage({
+      message: '请勾选要客服介入的数据',
+      type: 'warning',
+    });
+    return;
+  }
+  ElMessage({
+    message: '功能维护中...',
+    type: 'warning',
+  });
+  return;
+  CustomerServiceForm.value.loadingCustomer = true;
+  CustomerServiceForm.value.reasonRemarks = '';
+};
+/**
+ * @description 客服介入提交
+ * @return {void} 无返回值
+ */
+const InterventionSubmission = async () => {
+  CustomerServiceForm.value.loading = true;
+
+  try {
+    let data = {
+      assignList: [],
+      reasonRemarks: CustomerServiceForm.value.reasonRemarks, //客服介入原因
+    };
+    data['assignList'] = details.selectionList.map(item => {
+      return item.id;
+    });
+    let res = await $_arbitrate(data);
+    const { code, msg } = res.data;
+    if (code == 200) {
+      CustomerServiceForm.value.loadingCustomer = false;
+      updateMenuAndData(); //获取最新数据
+      ElMessage({
+        message: msg,
+        type: 'success',
+      });
+    }
+  } catch (error) {
+    console.log(error);
+  } finally {
+    CustomerServiceForm.value.loading = false;
+  }
+  // 处理中，待处理可申请
+};
 /**
  * 工单指派确定按钮
  * 1.根据选择的客服ID,名称,和选择的工单ID,将其组装成一个data对象
@@ -2888,7 +3018,6 @@ const ProcessedExported = async dataID => {
 }
 :deep(.plAllret) {
   height: 30%;
-
   display: flex;
   flex-direction: column;
   .el-select {
@@ -2901,6 +3030,11 @@ const ProcessedExported = async dataID => {
     justify-content: flex-end;
   }
 }
+:deep(.el_Customer) {
+  .el-form-item {
+    flex-direction: column;
+  }
+}
 :deep(.el-fr-d) {
   display: flex;
   .el-form-item {
@@ -3001,16 +3135,56 @@ const ProcessedExported = async dataID => {
   align-items: center;
   justify-content: center;
   flex-direction: column;
+  .el_title_a,
+  .el_title_b {
+    position: relative;
+  }
+  .el_title_a::after {
+    content: '导出全部数据【如果存在“ 勾选 ”数据则默认导出“ 勾选 ”数据】';
+    position: absolute;
+    color: #ff0000;
+    border: 1px solid #ff0000;
+    border-top: none;
+    padding: 4px;
+    border-radius: 22px;
+    top: -40px;
+    left: -50%;
+  }
+  .el_title_a::before {
+    content: '▼';
+    position: absolute;
+    color: #ff0000;
+    top: -18px;
+    left: 80px;
+  }
+  .el_title_b::after {
+    content: '目前只支持导出 " 当前页面 " 不会卡顿，速度很快';
+    position: absolute;
+    color: #ff0000;
+    border: 1px solid #ff0000;
+    border-bottom: none;
+    padding: 4px;
+    border-radius: 10px;
+    bottom: -40px;
+    right: -50%;
+  }
+  .el_title_b::before {
+    content: '▲';
+    position: absolute;
+    color: #ff0000;
+    bottom: -18px;
+    left: 80px;
+  }
   .el-dialog__body {
     width: 100%;
-    height: 100%;
+    height: 44%;
     display: flex;
     align-items: center;
     justify-content: space-evenly;
     border-radius: 12px;
     .el-button {
       width: 30%;
-      height: 44%;
+      height: 100%;
     }
   }
 }

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -682,7 +682,7 @@
               v-if="PermissionButton.Arbitration_completed"
               type="primary"
               class="button"
-              @click="CustomerServiceCompleted"
+              @click="ArbitrationSubmission"
               >客服仲裁完结</el-button
             >
             <el-button type="primary" v-if="PermissionButton.repulse" @click="BatchReturn"
@@ -1263,13 +1263,19 @@ const Completedsubmission = () => {
     return true;
   }
   // 否则只能总部客服和经理展示
-  if (UserPermissions.value == Useridentity.Headquarters_customer_service || UserPermissions.value == Useridentity.Headquarters_Manager) {
+  if (
+    UserPermissions.value == Useridentity.Headquarters_customer_service ||
+    UserPermissions.value == Useridentity.Headquarters_Manager
+  ) {
     return true;
   }
   return false;
 };
 const CompletedPresentation = () => {
-  if ( UserPermissions.value == Useridentity.Headquarters_customer_service || UserPermissions.value == Useridentity.Headquarters_Manager) {
+  if (
+    UserPermissions.value == Useridentity.Headquarters_customer_service ||
+    UserPermissions.value == Useridentity.Headquarters_Manager
+  ) {
     // 客服介入
     if (['70'].includes($route.query.workOrderStatus)) {
       return false;
@@ -1322,13 +1328,12 @@ const Processingresultmodification = () => {
 
 // 客服仲裁完结
 const Arbitrationcompleted = () => {
-  return false;
   if (
     UserPermissions.value == Useridentity.Headquarters_customer_service ||
     UserPermissions.value == Useridentity.Headquarters_Manager
   ) {
     //总部客服、总部客服经理
-    if ($route.query.workOrderStatus == '10') {
+    if (['70'].includes($route.query.workOrderStatus)) {
       return true;
     }
   }
@@ -2617,7 +2622,14 @@ const CustomerServiceCompleted = () => {
   });
   $useStore.commit('DEL_TAG_CURRENT');
 };
-
+// 客服仲裁完结提交
+const ArbitrationSubmission = () => {
+  ElMessage({
+    message: '功能维护中...',
+    type: 'warning',
+  });
+  return;
+};
 // 处理结果打回
 const resultreturnedFun = () => {
   BatchFrom.value.businessDepartment = [];

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -323,6 +323,7 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { addIncrement } from '@/api/distribution/distributionStockArticle';
 import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
 import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
+import dayjs from 'dayjs';
 import print from '@/utils/print';
 import {
   downloadXls,
@@ -331,12 +332,13 @@ import {
   handleSelectQuery,
   setNodeHeight,
 } from '@/utils/util';
-import { ElMessage, ElMessageBox } from 'element-plus';
+import { ElMessage, ElMessageBox, tourEmits } from 'element-plus';
 import * as XLSX from 'xlsx';
 export default {
   data() {
     return {
       height: 0,
+      currentdate:true,
       // 弹框标题
       title: '',
       // 是否展示弹框
@@ -984,10 +986,25 @@ export default {
         this.loadingObj.pageLoading = false;
       }
     },
+    Getcurrentdate() {
+      // 获取当前日期
+      const currentDate = dayjs();
+      // 计算一个月前的日期
+      const startDate = currentDate.subtract(1, 'month');
+      // 格式化日期为 'YYYY-MM-DD'
+      const formatDate = date => date.format('YYYY-MM-DD');
+      this.query.taskTimeArr = [];
+      this.query.taskTimeArr[0] = formatDate(startDate); // 一个月前的日期
+      this.query.taskTimeArr[1] = formatDate(currentDate); // 当前日期
+    },
 
-    onLoad(page, params = {}) {
+  async  onLoad(page, params = {}) {
       this.loading = true;
       this.query.type = '1';
+      if(this.currentdate){
+        await this.Getcurrentdate()
+      }
+  
       const submitData = { ...params, ...this.query };
 
       if (getObjType(this.query.taskTimeArr) === 'array') {
@@ -1024,6 +1041,7 @@ export default {
         this.page.total = data.total;
         this.data = data.records;
         // data.records
+        this.currentdate = false;
         this.loading = false;
         this.selectionClear();
       });

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -223,6 +223,7 @@ import {
   printBatch,
   getDeliveryListExport,
 } from '@/api/distribution/distributionDeliveryList';
+import dayjs from 'dayjs';
 import option from '@/option/distribution/distributionDeliveryList';
 // import distributionDeliveryListmar from '@/components/distributionDeliveryListmar/distributionDeliveryListmar.vue';
 import { mapGetters } from 'vuex';
@@ -248,6 +249,7 @@ export default {
   data() {
     return {
       height: 0,
+      currentdate:true,
       dydialogVisible: false,
       // 弹框标题
       title: '',
@@ -773,9 +775,24 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad(page, params = {}) {
+    Getcurrentdate() {
+      // 获取当前日期
+      const currentDate = dayjs();
+      // 计算一个月前的日期
+      const startDate = currentDate.subtract(1, 'month');
+      // 格式化日期为 'YYYY-MM-DD'
+      const formatDate = date => date.format('YYYY-MM-DD');
+      this.query.taskTimeArr = [];
+      this.query.taskTimeArr[0] = formatDate(startDate); // 一个月前的日期
+      this.query.taskTimeArr[1] = formatDate(currentDate); // 当前日期
+    },
+   async onLoad(page, params = {}) {
       this.loading = true;
       this.query.type = '2';
+      if(this.currentdate){
+        await this.Getcurrentdate()
+      }
+  
       const submitData = { ...params, ...this.query };
 
       if (getObjType(this.query.taskTimeArr) === 'array') {
@@ -812,6 +829,7 @@ export default {
         this.page.total = data.total || 0;
         this.data = data.records || [];
         this.loading = false;
+        this.currentdate=false;
         this.selectionClear();
       });
       getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -12,6 +12,7 @@
               range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
 
@@ -23,6 +24,7 @@
               range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
 
@@ -33,6 +35,7 @@
               unlink-panels
               range-separator="至"
               start-placeholder="开始时间"
+              value-format="YYYY-MM-DD"
               end-placeholder="结束时间"
             />
           </el-form-item>
@@ -745,10 +748,6 @@ export default {
           console.log(res, '获取到的页面初始值');
           for (let index = 0; index < data.records.length; index++) {
             const element = data.records[index];
-            if (element.warehouseEntryTimeEnd) {
-              element.warehouseEntryTimeEnd = this.formatDateTime(element.warehouseEntryTimeEnd);
-            }
-
             element.conditionsType = element.conditions === 1 ? '定制品' : '库存品';
           }
           this.page.total = data.total;
@@ -973,21 +972,28 @@ export default {
     },
     searchChange() {
       if (
-        this.warehouseEntryTimeEnd.length === 0 &&
-        this.loadingTime.length === 0 &&
-        this.signingTime.length === 0
-      )
+        !this.warehouseEntryTimeEnd?.length &&
+        !this.loadingTime.length &&
+        !this.signingTime.length
+      ) {
         return this.$message.warning('请选择时间!!!');
+      }
 
-      /** 入库时间 */
-      this.query.startWarehouseEntryTimeEnd = this.warehouseEntryTimeEnd[0];
-      this.query.lastWarehouseEntryTimeEnd = this.warehouseEntryTimeEnd[1];
-      /** 装车时间 */
-      this.query.startLoadingTime = this.loadingTime[0];
-      this.query.lastLoadingTime = this.loadingTime[1];
-      /** 签收时间 */
-      this.query.startSigningTime = this.signingTime[0];
-      this.query.lastSigningTime = this.signingTime[1];
+      if (this.warehouseEntryTimeEnd?.length) {
+        /** 入库时间 */
+        this.query.startWarehouseEntryTimeEnd = this.warehouseEntryTimeEnd[0];
+        this.query.lastWarehouseEntryTimeEnd = this.warehouseEntryTimeEnd[1];
+      }
+      if (this.loadingTime?.length) {
+        /** 装车时间 */
+        this.query.startLoadingTime = this.loadingTime[0];
+        this.query.lastLoadingTime = this.loadingTime[1];
+      }
+      if (this.signingTime?.length) {
+        /** 签收时间 */
+        this.query.startSigningTime = this.signingTime[0];
+        this.query.lastSigningTime = this.signingTime[1];
+      }
 
       this.onLoad(this.page);
     },
@@ -1103,16 +1109,6 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    formatDateTime(dateTimeString) {
-      // 检查时间字符串是否以 "00:00:00" 结束
-      if (dateTimeString.endsWith('00:00:00')) {
-        // 如果是，去除时间部分（包括前面的空格）
-        return dateTimeString.slice(0, -9);
-      } else {
-        // 如果不是，返回原始字符串
-        return dateTimeString;
-      }
-    },
   },
 };
 </script>