diff --git a/src/views/firstOrder/components/approvalProcessDialog.vue b/src/views/firstOrder/components/approvalProcessDialog.vue index 002be0f..6555a49 100644 --- a/src/views/firstOrder/components/approvalProcessDialog.vue +++ b/src/views/firstOrder/components/approvalProcessDialog.vue @@ -89,9 +89,16 @@ export default { } .teps-con { - margin: 0 auto 0 + margin: 0 auto 0; + :deep(.el-step) { + margin-bottom: 10px; + &:last-child { + margin-bottom: 0; + } + } } + // :deep(.el-dialog__body) { // height: 300px; // } diff --git a/src/views/firstOrder/components/consumableDialog.vue b/src/views/firstOrder/components/consumableDialog.vue index d354c13..e435564 100644 --- a/src/views/firstOrder/components/consumableDialog.vue +++ b/src/views/firstOrder/components/consumableDialog.vue @@ -1,6 +1,6 @@ - - diff --git a/src/views/firstOrder/components/inDialog copy.vue b/src/views/firstOrder/components/inDialog copy.vue deleted file mode 100644 index 6c96c8f..0000000 --- a/src/views/firstOrder/components/inDialog copy.vue +++ /dev/null @@ -1,459 +0,0 @@ - - - diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue index f5404d0..ebf4013 100644 --- a/src/views/firstOrder/components/inDialog.vue +++ b/src/views/firstOrder/components/inDialog.vue @@ -616,7 +616,6 @@ export default { ldOnePutStorageDetailVOList: [], //入库明细 }, inTableData: [], - inBatchDialogVisible: false, //选择采购单的数据 batchType: "", //批量选择类型 materialsType: "", diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue index 43b3abc..fa85953 100644 --- a/src/views/firstOrder/components/outDialog.vue +++ b/src/views/firstOrder/components/outDialog.vue @@ -428,7 +428,7 @@ v-if="consumableVisible" :consumableVisible="consumableVisible" :demandDialogTitle="demandDialogTitle" - @handleCloseDetail="handleCloseDetail" + @handleCloseDetail="closeDialog" @confirm="confirm" > @@ -594,20 +594,22 @@ export default { }, getStatistics() { getStatistics(this.sizeForm.inTableData).then((res) => { - this.statisticsList = res.data.result; + this.statisticsList = res.data.result this.statisticsList = this.statisticsList.map((stat) => { const detail = this.sizeForm.inTableData.find( (item) => item.materialCode === stat.materialCode - ); - console.log("detail", detail, stat); + ) + console.log("detail", detail, stat) return { ...stat, theOutboundQuantity: detail.theOutboundQuantity, //本次出库数量 unitPrice: detail.unitPrice, totalQuantity: stat.num - detail.theOutboundQuantity, - }; - }); - }); + department: detail.department, // 部门ID + departmentName: detail.departmentName || this.getDepartmentName(detail.department), + } + }) + }) }, changeDepartment(){ this.getStatistics() @@ -618,7 +620,7 @@ export default { selectionChange(row) { this.batchSelectionVisible = false; this.sizeForm.inTableData = row; - this.getStatistics(); + this.getStatistics(); }, confirm(allSelectedList) { this.consumableVisible = false; @@ -693,9 +695,12 @@ export default { //关闭新增弹窗 handleCloseDetail() { this.outDialogVisible = false; - this.consumableVisible = false; + this.$emit("handleCloseDetail"); }, + closeDialog() { + this.consumableVisible = false; + }, // 获取批量需求单列表 async getQuarterList() { try { @@ -834,8 +839,8 @@ export default { getDepartmentName(departmentId) { const department = this.list.find( (item) => item.departmentId === departmentId - ); - return department ? department.department : ""; + ) + return department ? department.department : "" }, //获取单条选择的物资名称列表 async getMaterialList() { diff --git a/src/views/firstOrder/components/recordDialog.vue b/src/views/firstOrder/components/recordDialog.vue index bb83b87..e7e2346 100644 --- a/src/views/firstOrder/components/recordDialog.vue +++ b/src/views/firstOrder/components/recordDialog.vue @@ -5,13 +5,12 @@ :visible.sync="openShow" width="50%" @close="closeDialog" - :style="{ height: '600px' }" > - +
+
@@ -44,7 +44,7 @@ export default { data() { return { openShow: false, - transactionType: "1", + transactionType: "2", tableData: [], purchaseTitle: "记录", data: [], diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue index e3b1c37..f75edd9 100644 --- a/src/views/firstOrder/inbound.vue +++ b/src/views/firstOrder/inbound.vue @@ -236,6 +236,10 @@ export default { label: "已审批", value: 3, }, + { + label: "审批失败", + value: 4, + }, ], }, ], diff --git a/src/views/materials/index.vue b/src/views/materials/index.vue index 36ad135..b2175df 100644 --- a/src/views/materials/index.vue +++ b/src/views/materials/index.vue @@ -76,12 +76,14 @@ export default { search: true, headerAlign: "center", align: "center", + rules: [{ required: true, message: "请输入物资名称", trigger: "blur" }] }, { label: "规格/型号", prop: "model", headerAlign: "center", align: "center", + rules: [{ required: true, message: "请输入规格/型号", trigger: "blur" }] }, { label: "物资编码", @@ -95,12 +97,14 @@ export default { value: "value", }, dataType: "string", + rules: [{ required: true, message: "请选择物资编码", trigger: "change" }] }, { label: "单位", prop: "unit", headerAlign: "center", align: "center", + rules: [{ required: true, message: "请输入单位", trigger: "blur" }] }, { label: "描述", diff --git a/src/views/secondOrder/components/categoryDialog copy.vue b/src/views/secondOrder/components/categoryDialog copy.vue deleted file mode 100644 index a35a87f..0000000 --- a/src/views/secondOrder/components/categoryDialog copy.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/secondOrder/components/categoryDialog.vue b/src/views/secondOrder/components/categoryDialog.vue index 9e0f06e..2a4f5f3 100644 --- a/src/views/secondOrder/components/categoryDialog.vue +++ b/src/views/secondOrder/components/categoryDialog.vue @@ -41,7 +41,6 @@