Browse Source

Merge remote-tracking branch 'origin/dev' into dev

fix_bug_pro20231227
caoyizhong 1 year ago
parent
commit
ea54c465a2
  1. 71
      src/api/aftersales/aftersalesWorkOrder.js
  2. 9
      src/api/basicdata/basicdataGoodsShelfView.ts
  3. 16
      src/api/distribution/VehicleArrivalManagement.js
  4. 12
      src/api/distribution/truckLoadingDetails.js
  5. 280
      src/option/aftersales/vueTvemp.js
  6. 319
      src/option/distribution/TripartiteTransfer.js
  7. 14
      src/router/views/index.js
  8. 4
      src/utils/util.js
  9. 297
      src/views/aftersales/aftersalesWorkOrder.vue
  10. 899
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  11. 32
      src/views/aftersales/aftersalesWorkOrderSS.vue
  12. 1375
      src/views/aftersales/aftersalesWorkOrderend.vue
  13. 2
      src/views/aftersales/customerService.vue
  14. 19
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  15. 47
      src/views/distribution/artery/TripartiteTransfer.vue
  16. 12
      src/views/distribution/artery/TripartiteTransferDetails.vue
  17. 50
      src/views/distribution/artery/VehicleArrivalManagement.vue
  18. 23
      src/views/distribution/artery/VehicleStowage.vue
  19. 85
      src/views/distribution/artery/truckLoadingDetails.vue
  20. 4
      vite.config.js

71
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
})
}

9
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
})
}

16
src/api/distribution/VehicleArrivalManagement.js

@ -15,7 +15,7 @@ export const postloadArriveCarsPageList = (page, params) => {
};
/**
* 到车管理分页列表
* 到车
*/
export const postloadArriveCarByLoadId = (page, params) => {
return request({
@ -27,3 +27,17 @@ export const postloadArriveCarByLoadId = (page, params) => {
},
});
};
/**
* 取消到车
*/
export const postloadCancelArriveCarByLoadId = (page, params) => {
return request({
url: '/api/logpm-trunkline/carsLoad/cancelArriveCarByLoadId',
method: 'post',
data: {
...page,
...params,
},
});
};

12
src/api/distribution/truckLoadingDetails.js

@ -0,0 +1,12 @@
import request from '@/axios';
/**
* 初始化获取配载信息
*/
export const postLoadingDetail = (data = {}) => {
return request({
url: '/api/logpm-trunkline/carsLoad/loadingDetail',
method: 'post',
data,
});
};

280
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,278 @@ 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: 3,
values: '',
width: '100',
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: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'mallName',
label: '商场名称',
type: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 3,
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: '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: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'vehicleRoute',
label: '车辆路线',
type: 3,
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: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'money',
label: '金额',
type: 3,
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: 3,
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,
},
]

319
src/option/distribution/TripartiteTransfer.js

@ -246,9 +246,9 @@ export const detailsColumnList = [
fixed: true,
},
{
prop: 'orderCode',
prop: 'waybillNo',
label: '运单号',
type: 6,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -257,9 +257,9 @@ export const detailsColumnList = [
head: false,
},
{
prop: 'orderCode',
label: '合同号',
type: 6,
prop: 'loadCode',
label: '配载批次',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -268,37 +268,48 @@ export const detailsColumnList = [
head: false,
},
{
prop: 'orderPackageCode',
label: '包条码',
type: 6,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'driverName',
label: '计划目的地',
prop: 'orderCode',
label: '合同号',
type: 1,
values: '',
width: '130',
width: '150',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
{
prop: 'driverPhone',
label: '目的地',
prop: 'scanCode',
label: '包条码/产品名称',
type: 1,
values: '',
width: '130',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'warehouseName',
// {
// prop: 'driverName',
// label: '计划目的地',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'driverPhone',
// label: '目的地',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'scanStatusName',
label: '装卸状态',
type: 1,
values: '',
@ -307,19 +318,19 @@ export const detailsColumnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'lineNameTitle',
// label: '订单来源',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'lineNameTitle',
label: '订单来源',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'nodeNub',
label: '装车仓库',
prop: 'trayName',
label: '托盘名称',
type: 1,
values: '',
width: '130',
@ -328,8 +339,8 @@ export const detailsColumnList = [
sortable: true,
},
{
prop: 'startTime',
label: '扫码时间',
prop: 'trayCode',
label: '托盘码',
type: 1,
values: '',
width: '130',
@ -337,9 +348,59 @@ export const detailsColumnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'nodeNub',
// label: '装车仓库',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'startTime',
// label: '扫码时间',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'endTime',
// label: '装卸仓库',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'planVolume',
// label: '卸车时间',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'billladingStatus',
// label: '装车类型',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'endTime',
label: '装卸仓库',
prop: 'typeName',
label: '类型',
type: 1,
values: '',
width: '130',
@ -348,8 +409,8 @@ export const detailsColumnList = [
sortable: true,
},
{
prop: 'planVolume',
label: '卸车时间',
prop: 'isDataName',
label: '有无数据',
type: 1,
values: '',
width: '130',
@ -358,8 +419,8 @@ export const detailsColumnList = [
sortable: true,
},
{
prop: 'billladingStatus',
label: '装车类型',
prop: 'isAbnormalName',
label: '是否异常',
type: 1,
values: '',
width: '130',
@ -377,96 +438,86 @@ export const detailsColumnList = [
fixed: false,
sortable: true,
},
{
prop: 'totalFee',
label: '是否齐套',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'remark',
label: '托盘码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'carrierName',
label: '一级品类',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'waybillCount',
label: '二级品类',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalNum',
label: '三级品类',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalWeight',
label: '物料名称',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalVolume',
label: '装车扫描人',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'createUserName',
label: '卸车人',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalWeight',
label: '同步状态',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'totalFee',
// label: '是否齐套',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'carrierName',
// label: '一级品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'waybillCount',
// label: '二级品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalNum',
// label: '三级品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalWeight',
// label: '物料名称',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalVolume',
// label: '装车扫描人',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'createUserName',
// label: '卸车人',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalWeight',
// label: '同步状态',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
];
/** 运单池列表 */

14
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,

4
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);

297
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;
//
@ -1414,10 +1472,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 +1568,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 +1720,16 @@ const handlePictureCardPreview = uploadFile => {
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
details.query[row.prop] = index;
if(ClaimStatus.value){
//
return
}
if (!ProcessingPartyState.value) {
IndexTable(details.query); //
console.log('首页');
@ -1599,6 +1740,14 @@ const inputsc = (index, row) => {
};
//
const searchChange = () => {
if( ClaimStatus.value){
//
settlementclaim()
details.search = false; //
return
}
details.search = false; //
if (!ProcessingPartyState.value) {
IndexTable(details.query); //
@ -1658,7 +1807,7 @@ function onLoad() {}
/** 表格表头复选框选择 */
const selectionChange = list => {
console.log(list);
console.log(list, '当前选择的数据');
details.selectionList = list;
};
@ -1724,6 +1873,26 @@ const changeProcessingResults = val => {
}
});
};
//
const settlementclaim = (val) => {
ClaimStatus.value=true;//
details.columnList = Claimsfield;
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 +1901,7 @@ const tabChenge = val => {
ProcessingPartyState.value = false; //
details.query.workOrderStatus = null;
ArbitrationStatus.value = false; //
Tableheaderswitching(columnList);
IndexTable();
empty();
console.log('全部');
@ -1741,6 +1911,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 +1920,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,14 +1954,16 @@ const tabChenge = val => {
data.workOrderStatus = 80;
details.query.workOrderStatus = 80;
ArbitrationStatus.value = false; //
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else if (val == 7) {
} else if (val == 7) {
//
ProcessingPartyState.value = false; //
data.workOrderStatus = 60;
details.query.workOrderStatus = 60;
ArbitrationStatus.value = false; //
Tableheaderswitching(columnList);
empty();
IndexTable(data);
}
@ -1817,6 +1992,7 @@ const showdrawer = _flag => {
//
const ProcessingPartyFun = val => {
ClaimStatus.value=false;//
details.query.workOrderStatus = null;
details.loadingObj.list = true; //
let data = {
@ -1843,33 +2019,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 +2076,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 +2917,7 @@ const CompletedSubmission = () => {
display: flex;
align-items: center;
}
:deep(.el-tab-pane){
:deep(.el-tab-pane) {
padding: 10px;
}
}
@ -2772,24 +2948,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>

899
src/views/aftersales/aftersalesWorkOrderAdd.vue

File diff suppressed because it is too large Load Diff

32
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(){

1375
src/views/aftersales/aftersalesWorkOrderend.vue

File diff suppressed because it is too large Load Diff

2
src/views/aftersales/customerService.vue

@ -192,7 +192,7 @@ const messagesendFn = () => {
content: KFinput.value,
createTime: formattedTime,
});
//
//
setTimeout(() => {
const container = scrollContainer.value;
if (container) {

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

@ -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;
}

47
src/views/distribution/artery/TripartiteTransfer.vue

@ -138,11 +138,6 @@
</template>
</tablecmt>
<!-- 统计 -->
<el-row>
<div>选择数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
<div>总计: 总数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
</el-row>
<!-- 分页模块 -->
<el-row class="el-fy">
@ -1000,27 +995,31 @@ const handleShowConfirm = () => {
/** 提交到达 */
const submitConfirmArrive = async () => {
console.log('details.selectionList :>> ', details.selectionList);
console.log(
'details.selectionList.map(val => val.id) :>> ',
details.selectionList.map(val => val.id)
);
const submitData = {
loadId: details.selectionList.map(val => val.id).join(','),
...details.form,
};
const res = await postArriveCars(submitData);
const { code } = res.data;
if (code !== 200) {
return;
if (!details.form.arriveDateStr) {
return ElMessage({
message: '请选择到达日期',
type: 'warning',
});
}
ElMessage({
type: 'success',
message: '到达成功',
});
try {
const submitData = {
loadId: details.selectionList.map(val => val.id).join(','),
...details.form,
};
onLoad();
const res = await postArriveCars(submitData);
const { code } = res.data;
if (code !== 200) {
return;
}
ElMessage({
type: 'success',
message: '到达成功',
});
} catch (error) {
} finally {
onLoad();
}
};
/** 发车 */

12
src/views/distribution/artery/TripartiteTransferDetails.vue

@ -20,10 +20,9 @@
remote
reserve-keyword
placeholder="中转承运商"
@change="val => carrierNameChange(val, index)"
@change="val => carrierNameChange()"
:remote-method="remoteMethod"
:loading="details.loadingObj.loading"
:disabled="index === 0"
>
<el-option
v-for="val in details.carrierNameOptions"
@ -315,7 +314,7 @@ import dayjs from 'dayjs';
import { mapGetters } from 'vuex';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import { downloadXls, computeNumber, setNodeHeight, getWinHight, debounce } from '@/utils/util';
import { downloadXls, computeNumber, setNodeHeight, debounce } from '@/utils/util';
import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage';
import {
postloadFindLoadInitData,
@ -327,7 +326,7 @@ import {
} from '@/api/distribution/AddVehicleStowage';
import { postSaveNewTripartiteTransfer } from '@/api/distribution/addTripartiteTransfer.js';
import type { FormInstance, FormRules } from 'element-plus';
import { useRouter } from 'vue-router';
import { useRouter, useRoute } from 'vue-router';
import { useStore } from 'vuex';
// vuex
@ -335,6 +334,7 @@ const $store = useStore();
//
const $router = useRouter();
const $route = useRoute();
//
const ruleFormRef = ref();
@ -484,6 +484,8 @@ const details = reactive<any>({
driverListByName: [],
/** 被选中在调度池的订单列表 */
orderCodeList: [],
});
const {
@ -654,7 +656,7 @@ const clearSelectionList = () => {
};
/** 展开列表控件 */
const showdrawer = (_flag?: boolean, _type?: string) => {
const showdrawer = (_flag?: boolean, _type?: number) => {
switch (_type) {
default:
console.log('123 :>> ', 123);

50
src/views/distribution/artery/VehicleArrivalManagement.vue

@ -91,6 +91,9 @@
>装载清单</el-button
>
<el-button type="primary" icon="el-icon-printer" @click="handleArrive">到达</el-button>
<el-button type="primary" icon="el-icon-printer" @click="handleCloseArrive"
>取消到达</el-button
>
<el-button type="primary" icon="el-icon-delete" @click="searchReset()">
中途到达卸车
</el-button>
@ -179,7 +182,7 @@
</template>
<template v-if="slotProps.scope.column.label === '操作'">
<el-text @click="handleShowTruckLoadingDetails">装车明细</el-text>
<el-text @click="handleShowTruckLoadingDetails(slotProps.scope)">装车明细</el-text>
<el-text>编辑</el-text>
</template>
</template>
@ -317,6 +320,7 @@ import { columnList, detailsColumnList } from '@/option/distribution/VehicleArri
import {
postloadArriveCarsPageList,
postloadArriveCarByLoadId,
postloadCancelArriveCarByLoadId,
} from '@/api/distribution/VehicleArrivalManagement';
import { useRouter } from 'vue-router';
import { ElMessage, ElMessageBox } from 'element-plus';
@ -562,13 +566,21 @@ const beforeClose = done => {
/** 显示装车详情 */
const handleShowTruckLoadingDetails = ({ row }) => {
details.popUpShow.truckLoadingDetailVisited = true;
nextTick(() => {
// ,
const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi');
_node.style.height = '550px';
$router.push({
path: '/distribution/artery/truckLoadingDetails',
query: {
loadId: row.id,
name: row.carsNo + '--' + '装车明细',
},
});
// details.popUpShow.truckLoadingDetailVisited = true;
// nextTick(() => {
// // ,
// const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi');
// _node.style.height = '550px';
// });
};
/** 显示对比报表 */
@ -599,6 +611,30 @@ const handleArrive = async () => {
onLoad();
};
/** 到车 */
const handleCloseArrive = async () => {
console.log(
'details.selectionList.map(val => val.id) :>> ',
details.selectionList.map(val => val.id)
);
const submitData = {
loadId: details.selectionList.map(val => val.id).join(','),
...details.form,
};
const res = await postloadCancelArriveCarByLoadId(submitData);
const { code } = res.data;
if (code !== 200) {
return;
}
ElMessage({
type: 'success',
message: '取消成功',
});
onLoad();
};
</script>
<style scoped lang="scss">

23
src/views/distribution/artery/VehicleStowage.vue

@ -791,14 +791,23 @@ const handleComparativeStatement = () => {
/** 显示装车详情 */
const handleShowTruckLoadingDetails = ({ row }) => {
details.popUpShow.truckLoadingDetailVisited = true;
nextTick(() => {
// ,
const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi');
_node.style.height = '550px';
console.log('_node :>> ', _node);
console.log('row :>> ', row);
$router.push({
path: '/distribution/artery/truckLoadingDetails',
query: {
loadId: row.id,
name: row.carsNo + '--' + '装车明细',
},
});
// details.popUpShow.truckLoadingDetailVisited = true;
// nextTick(() => {
// // ,
// const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi');
// _node.style.height = '550px';
// console.log('_node :>> ', _node);
// });
};
/** 显示零担补录 */

85
src/views/distribution/artery/truckLoadingDetails.vue

@ -87,7 +87,7 @@
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:current-page="page.pageNum"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
@ -104,23 +104,21 @@
@setcolum="setnewcolum"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="details.editColumnList"
:columnList="details.detailsColumnList"
></edittablehead>
</template>
<script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
import functions from '@/utils/functions';
import dayjs from 'dayjs';
import { mapGetters } from 'vuex';
import { postLoadingDetail } from '@/api/distribution/truckLoadingDetails';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import { downloadXls } from '@/utils/util';
import { detailsColumnList } from '@/option/distribution/TripartiteTransfer';
import { useRouter } from 'vue-router';
//
const $router = useRouter();
import { useRouter, useRoute } from 'vue-router';
const details = reactive<any>({
/** 是否开启搜索 */
@ -162,7 +160,7 @@ const details = reactive<any>({
/** 装车明细表头信息 */
detailsColumnList,
/** 列表数据 */
data: [{}],
data: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
@ -174,7 +172,7 @@ const details = reactive<any>({
drawerShow: false,
/** 分页参数 */
page: {
currentPage: 1,
pageNum: 1,
pageSize: 30,
total: 0,
},
@ -188,6 +186,9 @@ const details = reactive<any>({
/** 列表Dom节点 */
listNode: '',
form: {},
pageInfo: {
loadId: '',
},
});
const {
@ -203,6 +204,10 @@ const {
trickleLoadingPage,
} = toRefs(details);
//
const $router = useRouter();
const $route = useRoute();
/** vuex */
const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
console.log('permission :>> ', permission);
@ -223,11 +228,11 @@ onMounted(() => {
let flexListnewarr = functions.getStorage(window.location.pathname + 'flexList');
let sortlistnewarr = functions.getStorage(window.location.pathname + 'sortlist');
if (checkListnewarr) {
details.columnList.map(item => {
details.detailsColumnList.map(item => {
item.head = false;
});
checkListnewarr.map(ite => {
details.columnList.map(item => {
details.detailsColumnList.map(item => {
if (ite == item.label) {
item.head = true;
}
@ -235,7 +240,7 @@ onMounted(() => {
});
} else {
let arr = [];
details.columnList.map(item => {
details.detailsColumnList.map(item => {
if (item.head) {
arr.push(item.label);
}
@ -243,11 +248,11 @@ onMounted(() => {
functions.setStorage(window.location.pathname + 'checkList', arr);
}
if (flexListnewarr) {
details.columnList.map(item => {
details.detailsColumnList.map(item => {
item.fixed = false;
});
flexListnewarr.map(ite => {
details.columnList.map(item => {
details.detailsColumnList.map(item => {
if (ite == item.label) {
if (item.type == 6) {
item.fixed = 'right';
@ -259,7 +264,7 @@ onMounted(() => {
});
} else {
let arr = [];
details.columnList.map(item => {
details.detailsColumnList.map(item => {
if (item.fixed) {
arr.push(item.label);
}
@ -267,11 +272,11 @@ onMounted(() => {
functions.setStorage(window.location.pathname + 'flexList', arr);
}
if (sortlistnewarr) {
details.columnList.map(item => {
details.detailsColumnList.map(item => {
item.sortable = false;
});
sortlistnewarr.map(ite => {
details.columnList.map(item => {
details.detailsColumnList.map(item => {
if (ite == item.label) {
item.sortable = true;
}
@ -279,7 +284,7 @@ onMounted(() => {
});
} else {
let arr = [];
details.columnList.map(item => {
details.detailsColumnList.map(item => {
if (item.sortable) {
arr.push(item.label);
}
@ -289,7 +294,28 @@ onMounted(() => {
});
/** 请求页面数据 */
const onLoad = (page: any) => {};
const onLoad = async (params = {}) => {
try {
// loading
details.loadingObj.list = true;
details.query.loadId = details.pageInfo.loadId;
//
const res = await postLoadingDetail({ ...details.page, ...details.query, ...params });
const { code, data } = res.data;
if (code !== 200) return;
details.data = data.records;
details.page.total = data.total;
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.list = false;
}
};
details.pageInfo.loadId = $route.query.loadId;
onLoad();
/** 搜索 */
const searchChange = () => {
@ -300,7 +326,7 @@ const searchChange = () => {
const searchReset = () => {
details.query = {};
details.stockupDate = [];
details.page.currentPage = 1;
details.page.pageNum = 1;
onLoad(details.page);
};
@ -504,18 +530,13 @@ const handleShowTransfer = async (_type: string) => {
});
};
/** 添加运单 */
const handleAddWaybill = () => {
// if (this.addInfo.oldSelectionList.length === 0) return this.$message.warning('');
// this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
// this.addInfo.haveIds = this.addInfo.map(val => val.id);
};
/** 移除运单 */
const handleRemoveWaybill = () => {
// if (this.addInfo.newSelectionList.length === 0) return this.$message.warning('');
// this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
// this.addInfo.haveIds = this.addInfo.map(val => val.id);
};
watch($route, (newVal, oldVal) => {
console.log('newVal :>> ', newVal);
console.log('oldVal :>> ', oldVal);
if (newVal.path !== '/distribution/artery/truckLoadingDetails') return;
details.pageInfo.loadId = $route.query.loadId;
onLoad();
});
</script>
<style scoped lang="scss">

4
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',

Loading…
Cancel
Save