diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js index 78ab45f2..89083d94 100644 --- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js +++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js @@ -249,7 +249,7 @@ export const JeecgListMixin = { }, fuliao: function (id) { this.$refs.modalForm3.edit(id); - this.$refs.modalForm3.title = "工序辅料管理"; + this.$refs.modalForm3.title = "工序面料管理"; this.$refs.modalForm3.disableSubmit = false; }, gongju: function (id) { @@ -259,7 +259,7 @@ export const JeecgListMixin = { }, mianliao: function (id) { this.$refs.modalForm5.edit(id); - this.$refs.modalForm5.title = "工序面料管理"; + this.$refs.modalForm5.title = "工序辅料管理"; this.$refs.modalForm5.disableSubmit = false; }, handleAdd: function () { diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue index 550e970f..c8833255 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue @@ -98,11 +98,11 @@ 设备 - 辅料 + 面料 工具 - 面料 + 辅料 更多 diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue index ef19b0e4..0a1376c2 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue @@ -5,8 +5,8 @@ - - + + @@ -23,7 +23,7 @@
新增 - 导出 + 导出 @@ -124,7 +124,7 @@ xs: { span: 24 }, sm: { span: 16 }, }, - description: '面料表管理页面', + description: '辅料表管理页面', // 表头 columns: [ { @@ -148,12 +148,12 @@ dataIndex: 'processId_dictText' }, { - title:'面料编号', + title:'辅料编号', align:"center", dataIndex: 'accessoriesId' }, { - title:'面料', + title:'辅料', align:"center", dataIndex: 'accessoriesId_dictText' }, @@ -172,7 +172,7 @@ deleteBatch: "/pro/zyProcessAccessories/deleteBatch", exportXlsUrl: "/pro/zyProcessAccessories/exportXls", importExcelUrl: "pro/zyProcessAccessories/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -190,7 +190,7 @@ edit (record) { this.id = record; this.queryParam.processId=this.id; - console.log("燕慧森1号") + // console.log("燕慧森1号") this.loadData(); this.visible = true; @@ -200,7 +200,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) - fieldList.push({type:'popup',value:'accessoriesId',text:'面料表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) + fieldList.push({type:'popup',value:'accessoriesId',text:'辅料表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) this.superFieldList = fieldList } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue index 6467e719..37bd5e22 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue @@ -11,7 +11,7 @@ - + @@ -153,12 +153,12 @@ dataIndex: 'processId_dictText' }, { - title:'辅料编号', + title:'面料编号', align:"center", dataIndex: 'fabricId' }, { - title:'辅料', + title:'面料', align:"center", dataIndex: 'fabricId_dictText' }, @@ -195,7 +195,7 @@ edit (record) { this.id = record; this.queryParam.processId=this.id; - console.log("燕慧森1号") + // console.log("燕慧森1号") this.loadData(); this.visible = true; }, @@ -204,7 +204,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'}) - fieldList.push({type:'string',value:'fabricId',text:'辅料',dictCode:'zy_fabric,name,id'}) + fieldList.push({type:'string',value:'fabricId',text:'面料',dictCode:'zy_fabric,name,id'}) this.superFieldList = fieldList } }