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

src/api/aftersales/aftersalesWorkOrder.js

@@ -203,3 +203,74 @@ export const $_addCompletionEnd = (data) => {
     data
   })
 }
+
+// 获取责任人
+export const $_getBusinessDepartmentUser = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/getBusinessDepartmentUser',
+    method: 'get',
+    params
+  })
+}
+
+
+// 回复调查接口
+export const $_savaSurveyRecord = (data) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/savaSurveyRecord ',
+    method: 'post',
+    data
+  })
+}
+
+
+//  提交异常工单处理结果
+export const $_addProcessingResults = (data) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/addProcessingResults',
+    method: 'post',
+    data
+  })
+}
+
+
+
+// 获取回复记录
+export const $_getSurveyRecord = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/getSurveyRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 工单申诉
+
+
+export const $_appealSubmit = (data) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesAppeal/submit',
+    method: 'post',
+    data
+  })
+}
+
+
+
+// 查询理赔数据
+export const $_listSettlement = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/listSettlement',
+    method: 'get',
+    params
+  })
+}
+
+//  查询包件信息
+export const $_getAbnormalPackage = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesAbnormalPackage/getAbnormalPackage',
+    method: 'get',
+    params
+  })
+}

src/api/basicdata/basicdataGoodsShelfView.ts

@@ -78,3 +78,12 @@ export function posturl(name,data): Promise<AxiosResponse<VisualizationResponseD
     data
   })
 }
+
+
+export const $_locationsnub = (params) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseGoodsAllocation/locationsnub',
+    method: 'get',
+    params
+  })
+}

src/option/aftersales/vueTvemp.js

@@ -15,7 +15,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'workOrderTypeName',//workOrderType
+    prop: 'workOrderTypeNameS',//workOrderType
     label: '异常类型',
     type: 3,
     values: '',
@@ -26,7 +26,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'discoveryNodeName',//discoveryNode
+    prop: 'discoveryNodeNameS',//discoveryNode
     label: '发现节点',
     type: 3,
     values: '',
@@ -382,4 +382,267 @@ export const recordList = [
     sortable: false,
     head: false,
   },
-]  
+]  
+
+
+// 理赔
+export const Claimsfield = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '', 
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'workOrderNumber',
+    label: '工单号',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'businessName',
+    label: '营业部',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'businessId',
+  //   label: '营业部ID',
+  //   type: 3,
+  //   values: '',
+  //   width: '100',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'brandName',
+    label: '品牌',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'mallName',
+    label: '商场名称',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'waybillNumber',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'workOrderType',
+  //   label: '异常类型',
+  //   type: 3,
+  //   values: '',
+  //   width: '100',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'workOrderTypeName',
+    label: '异常类型名称',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'resultType',
+  //   label: '处理结果',
+  //   type: 3,
+  //   values: '',
+  //   width: '100',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'resultTypeName',
+    label: '处理结果名称',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'laprId',
+  //   label: '处理结果ID',
+  //   type: 3,
+  //   values: '',
+  //   width: '100',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'discoveryNode',
+  //   label: '发现环节',
+  //   type: 3,
+  //   values: '',
+  //   width: '100',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'discoveryNodeName',
+    label: '发现环节名称',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'resultDescription',
+    label: '处理结果说明',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'vehicleRoute',
+    label: '车辆路线',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'indemnitor',
+    label: '赔款方',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'reason',
+    label: '判责原因',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'money',
+    label: '金额',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'lawoId',
+  //   label: '异常工单ID',
+  //   type: 3,
+  //   values: '',
+  //   width: '100',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'processNumber',
+    label: '钉钉流程号',
+    type: 2,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'workOrderStatus',
+  //   label: '工单状态',
+  //   type: 3,
+  //   values: '',
+  //   width: '100',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'workOrderStatusName',
+    label: '工单状态名称',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+]
+

src/router/views/index.js

@@ -1252,6 +1252,20 @@ export default [
       },
     ],
   },
+
+  {
+    path: '/aftersales/aftersalesWorkOrderSS',
+    component: Layout,
+    redirect: '/aftersales/aftersalesWorkOrderSS',
+    children: [
+      {
+        path: '/aftersales/aftersalesWorkOrderSS',
+        name: '工单A',
+        component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'),
+      },
+    ],
+  },
+  
   // {
   //   path: '/distribution/turndelivery/devtmp',
   //   component: Layout,

src/utils/util.js

@@ -504,10 +504,10 @@ const updateDetailQuery = (index, propName, obj) => {
   }
 };
 export const processRowProperty = (index, row, details) => {
-  const nameRegex = /(\w+)Name$/; // 捕获以'Name'结尾的属性名
+  const nameRegex = /(\w+)NameS$/; // 捕获以'NameS'结尾的属性名
   const match = row.prop.match(nameRegex);
 
-  // 如果属性以'Name'结尾，则更新相应的查询参数
+  // 如果属性以'NameS'结尾，则更新相应的查询参数
   if (match) {
     const basePropName = match[1]; // 获取不包含'Name'的属性名
     updateDetailQuery(index, basePropName, details.query);

src/views/aftersales/aftersalesWorkOrder.vue

@@ -89,6 +89,7 @@
                   <el-button type="primary" @click="assign">工单指派</el-button>
                   <el-button type="primary" @click="arbitrate">申请仲裁</el-button>
                   <el-button type="primary" @click="Batchcompletion">批量完结</el-button>
+                  <el-button type="primary" @click="appeal">申诉</el-button>
                   <!-- <el-button type="primary" @click="ProcessingParty"> 处理方信息</el-button> -->
                 </div>
                 <!-- 头部右侧按钮模块 -->
@@ -99,12 +100,20 @@
                 </div>
               </div>
             </el-row>
-
+            <!-- 申诉列表展示 -->
+            <el-tabs
+              type="border-card"
+              v-if="details.query.workOrderStatus == 30"
+              @tab-change="AppealTab"
+            >
+              <el-tab-pane label="处理完毕"></el-tab-pane>
+              <el-tab-pane label="申诉列表"></el-tab-pane>
+            </el-tabs>
             <!-- 首页表格 -->
             <el-row>
               <!-- 列表模块 -->
               <tablecmt
-                :columnList="columnList"
+                :columnList="publicColumnList"
                 :tableData="data"
                 :loading="loadingObj.list"
                 @inputTxt="inputsc"
@@ -941,6 +950,36 @@
               </div>
             </div>
           </el-dialog>
+          <!-- 申诉弹窗 -->
+          <el-dialog v-model="dialogappeal" title="工单申诉" width="30%">
+            <div class="el_appeal" v-loading="loadingappeal" element-loading-text="Loading...">
+              <el-select
+                v-model="Appealselection"
+                clearable
+                filterable
+                multiple
+                placeholder="请选择责任方"
+              >
+                <el-option
+                  v-for="item in warehouseData"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+              <el-input
+                v-model="Reasonforappeal"
+                :rows="4"
+                type="textarea"
+                placeholder="请输入申诉原因"
+              />
+
+              <span class="el_sdialog-footer">
+                <el-button @click="dialogappeal = false">取消</el-button>
+                <el-button type="primary" @click="Appealbutton"> 确定 </el-button>
+              </span>
+            </div>
+          </el-dialog>
         </basic-container>
       </div>
     </el-tabs>
@@ -972,18 +1011,22 @@ import {
   $_getCustomerServicePersonnel,
   $_arbitrate,
   $_addCompletionEnd,
+  $_appealSubmit,
+  $_listSettlement,
+  $_getAbnormalPackage,
 } from '@/api/aftersales/aftersalesWorkOrder';
 import { getToken } from '@/utils/auth';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import functions from '@/utils/functions.js';
 import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
+import { columnList, recordList, Claimsfield } from '@/option/aftersales/vueTvemp.js';
 import { processRowProperty, isNumer, computeNumber } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import dayjs from 'dayjs';
 const $router = useRouter();
 const tabValue = ref(0); //侧边栏激活状态
+const publicColumnList = ref([]); //公共列表参数
 const scrollContainer = ref(null); //客服实例
 const workOrderStatus = ref(null); //侧边栏参数
 const BatchFrom = ref({}); //批量打回
@@ -991,13 +1034,16 @@ const currentPage = ref(1); // 默认页码
 const pageSize = ref(30); // 默认每一页几条
 const total = ref(0); //页码总页数
 const KFinput = ref(''); //客服发送消息
+const Appealselection = ref([]); //申诉选择的责任人
 const KFfeel = ref(''); //文件附件地址
 const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
 const background = ref(true); // 是否开启背景颜色
 const disabled = ref(false); // 是否禁止使用页码功能
 const loading = ref(false); //首页表格加载效果
 const dialogReturn = ref(false); //批量打回弹窗状态
+const dialogappeal = ref(false); //申诉弹窗状态
 const Indexdialog = ref(false); //新增弹窗
+const Reasonforappeal = ref(''); //申诉原因
 const Indexform = ref({}); //首页新增表单
 const dialogcustomerService = ref(false); //客服信息
 const IndexException = ref([]); //异常类型下拉选择
@@ -1006,8 +1052,10 @@ const warehouseData = ref([]); //处理方
 const customerService = ref([]);
 const IndexForm = ref(null); //首页表实例
 const FromDisabled = ref(false); //详情禁止输入框
+const loadingappeal = ref(false); //工单申诉状态
 const SelectType = ref(null); //类型
 const ListRow = ref(); //当前行数据
+const appealList = ref(); //申诉选择的参数
 const StateType = ref(true); //类型
 const dialogassign = ref(false); //工单指派
 const AssignLoad = ref(false); //工单指派加载
@@ -1035,6 +1083,8 @@ const TotalamountCompensation = ref(0); //赔款金额合计
 const TotalamountReceived = ref(0); //收款金额合计
 const Reasonarbitration = ref(null); //仲裁原因
 const BatchcompletionHeight = ref(0); //批量完结弹窗
+const userInfo = ref(); //当前登录人信息
+const ClaimStatus = ref(false); //理赔状态
 const TabList = ref([
   { name: 0, label: '全部' },
   { name: 1, label: '处理中' },
@@ -1218,6 +1268,7 @@ const TransportLossNode = ref([
 
 // 页面初始化数据
 const IndexTable = val => {
+  ClaimStatus.value = false;
   // ProcessingPartyState.value = false; //关闭处理方
   details.loadingObj.list = true; //开启动画加载
   let data = {
@@ -1243,33 +1294,33 @@ const IndexTable = val => {
         }
         // 对状态进行处理
         if (item.workOrderType == 1) {
-          item.workOrderTypeName = columnList[2].checkarr[0].label; //货损
+          item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损
         } else if (item.workOrderType == 2) {
-          item.workOrderTypeName = columnList[2].checkarr[1].label; //少货
+          item.workOrderTypeNameS = columnList[2].checkarr[1].label; //少货
         } else if (item.workOrderType == 3) {
-          item.workOrderTypeName = columnList[2].checkarr[2].label; //窜货
+          item.workOrderTypeNameS = columnList[2].checkarr[2].label; //窜货
         } else if (item.workOrderType == 4) {
-          item.workOrderTypeName = columnList[2].checkarr[3].label; //加急
+          item.workOrderTypeNameS = columnList[2].checkarr[3].label; //加急
         } else if (item.workOrderType == 5) {
-          item.workOrderTypeName = columnList[2].checkarr[4].label; //其他
+          item.workOrderTypeNameS = columnList[2].checkarr[4].label; //其他
         }
         // 提货环节下拉赋值
         if (item.discoveryNode == 1) {
-          item.discoveryNodeName = columnList[3].checkarr[0].label; //提货环节
+          item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节
         } else if (item.discoveryNode == 2) {
-          item.discoveryNodeName = columnList[3].checkarr[1].label; //发货环节
+          item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节
         } else if (item.discoveryNode == 3) {
-          item.discoveryNodeName = columnList[3].checkarr[2].label; //干线卸车环节
+          item.discoveryNodeNameS = columnList[3].checkarr[2].label; //干线卸车环节
         } else if (item.discoveryNode == 4) {
-          item.discoveryNodeName = columnList[3].checkarr[3].label; //库内作业环节
+          item.discoveryNodeNameS = columnList[3].checkarr[3].label; //库内作业环节
         } else if (item.discoveryNode == 5) {
-          item.discoveryNodeName = columnList[3].checkarr[4].label; //配送装车环节
+          item.discoveryNodeNameS = columnList[3].checkarr[4].label; //配送装车环节
         } else if (item.discoveryNode == 6) {
-          item.discoveryNodeName = columnList[3].checkarr[5].label; //其他
+          item.discoveryNodeNameS = columnList[3].checkarr[5].label; //其他
         } else if (item.discoveryNode == 7) {
-          item.discoveryNodeName = columnList[3].checkarr[6].label; //配送签收环节
+          item.discoveryNodeNameS = columnList[3].checkarr[6].label; //配送签收环节
         } else if (item.discoveryNode == 8) {
-          item.discoveryNodeName = columnList[3].checkarr[7].label; //安装环节
+          item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节
         }
       });
       details.data = res.data.data.records;
@@ -1280,8 +1331,15 @@ const IndexTable = val => {
   });
 };
 
+// 表格切换
+const Tableheaderswitching = (val = columnList) => {
+  publicColumnList.value = val; //默认加载表格
+};
 // 页面初始化
 const OnLoad = () => {
+  // 表格切换
+  Tableheaderswitching();
+  userInfo.value = JSON.parse(localStorage.getItem('TWMS-userInfo')); //获取本地登录人参数
   Mydata.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
   currentUser.value = Mydata.value.id;
   // 在组件挂载后获取屏幕高度
@@ -1298,6 +1356,7 @@ const OnLoad = () => {
 
   updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型
   updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节
+
   IndexTable(details.query);
   getDeptWarehouse({}).then(res => {
     res.data.data.forEach(item => {
@@ -1414,10 +1473,10 @@ const view = val => {
     query: {
       id: val.row.id,
       name: val.row.id + '-信息查看',
-      RouterState: 'view',
+      routerState: 'view',
     },
   });
-  return
+  return;
   console.log(val, '当前行数据');
   FromDisabled.value = true; //禁用输入框
   updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
@@ -1510,11 +1569,86 @@ const addingRecord = val => {
     path: '/aftersales/aftersalesWorkOrderend',
     query: {
       id: val.row.id,
-      name: val.row.id + '-添加异常记录',
+      name: val.row.workOrderNumber + '-添加异常记录',
       RouterState: 'record',
+      businessId: val.row.businessId,
     },
   });
 };
+
+//  工单申诉按钮
+const appeal = val => {
+  console.log(details.selectionList, 'details.selectionList');
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请选择要申诉的数据',
+      type: 'warning',
+    });
+    return;
+  }
+  dialogappeal.value = true; //展开申诉弹窗
+};
+// 工单申诉确认按钮
+const Appealbutton = () => {
+  loadingappeal.value = true; //开启加载效果
+  console.log(Appealselection.value, '当前选择的责任人');
+  console.log(warehouseData.value, '要循环处理的参数');
+  let data = {
+    peopleEntityList: [], //参数一
+  };
+  details.selectionList.forEach(item => {
+    console.log(item, '已经选择的列表');
+    data['peopleEntityList'].push({
+      workOrderId: item.id, //异常工单ID
+      warehouseId: item.warehouseId == '/' ? '' : item.warehouseId,
+      reason: Reasonforappeal.value, //申诉理由
+      claimant: userInfo.value.content.user_name, //申诉人
+      claimantUserId: userInfo.value.content.user_id, //申诉人ID
+      actualPersonName: warehouseData.value
+        .filter(item => Appealselection.value.includes(item.value))
+        .map(item => item.label)
+        .join(','), //实际责任人名称
+      actualPersonId: warehouseData.value
+        .filter(item => Appealselection.value.includes(item.value))
+        .map(item => item.value)
+        .join(','), //实际责任人ID
+    });
+  });
+  console.log(data, '处理好的值');
+  $_appealSubmit(data).then(res => {
+    dialogappeal.value = false; //关闭申诉弹窗
+    loadingappeal.value = false; //关闭加载效果
+    console.log(res, '申诉成功返回值');
+    ProcessingPartyState.value = false; //关闭处理方
+    data.workOrderStatus = 30;
+    details.query.workOrderStatus = 30;
+    ArbitrationStatus.value = false; //不可以申请仲裁
+    tabValue.value = 2;
+    empty(); //清空搜索数据
+    IndexTable({ workOrderStatus: 30 });
+    if (res.data.code == 200) {
+      ElMessage({
+        message: res.data.msg,
+        type: 'success',
+      });
+    }
+  });
+};
+// 申诉列表
+const AppealTab = val => {
+  if (val == 0) {
+    console.log('处理完毕');
+    ProcessingPartyState.value = false; //关闭处理方
+    data.workOrderStatus = 30;
+    details.query.workOrderStatus = 30;
+    ArbitrationStatus.value = false; //不可以申请仲裁
+    empty(); //清空搜索数据
+    IndexTable({ workOrderStatus: 30 });
+  } else {
+    console.log('当前是申诉列表');
+  }
+};
+
 // 异常类型事件
 const abnormalChange = val => {
   console.log(val);
@@ -1587,8 +1721,14 @@ const handlePictureCardPreview = uploadFile => {
 
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
-  details.query[row.prop] = index;
   processRowProperty(index, row, details);
+  details.query[row.prop] = index;
+  if (ClaimStatus.value) {
+    // 这是理赔搜索
+    settlementclaim(details.query);
+    return;
+  }
+
   if (!ProcessingPartyState.value) {
     IndexTable(details.query); //首页初始化信息
     console.log('首页');
@@ -1599,6 +1739,13 @@ const inputsc = (index, row) => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
+  if (ClaimStatus.value) {
+    // 表示这是理赔查询
+    settlementclaim();
+    details.search = false; //关闭搜索
+    return;
+  }
+
   details.search = false; //关闭搜索
   if (!ProcessingPartyState.value) {
     IndexTable(details.query); //首页初始化信息
@@ -1647,6 +1794,13 @@ const btnsc = val => {
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
   processRowProperty(index, row, details);
+
+  if (ClaimStatus.value) {
+    // 这是理赔搜索
+    settlementclaim(details.query);
+    return;
+  }
+
   if (!ProcessingPartyState.value) {
     IndexTable(details.query); //首页初始化信息
   } else {
@@ -1658,13 +1812,20 @@ function onLoad() {}
 
 /** 表格表头复选框选择 */
 const selectionChange = list => {
-  console.log(list);
+  console.log(list, '当前选择的数据');
   details.selectionList = list;
 };
 
 /** 页码改变执行的回调 */
 const currentChange = val => {
   page.value.currentPage = val;
+
+  if (ClaimStatus.value) {
+    // 这是理赔
+    settlementclaim(details.query);
+    return;
+  }
+
   if (!ProcessingPartyState.value) {
     //表示当前不是处理方
     IndexTable(details.query);
@@ -1675,6 +1836,13 @@ const currentChange = val => {
 // 每页多少条
 const sizeChange = val => {
   page.value.pageSize = val;
+
+  if (ClaimStatus.value) {
+    // 这是理赔
+    settlementclaim(details.query);
+    return;
+  }
+
   if (!ProcessingPartyState.value) {
     //表示当前不是处理方
     IndexTable(details.query);
@@ -1724,6 +1892,57 @@ const changeProcessingResults = val => {
     }
   });
 };
+// 查询理赔数据
+const settlementclaim = val => {
+  console.log(Claimsfield, '理赔数据');
+  ClaimStatus.value = true; //开启理赔查询状态
+  details.columnList = Claimsfield;
+  Claimsfield[3].checkarr = []; //营业部
+  Claimsfield[7].checkarr = []; //异常类型名称
+  Claimsfield[9].checkarr = []; //异常类型名称
+  getDeptWarehouse({}).then(res => {
+    res.data.data.forEach(item => {
+      Claimsfield[3].checkarr.push({
+        value: item.name,
+        label: item.name,
+      });
+    });
+  });
+
+  getDictionaryBiz('pc_work_order').then(res => {
+    res.data.data.forEach(item => {
+      Claimsfield[7].checkarr.push({
+        value: item.dictValue,
+        label: item.dictValue,
+      });
+    });
+  });
+  getDictionaryBiz('pc_discovery_node').then(res => {
+    res.data.data.forEach(item => {
+      Claimsfield[9].checkarr.push({
+        value: item.dictValue,
+        label: item.dictValue,
+      });
+    });
+  });
+
+  // details.columnList    warehouseData.value
+  details.loadingObj.list = true; //开启动画加载
+  console.log(details, 'details');
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...val,
+  };
+  console.log(data, '要传递的参数');
+  $_listSettlement(data).then(res => {
+    details.loadingObj.list = false; //关闭动画加载
+    console.log(res, '查询理赔数据');
+    details.data = res.data.data.records; //数据
+    page.value.total = res.data.data.total;
+  });
+};
+
 // 标签栏触发
 const tabChenge = val => {
   console.log(val, '触发了标签栏');
@@ -1732,6 +1951,7 @@ const tabChenge = val => {
     ProcessingPartyState.value = false; //关闭处理方
     details.query.workOrderStatus = null;
     ArbitrationStatus.value = false; //不可以申请仲裁
+    Tableheaderswitching(columnList);
     IndexTable();
     empty();
     console.log('全部');
@@ -1741,6 +1961,7 @@ const tabChenge = val => {
     data.workOrderStatus = 20;
     details.query.workOrderStatus = 20;
     ArbitrationStatus.value = true; //可以申请仲裁
+    Tableheaderswitching(columnList);
     empty();
     IndexTable(data);
   } else if (val == 2) {
@@ -1749,30 +1970,32 @@ const tabChenge = val => {
     data.workOrderStatus = 30;
     details.query.workOrderStatus = 30;
     ArbitrationStatus.value = false; //不可以申请仲裁
+    Tableheaderswitching(columnList);
     empty();
     IndexTable(data);
   } else if (val == 3) {
     console.log('待处理');
-    
     ProcessingPartyState.value = true; //开启处理方
     details.query.workOrderStatus = '';
     ArbitrationStatus.value = true; //可以申请仲裁
+    Tableheaderswitching(columnList);
     empty();
     ProcessingPartyFun(data);
   } else if (val == 4) {
     ProcessingPartyState.value = false; //关闭处理方
     // 理赔金额未出
-    data.workOrderStatus = 40;
-    details.query.workOrderStatus = 40;
+    details.query.workOrderStatus = null;
     ArbitrationStatus.value = false; //不可以申请仲裁
+    Tableheaderswitching(Claimsfield); //切换表格
     empty();
-    IndexTable(data);
+    settlementclaim();
   } else if (val == 5) {
     // 仲裁中
     ProcessingPartyState.value = false; //关闭处理方
     data.workOrderStatus = 70;
     details.query.workOrderStatus = 70;
     ArbitrationStatus.value = false; //不可以申请仲裁
+    Tableheaderswitching(columnList);
     empty();
     IndexTable(data);
   } else if (val == 6) {
@@ -1781,6 +2004,7 @@ const tabChenge = val => {
     data.workOrderStatus = 80;
     details.query.workOrderStatus = 80;
     ArbitrationStatus.value = false; //不可以申请仲裁
+    Tableheaderswitching(columnList);
     empty();
     IndexTable(data);
   } else if (val == 7) {
@@ -1789,6 +2013,7 @@ const tabChenge = val => {
     data.workOrderStatus = 60;
     details.query.workOrderStatus = 60;
     ArbitrationStatus.value = false; //不可以申请仲裁
+    Tableheaderswitching(columnList);
     empty();
     IndexTable(data);
   }
@@ -1817,6 +2042,7 @@ const showdrawer = _flag => {
 
 // 处理方数据公共函数
 const ProcessingPartyFun = val => {
+  ClaimStatus.value = false; //关闭理赔状态
   details.query.workOrderStatus = null;
   details.loadingObj.list = true; //开启动画加载
   let data = {
@@ -1843,33 +2069,33 @@ const ProcessingPartyFun = val => {
         }
         // 对状态进行处理
         if (item.workOrderType == 1) {
-          item.workOrderTypeName = columnList[2].checkarr[0].label; //货损
+          item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损
         } else if (item.workOrderType == 2) {
-          item.workOrderTypeName = columnList[2].checkarr[1].label; //少货
+          item.workOrderTypeNameS = columnList[2].checkarr[1].label; //少货
         } else if (item.workOrderType == 3) {
-          item.workOrderTypeName = columnList[2].checkarr[2].label; //窜货
+          item.workOrderTypeNameS = columnList[2].checkarr[2].label; //窜货
         } else if (item.workOrderType == 4) {
-          item.workOrderTypeName = columnList[2].checkarr[3].label; //加急
+          item.workOrderTypeNameS = columnList[2].checkarr[3].label; //加急
         } else if (item.workOrderType == 5) {
-          item.workOrderTypeName = columnList[2].checkarr[4].label; //其他
+          item.workOrderTypeNameS = columnList[2].checkarr[4].label; //其他
         }
         // 提货环节下拉赋值
         if (item.discoveryNode == 1) {
-          item.discoveryNodeName = columnList[3].checkarr[0].label; //提货环节
+          item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节
         } else if (item.discoveryNode == 2) {
-          item.discoveryNodeName = columnList[3].checkarr[1].label; //发货环节
+          item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节
         } else if (item.discoveryNode == 3) {
-          item.discoveryNodeName = columnList[3].checkarr[2].label; //干线卸车环节
+          item.discoveryNodeNameS = columnList[3].checkarr[2].label; //干线卸车环节
         } else if (item.discoveryNode == 4) {
-          item.discoveryNodeName = columnList[3].checkarr[3].label; //库内作业环节
+          item.discoveryNodeNameS = columnList[3].checkarr[3].label; //库内作业环节
         } else if (item.discoveryNode == 5) {
-          item.discoveryNodeName = columnList[3].checkarr[4].label; //配送装车环节
+          item.discoveryNodeNameS = columnList[3].checkarr[4].label; //配送装车环节
         } else if (item.discoveryNode == 6) {
-          item.discoveryNodeName = columnList[3].checkarr[5].label; //其他
+          item.discoveryNodeNameS = columnList[3].checkarr[5].label; //其他
         } else if (item.discoveryNode == 7) {
-          item.discoveryNodeName = columnList[3].checkarr[6].label; //配送签收环节
+          item.discoveryNodeNameS = columnList[3].checkarr[6].label; //配送签收环节
         } else if (item.discoveryNode == 8) {
-          item.discoveryNodeName = columnList[3].checkarr[7].label; //安装环节
+          item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节
         }
       });
       details.data = res.data.data.records;
@@ -1900,12 +2126,12 @@ const FKList = () => {
 // 点击回复按钮
 const reply = val => {
   $router.push({
-    path:'/aftersales/customerService',
-    query:{
-      row:JSON.stringify(val.row),
-    }
+    path: '/aftersales/customerService',
+    query: {
+      row: JSON.stringify(val.row),
+    },
   });
-  return
+  return;
   console.log(val, 'ID++++++++');
   console.log(val.row);
   dialogcustomerService.value = true; //开启回复弹窗
@@ -2741,7 +2967,7 @@ const CompletedSubmission = () => {
     display: flex;
     align-items: center;
   }
-  :deep(.el-tab-pane){
+  :deep(.el-tab-pane) {
     padding: 10px;
   }
 }
@@ -2772,24 +2998,35 @@ const CompletedSubmission = () => {
   display: flex;
   justify-content: flex-end;
 }
-:deep(.el_tabs){
+:deep(.el_tabs) {
   width: 100%;
-    display: flex;
-    flex-direction: column;
-    .el-tabs__content{
-      padding: 0;
-    }
+  display: flex;
+  flex-direction: column;
+  .el-tabs__content {
+    padding: 0;
+  }
 }
-:deep(.avue-crud__pagination){
+:deep(.avue-crud__pagination) {
   padding-top: 2px !important;
 }
-.arbitrate{
+.arbitrate {
   margin-top: 36px;
-  .el_btn{
+  .el_btn {
     margin-top: 10px;
   }
-  :deep(.el-tabs__content){
+  :deep(.el-tabs__content) {
     padding: 0 !important;
   }
 }
+.el_appeal {
+  :deep(.el-select) {
+    width: 100% !important;
+    margin-bottom: 10px;
+  }
+}
+.el_sdialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
 </style>

src/views/aftersales/aftersalesWorkOrderSS.vue

@@ -478,23 +478,23 @@ export default {
         this.form.processorEntityList = processorEntityList;
           console.log(this.form,'处理好的数据');
 
-        // add(this.form).then(() => {
-        //   // this.box = false;
-        //   this.onLoad(this.page);
-        //   this.$message({
-        //     type: "success",
-        //     message: "操作成功!"
-        //   });
-        // });
+        add(this.form).then(() => {
+          // this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
       } else {
-        // update(this.form).then(() => {
-        //   this.box = false;
-        //   this.onLoad(this.page);
-        //   this.$message({
-        //     type: "success",
-        //     message: "操作成功!"
-        //   });
-        // })
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
       }
     },
     handleAdd(){

src/views/aftersales/customerService.vue

@@ -192,7 +192,7 @@ const messagesendFn = () => {
         content: KFinput.value,
         createTime: formattedTime,
       });
-      // 滚动到最后
+      // 聊天记录滚动到最后
       setTimeout(() => {
         const container = scrollContainer.value;
         if (container) {

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -211,7 +211,7 @@
         <el-button type="primary" @click="showupt(2)">按自编号</el-button>
         <el-button type="primary" @click="showupt(3)">按包件</el-button>
         <el-button type="primary" @click="showupt(4)">按托盘</el-button>
-        <el-button type="primary" @click="showupt(5)">按库存品</el-button>
+        <!-- <el-button type="primary" @click="showupt(5)">按库存品</el-button> -->
         <el-button type="primary" @click="showupt(6)">按零担</el-button>
         <el-button type="danger" @click="upgood">禁用</el-button>
       </span>
@@ -581,6 +581,7 @@ import {
   posturl,
   Alloclocationsnub,
   disable,
+  $_locationsnub,
 } from '@/api/basicdata/basicdataGoodsShelfView';
 import { reactive, ref, toRefs, onMounted, getCurrentInstance } from 'vue';
 import { getToken } from '@/utils/auth';
@@ -640,6 +641,7 @@ let details = reactive({
   inputtxts1: '',
   boxdetails: {},
 });
+
 onMounted(() => {
   details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
   initconfig();
@@ -663,6 +665,12 @@ async function initnumber() {
 async function initconfig() {
   let res = await getstoreCargo();
   details.arrlist = res.data.data;
+  console.log(details.arrlist, '仓库列表');
+  if (details.arrlist.length > 0) {
+    $_locationsnub({ warehouseId: details.arrlist[0].id }).then(res => {
+      console.log('初始化仓库参数成功', res);
+    });
+  }
   if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
     details.checkregionselect = 0;
     details.checksele = 0;
@@ -837,10 +845,16 @@ async function upgood() {
   }
 }
 
-const checkcso = () => {
+const checkcso = val => {
+  console.log(details.arrlist[val].id, '选择的ID-=====');
+  console.log(val, '货位接受参数');
+  $_locationsnub({ warehouseId: details.arrlist[val].id }).then(res => {
+    console.log('切换请求成功', res);
+  });
   if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
     details.checkregionselect = 0;
     details.checksele = 0;
+
     checkshelves();
   } else {
     details.checkregionselect = '';
@@ -1557,6 +1571,7 @@ const showupt = value => {
   }
   searchbuts();
 };
+
 const alldown = async () => {
   console.log(scope.row);
   let data = {
@@ -2546,7 +2561,7 @@ const {
     // font-size: 14px;
   }
   .type2 {
-    border: 1px solid #3AD8BC;
+    border: 1px solid #3ad8bc;
     background: #ffffff;
     border-radius: 4px 4px 4px 4px;
   }

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -341,6 +341,17 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }
+        ,
+        {
+          label: '存放位置备注',
+          prop: 'positions',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
         {
           label: '状态',
@@ -687,7 +698,7 @@ export default {
     handleTemplate() {
       console.log('下载模板！！！');
       exportBlob(
-        `/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingEntry?${
+        `/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingTemplate?${
           this.website.tokenHeader
         }=${getToken()}`
       ).then(res => {

vite.config.js

@@ -23,8 +23,8 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
 
-          // target: 'http://192.168.6.141:8777',
-          target: 'http://192.168.6.116:8777',
+          target: 'http://192.168.6.122:8777',
+          // target: 'http://192.168.6.116:8777',
           // tjj
           // sst
           // target: 'http://192.168.10.94:8888',