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 | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index d8e6d90..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()"
@@ -89,14 +89,14 @@
:loading="loadingStructIfs"
>鐗╂枡鍚屾ERP
</el-button> -->
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_refresh_ifsorder"
@click="refreshIfsorder()"
type="primary"
style="margin-left:10px;"
:loading="refreshIfsorderLoading"
>鍒锋柊ifs杞﹂棿璁㈠崟鍙�
- </el-button>
+ </el-button> -->
<el-button
@click="exportExcel"
@@ -105,13 +105,13 @@
:loading="loadingExcel"
>瀵煎嚭
</el-button>
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_update_orderno"
@click="updateOrderNo"
type="primary"
style="margin-left:10px;"
>鏇存柊璁㈠崟鍙�
- </el-button>
+ </el-button>-->
</template>
</ttable>
<customerorder
@@ -428,8 +428,8 @@
},
{
minWidth: '120',
- prop: 'orderRemark',
- label: '閿�鍞鍗曞娉�',
+ prop: 'remark',
+ label: '澶囨敞',
sort: true,
isTrue: true,
isSearch: true,
@@ -823,14 +823,7 @@
}
],
toolbar: [],
- operator: [
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.searchStock
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -934,12 +927,12 @@
fun: this.getOperationTaskByCustomer
})
}
- if (this.permissions.manufacturingorder_order_merge) {
- this.table.toolbar.push({
- text: '璁㈠崟鍚堝苟',
- fun: this.openOrderMerge
- })
- }
+ // if (this.permissions.manufacturingorder_order_merge) {
+ // this.table.toolbar.push({
+ // text: '璁㈠崟鍚堝苟',
+ // fun: this.openOrderMerge
+ // })
+ // }
/**
* {
@@ -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