From c3148091b5adfde56ebb18898c3b44dfc8d38eb2 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期四, 16 十一月 2023 10:04:43 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before --- src/views/plan/customerorder/index.vue | 2 +- src/views/plan/customerorder/schedule-table.vue | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue index 15515eb..1c1af1d 100644 --- a/src/views/plan/customerorder/index.vue +++ b/src/views/plan/customerorder/index.vue @@ -841,7 +841,7 @@ } if (this.permissions.customerorder_submit_oa) { this.table.toolbar.push({ - text: '鎻愪氦瀹℃牳', + text: '鎻愪氦OA瀹℃牳', type: 'primary', fun: this.auditCustomerOrder, disabled: false, diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue index d0aec79..0f60dab 100644 --- a/src/views/plan/customerorder/schedule-table.vue +++ b/src/views/plan/customerorder/schedule-table.vue @@ -84,15 +84,16 @@ label="鏈璁″垝鏁伴噺" > <template scope="scope"> - <el-form-item + <el-form-item>{{ scope.row.qtyPlaned }}</el-form-item> + <!-- <el-form-item :prop="'customer.' + scope.$index" :rules="rules.qtyPlaned" > <el-input v-model="scope.row.qtyPlaned" placeholder="璇疯緭鍏ユ湰娆¤鍒掓暟閲�" - ></el-input> - </el-form-item> + ></el-input> --> + <!-- </el-form-item> --> </template> </el-table-column> <el-table-column @@ -224,6 +225,9 @@ customerList.push(item) }) this.dataForm.customer = JSON.parse(JSON.stringify(customerList)) + this.dataForm.customer.forEach(item=>{ + item.qtyPlaned=item.buyQtyDue + }) }) }, dataFormSubmit() { -- Gitblit v1.9.3