diff --git a/src/views/basic/BasicThirdSysModify.vue b/src/views/basic/BasicThirdSysModify.vue index d12c782..b46c29d 100644 --- a/src/views/basic/BasicThirdSysModify.vue +++ b/src/views/basic/BasicThirdSysModify.vue @@ -59,7 +59,7 @@
- 第三方服务IP地址:  +
- 第三方服务接口授权:  +  
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 8d802f1..f6435ae 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -256,7 +256,7 @@ 出库时必须校验预验收库存 - 是否允许无库存出库 + 是否只允许有库存产品出库 采集UDI码时进行三期校验 diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index cb01c64..f854f3f 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -353,7 +353,7 @@
- + - +
@@ -1103,9 +1103,9 @@ export default { } this.$message.success("操作成功"); this.formVisible = false; - + if (this.formName !== "edit") { - + if (response.data && response.data.id) { data.id = response.data.id; if (this.pidData) { @@ -1439,7 +1439,7 @@ export default { var action=obj.toString(); this.bussinessTypeQuery.ids=action; } - + this.bussinessTypeQuery.code=this.busQuery.code; getJoinBussinessType(this.bussinessTypeQuery).then((res) => { this.selectBussinessTypeList = []; @@ -1540,12 +1540,16 @@ export default { this.getBussinessType(1,action); }, selsectBussinessType(row){ + if (this.currentRow.id !== row.id) { + this.$message.error("请先选择需要操作的分库！"); + return; + } var busQuery = { code: this.currentCode, page: 1, limit: 50 } - + warehouseBussinessTypeList(busQuery).then((res) => { this.userBussinessTypeList = res.data.list; }).catch((error) => { @@ -1596,7 +1600,7 @@ export default { limit: 50 } warehouseBussinessTypeList(busQuery).then((res) => { - + this.userBussinessTypeList = res.data.list || []; }).catch((error) => { }); diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index f9fcf68..80ae941 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -152,13 +152,6 @@ @click.native="rollback(scope.row)" >撤回 --> - 提交 - diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index f72e0fb..c936076 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -183,7 +183,12 @@ export default { return { listQuery: { purType: null, - billNo: "", + udiCode: null, + unicode: null, + cpmctymc: null, + ggxh: null, + ylqxzcrbarmc: null, + thrPiId: null, page: 1, limit: 10, }, @@ -249,12 +254,20 @@ export default { this.$router.push({ path: "", }); - this.listQuery.udiCode=null - this.listQuery.unionCode=null - this.listQuery.cpmctymc=null - this.listQuery.ggxh=null - this.listQuery.ylqxzcrbarmc=null - this.listQuery.thrPiId=null + this.listQuery = { + purType: null, + udiCode: null, + unicode: null, + cpmctymc: null, + ggxh: null, + ylqxzcrbarmc: null, + thrPiId: null, + page: 1, + limit: 10 + } + this.multipleSelection = []; + this.radioCheck = null; + this.currentRow = null; this.getList(); }, tableRowClassName({row}) { @@ -345,7 +358,7 @@ export default { this.$message.error('未选择产品'); return; } - + if(this.ids.length>0){ for(var i=0;i { - + if (response.code === 20000) { this.$refs.inputRef.focus(); this.$refs.inputRef.select(); @@ -700,7 +700,7 @@ export default { }); }, addCode(event) { - + this.originCode = ""; this.sictomText = ""; this.formData.corpOrderId = this.formData.corpOrderId.trim(); @@ -765,7 +765,7 @@ export default { }, addCodeSubmit(tQuery) { - + addOrderWeb(tQuery).then((response) => { if (response.code === 20000) { this.idQuery.id = response.data.orderId; @@ -831,13 +831,15 @@ export default { message: "提交失败！" + this.editTitle, customClass: 'messageIndex' }); - - } else { - this.$message({ - type: 'error', - message: "提交失败！" + this.editTitle, - customClass: 'messageIndex' + this.$alert(response.message, '提示', { + confirmButtonText: '确定', + type: 'warning', + closeOnClickModal: true, + callback: action => { + this.$refs.inputRef.focus(); + this.$refs.inputRef.select(); + } }); } } @@ -930,7 +932,7 @@ export default { } getLocalJoinByUser(query) .then((response) => { - + this.busTypes = response.data.list || []; if (this.formData.action != null) { this.curAction = this.getActionItem(this.formData.action); @@ -968,7 +970,7 @@ export default { } , findMethod(query) { - + this.fromOptions = []; let cQuery = { key: query, @@ -1099,7 +1101,7 @@ export default { } , actionChange(item) { - + this.curAction = this.getActionItem(item); this.findMethod(); @@ -1223,11 +1225,11 @@ export default { } , created() { - + this.formData.code = ''; this.formData.actDate = new Date(); this.codeArray = []; - + this.getStorage(this.formData.action); if (this.$isNotBlank(this.idQuery.id)) { diff --git a/src/views/inventory/innerOrder.vue b/src/views/inventory/innerOrder.vue index 5c79e14..dfe9011 100644 --- a/src/views/inventory/innerOrder.vue +++ b/src/views/inventory/innerOrder.vue @@ -7,7 +7,7 @@ @@ -270,13 +270,11 @@ export default { listInnerOrderDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { this.loading = false; this.detailList = []; - this.total = 0; }); }, submitOrder(row) { diff --git a/src/views/inventory/innerOrderEditDialog.vue b/src/views/inventory/innerOrderEditDialog.vue index 1274d49..2028f62 100644 --- a/src/views/inventory/innerOrderEditDialog.vue +++ b/src/views/inventory/innerOrderEditDialog.vue @@ -39,16 +39,8 @@
- - - + + @@ -267,7 +259,7 @@ export default { } if (status === '0') { for (let i = 0; i < this.codeArray.length; i++) { - if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { + if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) { return this.$message.error('单据数量不能为0'); } } @@ -275,6 +267,16 @@ export default { if (status == "1") { this.submitFunction(status); } else { + if (this.codeArray.length < 1) { + this.$message.warning('未添加产品'); + return; + } + for (let i = 0; i < this.codeArray.length; i++) { + if (isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) { + this.$message.error('单据数量不能为0'); + return; + } + } let tip = "是否确定提交订单?"; this.$confirm(tip, "提示", { confirmButtonText: "确定", @@ -419,6 +421,8 @@ export default { this.query.limit = 100; this.query.orderIdFk = this.idQuery.id; this.formData = this.idQuery.formData; + this.formData.billNo = this.idQuery.formData.recordKey; + this.formData.billDate = this.idQuery.formData.createTime; this.orderEditor = true; this.sValue = this.formData.corpName; this.getStockOrderDetailList();