1.已验收单据和未验收单据数据列表,当前仓库和当前分库使用后端返回名称,不再使用前端取值

2.删除部分无用调试代码
fencang
x_z 3 years ago
parent 9f5e8f934b
commit b81ccc6d58

@ -283,8 +283,6 @@
<script> <script>
import { import {
orderListError,
codeList,
filterOrder, filterOrder,
deleteByOrderId, deleteByOrderId,
commitOrder, commitOrder,
@ -293,12 +291,10 @@ import {
import {unitListBykey} from "../../api/warehouse/unit"; import {unitListBykey} from "../../api/warehouse/unit";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./errorCode"; import codeDetail from "./errorCode";
import ioErrorOrder from "./IOErrorOrder"; import ioErrorOrder from "./IOErrorOrder";
import addOrder from "./addOrder"; import addOrder from "./addOrder";
import addHosOrder from "./addHosOrder"; import addHosOrder from "./addHosOrder";
import store from "../../store"; import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse";
@ -644,12 +640,20 @@ export default {
orderId: "", orderId: "",
}; };
idQuery.orderId = data; idQuery.orderId = data;
console.log(idQuery);
console.log(this.list);
commitOrder(idQuery) commitOrder(idQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success(response.data); this.$message.success(response.data);
this.getList(); for (let i = 0; i < this.list.length; i++) {
if (idQuery.orderId === this.list[i].id) {
this.list.splice(i, 1);
break;
}
};
this.$message.success("提交成功");
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }

@ -1117,6 +1117,7 @@ export default {
this.getBusType(); this.getBusType();
this.getStorage(this.formData.action); this.getStorage(this.formData.action);
this.findSubInvByInv(); this.findSubInvByInv();
this.findSubStorageMethod();
if (this.$isNotBlank(this.idQuery.id)) { if (this.$isNotBlank(this.idQuery.id)) {
this.formData.actDate = new Date(this.idQuery.actDate); this.formData.actDate = new Date(this.idQuery.actDate);
this.formData.corpOrderId = this.idQuery.corpOrderId; this.formData.corpOrderId = this.idQuery.corpOrderId;
@ -1131,7 +1132,6 @@ export default {
this.formData.preCheck = this.idQuery.preCheck; this.formData.preCheck = this.idQuery.preCheck;
this.actionEnable = true; this.actionEnable = true;
this.getCodeList(); this.getCodeList();
this.findSubStorageMethod();
} else { } else {
this.corpOrderIdDisabled = false; this.corpOrderIdDisabled = false;
if (JSON.stringify(this.$route.query) === '{}') { if (JSON.stringify(this.$route.query) === '{}') {

@ -1163,16 +1163,9 @@ export default {
} }
}, },
actionChange(item) { actionChange(item) {
// console.log("item = " + item);
// if (item == '') {
// this.formData.locStorageCode == null;
// } else {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.formData.locStorageCode = this.curAction.storageCode; this.formData.locStorageCode = this.curAction.storageCode;
console.log(this.curAction.corpType + "---" + this.formData.locStorageCode + "-----" + this.curAction.action);
this.findMethod(); this.findMethod();
// }
}, },
locInChange(item) { locInChange(item) {
console.log(item); console.log(item);

@ -102,17 +102,8 @@
<span>{{ getActionName(scope.row.billType) }}</span> <span>{{ getActionName(scope.row.billType) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="120"> <el-table-column label="当前仓库" prop="locStorageName" width="120"></el-table-column>
<template slot-scope="scope"> <el-table-column label="当前分库" prop="invWarehouseName" width="120"></el-table-column>
<span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template>
</el-table-column>
<el-table-column label="当前分库" prop="invWarehouseCode" width="120">
<template slot-scope="scope">
<span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="采购类型">--> <!-- <el-table-column label="采购类型">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ scope.row.type | typeFilterName }}--> <!-- {{ scope.row.type | typeFilterName }}-->
@ -500,7 +491,6 @@ export default {
}, },
handleEdit(index, row) { handleEdit(index, row) {
this.currentCheckIndex = index; this.currentCheckIndex = index;
console.log(this.currentCheckIndex)
}, },
handleSave(index, row) { handleSave(index, row) {
this.currentCheckIndex = -1; this.currentCheckIndex = -1;
@ -612,6 +602,7 @@ export default {
this.total = 0; this.total = 0;
this.detailList = []; this.detailList = [];
}); });
}, },
distributionForm(index, row) { distributionForm(index, row) {
this.idQuery.id = ''; this.idQuery.id = '';

@ -102,16 +102,8 @@
<span>{{ getActionName(scope.row.billType) }}</span> <span>{{ getActionName(scope.row.billType) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="120"> <el-table-column label="当前仓库" prop="locStorageName" width="120"></el-table-column>
<template slot-scope="scope"> <el-table-column label="当前分库" prop="invWarehouseName" width="120"></el-table-column>
<span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template>
</el-table-column>
<el-table-column label="当前分库" prop="invWarehouseCode" width="120">
<template slot-scope="scope">
<span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="200"> <el-table-column label="操作" fixed="right" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

Loading…
Cancel
Save