From 928ce303640ec457f45a5760aaa60053be925b12 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 19 Nov 2024 17:38:23 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/aftersales/aftersalesWorkOrder.js     |   2 +-
 .../MultiConditionSearch.vue                  |  11 +-
 src/views/aftersales/aftersalesWorkOrder.vue  | 224 +++++++++++++++++-
 .../aftersales/aftersalesWorkOrderAdd.vue     |   2 +-
 .../aftersales/aftersalesWorkOrderend.vue     |  35 ++-
 .../warehouse/tray/basicdataTrayedt.vue       |  17 +-
 .../delivery/distributionStockArticle.vue     |  20 +-
 src/views/waybill/WaybillOrderList.vue        |  15 +-
 8 files changed, 271 insertions(+), 55 deletions(-)

diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js
index e8fc781e..2812bc3e 100644
--- a/src/api/aftersales/aftersalesWorkOrder.js
+++ b/src/api/aftersales/aftersalesWorkOrder.js
@@ -389,7 +389,7 @@ export const $_updateWorkOrderStatus = (data) => {
     data
   })
 }
-// 处理结果完结结果确定
+// 完结审核
 export const $_updateManagerConfirmed = (data) => {
   return request({
     url: '/api/logpm-aftersales/aftersalesWorkOrder/updateManagerConfirmed',
diff --git a/src/components/MultiConditionSearch/MultiConditionSearch.vue b/src/components/MultiConditionSearch/MultiConditionSearch.vue
index 8b60419d..16bbdf83 100644
--- a/src/components/MultiConditionSearch/MultiConditionSearch.vue
+++ b/src/components/MultiConditionSearch/MultiConditionSearch.vue
@@ -100,6 +100,8 @@ const maximize = () => {
 
 const close = () => {
   emit('update:modelValue', false);
+  minimizeState.value = false;
+  emit('update:inputValue', localInputValue.value);
 };
 
 const expandWindow = () => {
@@ -114,7 +116,14 @@ const destroyWindow = () => {
 };
 
 const dialogSearchSubmit = () => {
-  emit('dialogSearchSubmit', localInputValue.value);
+  const lines = localInputValue.value
+    .split('\n') // 按换行分割
+    .map(line => line.trim()) // 移除每一行前后的空格
+    .filter(line => line !== ''); // 过滤掉空行
+
+  const joinedLines = lines.join(','); // 使用逗号连接，无空格
+  emit('dialogSearchSubmit', joinedLines);
+  emit('update:inputValue', localInputValue.value);
 };
 </script>
 
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index ef3c46d9..23a53bf8 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -115,16 +115,24 @@
             <el-button type="primary" icon="User" v-if="ButtonPermissions.applyArbitration"
               >客服介入</el-button
             >
-            <el-button type="primary" icon="EditPen" v-if="ButtonPermissions.DingTalkNumber"
+            <el-button
+              type="primary"
+              icon="EditPen"
+              v-if="ButtonPermissions.DingTalkNumber"
+              @click="DingTalk"
               >钉钉号填写</el-button
             >
-            <el-button type="primary" icon="Stamp" v-if="ButtonPermissions.batchFinish"
+            <!-- <el-button type="primary" icon="Stamp" v-if="ButtonPermissions.batchFinish"
               >批量完结</el-button
-            >
+            > -->
             <el-button type="primary" icon="Stamp" v-if="ButtonPermissions.ArbitrationDetermination"
               >批量完结审核</el-button
             >
-            <el-button type="primary" icon="Coin" v-if="ButtonPermissions.Financial_accounting"
+            <el-button
+              type="primary"
+              icon="Coin"
+              v-if="ButtonPermissions.Financial_accounting"
+              @click="Financialfillingbtn"
               >财务入账</el-button
             >
           </div>
@@ -440,6 +448,76 @@
         <el-button type="primary" @click="LocalExport"> 本地导出 </el-button>
       </el-tooltip>
     </el-dialog>
+
+    <!-- 钉钉号填写 -->
+    <el-dialog v-model="DingTalkfilling.dialogDingTalk" title="钉钉号填写" width="30%">
+      <div
+        class="el_DingTalk"
+        v-loading="DingTalkfilling.loading"
+        element-loading-text="Loading..."
+      >
+        <el-form :model="DingTalkfilling" label-width="120px">
+          <el-form-item label="钉钉流程号">
+            <el-input v-model="DingTalkfilling.processNumber" placeholder="请填写钉钉号" />
+          </el-form-item>
+          <el-form-item label="审核人">
+            <el-input v-model="DingTalkfilling.reviewedBy" placeholder="请填写审核人" />
+          </el-form-item>
+          <el-form-item label="审核时间">
+            <el-date-picker
+              v-model="DingTalkfilling.auditTime"
+              type="datetime"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择审核时间"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="DingTalkfilling.dialogDingTalk = false">关闭</el-button>
+          <el-button type="primary" @click="DingTalkSubmit" :disabled="DingTalkfilling.loading">
+            确认
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 财务入账弹窗 -->
+    <el-dialog v-model="FinancialFrom.loadingFinancial" title="财务入账" width="30%">
+      <div
+        class="el_DingTalk"
+        v-loading="FinancialFrom.loading"
+        element-loading-text="正在处理中..."
+      >
+        <el-form :model="FinancialFrom" label-width="120px">
+          <el-form-item label="操作人">
+            <el-input v-model="FinancialFrom.operator" placeholder="请填写操作人" />
+          </el-form-item>
+          <el-form-item label="财务入账时间">
+            <el-date-picker
+              v-model="FinancialFrom.entryTime"
+              type="datetime"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择财务入账时间"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="FinancialFrom.loadingFinancial = false">取消</el-button>
+          <el-button
+            type="primary"
+            @click="FinancialfillingSubmit"
+            :disabled="FinancialFrom.loading"
+          >
+            确认
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </basic-container>
   <!-- 列表配置显示 -->
   <template v-for="columnList in columnListNames" :key="columnList">
@@ -582,6 +660,16 @@ const ExportObjects = ref({
   tcTableexport: false, //本地导出
   ExportSelection: false, //导出选择弹窗
 });
+// 钉钉号
+const DingTalkfilling = ref({
+  dialogDingTalk: false,
+  loading: false,
+});
+// 财务入账
+const FinancialFrom = ref({
+  loadingFinancial: false,
+  loading: false,
+});
 // 多行搜索
 const Searchboxpop = ref({
   SearchboxpopUpwindowtitle: '', //标题
@@ -787,7 +875,9 @@ const ButtonPermissions = computed(() => {
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
-        assignment: UserPermissions.value != Useridentity.Warehouse_customer_service, //工单指派
+        assignment:
+          UserPermissions.value == Useridentity.Headquarters_Manager ||
+          UserPermissions.value == Useridentity.Headquarters_customer_service, //工单指派
         applyArbitration: UserPermissions.value == Useridentity.Warehouse_customer_service, //客服介入
         DingTalkNumber: false, //钉钉号填写
         batchFinish: false, //批量完结
@@ -804,7 +894,9 @@ const ButtonPermissions = computed(() => {
       return {
         add: false, //新增按钮
         batchReject: UserPermissions.value == Useridentity.Headquarters_customer_service, //批量打回
-        assignment: UserPermissions.value != Useridentity.Warehouse_customer_service, //工单指派
+        assignment:
+          UserPermissions.value == Useridentity.Headquarters_Manager ||
+          UserPermissions.value == Useridentity.Headquarters_customer_service, //工单指派
         applyArbitration: false, //客服介入
         DingTalkNumber: false, //钉钉号填
         batchFinish: false, //批量完结
@@ -861,7 +953,9 @@ const ButtonPermissions = computed(() => {
         DingTalkNumber: false, //钉钉号填写
         Batchdetermination: false, //批量确定
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
-        ArbitrationDetermination: UserPermissions.value != Useridentity.Warehouse_customer_service, //批量总裁完结确定
+        ArbitrationDetermination:
+          UserPermissions.value == Useridentity.Headquarters_Manager ||
+          UserPermissions.value == Useridentity.Headquarters_customer_service, //批量总裁完结确定
         Financial_accounting: false, //财务入账
         Result_review: false, //结果审核（总部审核处理结果）
         defaultassignments: false, //默认指派
@@ -875,11 +969,15 @@ const ButtonPermissions = computed(() => {
         assignment: false, //工单指派
         applyArbitration: false, //客服介入
         batchFinish: false, //批量完结
-        DingTalkNumber: UserPermissions.value != Useridentity.Warehouse_customer_service, //钉钉号填写, //钉钉号填写
+        DingTalkNumber:
+          UserPermissions.value == Useridentity.Headquarters_customer_service ||
+          UserPermissions.value == Useridentity.Headquarters_Manager, //钉钉号填写, //钉钉号填写
         Batchdetermination: false, //批量确定
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
         ArbitrationDetermination: false, //批量完结确定
-        Financial_accounting: UserPermissions.value != Useridentity.Warehouse_customer_service, //财务入账
+        Financial_accounting:
+          UserPermissions.value == Useridentity.Headquarters_Manager ||
+          UserPermissions.value == Useridentity.Headquarters_customer_service, //财务入账
         defaultassignments: false, //默认指派
         Result_review: false, //结果审核（总部审核处理结果）
         export_Report: true, //导出报表
@@ -1903,6 +2001,99 @@ const CancelWorkOrderAppeal = row => {
     })
     .catch(() => {});
 };
+
+/**
+ * @description: [钉钉号填写] - 选择数据后，点击钉钉号填写按钮，出现弹窗
+ * @return {void}
+ */
+const DingTalk = () => {
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请勾选数据',
+      type: 'warning',
+    });
+    return;
+  }
+  // 开启钉钉号填写弹窗
+  DingTalkfilling.value.dialogDingTalk = true;
+};
+/**
+ * @description: [钉钉号填写确认]
+ * @return {void}
+ */
+const DingTalkSubmit = async () => {
+  const { processNumber, reviewedBy, auditTime } = DingTalkfilling.value;
+  try {
+    // 启动加载
+    DingTalkfilling.value.loading = true;
+
+    // 构建数据对象
+    const data = {
+      processNumber, // 钉钉号
+      reviewedBy, // 审核人
+      auditTime, // 审核时间
+      assignList: details.selectionList.map(item => item.id), // ID列表
+    };
+    let res = await $_updateWorkList(data);
+    if (res.data.code == 200) {
+      ElMessage({
+        message: res.data.msg,
+        type: 'success',
+      });
+      // 关闭弹窗和加载
+      DingTalkfilling.value.dialogDingTalk = false;
+      // 更新菜单数据
+      updateMenuAndData();
+    }
+  } catch (error) {
+    console.log(error);
+  } finally {
+    DingTalkfilling.value.loading = false;
+  }
+};
+/**
+ * @description: [财务入账]
+ * @return {void}
+ */
+const Financialfillingbtn = () => {
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请勾选数据',
+      type: 'warning',
+    });
+    return;
+  }
+  // 开启钉钉号填写弹窗
+  FinancialFrom.value.loadingFinancial = true;
+};
+/**
+ * @description: [财务入账确定]
+ * @return {void}
+ */
+const FinancialfillingSubmit = async () => {
+  const { operator, entryTime } = FinancialFrom.value;
+  try {
+    FinancialFrom.value.dialog = true; //加载
+    const data = {
+      operator,
+      entryTime,
+      ids: details.selectionList.map(item => item.id).join(','),
+    };
+    let res = await $_updateFinanceTime(data);
+    if (res.data.code == 200) {
+      ElMessage({
+        message: res.data.msg,
+        type: 'success',
+      });
+      FinancialFrom.value.loadingFinancial = false;
+      // 更新菜单数据
+      updateMenuAndData();
+    }
+  } catch (error) {
+  } finally {
+    FinancialFrom.value.loading = false; //关闭加载
+  }
+};
 /**
  * @description: [全部]常工单号，跳转到详情信息页面
  * @param {Object} row - 当前行数据
@@ -2823,4 +3014,19 @@ const ProcessedExported = async dataID => {
     }
   }
 }
+
+// 钉钉号
+:deep(.el_DingTalk) {
+  .el-form-item {
+    flex-direction: column;
+    .el-form-item__label {
+      justify-content: flex-start;
+    }
+    .el-form-item__content {
+      .el-input {
+        width: 100%;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 0e61a590..85672ded 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -840,7 +840,7 @@ const ruleForm = reactive({
   ],
   orderCode: [
     { required: true, message: '请输入订单自编号', trigger: ['blur', 'change'] },
-    { max: 30, message: '订单自编号最多30位', trigger: 'change' },
+    { max: 70, message: '订单自编号最多70位', trigger: 'change' },
   ],
   first: [
     { required: false, message: '请输入一级品', trigger: ['blur', 'change'] },
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index f1dd5ab3..c1baf5fe 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -1258,23 +1258,22 @@ async function updateDictionary(targetArray, dictionaryType) {
 
 //完结展示权限
 const Completedsubmission = () => {
-  if (UserPermissions.value == Useridentity.Warehouse_customer_service && endFrom.value.arbitrate) {
+  if (endFrom.value.arbitrate) {
+    //已经完结了的，可以给仓库客服展示
     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;
+    }
     if (['30'].includes($route.query.workOrderStatus)) {
       return false;
     }
@@ -1323,7 +1322,7 @@ const Processingresultmodification = () => {
 
 // 客服仲裁完结
 const Arbitrationcompleted = () => {
-  return false
+  return false;
   if (
     UserPermissions.value == Useridentity.Headquarters_customer_service ||
     UserPermissions.value == Useridentity.Headquarters_Manager
@@ -1338,6 +1337,16 @@ const Arbitrationcompleted = () => {
 // 处理结果是否可以填写
 
 const Processingresultdisabled = () => {
+  // 总部仲裁中
+  if (['70'].includes($route.query.workOrderStatus)) {
+    if (
+      UserPermissions.value == Useridentity.Headquarters_customer_service ||
+      UserPermissions.value == Useridentity.Headquarters_Manager
+    ) {
+      return true;
+    }
+  }
+
   if (
     UserPermissions.value == Useridentity.Warehouse_customer_service ||
     UserPermissions.value == Useridentity.Headquarters_customer_service ||
@@ -1641,7 +1650,7 @@ const onLoad = async () => {
         });
       }
       console.log(endFrom.value, '表单信息');
-    await  getDeptWarehouse({}).then(res => {
+      await getDeptWarehouse({}).then(res => {
         // 验证本地仓库用于回复选择，自己不能选择自己仓库
         console.log(res, '处理方');
         console.log(localStorage.getItem('WarehouseName'), '当前本地仓库');
@@ -2702,7 +2711,7 @@ const BatchReturn = () => {
     })
     .catch(() => {});
 };
-// 待审核确认审核（经理审核）
+// 待审核确认审核（经理审核或总部）
 const ResultConfirmation = async () => {
   ElMessageBox.confirm('是否确认审核?请注意查验数据正确性!', '提示', {
     confirmButtonText: '确认',
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 116233a0..71980c05 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -640,7 +640,7 @@ export default {
           label: '订单自编号',
           type: 30,
           values: '',
-          width: '300',
+          width: '180',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -657,10 +657,21 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'mallName',
+          label: '商场名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'isFleeingName',
           label: '是否窜货',
-          type: 30,
+          type: 1,
           values: '',
           width: '80',
           checkarr: [
@@ -682,6 +693,8 @@ export default {
           sortable: true,
           head: false,
         },
+ 
+        
         {
           prop: 'firsts',
           label: '一级品类',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 474f3993..bfb56f17 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -1504,32 +1504,20 @@ export default {
       }
     },
 
-    async openDialog(title, input) {
+    openDialog(title, input) {
       this.popupTitle = title;
-      console.log(input, '输入框值1');
       if (input) {
-        const formattedInput = await input.split(',').join('\n');
-        console.log(formattedInput, '输入框值2');
-
-        this.searchInput = formattedInput; // 赋值给 inputAll
+        this.searchInput = input.split(',').join('\n');
       } else {
         this.searchInput = '';
       }
-      console.log(this.searchInput, '输入框值3');
       this.dialogVisible = true;
     },
     handleSearchSubmit(value) {
-      const lines = value
-        .split('\n') // 按换行分割
-        .map(line => line.trim()) // 移除每一行前后的空格
-        .filter(line => line !== ''); // 过滤掉空行
-
-      const joinedLines = lines.join(','); // 使用逗号连接，无空格
-
       if (this.popupTitle == '订单自编号搜索') {
-        this.query.orderCodeNum = joinedLines; //搜索框值
+        this.query.orderCodeNum = value; //搜索框值
       } else if (this.popupTitle == '运单号搜索') {
-        this.query.waybillNum = joinedLines; //搜索框值
+        this.query.waybillNum = value; //搜索框值
       }
       this.dialogVisible = false;
     },
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index bddcec9d..01936534 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -471,28 +471,20 @@ const permissionObj = reactive({
   }),
 });
 const dialogVisible = ref(false);
-const popupTitle = ref('搜索弹窗');
+const popupTitle = ref('');
 const searchInput = ref('');
 const openDialog = (title, input) => {
   popupTitle.value = title;
-  console.log(input, 'input');
   if (input) {
-    const formattedInput = input.split(',').join('\n');
-    searchInput.value = formattedInput; // 赋值给 inputAll
+    searchInput.value = input.split(',').join('\n'); // 赋值给 inputAll
   } else {
     searchInput.value = '';
   }
   dialogVisible.value = true;
 };
 const handleSearchSubmit = value => {
-  const lines = value
-        .split('\n') // 按换行分割
-        .map(line => line.trim()) // 移除每一行前后的空格
-        .filter(line => line !== ''); // 过滤掉空行
-
-      const joinedLines = lines.join(','); // 使用逗号连接，无空格
   if (popupTitle.value == '运单号搜索') {
-    query.value.waybillNoList = joinedLines; //搜索框值
+    query.value.waybillNoList = value; //搜索框值
   }
   dialogVisible.value = false;
 };
@@ -1121,5 +1113,4 @@ getListName({ name: '' }).then(res => {
 .imgDialogVisible .el-dialog__body {
   padding: 0;
 }
-
 </style>

From 4224e648e6f972c3ed33464b839209228293fb27 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 20 Nov 2024 15:18:38 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wel/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 6219a7e0..4671421d 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -1313,8 +1313,8 @@ const handleRefresh = () => {
     initTrunklineCarsData();
     initTrunklineHandOrderData();
     initUnloadAbnormalData();
-    // initDeliveryData();
-    // initSignforData();
+    initDeliveryData();
+    initSignforData();
   } else {
     name.value = _userInfo.content.real_name;
   }

From 8d1b0d2caae880f93bc2096884856fc1e6a7c035 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 20 Nov 2024 15:22:59 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wel/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 4671421d..d8381959 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -1713,7 +1713,7 @@ const billSignforData = computed(() => {
 }
 </style>
 <style lang="scss" scope>
-@import '../../styles/flowStyle.scss';
+@import url('@/styles/flowStyle.scss');
 
 #avue-view {
   background-color: #fff;

From 10eb3251a9b741f0d8f4c1f4c00b26c34718b4df Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 20 Nov 2024 18:39:59 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrder.vue  | 188 +++++++++++++++++-
 .../aftersales/aftersalesWorkOrderend.vue     |  24 ++-
 .../distributionDeliveryListdis.vue           |  22 +-
 .../distributionDeliveryListmar.vue           |  20 +-
 .../parcelList/distributionParcelList.vue     |  50 +++--
 5 files changed, 261 insertions(+), 43 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 23a53bf8..cd0e7143 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/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%;
     }
   }
 }
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index c1baf5fe..42ca2e15 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/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 = [];
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 0e76f627..1dceea59 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/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();
       });
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 39c41bfa..54e75fc9 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/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(
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 62a5477b..20d472f3 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/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>

From 559c928585704f2eb0737b41bcbf470ceb01c6c5 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 20 Nov 2024 19:17:25 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wel/index.js                          |  13 ++
 src/components/tablecmt/tablecmt.vue          |  41 +---
 src/option/distribution/TripartiteTransfer.js |   2 +-
 src/option/wel/index.js                       |  94 +++++++++
 src/views/wel/Tip.vue                         |  72 +++++++
 src/views/wel/index.vue                       | 192 +++++++++++++++++-
 6 files changed, 381 insertions(+), 33 deletions(-)
 create mode 100644 src/option/wel/index.js
 create mode 100644 src/views/wel/Tip.vue

diff --git a/src/api/wel/index.js b/src/api/wel/index.js
index d4112e05..7c26ff01 100644
--- a/src/api/wel/index.js
+++ b/src/api/wel/index.js
@@ -13,6 +13,19 @@ export const postAllocationData = data => {
   });
 };
 
+/**
+ * 库位数据 -- 对比数据
+ * @param {Object} data
+ * @returns
+ */
+export const postOpenOrderDataByWarehouseId = data => {
+  return request({
+    url: '/api/logpm-report/warehouseIndex/openOrderDataByWarehouseId',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 当前在库数据
  * @param {Object} data
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 11487f0a..5c44edf7 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -381,6 +381,8 @@ const isHaveSelection = ref(false);
 let selectarr = ref([]);
 /** 设置每行颜色 */
 const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => {
+  if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor';
+
   for (let i = 0; i < selectarr.value.length; i++) {
     if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor';
   }
@@ -527,10 +529,10 @@ const handleSelectionChange = (param: TableDataType[]) => {
         selectCount.value[i].value = 0;
       }
 
-      if (selectarr.value.length === 0) return;
+      if (param.length === 0) return;
 
-      for (let index = 0; index < selectarr.value.length; index++) {
-        const val = selectarr.value[index];
+      for (let index = 0; index < param.length; index++) {
+        const val = param[index];
 
         for (let j = 0; j < selectCount.value.length; j++) {
           const item = selectCount.value[j];
@@ -714,10 +716,10 @@ const handleWidthChange = (newWidth, oldWidth, column, event) => {
 
   if (props.isSave) return;
 
-  postSaveTableSeting({
-    tableKey: $route.path + props.columnListName,
-    tableSetCongig: JSON.stringify(props.columnList),
-  });
+  // postSaveTableSeting({
+  //   tableKey: $route.path + props.columnListName,
+  //   tableSetCongig: JSON.stringify(props.columnList),
+  // });
 };
 
 let watchTimer;
@@ -725,7 +727,6 @@ watch(
   () => props.columnList,
   () => {
     if (watchTimer) clearTimeout(watchTimer);
-
     watchTimer = setTimeout(() => {
       for (let i = 0; i < props.columnList.length; i++) {
         const val = props.columnList[i];
@@ -830,21 +831,6 @@ defineExpose({ handleCheckSelect, handleClearSelect });
 .el-table .el-input__inner {
   height: 23px !important;
 }
-// .el-checkbox__input.is-checked .el-checkbox__inner{
-//   background-color: #D3832A !important;
-//   border-color: #D3832A !important;
-// }
-// .is .el-checkbox__input.is-checked .el-checkbox__inner{
-//   background-color: #D3832A !important;
-//   border-color: #D3832A !important;
-// }
-// .is-checked .el-checkbox__inner:hover{
-//   border-color: #D3832A !important;
-// }
-// .el-checkbox__input.is-indeterminate .el-checkbox__inner{
-//   background-color: #D3832A !important;
-//   border-color: #D3832A !important;
-// }
 .el-table .el-table__cell {
   padding: 0px !important;
 }
@@ -864,10 +850,8 @@ defineExpose({ handleCheckSelect, handleClearSelect });
   border-color: #d3832a !important;
   font-size: 12px !important;
 }
-.table-SelectedRow-bgcolor {
-  > td {
-    background-color: #f7e8d7 !important;
-  }
+.el-table .table-SelectedRow-bgcolor {
+  background-color: #f7e8d7 !important;
 }
 .colors {
   color: #409eff !important;
@@ -902,9 +886,6 @@ defineExpose({ handleCheckSelect, handleClearSelect });
 .el-table .el-popper {
   max-width: 20% !important;
 }
-.el-input {
-  // width: 200px !important;
-}
 
 .el-table__footer {
   tr {
diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index 6659366a..334238bc 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -251,7 +251,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '200',
+    width: '300',
     checkarr: [],
     fixed: 'right',
     sortable: false,
diff --git a/src/option/wel/index.js b/src/option/wel/index.js
new file mode 100644
index 00000000..cfd23a59
--- /dev/null
+++ b/src/option/wel/index.js
@@ -0,0 +1,94 @@
+/** 开单数据 */
+export const openOrderColumn = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: false,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: false,
+  },
+  {
+    prop: 'warehouseName',
+    label: '仓库',
+    type: 2,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '总单数',
+    type: 2,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'totalCount',
+    label: '总件数',
+    type: 2,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'monthNum',
+    label: '月单数',
+    type: 2,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'monthCount',
+    label: '月件数',
+    type: 2,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'dayNum',
+    label: '日单数',
+    type: 2,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'dayCount',
+    label: '日件数',
+    type: 2,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+];
diff --git a/src/views/wel/Tip.vue b/src/views/wel/Tip.vue
new file mode 100644
index 00000000..2ece9bc6
--- /dev/null
+++ b/src/views/wel/Tip.vue
@@ -0,0 +1,72 @@
+<template>
+  <div class="tip_container">
+    <slot></slot>
+
+    <div class="mask" v-if="isShow">
+      <tablecmt
+        style="max-height: 500px"
+        :columnList="columnList"
+        :tableData="tableData"
+        :loading="loading"
+        :isInitHeigt="false"
+      ></tablecmt>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { reactive } from 'vue';
+
+const props = defineProps({
+  /** 是否显示 */
+  isShow: {
+    type: Boolean,
+    default: true,
+  },
+
+  /** 是否在消失后保留dom */
+  isDistory: {
+    type: Boolean,
+    required: false,
+    default: true,
+  },
+
+  /** 表格表头 */
+  columnList: {
+    type: Array,
+    required: true,
+  },
+
+  /** 表格数据 */
+  tableData: {
+    type: Array,
+    required: true,
+  },
+
+  /** 请求loading */
+  loading: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
+});
+
+const details = reactive({});
+</script>
+
+<style lang="scss" scoped>
+.tip_container {
+  position: relative;
+}
+
+.mask {
+  position: absolute;
+  top: calc(100% + 10px);
+  width: 50vw;
+  background-color: #fff;
+  padding: 10px;
+  box-shadow: 5px 5px 5px 5px #172e6080;
+  border-radius: 5px;
+  //   border: 1px solid var(--el-color-primary);
+}
+</style>
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index d8381959..a87db5ba 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -7,12 +7,27 @@
       <!-- 开单数据 && 开单收入 -->
       <div class="flex mb10 row_first">
         <!-- 开单数据 -->
+
         <div class="mr10 box1 view_box" v-loading="details.loadingObj.openOrderData">
           <!-- 标题 -->
           <div class="align_center mb20">
             <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
 
             <div class="title">开单数据</div>
+
+            <!-- 详情 -->
+            <div class="flex-c-c detailsBtn ml20">
+              <el-icon>
+                <DataAnalysis />
+              </el-icon>
+
+              <span
+                style="margin-left: 5px"
+                @click="() => handleDetails('openOrderColumn', '开单数据详情')"
+              >
+                详情
+              </span>
+            </div>
           </div>
 
           <!-- 数据 -->
@@ -263,6 +278,20 @@
             <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
 
             <div class="title">当前在库数据</div>
+
+            <!-- 详情 -->
+            <!-- <div class="flex-c-c detailsBtn ml20">
+              <el-icon>
+                <DataAnalysis />
+              </el-icon>
+
+              <span
+                style="margin-left: 5px"
+                @click="() => handleDetails('openOrderColumn', '开单数据详情')"
+              >
+                详情
+              </span>
+            </div> -->
           </div>
 
           <!-- 数据 -->
@@ -355,6 +384,20 @@
             <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
 
             <div class="title">库位数据</div>
+
+            <!-- 详情 -->
+            <!-- <div class="flex-c-c detailsBtn ml20">
+              <el-icon>
+                <DataAnalysis />
+              </el-icon>
+
+              <span
+                style="margin-left: 5px"
+                @click="() => handleDetails('openOrderColumn', '开单数据详情')"
+              >
+                详情
+              </span>
+            </div> -->
           </div>
 
           <div class="border data_container pd10 flex">
@@ -979,6 +1022,46 @@
           </div>
         </div>
       </div>
+
+      <!-- 开单数据 -->
+      <el-dialog
+        title="开单数据"
+        v-model="details.popUpShow.isShow"
+        width="80%"
+        :append-to-body="false"
+        :destroy-on-close="false"
+        draggable
+      >
+        <!-- 导出 -->
+        <div class="flex-c-sb mb10">
+          <div></div>
+          <el-button icon="Download" type="primary" @click="handleExport"> 导出 </el-button>
+        </div>
+
+        <!-- 表格 -->
+        <tablecmt
+          style="height: 500px"
+          :columnList="details.columnList"
+          :tableData="details.renderData"
+          :loading="details.loadingObj.loading"
+          @inputTxt="
+            (value, col) => {
+              handleInputQuery(value, col, details.query.inputQuery, true);
+              details.renderData = handleFilterData(details.tableData, [], details.query);
+            }
+          "
+          :isInitHeigt="false"
+        ></tablecmt>
+
+        <tablecmt
+          ref="exportColumnListNode"
+          v-show="false"
+          style="height: 500px"
+          :columnList="details.exportColumnList"
+          :tableData="details.tableData"
+          :isInitHeigt="false"
+        ></tablecmt>
+      </el-dialog>
     </div>
   </template>
 
@@ -998,9 +1081,16 @@
   </template>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, computed, reactive } from 'vue';
-import { computeNumber } from '@/utils/util.js';
+import { ref, onMounted, computed, reactive, defineComponent, toRefs, toRef } from 'vue';
+import {
+  computeNumber,
+  deepClone,
+  getObjType,
+  handleFilterData,
+  handleInputQuery,
+} from '@/utils/util.js';
 import { getStore } from '@/utils/store';
+import { dateNow } from '@/utils/date';
 
 import {
   postAllocationData,
@@ -1012,9 +1102,22 @@ import {
   postUnloadAbnormalData,
   postDeliveryData,
   postSignforData,
+  postOpenOrderDataByWarehouseId,
 } from '@/api/wel/index';
+import { exportExcelByDom } from '@/utils/export';
+
+import { openOrderColumn } from '@/option/wel/index';
+
+// 弹窗组件
+import Tip from './Tip.vue';
+
+// 注册组件
+defineComponent([Tip]);
+
+const exportColumnListNode = ref();
 
 const details = reactive({
+  title: '',
   /** 开单数据 */
   openOrderDataInfo: {
     /** 开单 -- 当日 -- 单 */
@@ -1112,11 +1215,31 @@ const details = reactive({
     deliveryData: false,
     /** 签收数据 */
     signforData: false,
+    /** 弹窗loading */
+    loading: false,
   },
   /** 1 -- 公司首页, 2 -- 数据看板 */
   pageType: 1,
+  /** 表头 */
+  detailOption: {
+    // 开单数据
+    openOrderColumn: deepClone(openOrderColumn),
+  },
+  columnList: [],
+  exportColumnList: [],
+  tableData: [],
+  renderData: [],
+  /** 搜索 */
+  query: {
+    inputQuery: {},
+  },
+  popUpShow: {
+    isShow: false,
+  },
 });
 
+const { detailOption } = toRefs(details);
+
 const info = localStorage.getItem('TWMS-userInfo');
 
 const _userInfo = info ? JSON.parse(info) : {};
@@ -1419,6 +1542,49 @@ const billSignforData = computed(() => {
 
   return _obj;
 });
+
+/** 请求详情 */
+const handleDetails = async (type, title) => {
+  details.popUpShow.isShow = true;
+  details.loadingObj.loading = true;
+  details.title = title;
+  details.columnList = details.detailOption[type];
+  const _arr = [];
+  const _whiteArr = ['操作', '序号', '复选框'];
+  for (let i = 0; i < details.columnList.length; i++) {
+    const val = { ...details.columnList[i] };
+    if (_whiteArr.includes(val.label)) continue;
+    val.type = 30;
+    _arr.push(val);
+  }
+  details.exportColumnList = _arr;
+
+  try {
+    let res: any = { data: {} };
+    switch (type) {
+      // 开单数据
+      case 'openOrderColumn':
+        res = await postOpenOrderDataByWarehouseId({});
+        break;
+
+      default:
+        break;
+    }
+    const { code, data } = res.data;
+    if (code !== 200 || getObjType(data) !== 'array') return;
+    details.tableData = data;
+    details.renderData = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.loading = false;
+  }
+};
+
+/** 导出 */
+const handleExport = () => {
+  exportExcelByDom(exportColumnListNode.value.$el, `${details.title} - ${dateNow()}.xlsx`);
+};
 </script>
 
 <style scoped lang="scss">
@@ -1426,6 +1592,16 @@ const billSignforData = computed(() => {
   font-size: 14px;
   background: #f5f5f6;
   padding: 0 5px;
+  position: relative;
+
+  // 弹窗
+  :deep(.el-overlay) {
+    position: absolute;
+  }
+
+  :deep(.el-overlay-dialog) {
+    position: absolute;
+  }
 }
 
 .view_box {
@@ -1454,6 +1630,18 @@ const billSignforData = computed(() => {
   padding: 0 10px;
 }
 
+.detailsBtn {
+  font-size: 0.9rem;
+  color: var(--el-color-primary);
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+
+  &:hover {
+    color: #2693ff;
+  }
+}
+
 .align_center {
   display: flex;
   align-items: center;

From 5407f3651b55a240709bb7e4a6dfc678e7f86539 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 21 Nov 2024 00:27:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/views/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index ec092d40..8f443f36 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -9,7 +9,7 @@ export default [
     children: [
       {
         path: 'index',
-        name: '首页',
+        name: '数据看板',
         meta: {
           i18n: 'dashboard',
         },