diff --git a/src/api/processManagement/processCapability.js b/src/api/processManagement/processCapability.js new file mode 100644 index 00000000..ea7cad71 --- /dev/null +++ b/src/api/processManagement/processCapability.js @@ -0,0 +1,54 @@ +import request from '@/axios'; + +/** + * 工艺能力管理 + **/ + +// 获取列表数据 bsCraftAbility/queryAllCa +export const getQueryAllCaList = (current, size, params) => { + return request({ + url: '/bsCraftAbility/queryAllCa', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; +// 获取详情 +export const getQueryAllCaDeatils = (params) => { + return request({ + url: `/bsCraftAbility/getByKey/${params,id}`, + method: 'get', + params, + }); +}; + +// 编辑 +export const getQueryAllCaSave = (params) => { + return request({ + url: `/bsCraftAbility/saveOrEdit`, + method: 'get', + params, + }); +}; +// 删除 +export const getQueryAllCaDel = (params) => { + return request({ + url: `/bsCraftAbility/signDelete`, + method: 'get', + params, + }); +}; +// 模板下载 download/downloadDoc +// 导入 bsCraftAbility/importSave +// 导出 +export const exportBlob = (url, params) => { + return request({ + url: url, + params: params, + method: 'get', + responseType: 'blob', + }); +}; diff --git a/src/components/dialogCom/lookProcess.vue b/src/components/dialogCom/lookProcess.vue new file mode 100644 index 00000000..dd182043 --- /dev/null +++ b/src/components/dialogCom/lookProcess.vue @@ -0,0 +1,154 @@ + + + diff --git a/src/components/dialogCom/setCrew.vue b/src/components/dialogCom/setCrew.vue new file mode 100644 index 00000000..c9cd92df --- /dev/null +++ b/src/components/dialogCom/setCrew.vue @@ -0,0 +1,90 @@ + + diff --git a/src/components/dialogCom/setPersonnel.vue b/src/components/dialogCom/setPersonnel.vue new file mode 100644 index 00000000..6e78095f --- /dev/null +++ b/src/components/dialogCom/setPersonnel.vue @@ -0,0 +1,90 @@ + + diff --git a/src/config/website.js b/src/config/website.js index e295209a..78cea287 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -32,7 +32,7 @@ export default { fullscreen: false, theme: true, menu: true, - styleRadio:'1',//风格样式 + styleRadio:'4',//风格样式 }, //首页配置 fistPage: { diff --git a/src/store/modules/common.js b/src/store/modules/common.js index 6374447d..60aee510 100644 --- a/src/store/modules/common.js +++ b/src/store/modules/common.js @@ -11,7 +11,7 @@ const common = { isRefresh: true, isLock: getStore({ name: 'isLock' }), colorName: getStore({ name: 'colorName' }) || '#2C77F1', - themeName: 'theme-bule', + themeName: 'theme-white', lockPasswd: getStore({ name: 'lockPasswd' }) || '', website: website, setting: website.setting, diff --git a/src/views/orderManagement/exceptionOrder.vue b/src/views/orderManagement/exceptionOrder.vue index 86293e21..205af41e 100644 --- a/src/views/orderManagement/exceptionOrder.vue +++ b/src/views/orderManagement/exceptionOrder.vue @@ -1,3 +1,1378 @@ \ No newline at end of file + +
+ +
+ + + + + + + + + + + + + + + diff --git a/src/views/orderManagement/orderCol.js b/src/views/orderManagement/orderCol.js new file mode 100644 index 00000000..df766562 --- /dev/null +++ b/src/views/orderManagement/orderCol.js @@ -0,0 +1,705 @@ +export default { + plannedOrder:[ + { + label: '计划单号', + prop: 'poCode', + search: false, + sortable: true, + width: 150, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '零件号', + prop: 'partCode', + search: false, + sortable: true, + width: 150, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品型号', + prop: 'productType', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '名称', + prop: 'partName', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 100, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种', + prop: 'plate', + search: false, + sortable: true, + disabled: true, + span: 12, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种小类', + prop: 'plate', + search: false, + sortable: true, + width: 120, + display: false, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产标识', + prop: 'prodIdent', + search: false, + sortable: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '使用部门', + prop: 'useDept', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产数量', + prop: 'poQty', + search: false, + sortable: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '面积(d㎡)', + prop: 'poArea', + search: false, + sortable: true, + width: 120, + span: 12, + disabled: true, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '需求交期', + prop: 'demandDate', + search: false, + sortable: true, + width: 150, + span: 12, + + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划员', + prop: 'planUser', + search: false, + sortable: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划下达时间', + prop: 'releaseDate', + search: true, + sortable: true, + searchLabelWidth:120, + width: 150, + span: 12, + type: "date", + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '优先级', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划类型', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '工艺路线', + prop: 'createName', + search: false, + sortable: true, + disabled: true, + hide: true, + span: 24, + type: 'textarea', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '备注', + prop: 'memo', + search: false, + sortable: true, + span: 24, + type: 'textarea', + width: 150, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品系列', + prop: 'prodLine', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '已交付数量', + prop: 'deliveryQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '未交付数量', + prop: 'undeliveredQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '状态', + prop: 'curStatusText', + search: true, + sortable: true, + searchLabelWidth:80, + span: 12, + display: false, + type: 'select', + width: '100', + dicData: [{ + value: 2, + label: '已退回' + }, { + value: 4, + label: '已派工' + }, { + value: 5, + label: '加工中' + }, { + value: 15, + label: '已完工' + }, + { + value: 21, + label: '已关闭' + }] + }, + ], + exceptionOrder:[ + { + label: '描述', + prop: 'roamNo', + search: false, + sortable: true, + width: 150, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划单号', + prop: 'poCode', + search: false, + sortable: true, + width: 150, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '零件号', + prop: 'partCode', + search: false, + sortable: true, + width: 150, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品型号', + prop: 'productType', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '名称', + prop: 'partName', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 100, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种', + prop: 'plate', + search: false, + sortable: true, + disabled: true, + span: 12, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种小类', + prop: 'plate', + search: false, + sortable: true, + width: 120, + display: false, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产标识', + prop: 'prodIdent', + search: false, + sortable: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '使用部门', + prop: 'useDept', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产数量', + prop: 'poQty', + search: false, + sortable: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '面积(d㎡)', + prop: 'poArea', + search: false, + sortable: true, + width: 120, + span: 12, + disabled: true, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '需求交期', + prop: 'demandDate', + search: false, + sortable: true, + width: 150, + span: 12, + + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划员', + prop: 'planUser', + search: false, + sortable: true, + width: 120, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划下达时间', + prop: 'releaseDate', + search: true, + sortable: true, + searchLabelWidth:120, + width: 150, + span: 12, + type: "date", + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '优先级', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划类型', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '工艺路线', + prop: 'createName', + search: false, + sortable: true, + disabled: true, + hide: true, + span: 24, + type: 'textarea', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '备注', + prop: 'memo', + search: false, + sortable: true, + span: 24, + type: 'textarea', + width: 150, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品系列', + prop: 'prodLine', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '已交付数量', + prop: 'deliveryQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '未交付数量', + prop: 'undeliveredQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '状态', + prop: 'curStatusText', + search: true, + sortable: true, + searchLabelWidth:80, + span: 12, + display: false, + type: 'select', + width: '100', + dicData: [{ + value: 2, + label: '已退回' + }, { + value: 4, + label: '已派工' + }, { + value: 5, + label: '加工中' + }, { + value: 15, + label: '已完工' + }, + { + value: 21, + label: '已关闭' + }] + }, + ] +} \ No newline at end of file diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue index 78540c61..08bc17b5 100644 --- a/src/views/orderManagement/plannedOrder.vue +++ b/src/views/orderManagement/plannedOrder.vue @@ -1,3 +1,1430 @@ \ No newline at end of file + +
+ +
+ + + + + + + + + + + + + + + + diff --git a/src/views/platingType/index.vue b/src/views/platingType/index.vue deleted file mode 100644 index ef78b9da..00000000 --- a/src/views/platingType/index.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/processCapability/index.vue b/src/views/processCapability/index.vue deleted file mode 100644 index ae0f4a37..00000000 --- a/src/views/processCapability/index.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/processManagement/basicProcesses.vue b/src/views/processManagement/basicProcesses.vue new file mode 100644 index 00000000..f0424768 --- /dev/null +++ b/src/views/processManagement/basicProcesses.vue @@ -0,0 +1,600 @@ + + \ No newline at end of file diff --git a/src/views/processManagement/platingAssort.vue b/src/views/processManagement/platingAssort.vue new file mode 100644 index 00000000..2b1fc764 --- /dev/null +++ b/src/views/processManagement/platingAssort.vue @@ -0,0 +1,361 @@ + + \ No newline at end of file diff --git a/src/views/processManagement/platingTypeInfo.vue b/src/views/processManagement/platingTypeInfo.vue new file mode 100644 index 00000000..fd07e522 --- /dev/null +++ b/src/views/processManagement/platingTypeInfo.vue @@ -0,0 +1,930 @@ + + \ No newline at end of file diff --git a/src/views/procepssPlanning/index.vue b/src/views/processManagement/procepssPlanning.vue similarity index 100% rename from src/views/procepssPlanning/index.vue rename to src/views/processManagement/procepssPlanning.vue diff --git a/src/views/processManagement/processCapability.vue b/src/views/processManagement/processCapability.vue new file mode 100644 index 00000000..6cd809aa --- /dev/null +++ b/src/views/processManagement/processCapability.vue @@ -0,0 +1,450 @@ + + \ No newline at end of file diff --git a/src/views/processManagement/processTemplate.vue b/src/views/processManagement/processTemplate.vue index 2edf3199..20611d9d 100644 --- a/src/views/processManagement/processTemplate.vue +++ b/src/views/processManagement/processTemplate.vue @@ -1,3 +1,477 @@ \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/src/views/taskDispatch/index.vue b/src/views/processManagement/taskDispatch.vue similarity index 100% rename from src/views/taskDispatch/index.vue rename to src/views/processManagement/taskDispatch.vue diff --git a/src/views/taskProcessing/index.vue b/src/views/processManagement/taskProcessing.vue similarity index 100% rename from src/views/taskProcessing/index.vue rename to src/views/processManagement/taskProcessing.vue diff --git a/src/views/processTemplate/index.vue b/src/views/processTemplate/index.vue deleted file mode 100644 index 2edf3199..00000000 --- a/src/views/processTemplate/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/src/views/productionSchedulingPlan/productPlan.vue b/src/views/productionSchedulingPlan/productPlan.vue deleted file mode 100644 index 9e1dccab..00000000 --- a/src/views/productionSchedulingPlan/productPlan.vue +++ /dev/null @@ -1,1771 +0,0 @@ - - - diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index ba4b1e46..46530397 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -88,6 +88,7 @@ export default { viewBtn: true, menuWidth: 320, dialogClickModal: false, + excelBtn: true, column: [ { label: '菜单名称',