diff --git a/src/api/equipment/base/maintain/record.js b/src/api/equipment/base/maintain/record.js index f6cf896e..ddf7c9a3 100644 --- a/src/api/equipment/base/maintain/record.js +++ b/src/api/equipment/base/maintain/record.js @@ -81,7 +81,7 @@ export function deleteLogDet(id) { export function getEqMaintainPlanPageData(query) { return request({ - url: '/base/equipment-maintain-plan-det/page', + url: '/base/equipment-maintain-log-det/page', method: 'get', params: query }) diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 6c75636b..6d81c2f2 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -113,7 +113,7 @@ export default { console.log(btn); // const keys = ['name', 'createTime']; // timeVal // 已被 searchBarKeys 替代 - switch (btn.btnName) { + switch (btn.btnName) { case 'search': this.searchBarKeys.forEach((key) => { if (key == 'timeVal') { diff --git a/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue b/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue index 41ff8883..b71cc4f0 100644 --- a/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue +++ b/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue @@ -93,6 +93,16 @@ const tableProps = [ label: '装箱规格(片/箱)', width: 150 }, + { + prop: 'contactPerson', + label: '车辆联系人', + width: 150 + }, + { + prop: 'contactPersonCall', + label: '联系方式', + width: 150 + }, { prop: 'packagingNum', label: '箱数' @@ -221,4 +231,4 @@ export default { padding:32px 32px 30px 30px; height: calc(100vh - 125px); } - \ No newline at end of file + diff --git a/src/views/delivery/deliveryLog/components/editDetail.vue b/src/views/delivery/deliveryLog/components/editDetail.vue index 97373334..9f21dc47 100644 --- a/src/views/delivery/deliveryLog/components/editDetail.vue +++ b/src/views/delivery/deliveryLog/components/editDetail.vue @@ -8,26 +8,29 @@ - + + + + + + + + + + + + + - + @@ -121,4 +124,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue b/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue index fda599ad..00a27c44 100644 --- a/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue +++ b/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue @@ -44,14 +44,14 @@ :table-data="tableData" :max-height="tableH" > - + /> -->
-
- -
- - - 订单名： - {{orderMsg.orderName ? orderMsg.orderName : '-'}} - - - 发货单号： - {{logCode ? logCode : '-'}} - - -
-
-
- - 详情 -
- - -
- @@ -498,4 +419,4 @@ export default { color: rgba(0, 0, 0, 0.45); } } - \ No newline at end of file + diff --git a/src/views/delivery/deliveryLogDet/components/detailButton.vue b/src/views/delivery/deliveryLogDet/components/detailButton.vue new file mode 100644 index 00000000..fd315300 --- /dev/null +++ b/src/views/delivery/deliveryLogDet/components/detailButton.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/src/views/delivery/deliveryLogDet/components/shippingBtn.vue b/src/views/delivery/deliveryLogDet/components/shippingBtn.vue new file mode 100644 index 00000000..d270b985 --- /dev/null +++ b/src/views/delivery/deliveryLogDet/components/shippingBtn.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/views/delivery/deliveryLogDet/index.vue b/src/views/delivery/deliveryLogDet/index.vue index dc02ec0c..74c003f9 100644 --- a/src/views/delivery/deliveryLogDet/index.vue +++ b/src/views/delivery/deliveryLogDet/index.vue @@ -14,14 +14,14 @@ :table-data="list" :max-height="tableH" > - + /> --> - +
\ No newline at end of file + diff --git a/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue b/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue index ee725f0c..0e5dab9b 100644 --- a/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue +++ b/src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue @@ -3,7 +3,7 @@ - + { + if (val === item.id) { + this.form.unit = item.unit + } + }) + }, init(param) { this.form.connectId = param.connectId getEnergyTypeListAll().then((res) => { diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index 94d7571a..a96eadd5 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -331,7 +331,7 @@ export default { queryParams: { lineId: null, factoryId: null, - recordTime: [], + recordTime: undefined, }, // 表单参数 form: {}, @@ -410,15 +410,13 @@ export default { this.queryParams.factoryId = payload.factoryId || null; this.queryParams.lineId = payload.lineId || null; if (0 == payload.dateFilterType) { - this.queryParams.recordTime = payload.timerange; + this.queryParams.recordTime = payload.timerange ? payload.timerange :undefined } else if (1 == payload.dateFilterType) { this.queryParams.recordTime = [ `${payload.timeday} 00:00:00`, `${payload.timeday} 23:59:59`, ]; } - } else { - this.queryParams.recordTime = null; } this.getList(); }, diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue index 53da57d8..8d9dc49e 100644 --- a/src/views/equipment/base/alarm/Record/index.vue +++ b/src/views/equipment/base/alarm/Record/index.vue @@ -39,13 +39,6 @@ @close="cancel" @cancel="cancel" @confirm="submitForm"> - v), tableProps: [ - { prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true }, - { prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true }, - { prop: 'equipment', label: '设备名称', width: 120, showOverflowtooltip: true }, + { prop: 'productionLine', label: '产线', showOverflowtooltip: true }, + { prop: 'workshopSection', label: '工段',showOverflowtooltip: true }, + { prop: 'equipment', label: '设备名称', showOverflowtooltip: true }, { prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL), }, - { prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true }, - { prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true }, - { prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true }, + { prop: 'createTime', label: '报警时间', filter: timeFilter, showOverflowtooltip: true }, + { prop: 'alarmCode', label: '设备报警码', showOverflowtooltip: true }, + { prop: 'alarmContent', label: '报警内容', showOverflowtooltip: true }, this.$auth.hasPermiAnd([ 'monitoring:equipment-alarm-log:query', 'base:equipment-alarm-hand:query' ]) ? - { prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn } : undefined, + { prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn } : '', this.$auth.hasPermiAnd([ 'monitoring:equipment-alarm-log:query', 'base:equipment-alarm-hand:query', @@ -143,7 +136,7 @@ export default { 'base:equipment-alarm-hand:update', 'monitoring:equipment-alarm-log:update' ]) ? - { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn } : undefined, + { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn } : '', // { prop: 'remark', label: '备注' }, ], searchBarFormConfig: [ diff --git a/src/views/equipment/base/inspection/Confirm/index.vue b/src/views/equipment/base/inspection/Confirm/index.vue index 5d072a8b..fce79619 100644 --- a/src/views/equipment/base/inspection/Confirm/index.vue +++ b/src/views/equipment/base/inspection/Confirm/index.vue @@ -168,7 +168,8 @@ export default { pageSize: 20, maintainPlanId: null, startTime: null, - special: false, + special: false, + name:undefined, status: 1, }, // 表单参数 @@ -196,7 +197,7 @@ export default { methods: { /** 批量确认 */ async handleSearchBarBtnClick(btn) { - console.log(11111); + console.log(btn); switch (btn.btnName) { case 'batchConfirm': @@ -263,6 +264,8 @@ export default { .catch(() => { }); break; case 'search': + console.log(btn); + this.queryParams.name = btn.name || null; this.getList() break; case 'add': diff --git a/src/views/equipment/base/maintain/Monitor/showDetail.vue b/src/views/equipment/base/maintain/Monitor/showDetail.vue index 76a5a7a0..428db673 100644 --- a/src/views/equipment/base/maintain/Monitor/showDetail.vue +++ b/src/views/equipment/base/maintain/Monitor/showDetail.vue @@ -101,6 +101,7 @@ export default { addOrUpdateVisible: false, addOrEditTitle: '', queryParams: { + logId:null, pageNo:1, pageSize:10, planId:null, @@ -124,8 +125,10 @@ export default { methods: { getDataList(id) { this.dataListLoading = true; - this.queryParams.planId = id - this.urlOptions.getDataListURL(this.listQuery).then(response => { + console.log(id); + + this.queryParams.logId = id + this.urlOptions.getDataListURL(this.queryParams).then(response => { this.tableData = response.data.list; // this.listQuery.total = response.data.total; this.dataListLoading = false @@ -147,6 +150,8 @@ export default { init(obj) { this.drawer = true this.dataForm = obj + console.log(obj.id); + this.getDataList(obj.id) } }, diff --git a/src/views/equipment/base/maintain/items/components/add-or-updata.vue b/src/views/equipment/base/maintain/items/components/add-or-updata.vue index 97d2d38d..dc4e7d76 100644 --- a/src/views/equipment/base/maintain/items/components/add-or-updata.vue +++ b/src/views/equipment/base/maintain/items/components/add-or-updata.vue @@ -44,8 +44,8 @@ - - ————— + + —— diff --git a/src/views/equipment/base/maintain/items/index.vue b/src/views/equipment/base/maintain/items/index.vue index d8acead8..e1af2a5a 100644 --- a/src/views/equipment/base/maintain/items/index.vue +++ b/src/views/equipment/base/maintain/items/index.vue @@ -186,7 +186,7 @@ export default { handleDetail(row) { this.showDetailVisible = true this.$nextTick(() => { - this.$refs.showDetail.init(row.id) + this.$refs.showDetail.init(row.equipmentTypeId) }) // alert('跳转到 保养记录') // console.log(row) diff --git a/src/views/equipment/base/maintain/items/showDetail.vue b/src/views/equipment/base/maintain/items/showDetail.vue index 4cdd945b..40363600 100644 --- a/src/views/equipment/base/maintain/items/showDetail.vue +++ b/src/views/equipment/base/maintain/items/showDetail.vue @@ -103,9 +103,17 @@ export default { this.tableData[val._pageIndex - 1][val.prop] = val[val.prop] // console.log(this.tableData) }, - getDataList(id) { + handleCancel() { + this.$refs.addOrUpdate.formClear() + this.addOrUpdateVisible = false + this.addOrEditTitle = '' + }, + successSubmit() { + this.handleCancel() + this.getDataList() + }, + getDataList() { this.dataListLoading = true; - this.queryParams.mainId = id this.urlOptions.getDataListURL(this.queryParams).then(response => { this.tableData = response.data.list; this.queryParams.total = response.data.total; @@ -121,7 +129,8 @@ export default { }, init(id) { this.drawer = true - this.getDataList(id) + this.queryParams.mainId = id || '' + this.getDataList() } }, } diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue index a7b23222..a5b82e21 100644 --- a/src/views/equipment/base/repair/CustomDialogForm.vue +++ b/src/views/equipment/base/repair/CustomDialogForm.vue @@ -8,10 +8,7 @@