diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue index 49c17d12..ecd47196 100644 --- a/src/views/inout/DialogThrReviewOrder.vue +++ b/src/views/inout/DialogThrReviewOrder.vue @@ -108,14 +108,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue index ed979144..1f77d702 100644 --- a/src/views/inventory/supInoutSearchOrder.vue +++ b/src/views/inventory/supInoutSearchOrder.vue @@ -191,6 +191,7 @@ export default { limit: 10, startAduditTime: null, endAduditTime: null, + actionType: "norDetail", }; this.actDateRange=[] this.getList(); @@ -215,7 +216,7 @@ export default { }, getList() { this.loading = true; - this.filterQuery.actionType = this.actionType; + // this.filterQuery.actionType = this.actionType; getResultOrderList(this.filterQuery) .then((response) => { if (response.code === 20000) { diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue index 0e109212..d83bcf8d 100644 --- a/src/views/purchase/company/supCompanyEditDialog.vue +++ b/src/views/purchase/company/supCompanyEditDialog.vue @@ -517,6 +517,7 @@ export default { this.inputQuery.mobile=row.mobile this.inputQuery.detailAddr=row.addr this.customerId=this.inputQuery.customerId; + this.getCompanyCertList(); }, cancelDialog() { diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 8e91105b..5b829084 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -559,7 +559,6 @@ export default { if (formName === "edit") { this.subData = JSON.parse(JSON.stringify(data)); this.subData.advanceType = this.subData.advanceType.toString(); - this.query.advanceType=1; if (this.subData.parentCode != null && this.subData.parentCode != "") { this.isAdvanceTypeShow = true; this.isShow = false; @@ -578,9 +577,6 @@ export default { this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code}; } } - //转换 - let advanceTypese = this.subData.advanceType - this.subFormVisible = true; this.getSubThrsysDetailData(); @@ -630,7 +626,6 @@ export default { } }, forInvSubmit() { // 新增,编辑---提交 - this.subData.advanceType=1; this.$refs["dataForm"].validate(valid => { if (valid) { saveSubWarehouse(this.subData, this.formName).then((response) => { diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue index 8be05fe5..d060a2be 100644 --- a/src/views/system/param/busTypeChange.vue +++ b/src/views/system/param/busTypeChange.vue @@ -153,7 +153,8 @@ export default { 1: "耗材领用", 2: "产品申购", 3: "采购计划", - 4: "盘点转单" + 4: "盘点转单", + 5: "采购订单" }, orderStatus: { 1: "草稿", diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue index 7e581e0c..0c8e75b0 100644 --- a/src/views/system/print/pdfTmpleateManage.vue +++ b/src/views/system/print/pdfTmpleateManage.vue @@ -106,7 +106,8 @@ - + +