java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

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

fix_bug_pro20231227
汤建军 1 year ago
parent
5df02fbf4f c052739366
commit
7d9f81312c
4 changed files with 651 additions and 529 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/api/aftersales/aftersalesWorkOrder.js
  2. 181
      src/views/aftersales/aftersalesWorkOrder.vue
  3. 4
      vite.config.js
  4. 982
      yarn.lock

13
src/api/aftersales/aftersalesWorkOrder.js
Unescape View File

@ -22,6 +22,19 @@ export const getDetail = (id) => {
})
}
export const getProcessor = (current, size, params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/pendingWorkOrder',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const remove = (ids) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/remove',

181
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -4,23 +4,29 @@
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="工单异常类型:">
<el-form-item label="异常类型:">
<!-- <el-input v-model="query.workOrderType" placeholder="请输入工单异常类型;货损，少货，窜货，加急，其他"></el-input>-->
<el-option
v-for="item in this.workOrder"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
<el-select v-model="query.workOrderType" placeholder="请输入工单异常类型;货损，少货，窜货，加急，其他" >
<el-option
v-for="item in this.workOrder"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="发现节点:">
<!-- <el-input v-model="query.discoveryNode" placeholder="请输入发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）"></el-input>-->
<el-option
v-for="item in this.discoveryNode"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
<el-select v-model="query.discoveryNode" placeholder="请输入发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）" >
<el-option
v-for="item in this.discoveryNode"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="异常工单号:">
<el-input v-model="query.workOrderNumber" placeholder="请输入异常工单号"></el-input>
@ -43,6 +49,7 @@
<!-- <el-button v-if="this.permissionList.delBtn" type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleProcessor" plain>处理方信息</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -74,7 +81,7 @@
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<template #default="{row}">
<el-button v-if="this.permissionList.viewBtn" type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button v-if="this.permissionList.editBtn" type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button v-if="this.permissionList.delBtn" type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
@ -105,10 +112,10 @@
append-to-body>
<el-form :disabled="view" ref="form" :model="form" label-width="120px">
<!-- 表单字段 -->
<el-form-item label="工单异常类型 " prop="workOrderType">
<el-form-item label="异常类型 " prop="workOrderType">
<el-select v-model="form.workOrderType" clearable placeholder="请选择工单异常类型;货损，少货，窜货，加急，其他">
<el-option
v-for="item in workOrderTypeData"
v-for="item in workOrder"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
@ -118,7 +125,7 @@
<el-form-item label="发现节点 " prop="discoveryNode">
<el-select v-model="form.discoveryNode" clearable placeholder="请选择发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）">
<el-option
v-for="item in discoveryNodeData"
v-for="item in discoveryNode"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
@ -147,13 +154,34 @@
<el-input v-model="form.vehicleRoute" placeholder="请输入车辆路线;车次号、通过车次号自动带出车辆线路"/>
</el-form-item>
<el-form-item label="送货时间" prop="deliverGoodsTime">
<el-input v-model="form.deliverGoodsTime" placeholder="请输入送货时间"/>
<!-- <el-input v-model="form.deliverGoodsTime" placeholder="请输入送货时间"/> -->
<el-date-picker
v-model="form.deliverGoodsTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="发现时间 " prop="discoveryTime">
<el-input v-model="form.discoveryTime" placeholder="请输入发现时间 （库内作业环节,配送装车环节）"/>
<!-- <el-input v-model="form.discoveryTime" placeholder="请输入发现时间 （库内作业环节,配送装车环节）"/> -->
<el-date-picker
v-model="form.discoveryTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="入库时间 " prop="warehousingTime">
<el-input v-model="form.warehousingTime" placeholder="请输入入库时间（库内作业环节）"/>
<!-- <el-input v-model="form.warehousingTime" placeholder="请输入入库时间（库内作业环节）"/> -->
<el-date-picker
v-model="form.warehousingTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="运单商场" prop="waybillMall">
<el-input v-model="form.waybillMall" placeholder="请输入运单商场"/>
@ -161,8 +189,37 @@
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注"/>
</el-form-item>
<el-form-item label="处理方 " prop="deliveryTime">
<!-- <el-input v-model="form.processor" placeholder="请输入配送时间(配送装车环节)"/> -->
<el-select v-model="processor" placeholder="请选择">
<el-option
v-for="item in warehouseData"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="责任方 " prop="deliveryTime">
<!-- <el-input v-model="form.duty" placeholder="请输入配送时间(配送装车环节)"/> -->
<el-select v-model="duty" placeholder="请选择">
<el-option
v-for="item in warehouseData"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="配送时间 " prop="deliveryTime">
<el-input v-model="form.deliveryTime" placeholder="请输入配送时间(配送装车环节)"/>
<!-- <el-input v-model="form.deliveryTime" placeholder="请输入配送时间(配送装车环节)"/> -->
<el-date-picker
v-model="form.deliveryTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="配送司机 " prop="deliveryDriver">
<el-input v-model="form.deliveryDriver" placeholder="请输入配送司机(配送装车环节)"/>
@ -175,9 +232,14 @@
<el-input v-model="form.customerServiceName" placeholder="请输入归属客服名称"/>
</el-form-item>-->
<el-form-item label="完结时间" prop="overTime">
<!-- <el-form-item label="完结时间" prop="overTime">
<el-input v-model="form.overTime" placeholder="请输入完结时间"/>
</el-form-item>
<el-date-picker
v-model="value1"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item> -->
<el-form-item label="异常问题描述" prop="problemDescription">
<el-input v-model="form.problemDescription" placeholder="请输入异常问题描述"/>
</el-form-item>
@ -210,8 +272,9 @@
</template>
<script>
import { getList, getDetail, add, update, remove } from "@/api/aftersales/aftersalesWorkOrder";
import { getList, getDetail, add, update, remove,getProcessor } from "@/api/aftersales/aftersalesWorkOrder";
import option from "@/option/aftersales/aftersalesWorkOrder";
import { getDetailWarehouse,getDeptWarehouse } from "@/api/basicdata/basicdataWarehouse";
import { mapGetters } from "vuex";
import { getDictionaryBiz } from '@/api/system/dict';
@ -245,8 +308,11 @@ export default {
option: option,
// 表单列表
data: [],
discoveryNode: [],
workOrder: [],
discoveryNode: [], // 发现节点
workOrder: [],// 工单节点0
processor: '',// 处理方
duty: '',// 责任方
warehouseData: [], // 仓库数据
}
},
mounted() {
@ -294,11 +360,17 @@ export default {
return item;
});*/
});
this.getWarehouseInfo();
},
//查询全部仓库信息
getWarehouseInfo(){
let ro ={}
getDeptWarehouse(ro).then(res =>{
this.warehouseData = res.data.data;
console.log("仓库信息",res.data.data);
});
},
searchHide() {
this.search = !this.search;
},
@ -312,6 +384,26 @@ export default {
},
handleSubmit() {
if (!this.form.id) {
let processorEntityList =[];
let row= { //处理方
businessName: this.warehouseData.find(q=> q.id === this.processor).name ,
businessId: this.processor ,
conditions: 1,
typesOf:2
}
processorEntityList.push(row);
let row1= { //责任方
businessName: this.warehouseData.find(q=> q.id === this.duty).name ,
businessId: this.duty ,
conditions: 1,
typesOf:1
}
processorEntityList.push(row1);
console.log("数据????>>",processorEntityList);
this.form.processorEntityList = processorEntityList;
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
@ -336,7 +428,34 @@ export default {
this.form = {}
this.box = true
},
handleEdit(row) {
//查询处理方数据
handleProcessor() {
const {
workOrderType,
discoveryNode,
workOrderNumber,
orderCode,
} = this.query;
let values = {
workOrderType_: workOrderType,
discoveryNode_: discoveryNode,
workOrderNumber_: workOrderNumber,
orderCode_: orderCode,
};
getProcessor(this.page.currentPage, this.page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
console.log("处理方数据>>>>",this.data);
});
},
handle(row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {

4
vite.config.js
Unescape View File

@ -18,9 +18,9 @@ export default ({ mode, command }) => {
// lmy
// target: 'http://192.168.10.123:8889',
// target: 'http://192.168.10.101:8888',
target: 'http://192.168.10.200:13000',
// target: 'http://192.168.10.75:8777',
target: 'http://192.168.10.200:13000',
// tjj
// target: 'http://192.168.10.25:13000',
// sst
// target: 'http://192.168.10.94:8888',
// target: 'http://test.api.huitongys.com',

982
yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save