Merge branch 'dev' into pre-production

1 year ago · 544694acf2
8 changed files with 2071 additions and 260 deletions
--- a/src/api/aftersales/aftersalesWorkOrder.js
+++ b/src/api/aftersales/aftersalesWorkOrder.js
@ -84,3 +84,30 @@ export const $_getList = (params) => {
    params
  })
 }
+
+
+// 首页工单新增
+export const $_submit = (data) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/submit',
+    method: 'post',
+    data
+  })
+}
+
+// 首页查看详情
+export const $_getDetail = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/detail',
+    method: 'get',
+    params
+  })
+}
+// 首页删除
+export const $_remove = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/remove',
+    method: 'post',
+    params
+  })
+}
--- a/src/option/aftersales/aftersalesWorkOrder.js
+++ b/src/option/aftersales/aftersalesWorkOrder.js
@ -194,3 +194,4 @@ export default {
    }
  ]
 }
+
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@ -0,0 +1,385 @@
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'workOrderTypeName',//workOrderType
+    label: '异常类型',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'discoveryNodeName',//discoveryNode
+    label: '发现节点',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'workOrderNumber',
+    label: '异常工单号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'waybillNumber',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'trainNumber',
+    label: '车次号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  }, 
+  {
+    prop: 'first',
+    label: '一级品',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'secondary',
+    label: '二级品',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'vehicleRoute',
+    label: '车辆线路',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliverGoodsTime',
+    label: '送货时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'discoveryTime',
+    label: '发现时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'warehousingTime',
+    label: '入库时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'waybillMall',
+    label: '运单商场',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryTime',
+    label: '配送时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryDriver',
+    label: '配送司机',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'workOrderStatus',
+    label: '工单状态',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'customerServiceName',
+    label: '归属客服名称',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'overTime',
+    label: '完结时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'problemDescription',
+    label: '异常问题描述',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'personResponsible',
+    label: '责任人(库内作业环节)',
+    type: 2,
+    values: '',
+    width: '170',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'processNumber',
+    label: '钉钉流程号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'reviewedBy',
+    label: '审核人',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'auditTime',
+    label: '审核时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'entryTime',
+    label: '财务入账时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'remarks',
+    label: '备注',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+ 
+  {
+    prop: 'createUserName',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    sortable: false,
+  },
+]
+ 
+export const recordList = [
+  {
+    prop: 'entryTime',
+    label: '跟进时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'entryTime',
+    label: '跟进仓库',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'entryTime',
+    label: '跟进人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'entryTime',
+    label: '处理结果',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'entryTime',
+    label: '备注',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'entryTime',
+    label: '图片',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'entryTime',
+    label: '更新日志',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+]  
--- a/src/utils/util.js
+++ b/src/utils/util.js
@ -487,3 +487,35 @@ export const setNodeHeight = (_node, _height) => {
    console.log('_node :>> ', _defaultHeight - _node.getBoundingClientRect().top - 65 + 'px');
  }
 };
+
+/**
+ * 下拉框搜索公共函数processRowProperty(index, row, details);
+ * @param {string} index index参数 
+ * @param {object} row row (表头参数) 
+ * @param {object} details details (搜索参数) 
+ */
+// 
+const updateDetailQuery = (index, propName, obj) => {
+  // 更新或删除查询参数
+  if (index) {
+    obj[propName] = index;
+  } else {
+    delete obj[propName];
+  }
+};
+export const  processRowProperty = (index, row, details) => {
+  const nameRegex = /(\w+)Name$/; // 捕获以'Name'结尾的属性名
+  const match = row.prop.match(nameRegex);
+  
+  // 如果属性以'Name'结尾，则更新相应的查询参数
+  if (match) {
+    const basePropName = match[1]; // 获取不包含'Name'的属性名
+    updateDetailQuery(index, basePropName, details.query);
+  } else {
+    updateDetailQuery(index, row.prop, details.query);
+  }
+  // 如果提供的index为假值，从query中删除原始属性
+  if (!index) {
+    delete details.query[row.prop];
+  }
+};
--- a/src/views/aftersales/VueTemp.vue
+++ b/src/views/aftersales/VueTemp.vue
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@ -479,7 +479,7 @@ export default {


        add(this.form).then(() => {
-          this.box = false;
+          // this.box = false;
          this.onLoad(this.page);
          this.$message({
            type: "success",
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@ -92,47 +92,28 @@

              <div :class="ElBtnClass" v-if="item.type == 3">
                <el-button
-                  :link="ElButtonS[0].link"
-                  :class="ElButtonS[0].class"
-                  :auto-insert-space="ElButtonS[0].space"
-                  :size="ElButtonS[0].size"
-                  :icon="ElButtonS[0].icon"
+             
                  @click="ViewEvent(props.row)"
-                  >明细</el-button
+                  >已盘点明细</el-button
                >
+              
                <el-button
-                  :link="ElButtonS[0].link"
-                  :class="ElButtonS[0].class"
-                  :auto-insert-space="ElButtonS[0].space"
-                  :size="ElButtonS[0].size"
-                  :icon="ElButtonS[0].icon"
+            
                  @click="DetailsNotCounted(props.row)"
                  >未盘点明细</el-button
                >
                <el-button
-                  :link="ElButtonS[0].link"
-                  :class="ElButtonS[0].class"
-                  :auto-insert-space="ElButtonS[0].space"
-                  :size="ElButtonS[0].size"
-                  :icon="ElButtonS[0].icon"
+     
                  @click="Discard(props.row)"
                  >废弃</el-button
                >
                <el-button
-                  :link="ElButtonS[1].link"
-                  :class="ElButtonS[1].class"
-                  :auto-insert-space="ElButtonS[1].space"
-                  :size="ElButtonS[1].size"
-                  :icon="ElButtonS[1].icon"
+          
                  @click="extension(props.row)"
                  >延期</el-button
                >
                <el-button
-                  :link="ElButtonS[3].link"
-                  :class="ElButtonS[3].class"
-                  :auto-insert-space="ElButtonS[3].space"
-                  :size="ElButtonS[3].size"
-                  :icon="ElButtonS[3].icon"
+          
                  @click="comparativeData(props.row)"
                  >对比数据</el-button
                >
@ -211,7 +192,7 @@
        :data="TcPD"
        row-key="name"
        border
-        height="600"
+        :height="eightyPercentHeight + 'px'"
        style="width: 100%"
        @select-all="TcselectAll"
        @select="TcselectChange"
@ -744,6 +725,8 @@ const readList = ref([]); //多选框
 const TcReaJoin = ref([]); //零担库存品状态10，20，30...
 const TcDataaddition = ref(false); //数据新增弹唱
 const Fromnewlyadded = ref({}); //数据新增
+const screenHeight = ref(0); // 屏幕高度
+const eightyPercentHeight = ref(0); // 80% 高度
 const Statusjudgment = ref(false); //新增按钮
 const DbEx=ref(null);//对比明细导出
 const fullScreen=ref(false);//是否全屏
@ -779,7 +762,7 @@ const menuData = ref([
    label: '盘点任务编号',
    type: 5,
    values: '',
-    width: '260',
+    width: '200',
    checkarr: [],
    fixed: false,
    search: true,
@ -790,7 +773,7 @@ const menuData = ref([
    label: '仓库名称',
    type: 4,
    values: '',
-    width: '250',
+    width: '100',
    checkarr: [],
    fixed: false,
    search: true,
@ -801,7 +784,7 @@ const menuData = ref([
    label: '商城名称',
    type: 4,
    values: '',
-    width: '250',
+    width: '150',
    checkarr: [],
    fixed: false,
    search: true,
@ -812,7 +795,7 @@ const menuData = ref([
    label: '收货单位',
    type: 4,
    values: '',
-    width: '250',
+    width: '200',
    checkarr: [],
    fixed: false,
    search: true,
@ -823,7 +806,7 @@ const menuData = ref([
    label: '品牌名称',
    type: 4,
    values: '',
-    width: '250',
+    width: '200',
    checkarr: [],
    fixed: false,
    search: false,
@ -893,7 +876,7 @@ const InventoryDetails = ref([
    label: '订单自编号',
    type: 5,
    values: '',
-    width: '260',
+    width: '230',
    checkarr: [],
    fixed: true,
    search: true,
@ -904,7 +887,7 @@ const InventoryDetails = ref([
    label: '包条',
    type: 5,
    values: '',
-    width: '260',
+    width: '200',
    checkarr: [],
    fixed: true,
    search: true,
@ -916,7 +899,7 @@ const InventoryDetails = ref([
    label: '品类',
    type: 6,
    values: '',
-    width: '260',
+    width: '100',
    checkarr: [
      {
        value: 1,
@ -940,7 +923,7 @@ const InventoryDetails = ref([
    label: '盘点状态',
    type: 6,
    values: '',
-    width: '260',
+    width: '100',
    checkarr: [
      {
        value: 0,
@ -968,7 +951,7 @@ const InventoryDetails = ref([
    label: '货位',
    type: 5,
    values: '',
-    width: '260',
+    width: '150',
    checkarr: [],
    fixed: false,
    search: true,
@ -977,7 +960,7 @@ const InventoryDetails = ref([
  {
    prop: 'materialName',
    label: '物料名称',
-    type: 4,
+    type: 5,
    values: '',
    width: '260',
    checkarr: [],
@ -988,7 +971,7 @@ const InventoryDetails = ref([
  {
    prop: 'trayCode',
    label: '托盘码',
-    type: 4,
+    type: 5,
    values: '',
    width: '260',
    checkarr: [],
@ -999,7 +982,7 @@ const InventoryDetails = ref([
  {
    prop: 'trayName',
    label: '托盘名称',
-    type: 4,
+    type: 5,
    values: '',
    width: '150',
    checkarr: [],
@ -1010,7 +993,7 @@ const InventoryDetails = ref([
  {
    prop: 'inventoryPerson',
    label: '盘点人',
-    type: 4,
+    type: 5,
    values: '',
    width: '150',
    checkarr: [],
@ -1021,7 +1004,7 @@ const InventoryDetails = ref([
  {
    prop: 'inventoryDate',
    label: '盘点时间',
-    type: 4,
+    type: 5,
    values: '',
    width: '150',
    checkarr: [],
@ -1088,7 +1071,7 @@ const InventoryDetails = ref([
  {
    prop: 'brandName',
    label: '品牌',
-    type: 4,
+    type: 5,
    values: '',
    width: '250',
    checkarr: [],
@ -1382,6 +1365,10 @@ const BtnfullScreen=()=>{
 }

 function onLoad() {
+   // 在组件挂载后获取屏幕高度
+  screenHeight.value = window.innerHeight;
+   // 计算80%的高度
+  eightyPercentHeight.value = screenHeight.value * 0.8;
  getDictionaryBiz('logpm_unit').then(res => {
    //异常类型
    console.log(res, '字典返回值');
@ -1660,7 +1647,8 @@ const InventoryModification = () => {
      categoryName: item.categoryName,
      questId: item.questId,
      questNum: row.value.questNum,
-      name:item.Input
+      name:item.Input,
+      questStatus: 1
    });
  });
  console.log(data, '要提交的数据');
@ -1705,6 +1693,7 @@ const TcViewEvent = (val,Inso) => {
    questId: val.id,
    current: TccurrentPage.value, //页码
    size: TcpageSize.value, //条数
+    questStatus: 1,
    ...Inso
  };
  console.log(data, '要提交的数据');
@ -1769,10 +1758,10 @@ const Discard=(val)=>{

 }
 // 未盘点数据请求
-const NotCountedFn = (row,Inso) => {
+const NotCountedFn = (row,Inso,type=0) => {
  TcPdloading.value = true;
  $_getDetailInfo({
-    questStatus: 0,
+    questStatus: type,
    questNum: row.questNum,
    questId: row.id,
    current: TccurrentPage.value, //页码
@ -1796,7 +1785,6 @@ const DetailsNotCounted = row => {
  InventoryDetails.value.forEach(item=>{
    item.values=null
  })
-
  InventoryState.value=true;//修改弹窗标题（未盘点数据），
  TcFrom.value={};//重置搜索
  TccurrentPage.value = 1; //重置页码
@ -1808,6 +1796,15 @@ const DetailsNotCounted = row => {
  NotCountedFn(row);
  row.value = row;
 };
+
+
+
+
+
+
+
+
+
 // 未盘点转已盘点按钮
 const NotInventoried = val => {
  if (!Tcrow.value) {
--- a/src/views/distribution/checkInventoryTask/createTaskt.vue
+++ b/src/views/distribution/checkInventoryTask/createTaskt.vue
@ -168,7 +168,6 @@ import {
  postAddtaskQuest,
  getTaskQuestPage,
  postEditTaskQuestUpdate,
-  postBatchDelete,
 } from '@/api/distribution/createTask';
 import { mapGetters } from 'vuex';
 import dayjs from 'dayjs';
@ -491,33 +490,33 @@ export default {
    /**
     * 批量删除
     */
-    handleBatchDelete() {
-      if (this.selectionList.length === 0)
-        return this.$message({
-          type: 'error',
-          message: '最少选择一条数据',
-        });
-      const ids = this.selectionList.map(item => item.id).join(',');
-
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(async () => {
-          return postBatchDelete({ ids });
-        })
-        .then(res => {
-          this.onLoad(this.page);
-          const { code, msg } = res.data;
-          if (code === 200) {
-            return this.$message({
-              type: 'success',
-              message: msg,
-            });
-          }
-        });
-    },
+    // handleBatchDelete() {
+    //   if (this.selectionList.length === 0)
+    //     return this.$message({
+    //       type: 'error',
+    //       message: '最少选择一条数据',
+    //     });
+    //   const ids = this.selectionList.map(item => item.id).join(',');
+
+    //   this.$confirm('确定将选择数据删除?', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning',
+    //   })
+    //     .then(async () => {
+    //       return postBatchDelete({ ids });
+    //     })
+    //     .then(res => {
+    //       this.onLoad(this.page);
+    //       const { code, msg } = res.data;
+    //       if (code === 200) {
+    //         return this.$message({
+    //           type: 'success',
+    //           message: msg,
+    //         });
+    //       }
+    //     });
+    // },

    btnsc(index, row) {
      console.log(index, row);
@ -683,23 +682,23 @@ export default {
    /**
     * 删除单个任务
     */
-    handleDeleteCheck(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return postBatchDelete({ ids: row.id });
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
+    // handleDeleteCheck(row) {
+    //   this.$confirm('确定将选择数据删除?', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning',
+    //   })
+    //     .then(() => {
+    //       return postBatchDelete({ ids: row.id });
+    //     })
+    //     .then(() => {
+    //       this.onLoad(this.page);
+    //       this.$message({
+    //         type: 'success',
+    //         message: '操作成功!',
+    //       });
+    //     });
+    // },

    /**
     * 查看单个任务