diff --git a/src/views/jhzx/qfxqwh.vue b/src/views/jhzx/qfxqwh.vue index 697e943..96dfa0a 100644 --- a/src/views/jhzx/qfxqwh.vue +++ b/src/views/jhzx/qfxqwh.vue @@ -276,8 +276,6 @@ export default { this.$refs.xDown4.showPanel() }, keyupEvent4() { - - if (this.queryParam.dcch) { this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1) } else { @@ -305,7 +303,10 @@ export default { endLoading() if (res.success) { this.$message({ message: '导入成功', type: 'success' }) - this.initList(); + this.list = res.data + if (this.$refs.xGrid) { + this.$refs.xGrid.loadData(this.list) + } } else { Message({ diff --git a/src/views/jhzx/sygdCX.vue b/src/views/jhzx/sygdCX.vue index cafceaf..96fc9e6 100644 --- a/src/views/jhzx/sygdCX.vue +++ b/src/views/jhzx/sygdCX.vue @@ -34,7 +34,7 @@ - * 表中红色数据：钢加小组结束期为休息日 + @@ -59,8 +59,6 @@ highlight-current-row highlight-hover-row show-overflow - :cell-style="cellStyle2" - @cell-click="cellClickEvent" > diff --git a/src/views/jhzx/sygdSH.vue b/src/views/jhzx/sygdSH.vue index c12ab2e..5c8ed90 100644 --- a/src/views/jhzx/sygdSH.vue +++ b/src/views/jhzx/sygdSH.vue @@ -38,7 +38,7 @@ - * 表中红色数据：钢加小组结束期为休息日 + @@ -63,7 +63,6 @@ highlight-current-row highlight-hover-row show-overflow - :cell-style="cellStyle2" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" > diff --git a/src/views/jhzx/sygdWH.vue b/src/views/jhzx/sygdWH.vue index a7547b9..25d621d 100644 --- a/src/views/jhzx/sygdWH.vue +++ b/src/views/jhzx/sygdWH.vue @@ -55,7 +55,7 @@ - * 表中红色数据：钢加小组结束期为休息日 + @@ -83,7 +83,6 @@ highlight-current-row highlight-hover-row show-overflows - :cell-style="cellStyle2" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" :scroll-y="{ enabled: true }" diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue index c589c46..1fd8222 100644 --- a/src/views/jhzx/symxCX.vue +++ b/src/views/jhzx/symxCX.vue @@ -29,7 +29,7 @@
提取明细 汇总 - * 表中红色数据：钢料滚动需求期为休息日 + +
diff --git a/src/views/sjzx/sbcnWH.vue b/src/views/sjzx/sbcnWH.vue index e4325b6..8b57368 100644 --- a/src/views/sjzx/sbcnWH.vue +++ b/src/views/sjzx/sbcnWH.vue @@ -64,11 +64,51 @@ highlight-hover-row @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" + @cell-dblclick="cellClickEvent_xb" > + + + + @@ -82,18 +122,24 @@ import { update, delete1, } from "@/api/sjzx/sbcnWH"; +import { getList as getSbList}from "@/api/sjzx/sbxxWH"; export default { - name: "sbcnWH", + name: "sbcnWH1", data() { return { request: { tzbh: "", sbmc: "", }, + dialogVisible1: false, + title1: '选择加工设备', + mxList: [], + sbList:[], + sbbh:"", list: [], height: "500px", tableColumn: [ - // { type: "checkbox", width: "50", align: "center" }, + { type: "checkbox", width: "50", align: "center" }, { type: "seq", width: "50", title: "序号", align: "center" }, { field: 'tzbh', title: '套料图名称', width: 120,formatter:['dictFormat','QGKW'], editRender: { @@ -114,7 +160,7 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'jgsx', title: '加工顺序', width: 120,editRender: { name: "$input"}, + { field: 'jgsx', title: '加工顺序', width: 120,editRender: { name: "$input",props: { clearable: true },}, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -127,7 +173,15 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'jldw', title: '计量单位', width: 160,formatter:['dictFormat','JLDW'], + { + field: "sbbh", + title: "设备编号", + width: 120, + // editRender: { name: "$input",props: { clearable: true },}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'kw', title: '加工跨', width: 120,formatter:['dictFormat','CNKW'], editRender: { name: "$select", options: [], @@ -136,36 +190,218 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'degs', title: '定额工时(小时)', width: 160,editRender: { name: "$input"}, + { field: 'bjry', title: '编辑人员', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'degsYb', title: '定额工时(夜班)', width: 160,editRender: { name: "$input"}, + { field: 'bjrq', title: '编辑日期', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, + } + ], + tableColumn1:[ + { type: "checkbox", width: "50", align: "center", fixed: "left" }, + { + type: "seq", + width: "50", + title: "序号", + align: "center", + fixed: "left", }, - { field: 'sdgs', title: '实动工时(小时)', width: 160,editRender: { name: "$input"}, + { + field: "szcs", + title: "所属部门", + align: "center", + minWidth: "110", + formatter:['dictFormat','BMBM'], + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + { + field: "sbbh", + title: "设备编号", + align: "center", + minWidth: "120", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + { + field: "sbmc", + title: "设备名称", + align: "center", + minWidth: "110", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + { + field: "sbxh", + title: "设备型号", + align: "center", + minWidth: "110", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + + { field: 'gx', title: '工序', width: 100,formatter:['dictFormat','PCGX'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'kw', title: '加工跨', width: 120,formatter:['dictFormat','CNKW'], - editRender: { - name: "$select", - options: [], - props: { clearable: true }, - }, + { field: 'degs', title: '定额工时(小时)', width: 130, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bjry', title: '编辑人员', width: 120, + { field: 'degsYb', title: '定额工时(夜班)', width: 130, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bjrq', title: '编辑日期', width: 120, + { field: 'sdgs', title: '实动工时(小时)', width: 130, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, - } - ], + }, + { field: 'cndw', title: '计量单位', width: 110,formatter:['dictFormat','JLDW'], + + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { + field: "sbyxzt", + title: "设备状态", + align: "center", + minWidth: "110", + formatter:this.formatterSbzt, + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + { + field: "whsj1", + title: "维护开始时间", + align: "center", + minWidth: "150", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + { + field: "whsj2", + title: "维护结束时间", + align: "center", + minWidth: "150", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + { + field: "xqrs", + title: "默认人数", + align: "center", + minWidth: "110", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + + ], validRules: { // sbbh: [{ required: true, message: "设备编号不可为空" }], }, @@ -192,21 +428,58 @@ export default { options: [], sbmcOptions: [], checkedList: [], + checkedList1: [], + cnIndex:0, + }; }, created() { window.addEventListener("resize", this.getHeight); this.getHeight(); - this.emSbjbbZM("QGKW"); - this.emSbjbbZM("bmbm"); this.getBMMCBM(); this.initList(); this.initgxList(); - this.initdwList(); + this.emSbjbbZM("QGKW"); + this.emSbjbbZM("bmbm"); this.initkwList(); - // this.initzlList(); + this.initSb(); }, methods: { + formatterSbzt({ cellValue }){ + if (cellValue === '0') { + return '正常' + } else if (cellValue === '1') { + return '维护' + } + return '' + }, + initSb(){ + getSbList(this.request).then((res) => { + this.sbList = res.data; + }); + }, + //修改设备信息；根据修改后的设备信息；重新排计划期 + save() { + if (this.checkedList1.length>1 ||this.checkedList1.length==0){ + this.$message.warning('请选择一个设备！'); + }else { + this.list[this.cnIndex].sbbh=this.checkedList1[0].sbbh + this.dialogVisible1 = false; + } + }, + //设备信息弹窗 + cellClickEvent_xb(row) { + var gx= row.row.gx; + this. sbbh= row.row.sbbh; + this.cnIndex=row.rowIndex; + //设备list 找到工序下的设备 + this.mxList = this.sbList.filter((item, index) => { + if ( item.gx == gx){ + return item; + } + }); + this.dialogVisible1 = true + }, // 工序 xn20231110 initgxList(){ const dict=window.localStorage.getItem( 'PCGX'); @@ -227,42 +500,6 @@ export default { zl.editRender.options = this.zlOptions; }); - }, - initdwList(){ - const dict=window.localStorage.getItem( 'JLDW'); - const dwList =JSON.parse(dict) - this.$nextTick(() => { - const tableRef = this.$refs.tableRef; - const cndw = tableRef.getColumnByField("jldw"); - const testList = []; - for (let i = 0; i < dwList.length; i++) { - const temp = { - label: dwList[i].bmsm, - value: dwList[i].bm, - }; - testList.push(temp); - } - cndw.editRender.options = testList; - }); - - }, - initzlList(){ - const dict=window.localStorage.getItem( 'ZLLB'); - const dwList =JSON.parse(dict) - this.$nextTick(() => { - const tableRef = this.$refs.tableRef; - const cndw = tableRef.getColumnByField("zl"); - const testList = []; - for (let i = 0; i < dwList.length; i++) { - const temp = { - label: dwList[i].bmsm, - value: dwList[i].bm, - }; - testList.push(temp); - } - cndw.editRender.options = testList; - }); - }, initkwList(){ const dict=window.localStorage.getItem( 'CNKW'); @@ -310,17 +547,21 @@ export default { const tableRef = this.$refs.tableRef; if (params == "bmbm") { // 所属部门 - this.departmentOptions = res.data; - const sbztText = tableRef.getColumnByField("szcs"); - const testList = []; - for (let i = 0; i < this.departmentOptions.length; i++) { - const temp = { - label: this.departmentOptions[i].bmsm, - value: this.departmentOptions[i].bm, - }; - testList.push(temp); - } - sbztText.editRender.options = testList; + // this.departmentOptions = res.data; + // const sbztText = tableRef.getColumnByField("szcs"); + // const testList = []; + // Object.keys(this.options).forEach((item) => { + // for (let i = 0; i < this.departmentOptions.length; i++) { + // if (item == this.departmentOptions[i].bm) { + // const temp = { + // label: this.departmentOptions[i].bmsm, + // value: this.departmentOptions[i].bm, + // }; + // testList.push(temp); + // } + // } + // sbztText.editRender.options = testList; + // }); } else if (params == "QGKW") { // 跨位 this.kwOptions = res.data; @@ -337,44 +578,12 @@ export default { } }); }, - - // 监听选择所属部门 - changeSzcs(row, id) { - console.log(row, id); - if (row.row.szcs) { - row.row.sbmcDisabled = false; - row.row.sbmc = ""; - row.row.sbbh = ""; - this.sbmcOptions = []; - const testList = []; - console.log(this.options, "======"); - for (let i = 0; i < this.options[id.value].length; i++) { - const temp = { - label: this.options[id.value][i].sbmc, - value: this.options[id.value][i].sbbh, - }; - testList.push(temp); + cellStyle({row}) { + if (row.sbbh==this.sbbh) { + return { + color: 'blue', + cursor: 'pointer' } - this.sbmcOptions = testList; - } else { - row.row.sbmcDisabled = true; - row.row.sbmc = ""; - row.row.sbbh = ""; - this.sbmcOptions = []; - } - }, - // 监听选择设备名称 - changeSbmc(event, row) { - if (row.sbmc) { - row.sbbh = event.value; - let arr = this.sbmcOptions.filter((item, index) => { - if (item.value == event.value) { - return item; - } - }); - row.sbmc = arr[0].label; - } else { - row.sbbh = ""; } }, // 全选 @@ -387,6 +596,16 @@ export default { const records = this.$refs.tableRef.getCheckboxRecords(); this.checkedList = records; }, + // 全选 + selectAllEvent1() { + const records = this.$refs.tableRef1.getCheckboxRecords(); + this.checkedList1 = records; + }, + // 单选 + selectChangeEvent1() { + const records = this.$refs.tableRef1.getCheckboxRecords(); + this.checkedList1 = records; + }, // 操作 async toolbarButtonClickEvent(code) { const { insertRecords, removeRecords, updateRecords } = @@ -429,14 +648,7 @@ export default { flag = true; break; } - if(insertRecords[i].jldw === undefined || insertRecords[i].jldw === "" || insertRecords[i].jldw === null){ - flag = true; - break; - } - if(insertRecords[i].degs === undefined || insertRecords[i].degs === "" || insertRecords[i].degs === null){ - flag = true; - break; - } + } if(flag){ this.$message.error({message:"新增内容未达到可保存标准，请把必要信息空白补全。"}) diff --git a/src/views/sjzx/sbxxWH.vue b/src/views/sjzx/sbxxWH.vue index 53bd589..d85db91 100644 --- a/src/views/sjzx/sbxxWH.vue +++ b/src/views/sjzx/sbxxWH.vue @@ -49,9 +49,9 @@ - 保存 + + + @@ -274,156 +274,156 @@ export default { ], filterRender: { name: "FilterCombination" }, }, - { - field: "sbyxzt", - title: "设备状态", - align: "center", - editRender: { - name: "$select", - options: [], - props: { clearable: true }, - }, - minWidth: "110", - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, - }, - ], - filterRender: { name: "FilterCombination" }, - }, - { - field: "whsj1", - title: "维护开始时间", - align: "center", - editRender: { - name: '$input', - props:{type:"date" , - valueFormat:"yyyy/MM/dd",labelFormat:"yyyy/MM/dd",clearable: true,}, - events: { - change: this.changeWhsj1 - },}, - formatter: this.whsj1, - minWidth: "150", - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, - }, - ], - filterRender: { name: "FilterCombination" }, - }, - { - field: "whsj2", - title: "维护结束时间", - align: "center", - editRender: { name: '$input', - props:{type:"date" ,valueFormat:"yyyy/MM/dd",labelFormat:"yyyy/MM/dd",clearable: true,}, - events: { - change: this.changeWhsj2 - }, - }, - formatter: this.whsj2, - minWidth: "150", - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, - }, - ], - filterRender: { name: "FilterCombination" }, - }, - { field: 'tzbh', title: '套料图名称', width: 120,formatter:['dictFormat','QGKW'], - editRender: { - name: "$select", - options: [], - props: { clearable: true }, - }, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'gx', title: '工序', width: 160,formatter:['dictFormat','PCGX'], - editRender: { - name: "$select", - options: [], - props: { clearable: true }, - }, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { - field: "xqrs", - title: "默认人数", - align: "center", - editRender: { name: "input" }, - minWidth: "110", - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, - }, - ], - filterRender: { name: "FilterCombination" }, - }, - { - field: "gz", - title: "工种", - align: "center", - formatter:['dictFormat','RYGX'], - editRender: { - name: "$select", - options: [], - props: { clearable: true }, - }, - minWidth: "110", - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, - }, - ], - filterRender: { name: "FilterCombination" }, - }, + // { + // field: "sbyxzt", + // title: "设备状态", + // align: "center", + // editRender: { + // name: "$select", + // options: [], + // props: { clearable: true }, + // }, + // minWidth: "110", + // filters: [ + // { + // data: { + // checks: [], + // sVal: "", + // sMenu: "", + // fType1: "", + // fVal1: "", + // fMode: "and", + // fType2: "", + // fVal2: "", + // }, + // }, + // ], + // filterRender: { name: "FilterCombination" }, + // }, + // { + // field: "whsj1", + // title: "维护开始时间", + // align: "center", + // editRender: { + // name: '$input', + // props:{type:"date" , + // valueFormat:"yyyy/MM/dd",labelFormat:"yyyy/MM/dd",clearable: true,}, + // events: { + // change: this.changeWhsj1 + // },}, + // formatter: this.whsj1, + // minWidth: "150", + // filters: [ + // { + // data: { + // checks: [], + // sVal: "", + // sMenu: "", + // fType1: "", + // fVal1: "", + // fMode: "and", + // fType2: "", + // fVal2: "", + // }, + // }, + // ], + // filterRender: { name: "FilterCombination" }, + // }, + // { + // field: "whsj2", + // title: "维护结束时间", + // align: "center", + // editRender: { name: '$input', + // props:{type:"date" ,valueFormat:"yyyy/MM/dd",labelFormat:"yyyy/MM/dd",clearable: true,}, + // events: { + // change: this.changeWhsj2 + // }, + // }, + // formatter: this.whsj2, + // minWidth: "150", + // filters: [ + // { + // data: { + // checks: [], + // sVal: "", + // sMenu: "", + // fType1: "", + // fVal1: "", + // fMode: "and", + // fType2: "", + // fVal2: "", + // }, + // }, + // ], + // filterRender: { name: "FilterCombination" }, + // }, + // { field: 'tzbh', title: '套料图名称', width: 120,formatter:['dictFormat','QGKW'], + // editRender: { + // name: "$select", + // options: [], + // props: { clearable: true }, + // }, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { field: 'gx', title: '工序', width: 160,formatter:['dictFormat','PCGX'], + // editRender: { + // name: "$select", + // options: [], + // props: { clearable: true }, + // }, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + // { + // field: "xqrs", + // title: "默认人数", + // align: "center", + // editRender: { name: "input" }, + // minWidth: "110", + // filters: [ + // { + // data: { + // checks: [], + // sVal: "", + // sMenu: "", + // fType1: "", + // fVal1: "", + // fMode: "and", + // fType2: "", + // fVal2: "", + // }, + // }, + // ], + // filterRender: { name: "FilterCombination" }, + // }, + // { + // field: "gz", + // title: "工种", + // align: "center", + // formatter:['dictFormat','RYGX'], + // editRender: { + // name: "$select", + // options: [], + // props: { clearable: true }, + // }, + // minWidth: "110", + // filters: [ + // { + // data: { + // checks: [], + // sVal: "", + // sMenu: "", + // fType1: "", + // fVal1: "", + // fMode: "and", + // fType2: "", + // fVal2: "", + // }, + // }, + // ], + // filterRender: { name: "FilterCombination" }, + // }, { field: "sbfl", title: "设备大类", diff --git a/src/views/sjzx/sbxxWH1.vue b/src/views/sjzx/sbxxWH1.vue new file mode 100644 index 0000000..fdbd9b0 --- /dev/null +++ b/src/views/sjzx/sbxxWH1.vue @@ -0,0 +1,759 @@ + + + +