|
|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<div>
|
|
|
<FullPage
|
|
|
- :title="$route.query.type == 2 ? '发货详情' : '包装详情'"
|
|
|
+ :title=" '发货单详情'"
|
|
|
:list="list"
|
|
|
@init="init"
|
|
|
:logList="logList"
|
|
|
@@ -34,13 +34,19 @@
|
|
|
style="margin-right:10px;"
|
|
|
>待出库清单打印</Button
|
|
|
>
|
|
|
+ <Button
|
|
|
+ @click="outShip(selects, 1)"
|
|
|
+ type="warning"
|
|
|
+ ghost
|
|
|
+ style="margin-right:10px;"
|
|
|
+ >批量发货完成</Button
|
|
|
+ >
|
|
|
<Button
|
|
|
- v-if="$route.query.type == 2"
|
|
|
@click="outShip(selects, 2)"
|
|
|
type="success"
|
|
|
ghost
|
|
|
style="margin-right:10px;"
|
|
|
- >批量发货</Button
|
|
|
+ >批量收货完成</Button
|
|
|
>
|
|
|
</div>
|
|
|
<template slot-scope="{ row }" slot="set">
|
|
|
@@ -72,8 +78,12 @@
|
|
|
> -->
|
|
|
<a
|
|
|
class="map-margin"
|
|
|
- @click="row.order_in_no ? outDelivery(row) : ''"
|
|
|
- >{{ row.transport_no != 1 ? "发货" : "" }}</a
|
|
|
+ @click="outShip([row.orders_procedure_id], 1)"
|
|
|
+ >{{ row.transport_no != 1 ? "发货完成" : "" }}</a
|
|
|
+ ><a
|
|
|
+ class="map-margin"
|
|
|
+ @click="outShip([row.orders_procedure_id], 2)"
|
|
|
+ >{{ row.transport_no != 1 ? "收货完成" : "" }}</a
|
|
|
>
|
|
|
</template>
|
|
|
<Modal
|
|
|
@@ -94,7 +104,6 @@
|
|
|
></Option>
|
|
|
</Select>
|
|
|
</FormItem>
|
|
|
-
|
|
|
<FormItem label="出库日期">
|
|
|
<DatePicker
|
|
|
:options="options"
|
|
|
@@ -135,7 +144,7 @@ export default {
|
|
|
serverName: "house",
|
|
|
placeholder: "请选择楼幢",
|
|
|
value: "",
|
|
|
- option: [{ label: 1, value: 1 }],
|
|
|
+ option: [],
|
|
|
},
|
|
|
{
|
|
|
title: "单元",
|
|
|
@@ -158,12 +167,12 @@ export default {
|
|
|
option: [{ label: 1, value: 1 }],
|
|
|
},
|
|
|
{
|
|
|
- title: "房间",
|
|
|
+ title: "房号",
|
|
|
name: "Select",
|
|
|
multiple: true,
|
|
|
filterable: true,
|
|
|
serverName: "number_detail",
|
|
|
- placeholder: "请选择房间",
|
|
|
+ placeholder: "请选择房号",
|
|
|
value: "",
|
|
|
option: [{ label: 1, value: 1 }],
|
|
|
},
|
|
|
@@ -191,30 +200,24 @@ export default {
|
|
|
value: "",
|
|
|
option: [],
|
|
|
},
|
|
|
- {
|
|
|
- title: "部件",
|
|
|
- name: "Select",
|
|
|
- serverName: "part",
|
|
|
- placeholder: "请选择部件",
|
|
|
- value: "",
|
|
|
- option: [],
|
|
|
- },
|
|
|
- {
|
|
|
- title: "手机号",
|
|
|
- name: "Select",
|
|
|
- serverName: "phone",
|
|
|
- placeholder: "请选择部件",
|
|
|
- value: "",
|
|
|
- option: [],
|
|
|
- },
|
|
|
{
|
|
|
title: "发货状态",
|
|
|
name: "Select",
|
|
|
serverName: "transportation_value",
|
|
|
value: "",
|
|
|
option: [
|
|
|
- { label: "未发货", value: 0 },
|
|
|
- { label: "已发货", value: 1 },
|
|
|
+ { label: "已确认", value: 1 },
|
|
|
+ { label: "未确认", value: 0 },
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "收货状态",
|
|
|
+ name: "Select",
|
|
|
+ serverName: "transportation_value",
|
|
|
+ value: "",
|
|
|
+ option: [
|
|
|
+ { label: "已收货", value: 1 },
|
|
|
+ { label: "未收货", value: 0 },
|
|
|
],
|
|
|
}
|
|
|
],
|
|
|
@@ -222,7 +225,7 @@ export default {
|
|
|
tableColums: [
|
|
|
{ type: "selection", align: "center", width: "100", fixed: "left" },
|
|
|
{
|
|
|
- title: "房号",
|
|
|
+ title: "房间号",
|
|
|
align: "center",
|
|
|
minWidth: 100,
|
|
|
key: "number_detail",
|
|
|
@@ -246,24 +249,11 @@ export default {
|
|
|
title: "零部件",
|
|
|
align: "center",
|
|
|
minWidth: 200,
|
|
|
- key: "part_detail_title",
|
|
|
+ key: "sub_part_title",
|
|
|
},
|
|
|
- this.$route.query.type == 4
|
|
|
- ? {
|
|
|
- title: "包装码",
|
|
|
- align: "center",
|
|
|
- minWidth: 200,
|
|
|
- key: "order_in_no",
|
|
|
- }
|
|
|
- : {
|
|
|
- title: "运输单号",
|
|
|
- align: "center",
|
|
|
- minWidth: 200,
|
|
|
- key: "transport_no",
|
|
|
- },
|
|
|
{ title: "单位", align: "center", minWidth: 100, key: "company" },
|
|
|
{
|
|
|
- title: "状态",
|
|
|
+ title: "发货状态",
|
|
|
align: "center",
|
|
|
minWidth: 200,
|
|
|
key: "",
|
|
|
@@ -272,43 +262,25 @@ export default {
|
|
|
"span",
|
|
|
{},
|
|
|
params.row.sub_state == 0
|
|
|
- ? "未指派"
|
|
|
- : params.row.sub_state == 1
|
|
|
- ? "可以派工"
|
|
|
- : params.row.sub_state == 2
|
|
|
- ? "已派工"
|
|
|
- : "已完成"
|
|
|
+ ? "未确认"
|
|
|
+ : '已确认'
|
|
|
),
|
|
|
},
|
|
|
- {
|
|
|
- title: this.$route.query.type == 2 ? "确认出库状态" : "出库状态",
|
|
|
+ {
|
|
|
+ title: "收货状态",
|
|
|
align: "center",
|
|
|
minWidth: 200,
|
|
|
+ key: "",
|
|
|
render: (h, params) =>
|
|
|
h(
|
|
|
"span",
|
|
|
- params.row.in_out_value == 1
|
|
|
- ? this.$route.query.type == 2
|
|
|
- ? "已确认"
|
|
|
- : "已出库"
|
|
|
- : this.$route.query.type == 2
|
|
|
- ? "未确认"
|
|
|
- : "未出库"
|
|
|
+ {},
|
|
|
+ params.row.sub_state == 0
|
|
|
+ ? "未收获"
|
|
|
+ : '已收货'
|
|
|
),
|
|
|
},
|
|
|
- { title: "芯片编号", align: "center", minWidth: 200, key: "chip" },
|
|
|
- this.$route.query.type == 2
|
|
|
- ? {
|
|
|
- title: "运输状态",
|
|
|
- align: "center",
|
|
|
- minWidth: 200,
|
|
|
- render: (h, params) =>
|
|
|
- h(
|
|
|
- "span",
|
|
|
- params.row.transportation_value == 1 ? "已确认" : "未确认"
|
|
|
- ),
|
|
|
- }
|
|
|
- : {},
|
|
|
+ { title: "芯片编号", align: "center", minWidth: 200, key: "tag" },
|
|
|
{
|
|
|
title: "操作",
|
|
|
align: "center",
|
|
|
@@ -407,10 +379,10 @@ export default {
|
|
|
v.label = v.number;
|
|
|
});
|
|
|
res.data.product_title.map((v) => {
|
|
|
- (v.value = v.title), (v.label = v.title);
|
|
|
+ (v.value = v.product_title), (v.label = v.product_title);
|
|
|
});
|
|
|
res.data.part_title.map((v) => {
|
|
|
- (v.value = v.title), (v.label = v.title);
|
|
|
+ (v.value = v.part_title), (v.label = v.part_title);
|
|
|
});
|
|
|
res.data.url_number.map((v) => {
|
|
|
(v.value = v.url_number), (v.label = v.url_number);
|
|
|
@@ -476,21 +448,11 @@ export default {
|
|
|
},
|
|
|
selectTable(row) {
|
|
|
this.selectedReturnArr = row;
|
|
|
- let result = [],
|
|
|
- outResult = [];
|
|
|
- if (this.$route.query.type == 2) {
|
|
|
- row.map((v) => {
|
|
|
- v.id ? result.push(v.id) : "";
|
|
|
- v.order_in_no ? outResult.push(v.order_in_no) : "";
|
|
|
- });
|
|
|
- } else {
|
|
|
- row.map((v) => {
|
|
|
- v.orders_procedure_id ? result.push(v.orders_procedure_id) : "";
|
|
|
- v.order_in_no ? outResult.push(v.order_in_no) : "";
|
|
|
- });
|
|
|
- }
|
|
|
- this.selects = result || [];
|
|
|
- this.selects_out = outResult || [];
|
|
|
+ this.selects = [];
|
|
|
+ row.forEach(v => {
|
|
|
+ this.selects.push(v.orders_procedure_id)
|
|
|
+ });
|
|
|
+ console.log(this.selects)
|
|
|
},
|
|
|
confirmSuccess(row) {
|
|
|
let params = "";
|
|
|
@@ -572,12 +534,12 @@ export default {
|
|
|
}
|
|
|
let id = Array.isArray(row) ? row.join(",") : row.id;
|
|
|
let post_url =
|
|
|
- type == 1 ? "/api/orders_transport" : '/api/orders_out';//"/api/orders_transport_confirm"
|
|
|
+ type == 1 ? "/api/orders_transport" : '/api/orders_transport_confirm';
|
|
|
let params = {};
|
|
|
params.id = id;
|
|
|
this.confirmDelete({
|
|
|
- title: type == 1 ? "包装完成" : "发货指令",
|
|
|
- content: type == 1 ? "是否确认包装完成" : "确认发布发货指令",
|
|
|
+ title: type == 1 ? "发货完成" : "收获完成",
|
|
|
+ content: type == 1 ? "是否确认发货完成" : "是否确认收获完成",
|
|
|
type: "primary",
|
|
|
then: (e) => {
|
|
|
this.axios.post(post_url, params).then((res) => {
|
