diff --git a/public/config.json b/public/config.json index 21ee3ac..72945c9 100644 --- a/public/config.json +++ b/public/config.json @@ -5,4 +5,3 @@ "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", "hosp_name": "平和县医院" } - diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index 58cfb27..29362a9 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -1,360 +1,358 @@ diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue index d2f3733..63fff08 100644 --- a/src/views/basic/UdiInfoRelevance.vue +++ b/src/views/basic/UdiInfoRelevance.vue @@ -19,56 +19,59 @@
- - - - - - - - - - - - - - - - - - - - - - {{ item.thirdName }} - {{ item.thirdId }} - - - - - - 查询 - + + + + + + + + + + + + + + + + + + + + + + + + {{ item.thirdName }} + {{ item.thirdId }} + + + + + + 查询 + + { - this.userData = res.data; + warehouseUserList(this.userQuery).then((res) => { + this.userData = res.data.list; + this.userTotal = res.data.total; }).catch((error) => { + this.userData = []; + this.userTotal = 0; }); } else { this.$message.error(res.message); @@ -1464,12 +1469,17 @@ export default { saveWarehouseBussinessType(query).then((res) => { this.$message.success("添加成功"); //重新加载数据表格 - let loadParam = { - code: this.currentCode + this.busQuery = { + code: this.currentCode, + page: 1, + limit: 10 } - warehouseBussinessTypeList(loadParam).then((res) => { - this.bussinessTypeData = res.data; + warehouseBussinessTypeList(this.busQuery).then((res) => { + this.bussinessTypeData = res.data.list; + this.busTotal = res.data.total; }).catch((error) => { + this.bussinessTypeData = []; + this.busTotal = 0; }); }).catch((error) => { }); diff --git a/src/views/business/DialogcChangeNewOrder.vue b/src/views/business/DialogcChangeNewOrder.vue index 39783f9..5beb2bb 100644 --- a/src/views/business/DialogcChangeNewOrder.vue +++ b/src/views/business/DialogcChangeNewOrder.vue @@ -425,6 +425,7 @@ export default { storageChange(row) { this.formData.fromCorpId = row.code; this.formData.fromCorp = row.name; + this.formData.fromSubInvCode = null; this.findSubStorageMethod(); }, @@ -435,6 +436,10 @@ export default { actionChange(item) { this.curAction = this.getActionItem(item); // this.formData.locStorageCode = this.curAction.storageCode; + //切换单据类型，清空仓库和分仓信息 + this.formData.locStorageCode = null; + this.formData.invWarehouseCode = null; + this.formData.fromCorp = null; this.findMethod(); }, getActionItem(action) { diff --git a/src/views/business/stockOrderDelete.vue b/src/views/business/stockOrderDelete.vue index 8edddda..d3d3f91 100644 --- a/src/views/business/stockOrderDelete.vue +++ b/src/views/business/stockOrderDelete.vue @@ -61,6 +61,9 @@ {{ getStorageName(scope.row.locStorageCode) }} + + + {{ scope.row.actDate }} - - - - - - diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index d6a2a24..b62264f 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -564,18 +564,18 @@ export default { }, distributionVisible: false, detailFormRules: { - // batchNo: [ - // {required: true, message: "请输入批次号", trigger: "blur"} - // ], - // productDate: [ - // {required: true, message: "请输入生产日期", trigger: "blur"} - // ], - // expireDate: [ - // {required: true, message: "请输入失效日期", trigger: "blur"} - // ], - // sweepCount: [ - // {required: true, message: "请输入扫码数量", trigger: "blur"} - // ] + batchNo: [ + {required: true, message: "请输入批次号", trigger: "blur"} + ], + productDate: [ + {required: true, message: "请输入生产日期", trigger: "blur"} + ], + expireDate: [ + {required: true, message: "请输入失效日期", trigger: "blur"} + ], + sweepCount: [ + {required: true, message: "请输入扫码数量", trigger: "blur"} + ] }, detailFormVisible: false, detailFormData: {}, diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 967d957..f69b31b 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -62,7 +62,7 @@ - +
业务类型： @@ -164,7 +164,6 @@ -
@@ -457,7 +456,6 @@ import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehou import dialogInvProduct from "../inventory/DialogInvProduct" import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {isBlank} from "@/utils/strUtil"; -import {filterDepts} from "@/api/auth/authDept"; export default { name: "idQuery", @@ -495,7 +493,6 @@ export default { type: null, corpName: "", corpId: "", - deptCode: null, }, formRules: { corpName: [ @@ -828,6 +825,9 @@ export default { locStorageCode: this.formData.locStorageCode, invWarehouseCode: this.formData.invWarehouseCode, }; + if (!isBlank(this.formData.unitIdFk) && this.formData.unitIdFk === this.formData.corpId) { + this.invQueryData.corpId = this.formData.corpId; + } this.selectInvProductVisible = true; } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) { diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 8298cc3..56ac7c2 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -165,8 +165,7 @@ export default { keys: [], }, dataList: [], - pageTotal: 1, - total: 1, + pageTotal: 0, currentRow: null, loading: false, udiRlDetailVisible: false, @@ -224,7 +223,7 @@ export default { nameCode: "", ggxh: null, page: 1, - limit: 20, + limit: 10, addType: 1, billType: this.data.formData.billType, corpId: this.data.formData.corpId, diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index ecf984a..298c117 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -469,7 +469,7 @@ import selectRlDialog from "./DialogSelectRl"; import editCodeDialog from "./editCode"; import A from "../../plugin/KeyScaner" import {deleteLog} from "@/api/basic/udiinfolog"; -import {filterDepts} from "@/api/auth/authDept"; + export default { name: "idQuery", @@ -559,7 +559,6 @@ export default { checkSuccess: false, codeDetail: null, editTitle: "编辑条码", - fromDeptOptions: [], }; }, components: { @@ -583,7 +582,6 @@ export default { fromCorpId: this.formData.fromCorpId, outChangeEnable: this.formData.outChangeEnable, preCheck: this.formData.preCheck, - deptCode: this.formData.deptCode, } submitOrderWeb(tQuery) .then((response) => { @@ -922,6 +920,9 @@ export default { code: this.formData.invWarehouseCode, enabled: true, }; + if (isBlank(query.code)) { + query.code = this.$store.getters.locSubInvCode; + } getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; @@ -1258,15 +1259,9 @@ export default { this.findStorageMethod(); } } - - this.findSubInvByInv(this.formData.locStorageCode); - - } - , -} -; +}; diff --git a/src/views/inout/IOAdditionalOrder.vue b/src/views/inout/IOAdditionalOrder.vue index 3d5d68d..87fefbf 100644 --- a/src/views/inout/IOAdditionalOrder.vue +++ b/src/views/inout/IOAdditionalOrder.vue @@ -262,19 +262,18 @@ import { orderListError, deleteByOrderId, - commitOrder, addCommitOrder, + addCommitOrder, updateUnit, } from "../../api/inout/order"; - import draggable from "vuedraggable"; import codeDetail from "./IONewCode"; import addOrder from "./IOAddOrder"; import store from "../../store"; -import {getBussinessType} from "../../api/basic/bussinessType"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {filterAllByUser} from "@/api/basic/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {isBlank} from "@/utils/strUtil"; const formJson = { site_id: "", @@ -412,7 +411,6 @@ export default { }, selectUnit(row) { - console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; this.unitUpdateQuery.fromCorpId = row.erpId; @@ -432,7 +430,6 @@ export default { this.filterQuery.customerId = store.getters.customerId; orderListError(this.filterQuery) .then((response) => { - console.log(response) this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; @@ -449,7 +446,6 @@ export default { this.deleteData.id = data; deleteByOrderId(this.deleteData) .then((response) => { - if (response.code == 20000) { this.getList(); this.$message({ @@ -460,13 +456,16 @@ export default { this.$message.error("补录单据列表已不存在该扫码单据！"); this.getList(); } - }) .catch(() => { }); }, deleteDialog(rowId) { + if (isBlank(rowId)) { + this.$message.error("请选择需要删除的数据！"); + return; + } this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -503,7 +502,6 @@ export default { var corpOrderId = mOrder.remark; this.errorDetail = mOrder.remark; - console.log(corpOrderId + " " + mOrder + " " + mOrder.remark); this.dialogVisible = true; }, diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index c94dba1..0d79536 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -106,6 +106,7 @@ +