|
|
|
@ -347,9 +347,13 @@ import {
|
|
|
|
getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
|
|
|
|
getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
|
|
|
|
} from "../../api/inout/stockOrder";
|
|
|
|
} from "../../api/inout/stockOrder";
|
|
|
|
import draggable from "vuedraggable";
|
|
|
|
import draggable from "vuedraggable";
|
|
|
|
|
|
|
|
import {saveAs} from "file-saver";
|
|
|
|
|
|
|
|
import {parseTime} from "../../filtres";
|
|
|
|
import store from "../../store";
|
|
|
|
import store from "../../store";
|
|
|
|
import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
|
|
|
|
import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
|
|
|
|
import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
|
|
|
|
import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
|
|
|
|
|
|
|
|
import {getBussinessType} from "../../api/basic/bussinessType";
|
|
|
|
|
|
|
|
import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
|
|
|
|
import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
|
|
|
|
import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
|
|
|
|
import dialogInvProduct from "../inventory/DialogInvProduct"
|
|
|
|
import dialogInvProduct from "../inventory/DialogInvProduct"
|
|
|
|
import {getOriginJoinBusType} from "@/api/basic/busOriginType";
|
|
|
|
import {getOriginJoinBusType} from "@/api/basic/busOriginType";
|
|
|
|
@ -613,87 +617,30 @@ export default {
|
|
|
|
this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
|
|
|
|
this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
|
|
|
|
this.thisData.billType = this.curAction.localAction;
|
|
|
|
this.thisData.billType = this.curAction.localAction;
|
|
|
|
|
|
|
|
|
|
|
|
// this.thisData.formData.billType = this.curAction.localAction;
|
|
|
|
|
|
|
|
if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
|
|
|
|
|
|
|
|
this.invQueryData = {
|
|
|
|
|
|
|
|
locStorageCode: this.formData.locStorageCode,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
this.selectInvProductVisible = true;
|
|
|
|
|
|
|
|
} else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.invQueryData = {
|
|
|
|
this.invQueryData = {
|
|
|
|
locStorageCode: this.formData.corpId,
|
|
|
|
locStorageCode: this.formData.locStorageCode,
|
|
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
console.log("his.invQueryData " + this.invQueryData.locStorageCode);
|
|
|
|
|
|
|
|
this.selectInvProductVisible = true;
|
|
|
|
this.selectInvProductVisible = true;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.selectProductVisible = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// this.thisData.formData.billType = this.curAction.localAction;
|
|
|
|
return;
|
|
|
|
// if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
|
|
|
|
}
|
|
|
|
|
|
|
|
// this.code = this.code.trim();
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// if (this.code.length > 13) {
|
|
|
|
|
|
|
|
// let tStr = this.code.substring(0, 2);
|
|
|
|
|
|
|
|
// tStr = tStr.replace('m', 'M');
|
|
|
|
|
|
|
|
// tStr = tStr.replace('a', 'A');
|
|
|
|
|
|
|
|
// if (tStr.indexOf("MA") !== -1) {
|
|
|
|
|
|
|
|
// this.code = tStr + this.code.substring(2, this.code.length);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// this.loading = true;
|
|
|
|
// } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
|
|
|
|
// let tQuery = {
|
|
|
|
|
|
|
|
// code: this.code,
|
|
|
|
|
|
|
|
// customerId: store.getters.customerId,
|
|
|
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// stockOrderDetailQueryProduct(tQuery).then((response) => {
|
|
|
|
// this.invQueryData = {
|
|
|
|
// this.loading = false;
|
|
|
|
// locStorageCode: this.formData.corpId,
|
|
|
|
// console.log(response)
|
|
|
|
|
|
|
|
// if (response.code === 20000) {
|
|
|
|
|
|
|
|
// if (response.data.getType === "1") {
|
|
|
|
|
|
|
|
// this.loading = true;
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// let ids = [response.data.getId];
|
|
|
|
|
|
|
|
// let tQuery2 = {
|
|
|
|
|
|
|
|
// ids: ids,
|
|
|
|
|
|
|
|
// udiEntity: response.data
|
|
|
|
|
|
|
|
// };
|
|
|
|
// };
|
|
|
|
// getStockOrderDetailInstrumentById(tQuery2).then((response) => {
|
|
|
|
// console.log("his.invQueryData " + this.invQueryData.locStorageCode);
|
|
|
|
// this.loading = false;
|
|
|
|
// this.selectInvProductVisible = true;
|
|
|
|
// if (response.code === 20000) {
|
|
|
|
|
|
|
|
// this.closeDialogC2(response.data);
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
// this.$message.error(response.message);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }).catch(() => {
|
|
|
|
|
|
|
|
// this.loading = false;
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// this.thisData = response.data;
|
|
|
|
|
|
|
|
// this.thisData.code = this.code;
|
|
|
|
|
|
|
|
// this.thisData.orderEditor = this.orderEditor;
|
|
|
|
|
|
|
|
// this.thisData.orderId = "";
|
|
|
|
|
|
|
|
// if (this.orderEditor) {
|
|
|
|
|
|
|
|
// this.thisData.orderId = this.formData.id
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// this.thisData.stockOrderLists = this.codeArray;
|
|
|
|
|
|
|
|
// this.selectProductVisible = true;
|
|
|
|
// this.selectProductVisible = true;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// this.$message.warning(response.message);
|
|
|
|
|
|
|
|
// // this.focusNext('inputRef');
|
|
|
|
return;
|
|
|
|
// if (this.$isNotBlank(event)) {
|
|
|
|
}
|
|
|
|
// event.target.select();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// // event.target.select();
|
|
|
|
|
|
|
|
// // event.currentTarget.select();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -722,22 +669,8 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
this.focusNext('iCount');
|
|
|
|
this.focusNext('iCount');
|
|
|
|
|
|
|
|
|
|
|
|
// let sc = this.selectedIndex + 'reCount';
|
|
|
|
|
|
|
|
// const _this = this;
|
|
|
|
|
|
|
|
// this.$nextTick(() => {
|
|
|
|
|
|
|
|
// setTimeout(function() {
|
|
|
|
|
|
|
|
// console.log(sc);
|
|
|
|
|
|
|
|
// console.log(_this.$refs[sc]);
|
|
|
|
|
|
|
|
// console.log(_this.$refs[sc].focus());
|
|
|
|
|
|
|
|
// _this.$refs[sc].focus();
|
|
|
|
|
|
|
|
// }, 1)
|
|
|
|
|
|
|
|
// // this.$refs['inputBatchNoRef'][0].focus()
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
iCountChange() {
|
|
|
|
iCountChange() {
|
|
|
|
// console.log(this.iCount)
|
|
|
|
|
|
|
|
// this.currentRow.count = this.iCount;
|
|
|
|
|
|
|
|
// this.currentRow.reCount = this.iCount;
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
iCountEnterFunction() {
|
|
|
|
iCountEnterFunction() {
|
|
|
|
if (this.$isNotBlank(this.currentRow)) {
|
|
|
|
if (this.$isNotBlank(this.currentRow)) {
|
|
|
|
@ -842,13 +775,6 @@ export default {
|
|
|
|
if (this.$isBlank(row.batchNo)) {
|
|
|
|
if (this.$isBlank(row.batchNo)) {
|
|
|
|
return this.$message.error('批次号不能为空');
|
|
|
|
return this.$message.error('批次号不能为空');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// if (this.$isBlank(row.productDate)) {
|
|
|
|
|
|
|
|
// return this.$message.error('生产日期不能为空');
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if (this.$isBlank(row.expireDate)) {
|
|
|
|
|
|
|
|
// return this.$message.error('失效日期不能为空');
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.$refs.multipleTable.setCurrentRow();
|
|
|
|
this.$refs.multipleTable.setCurrentRow();
|
|
|
|
this.currentRow = {};
|
|
|
|
this.currentRow = {};
|
|
|
|
this.selectedIndex = "";
|
|
|
|
this.selectedIndex = "";
|
|
|
|
@ -976,7 +902,6 @@ export default {
|
|
|
|
this.loading = false;
|
|
|
|
this.loading = false;
|
|
|
|
if (response.code === 20000) {
|
|
|
|
if (response.code === 20000) {
|
|
|
|
this.formData.billNo = response.data;
|
|
|
|
this.formData.billNo = response.data;
|
|
|
|
// this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
|
|
|
|
|
|
|
|
this.formData.billdate = new Date();
|
|
|
|
this.formData.billdate = new Date();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.closeDialog(true);
|
|
|
|
this.closeDialog(true);
|
|
|
|
@ -1001,8 +926,6 @@ export default {
|
|
|
|
this.formData.corpName = event.name;
|
|
|
|
this.formData.corpName = event.name;
|
|
|
|
this.formData.corpId = event.erpId;
|
|
|
|
this.formData.corpId = event.erpId;
|
|
|
|
this.formData.unitIdFk = event.erpId;
|
|
|
|
this.formData.unitIdFk = event.erpId;
|
|
|
|
// console.log("this.inputQuery.companyId" + item);
|
|
|
|
|
|
|
|
console.log("this.inputQuery.companyId" + event.erpId);
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
findMethod(query) {
|
|
|
|
findMethod(query) {
|
|
|
|
console.log(query);
|
|
|
|
console.log(query);
|
|
|
|
@ -1050,6 +973,7 @@ export default {
|
|
|
|
actionChange(item) {
|
|
|
|
actionChange(item) {
|
|
|
|
console.log(item);
|
|
|
|
console.log(item);
|
|
|
|
this.curAction = this.getActionItem(item);
|
|
|
|
this.curAction = this.getActionItem(item);
|
|
|
|
|
|
|
|
// this.formData.locStorageCode = this.curAction.storageCode;
|
|
|
|
console.log(this.curAction.corpType + "---" + "-----" + this.curAction.action);
|
|
|
|
console.log(this.curAction.corpType + "---" + "-----" + this.curAction.action);
|
|
|
|
this.findMethod();
|
|
|
|
this.findMethod();
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
|
