From e06313b6dba4774aef0924f342f13e8433f8d6f6 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 01 十二月 2023 15:32:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/plan/manufacturingorder/index.vue | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue index 568bf63..c6e2cf8 100644 --- a/src/views/plan/manufacturingorder/index.vue +++ b/src/views/plan/manufacturingorder/index.vue @@ -48,7 +48,7 @@ </el-dropdown-menu> </el-dropdown> - <el-dropdown + <!-- <el-dropdown v-if="permissions.manufacturingorder_issue_material" @command="issueMaterialHandleCommand" style="margin-left:10px;" @@ -64,7 +64,7 @@ >{{ item.label }}</el-dropdown-item > </el-dropdown-menu> - </el-dropdown> + </el-dropdown> --> <!-- <el-button v-if="permissions.manufacturingorder_orderto_ifs" @click="commitOrderIfs()" @@ -110,8 +110,8 @@ @click="updateOrderNo" type="primary" style="margin-left:10px;" - >鏇存柊璁㈠崟鍙� --> - </el-button> + >鏇存柊璁㈠崟鍙� + </el-button>--> </template> </ttable> <customerorder @@ -823,14 +823,7 @@ } ], toolbar: [], - operator: [ - { - text: '鏌ョ湅搴撳瓨', - type: 'text', - size: 'small', - fun: this.searchStock - } - ], + operator: null, operatorConfig: { fixed: 'right', label: '鎿嶄綔', @@ -1130,6 +1123,7 @@ getByMoIds([this.orderPlan.id]).then((repsonse) => { const resData = repsonse.data.data const resCode = repsonse.data.code + console.log("resData-----",repsonse); if (resCode === 0) { const _that = this for (const key in resData) { @@ -1658,3 +1652,8 @@ } } </script> +<style lang="scss"> +.gantt-info { + display: none !important; +} +</style> -- Gitblit v1.9.3