|
|
@@ -93,13 +93,13 @@
|
|
|
@click="row.sub_state != 3 ? outShip(row, 2) : ''"
|
|
|
>{{ row.sub_state != 3 ? "运输" : "" }}</a
|
|
|
> -->
|
|
|
- <a
|
|
|
+ <a
|
|
|
class="map-margin"
|
|
|
v-if="row.in_out_value !== 1"
|
|
|
- @click="outShip(row,3)"
|
|
|
+ @click="outShip(row, 3)"
|
|
|
>确认出库</a
|
|
|
>
|
|
|
- <a
|
|
|
+ <a
|
|
|
class="map-margin"
|
|
|
@click="row.sub_state != 3 ? outShip(row, 2) : ''"
|
|
|
>{{ row.sub_state != 3 ? "运输" : "" }}</a
|
|
|
@@ -204,7 +204,7 @@ export default {
|
|
|
value: "",
|
|
|
option: [],
|
|
|
},
|
|
|
- {
|
|
|
+ {
|
|
|
title: "图号",
|
|
|
name: "Select",
|
|
|
serverName: "url_number",
|
|
|
@@ -227,10 +227,10 @@ export default {
|
|
|
placeholder: "入库状态",
|
|
|
value: "",
|
|
|
option: [
|
|
|
- { label: "未指派", value: 0 },
|
|
|
- { label: "可以派工", value: 1 },
|
|
|
- { label: "已派工", value: 2 },
|
|
|
- { label: "已完成", value: 3 },
|
|
|
+ // { label: "未指派", value: 0 },
|
|
|
+ // { label: "可以派工", value: 1 },
|
|
|
+ { label: "未入库", value: 2 },
|
|
|
+ { label: "已入库", value: 3 },
|
|
|
],
|
|
|
},
|
|
|
{
|
|
|
@@ -349,7 +349,7 @@ export default {
|
|
|
total: 0,
|
|
|
pageSize: 10,
|
|
|
loading: false,
|
|
|
- selectedReturnArr:[],
|
|
|
+ selectedReturnArr: [],
|
|
|
selects: [],
|
|
|
selects_out: [],
|
|
|
showStock: false,
|
|
|
@@ -443,42 +443,45 @@ export default {
|
|
|
this.getData(row);
|
|
|
},
|
|
|
getOptions() {
|
|
|
- // this.axios("/api/orders_list_detail", {
|
|
|
- // params: { order_no: this.$route.query.order_no ,type:this.$route.query.type},
|
|
|
- // }).then((res) => {
|
|
|
- // res.data.house.map((v) => {
|
|
|
- // v.value = v.house;
|
|
|
- // v.label = v.house;
|
|
|
- // });
|
|
|
- // res.data.unit.map((v) => {
|
|
|
- // v.value = v.unit;
|
|
|
- // v.label = v.unit;
|
|
|
- // });
|
|
|
- // res.data.layer.map((v) => {
|
|
|
- // v.value = v.layer;
|
|
|
- // v.label = v.layer;
|
|
|
- // });
|
|
|
- // res.data.number_detail.map((v) => {
|
|
|
- // v.value = v.number;
|
|
|
- // v.label = v.number;
|
|
|
- // });
|
|
|
- // res.data.product_title.map((v) => {
|
|
|
- // (v.value = v.title), (v.label = v.title);
|
|
|
- // });
|
|
|
- // res.data.part_title.map((v) => {
|
|
|
- // (v.value = v.title), (v.label = v.title);
|
|
|
- // });
|
|
|
- // res.data.url_number.map(v=>{
|
|
|
- // (v.value=v.url_number),(v.label = v.url_number);
|
|
|
- // })
|
|
|
- // this.list[0].option = res.data.house;
|
|
|
- // this.list[1].option = res.data.unit;
|
|
|
- // this.list[2].option = res.data.layer;
|
|
|
- // this.list[3].option = res.data.number_detail;
|
|
|
- // this.list[4].option = res.data.product_title;
|
|
|
- // this.list[5].option = res.data.url_number;
|
|
|
- // this.list[6].option = res.data.part_title;
|
|
|
- // });
|
|
|
+ this.axios("/api/orders_list_detail", {
|
|
|
+ params: {
|
|
|
+ order_no: this.$route.query.order_no,
|
|
|
+ type: this.$route.query.type,
|
|
|
+ },
|
|
|
+ }).then((res) => {
|
|
|
+ res.data.house.map((v) => {
|
|
|
+ v.value = v.house;
|
|
|
+ v.label = v.house;
|
|
|
+ });
|
|
|
+ res.data.unit.map((v) => {
|
|
|
+ v.value = v.unit;
|
|
|
+ v.label = v.unit;
|
|
|
+ });
|
|
|
+ res.data.layer.map((v) => {
|
|
|
+ v.value = v.layer;
|
|
|
+ v.label = v.layer;
|
|
|
+ });
|
|
|
+ res.data.number_detail.map((v) => {
|
|
|
+ v.value = v.number;
|
|
|
+ v.label = v.number;
|
|
|
+ });
|
|
|
+ res.data.product_title.map((v) => {
|
|
|
+ (v.value = v.title), (v.label = v.title);
|
|
|
+ });
|
|
|
+ res.data.part_title.map((v) => {
|
|
|
+ (v.value = v.title), (v.label = v.title);
|
|
|
+ });
|
|
|
+ res.data.url_number.map((v) => {
|
|
|
+ (v.value = v.url_number), (v.label = v.url_number);
|
|
|
+ });
|
|
|
+ this.list[0].option = res.data.house;
|
|
|
+ this.list[1].option = res.data.unit;
|
|
|
+ this.list[2].option = res.data.layer;
|
|
|
+ this.list[3].option = res.data.number_detail;
|
|
|
+ this.list[4].option = res.data.product_title;
|
|
|
+ this.list[5].option = res.data.url_number;
|
|
|
+ this.list[6].option = res.data.part_title;
|
|
|
+ });
|
|
|
},
|
|
|
getData(row) {
|
|
|
this.loading = true;
|
|
|
@@ -531,7 +534,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
selectTable(row) {
|
|
|
- this.selectedReturnArr = row
|
|
|
+ this.selectedReturnArr = row;
|
|
|
let result = [],
|
|
|
outResult = [];
|
|
|
if (this.$route.query.type == 2) {
|
|
|
@@ -604,44 +607,47 @@ export default {
|
|
|
|
|
|
outShip(row, type) {
|
|
|
//type 1出库 2运输
|
|
|
- if(type == 3){
|
|
|
- this.confirmDelete({
|
|
|
- title: "确认出库" ,
|
|
|
- content: "确认出库么？" ,
|
|
|
- type: "primary",
|
|
|
- then: (e) => {
|
|
|
- this.axios.post('/api/orders_transport', {transport_no:row.transport_no}).then((res) => {
|
|
|
- if (res.code == 200) {
|
|
|
- this.$Message.success(res.msg);
|
|
|
- this.getData(this.proxyObj);
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
- cancel: (e) => {},
|
|
|
- });
|
|
|
- }else{
|
|
|
- if (!row || row.length < 1) {
|
|
|
- return this.$Message.error("请至少选择一项");
|
|
|
+ if (type == 3) {
|
|
|
+ this.confirmDelete({
|
|
|
+ title: "确认出库",
|
|
|
+ content: "确认出库么？",
|
|
|
+ type: "primary",
|
|
|
+ then: (e) => {
|
|
|
+ this.axios
|
|
|
+ .post("/api/orders_transport", { transport_no: row.transport_no })
|
|
|
+ .then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.$Message.success(res.msg);
|
|
|
+ this.getData(this.proxyObj);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ cancel: (e) => {},
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ if (!row || row.length < 1) {
|
|
|
+ return this.$Message.error("请至少选择一项");
|
|
|
+ }
|
|
|
+ let id = Array.isArray(row) ? row.join(",") : row.id;
|
|
|
+ let post_url =
|
|
|
+ type == 1 ? "/api/orders_transport" : "/api/orders_transport_confirm";
|
|
|
+ let params = {};
|
|
|
+ params.id = id;
|
|
|
+ this.confirmDelete({
|
|
|
+ title: type == 1 ? "确认出库" : "确认运输",
|
|
|
+ content: type == 1 ? "确认出库么？" : "确认运输么",
|
|
|
+ type: "primary",
|
|
|
+ then: (e) => {
|
|
|
+ this.axios.post(post_url, params).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.$Message.success(res.msg);
|
|
|
+ this.getData(this.proxyObj);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ cancel: (e) => {},
|
|
|
+ });
|
|
|
}
|
|
|
- let id = Array.isArray(row) ? row.join(",") : row.id;
|
|
|
- let post_url =
|
|
|
- type == 1 ? "/api/orders_transport" : "/api/orders_transport_confirm";
|
|
|
- let params = {};
|
|
|
- params.id = id;
|
|
|
- this.confirmDelete({
|
|
|
- title: type == 1 ? "确认出库" : "确认运输",
|
|
|
- content: type == 1 ? "确认出库么？" : "确认运输么",
|
|
|
- type: "primary",
|
|
|
- then: (e) => {
|
|
|
- this.axios.post(post_url, params).then((res) => {
|
|
|
- if (res.code == 200) {
|
|
|
- this.$Message.success(res.msg);
|
|
|
- this.getData(this.proxyObj);
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
- cancel: (e) => {},
|
|
|
- });}
|
|
|
},
|
|
|
async exportData() {
|
|
|
const res = await this.axios("/api/orders_list_detail", {
|
Andy