diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js
index 2d5f910..456a9ad 100644
--- a/src/api/shopOrder/shopOrder.js
+++ b/src/api/shopOrder/shopOrder.js
@@ -80,5 +80,17 @@ export const getOrderNoItemNoCenter = data => createAPI('/shopOrder/getOrderNoIt
//查询--生产派工单 ---》取消派工单操作
export const cancelScheduleWithScheduleQuery = data => createAPI('/scheduling/cancelScheduleWithScheduleQuery', 'post', data)
+//查询工单的工具信息
+export const getShopOrderToolDatas = data => createAPI('/shopOrder/getShopOrderToolDatas', 'post', data)
+
+//新增工单的工具信息
+export const insertShopOrderToolData = data => createAPI('/shopOrder/insertShopOrderToolData', 'post', data)
+
+//修改工单的工具信息
+export const updateShopOrderToolData = data => createAPI('/shopOrder/updateShopOrderToolData', 'post', data)
+
+//查询工单的工具信息
+export const deleteShopOrderToolData = data => createAPI('/shopOrder/deleteShopOrderToolData', 'post', data)
+
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index ca95e6e..b45772a 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -93,6 +93,8 @@
:disabled="primaryMenuButton.partStockFlag">查看物料库存
+ {{ buttons.settingTable }}
+ {{ buttons.defaultTable }}
+
+
+
@@ -145,16 +150,29 @@
import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
import comScheduleOrderExpand from '@/views/modules/schedule/com_schedule_order_expand';/*排产扩展 排产单个工单*/
+ import column from '@/views/modules/common/column';/*动态表头*/
+
import {
getShopOrderList,
getCurrentWorkCenterNoByResourceId,
-} from '@/api/schedule/order_schedule_expand.js'
+} from '@/api/schedule/order_schedule_expand.js';
+
+ /*动态表头*/
+ import {
+ saveTableDefaultList,
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ removerDefault,
+ removerUser
+ } from "@/api/table.js";
export default {
data() {
return {
height: 200,
tagNo: '',
+ showDefault: false,
+ visible: false,
showPartStockFlag: false,
showScheduleOrderFlag: false,
currentRoutingRow: {},
@@ -184,7 +202,7 @@ export default {
},
shopOrderList: [],
dataListLoading: false,
- columnOrderArray: [
+ columnList: [
{
userId: this.$store.state.user.name,
functionId: 5301,
@@ -816,11 +834,41 @@ export default {
fixed: false
},
],
+ buttons: {
+ settingLanguageList: '按语言设置',
+ edit: '编辑',
+ delete: '删除',
+ deleteList: '批量删除',
+ cz: '操作',
+ search: '查询',
+ download: '导出',
+ settingTable: '设置列表',
+ defaultTable: '设置默认配置',
+ list: "列表",
+ addList: '批量添加',
+ settingLanguage: "按控件设置"
+ },
calendarOutList: [],
primaryMenuButton: {
shopOrderFlag: true,
partStockFlag: true,
},
+ queryTable:{
+ userId: this.$store.state.user.name,
+ functionId: this.$route.meta.menuId,
+ tableId: "5301Order",
+ languageCode: this.$i18n.locale
+ },
+ // 用户table 查询参数
+ queryTableUser: {
+ userId: this.$store.state.user.name,
+ functionId: this.$route.meta.menuId,
+ tableId: "5301Order",
+ status: true,
+ languageCode: this.$i18n.locale
+ },
+ // 用户table 配置集合
+ userColumnList: [],
}
},
@@ -829,6 +877,7 @@ export default {
Chooselist,/*列表的组件*/
comPartStock,/*展示物料库存的组件*/
comScheduleOrderExpand,/*扩展排产 处理多加工中心排产*/
+ column,/*动态列*/
},
mounted() {
@@ -977,6 +1026,89 @@ export default {
}
},
+ // 打开页面设置
+ userSetting() {
+ this.visible = true;
+ let queryTable = {
+ userId: this.$store.state.user.name,
+ functionId: this.$route.meta.menuId,
+ tableId: "5301Order",
+ languageCode: this.$i18n.locale
+ }
+ this.$nextTick(() => {
+ this.$refs.column.init(queryTable);
+ });
+ },
+ // 获取 用户保存的 格式列
+ getTableUserColumn() {
+ getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+ if (data.rows.length > 0) {
+ //this.columnList = []
+ this.columnList = data.rows
+ } else {
+ this.getColumnList()
+ }
+
+ })
+ },
+ // 保存 默认配置 列
+ async saveColumnList() {
+ // 删除所有的该页面下保存的数据
+ if (this.userColumnList) {
+ //删除 user自定义的数据
+ await removerUser(this.queryTable)
+ }
+ // 删除默认配置
+ await removerDefault(this.queryTable)
+ // 保存页面 table属性
+ let sumColumnList = this.columnList;//concat(this.columnList1);
+ sumColumnList = sumColumnList.map(item => {
+ return item = {
+ tableId: item.tableId,
+ tableName: item.tableName,
+ columnProp: item.columnProp,
+ columnLabel: item.columnLabel,
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ columnWidth: item.columnWidth,
+ format: item.format,
+ functionId: this.$route.meta.menuId,
+ sortLv: item.sortLv,
+ status: true,
+ fixed: item.fixed,
+ serialNumber: item.serialNumber,
+ columnType: item.columnType,
+ align: item.align
+ }
+ })
+
+ await saveTableDefaultList(sumColumnList)
+ // 保存页面 button label title 属性
+ /* let buttons = this.buttonList.map(item => {
+ return item = {
+ functionId: this.$route.meta.menuId,
+ languageValue: item.languageValue,
+ objectId: item.objectId,
+ objectType: item.objectType,
+ tableId: item.tableId
+ }
+ })
+ await saveButtonList(buttons)*/
+ this.getFunctionButtonList()
+ this.getColumnList()
+ },
+ // 获取 tableDefault 列
+ getColumnList() {
+ getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+ if (!data.rows.length == 0) {
+ // this.showDefault = false
+ this.columnList = data.rows
+ } else {
+ // this.showDefault = true
+ }
+ })
+ },
diff --git a/src/views/modules/shopOrder/shopOrder/common/shop_order_tool.vue b/src/views/modules/shopOrder/shopOrder/common/shop_order_tool.vue
new file mode 100644
index 0000000..53d823f
--- /dev/null
+++ b/src/views/modules/shopOrder/shopOrder/common/shop_order_tool.vue
@@ -0,0 +1,455 @@
+
+
+
+
+
+ {{ '新增' }}
+
+ {{ '修改' }}
+
+ {{ '删除' }}
+
+ {{ '复制' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工具编码：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+