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 @@ + + + + + + + + + + + 订单名: + {{ orderMsg.orderName ? orderMsg.orderName : '-' }} + + + 发货单号: + {{ logCode ? logCode : '-' }} + + + + + + + 详情 + + + + + + + + + + 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 @@ - + 详情 @@ -20,55 +17,73 @@ + + 维修单号 + {{ dataForm.repairOrderNumber }} + + + 产线名 + {{ dataForm.lineName }} + + + 工段名 + {{ dataForm.sectionName }} + 故障发生时间 {{ parseTime(dataForm.faultTime) }} + + + + 设备名 + {{ dataForm.equipmentName }} + + + 维修时长 + {{ dataForm.maintenanceDuration }} + + + 维修工 {{ dataForm.repairman }} - - 联系方式 {{ dataForm.repairmanPhone }} - - 维修方式 - {{ getDictDataLabel('repair-mode', dataForm.repairMode) }} - - - 创建时间 - {{ parseTime(dataForm.createTime) }} - - - 创建人 - {{ dataForm.creator }} - - - 备注 - {{ dataForm.remark }} + + + 备注 + {{ dataForm.remark }} + + + 故障明细 + {{ dataForm.faultDetail.replace(/<\/?p>/g, '') }} + + + 维修明细 + {{ dataForm.maintenanceDetail.replace(/<\/?p>/g, '') }} + 维修附件 - + 暂无附件 @@ -170,65 +185,65 @@ import { getDictDataLabel } from '@/utils/dict'; import tupleImg from '@/assets/images/tuple.png'; const uploadedFile = { - name: 'UploadedFile', - props: ['file', 'disabled'], - data() { - return {}; - }, - methods: { - handleDelete() { - this.$emit('delete', this.file); - }, - async handleDownload() { - const data = await this.$axios({ - url: this.file.fileUrl, - method: 'get', - responseType: 'blob', - }); + name: 'UploadedFile', + props: ['file', 'disabled'], + data() { + return {}; + }, + methods: { + handleDelete() { + this.$emit('delete', this.file); + }, + async handleDownload() { + const data = await this.$axios({ + url: this.file.fileUrl, + method: 'get', + responseType: 'blob', + }); - await this.$message.success('开始下载'); - // create download link - const url = window.URL.createObjectURL(data); - const link = document.createElement('a'); - link.href = url; - link.download = this.file.fileName; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - }, - }, - mounted() { - }, - render: function (h) { - return ( - - {this.file.fileName} - {!this.disabled && ( - - )} - - ); - }, + await this.$message.success('开始下载'); + // create download link + const url = window.URL.createObjectURL(data); + const link = document.createElement('a'); + link.href = url; + link.download = this.file.fileName; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + }, + }, + mounted() { + }, + render: function (h) { + return ( + + {this.file.fileName} + {!this.disabled && ( + + )} + + ); + }, }; export default { @@ -392,18 +407,20 @@ export default { justify-content: flex-end; padding: 18px; } + .blodTip { - height: 16px; - font-size: 14px; - font-weight: 600; - color: rgba(0,0,0,0.85); - margin-bottom: 8px; + height: 16px; + font-size: 14px; + font-weight: 600; + color: rgba(0, 0, 0, 0.85); + margin-bottom: 8px; } + .lightTip { - /* height: 16px; */ - font-size: 14px; - font-weight: 400; - color: rgba(102,102,102,0.75); - margin-bottom: 12px; + /* height: 16px; */ + font-size: 14px; + font-weight: 400; + color: rgba(102, 102, 102, 0.75); + margin-bottom: 12px; } diff --git a/src/views/equipment/base/repair/Repair--add.vue b/src/views/equipment/base/repair/Repair--add.vue index 16f96e9a..650a6efb 100644 --- a/src/views/equipment/base/repair/Repair--add.vue +++ b/src/views/equipment/base/repair/Repair--add.vue @@ -63,106 +63,6 @@ value-format="timestamp" format="yyyy-MM-dd HH:mm:ss" clearable @change="$emit('update', form)" /> - - - - - - - - - - - - + + + 查看更多 + + + + + diff --git a/src/views/equipment/base/repair/detail.vue b/src/views/equipment/base/repair/detail.vue new file mode 100644 index 00000000..85ed57e3 --- /dev/null +++ b/src/views/equipment/base/repair/detail.vue @@ -0,0 +1,421 @@ + + + + + + + 详情 + + + + + + + + 维修单号 + {{ dataForm.repairOrderNumber }} + + + 产线名 + {{ dataForm.lineName }} + + + 工段名 + {{ dataForm.sectionName }} + + + + + + 故障发生时间 + {{ parseTime(dataForm.faultTime) }} + + + 故障级别 + {{ getDictDataLabel('fault-level', dataForm.faultLevel) }} + + + 故障类型 + {{ getDictDataLabel('fault-type', dataForm.faultType) }} + + + 维修工 + {{ dataForm.repairman }} + + + + + 联系方式 + {{ dataForm.repairmanPhone }} + + + 维修方式 + {{ getDictDataLabel('repair-mode', dataForm.repairMode) }} + + + 创建时间 + {{ parseTime(dataForm.createTime) }} + + + 创建人 + {{ dataForm.creator }} + + + + 备注 + {{ dataForm.remark }} + + + 维修附件 + + + + 暂无附件 + + + + + + + + + + 取 消 + + + + + + + + diff --git a/src/views/equipment/base/repair/index.vue b/src/views/equipment/base/repair/index.vue index 9bdb5690..b4aed842 100644 --- a/src/views/equipment/base/repair/index.vue +++ b/src/views/equipment/base/repair/index.vue @@ -1,54 +1,26 @@ - - - + + + - - - - + + + + - - + + - - - - - - + + + + + + + - +` ` diff --git a/src/views/packaging/custom/index.vue b/src/views/packaging/custom/index.vue new file mode 100644 index 00000000..97c816dc --- /dev/null +++ b/src/views/packaging/custom/index.vue @@ -0,0 +1,409 @@ + + + + + + + 模板设计 + + + + + + + + + + + + + + + {{ type }} + + + + + + ~ + + + + 确定 + + 自定义宽高 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 旋转 + + 预览 + + + + 保存 + + + 清空 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/packaging/custom/preview.vue b/src/views/packaging/custom/preview.vue new file mode 100644 index 00000000..f7d18de2 --- /dev/null +++ b/src/views/packaging/custom/preview.vue @@ -0,0 +1,89 @@ + + + + + + 打印预览 + 打印 + pdf + + + + 关闭 + + + + + + + diff --git a/src/views/packaging/custom/print-data.js b/src/views/packaging/custom/print-data.js new file mode 100644 index 00000000..077f8388 --- /dev/null +++ b/src/views/packaging/custom/print-data.js @@ -0,0 +1,90 @@ +/* + * @Author: zhp + * @Date: 2023-09-27 14:23:54 + * @LastEditTime: 2023-09-27 14:29:59 + * @LastEditors: zhp + * @Description: + */ +export default { + totalCap: '壹佰元整', + test: { + a: '111', + b: '222', + longText: '浙江在线3月29日讯最近,\n一篇小学五年级学生写的作文引起了钱报记者的关注这篇作文的题目叫做《脏话风波》,讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多,有的人说话甚至句句“带把儿”。班主任为了遏制这种现象,煞费苦心想了很多办法,跟学生斗智斗勇……看到这篇作文,记者突然想到,自己读六年级的儿子有天突然冒出一句脏话。此前,他是从不说脏话的。问他怎么学会的,他也说不出个所以然来。于是,记者做了这个小学生脏话现象调查。经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近,一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》,讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多,有的人说话甚至句句“带把儿”。班主任为了遏制这种现象,煞费苦心想了很多办法,跟学生斗智斗勇……看到这篇作文,记者突然想到,自己读六年级的儿子有天突然冒出一句脏话。此前,他是从不说脏话的。问他怎么学会的,他也说不出个所以然来。于是,记者做了这个小学生脏话现象调查。经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近,一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》,讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多,有的人说话甚至句句“带把儿”。班主任为了遏制这种现象,煞费苦心想了很多办法,跟学生斗智斗勇……看到这篇作文,记者突然想到,自己读六年级的儿子有天突然冒出一句脏话。此前,他是从不说脏话的。问他怎么学会的,他也说不出个所以然来。于是,记者做了这个小学生脏话现象调查。经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近,一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》,讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多,有的人说话甚至句句“带把儿”。班主任为了遏制这种现象,煞费苦心想了很多办法,跟学生斗智斗勇……看到这篇作文,记者突然想到,自己读六年级的儿子有天突然冒出一句脏话。此前,他是从不说脏话的。问他怎么学会的,他也说不出个所以然来。于是,记者做了这个小学生脏话现象调查。经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近,一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》,讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多,有的人说话甚至句句“带把儿”。班主任为了遏制这种现象,煞费苦心想了很多办法,跟学生斗智斗勇……看到这篇作文,记者突然想到,自己读六年级的儿子有天突然冒出一句脏话。此前,他是从不说脏话的。问他怎么学会的,他也说不出个所以然来。于是,记者做了这个小学生脏话现象调查。经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多,有的人说话甚至句句“带把儿”。班主任为了遏制这种现象,煞费苦心想了很多办法,跟学生斗智斗勇……看到这篇作文,记者突然想到,自己读六年级的儿子有天突然冒出一句脏话。此前,他是从不说脏话的。问他怎么学会的,他也说不出个所以然来。于是,记者做了这个小学生脏话现象调查。经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多,有的人说话甚至句句“带把儿”。班主任为了遏制这种现象,煞费苦心想了很多办法,跟学生斗智斗勇……看到这篇作文,记者突然想到,自己读六年级的儿子有天突然冒出一句脏话。此前,他是从不说脏话的。问他怎么学会的,他也说不出个所以然来。于是,记者做了这个小学生脏话现象调查。经过了解才发现,小学生爱说脏话竟然较为普遍,一般三年级会冒出苗头。无论是学习成绩好的,还是平时不太起眼的,都会说脏话。而且,说脏话会“传染”,一旦冒头不制止,到了五六年级甚至可能在班里大爆发。以下为作文' + }, + testaaa: { + a: { + b: { + c: { + d: 'dddddddddddd' + } + } + } + }, + table_test: { + a: [ + { NAME: '测试商品01', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品02', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品03', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品04', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品05', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品06', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品07', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品08', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品09', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品10', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品11', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品12', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品13', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品14', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品15', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品16', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品17', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品18', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品19', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品20', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品21', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品22', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品23', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品24', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品25', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品26', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品27', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品28', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品29', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品30', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' } + ] + }, + table: [ + { NAME: '测试商品01', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品02', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品03', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品04', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品05', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品06', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品07', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品08', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品09', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品10', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品11', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品12', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品13', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品14', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品15', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品16', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品17', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品18', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品19', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品20', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品21', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品22', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品23', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品24', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品25', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品26', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品27', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品28', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品29', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品30', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' } + ] +} diff --git a/src/views/packaging/custom/providers.js b/src/views/packaging/custom/providers.js new file mode 100644 index 00000000..a37fb60f --- /dev/null +++ b/src/views/packaging/custom/providers.js @@ -0,0 +1,245 @@ +/* eslint-disable */ +import {hiprint} from 'vue-plugin-hiprint' + +/* eslint-disable */ +// import {hiprint} from '../../index' + +// 自定义设计元素1 +export const aProvider = function (ops) { + var addElementTypes = function (context) { + context.removePrintElementTypes("aProviderModule"); + context.addPrintElementTypes( + "aProviderModule", + [ + new hiprint.PrintElementTypeGroup("平台", [ + { + tid: 'aProviderModule.header', title: '单据表头', data: '单据表头', type: 'text', + options: { + testData: '单据表头', + height: 17, + fontSize: 16.5, + fontWeight: "700", + textAlign: "center", + hideTitle: true + } + }, + { + tid: 'aProviderModule.type', title: '单据类型', data: '单据类型', type: 'text', + options: { + testData: '单据类型', + height: 16, + fontSize: 15, + fontWeight: "700", + textAlign: "center", + hideTitle: true + } + }, + { + tid: 'aProviderModule.order', title: '订单编号', data: 'XS888888888', type: 'text', + options: { + field: 'orderId', + testData: 'XS888888888', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.date', title: '业务日期', data: '2020-01-01', type: 'text', + options: { + field: 'date', + testData: '2020-01-01', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.barcode', title: '条形码', data: 'XS888888888', type: 'text', + options: { + field: 'barcode', + testData: 'XS888888888', + height: 32, + fontSize: 12, + lineHeight: 18, + textType: "barcode" + } + }, + { + tid: 'aProviderModule.qrcode', title: '二维码', data: 'XS888888888', type: 'text', + options: { + field: 'qrcode', + testData: 'XS888888888', + height: 32, + fontSize: 12, + lineHeight: 18, + textType: "qrcode" + } + }, + { + tid: 'aProviderModule.platform', title: '平台名称', data: '平台名称', type: 'text', + options: { + testData: '平台名称', + height: 17, + fontSize: 16.5, + fontWeight: "700", + textAlign: "center", + hideTitle: true + } + }, + {tid: 'aProviderModule.logo', title: 'Logo', data: '', type: 'image'}, + ]), + new hiprint.PrintElementTypeGroup("库管", [ + { + tid: 'aProviderModule.creater', title: '制单人', data: '李四', type: 'text', + options: { + field: 'creater', + testData: '李四', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.printDate', title: '打印时间', data: '2022-01-01 09:00', type: 'text', + options: { + field: 'printDate', + testData: '2022-01-01 09:00', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.signer', title: '库管签字', data: '', type: 'text', + options: { + title: '库管签字:', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + ]), + new hiprint.PrintElementTypeGroup("表格/其他", [ + { + tid: 'aProviderModule.table', title: '订单数据', + type: 'table', + options: { + field: 'table', + tableHeaderRepeat: 'first', + tableFooterRepeat: 'last', + fields: [ + {text: '名称', field: 'NAME'}, + {text: '数量', field: 'SL'}, + {text: '规格', field: 'GG'}, + {text: '条码', field: 'TM'}, + {text: '单价', field: 'DJ'}, + {text: '金额', field: 'JE'}, + ], + }, + editable: true, + columnDisplayEditable: true,//列显示是否能编辑 + columnDisplayIndexEditable: true,//列顺序显示是否能编辑 + columnTitleEditable: true,//列标题是否能编辑 + columnResizable: true, //列宽是否能调整 + columnAlignEditable: true,//列对齐是否调整 + isEnableEditField: true, //编辑字段 + isEnableContextMenu: true, //开启右键菜单 默认true + isEnableInsertRow: true, //插入行 + isEnableDeleteRow: true, //删除行 + isEnableInsertColumn: true, //插入列 + isEnableDeleteColumn: true, //删除列 + isEnableMergeCell: true, //合并单元格 + columns: [ + [ + {title: '名称', align: 'center', field: 'NAME', width: 150}, + {title: '数量', align: 'center', field: 'SL', width: 80}, + {title: '规格', align: 'center', field: 'GG', width: 80, checked: false}, + {title: '条码', align: 'center', field: 'TM', width: 100, checked: false}, + {title: '单价', align: 'center', field: 'DJ', width: 100}, + {title: '金额', align: 'center', field: 'JE', width: 100, checked: false}, + ], + ], + rowsColumnsMerge: function (data, col, index) { + // 返回一个数组,参数一为行(rowspan)合并数,参数二为列(colspan)合并数, 被合并的行或者列值设为0 + if (index == 0) { + return [1, data.INDEX % 2 == 1 ? 2 : 1] + } else if (index > 0 && index < 2) { + return [data.INDEX % 2 == 1 ? 0 : 1, 1] + } else { + return [data.INDEX % 2 == 1 ? 2 : 0, 1] + } + }, + footerFormatter: function (options, rows, data, currentPageGridRowsData) { + if (data && data['totalCap']) { + return `${'应收金额大写: ' + data['totalCap']}` + } + return '应收金额大写: ' + }, + }, + {tid: 'aProviderModule.customText', title: '文本', customText: '自定义文本', custom: true, type: 'text'}, + { + tid: 'aProviderModule.longText', title: '长文本', type: 'longText', options: { + field: 'test.longText', + width: 200, + testData: '长文本分页/不分页测试' + }, + } + ]), + new hiprint.PrintElementTypeGroup("辅助", [ + { + tid: 'aProviderModule.hline', + title: '横线', + type: 'hline' + }, + { + tid: 'aProviderModule.vline', + title: '竖线', + type: 'vline' + }, + { + tid: 'aProviderModule.rect', + title: '矩形', + type: 'rect' + }, + { + tid: 'aProviderModule.oval', + title: '椭圆', + type: 'oval' + }, + { + tid: 'aProviderModule.barcode', + title: '条形码', + type: 'barcode', + }, + { + tid: 'aProviderModule.qrcode', + title: '二维码', + type: 'qrcode', + } + ]) + ] + ); + }; + return { + addElementTypes: addElementTypes + }; +}; + +// type: 1供货商 2经销商 +export default [{ + name: 'A设计', + value: 'aProviderModule', + type: 1, + f: aProvider() +}] diff --git a/src/views/packaging/mixins/basic-add.js b/src/views/packaging/mixins/basic-add.js new file mode 100644 index 00000000..0b9acd23 --- /dev/null +++ b/src/views/packaging/mixins/basic-add.js @@ -0,0 +1,100 @@ +/* + * @Author: zwq + * @Date: 2022-08-24 11:19:43 + * @LastEditors: zwq + * @LastEditTime: 2023-08-03 14:21:04 + * @Description: + */ +export default { + data() { + /* eslint-disable */ + return { + urlOptions: { + createURL: '', + updateURL: '', + infoURL: '', + codeURL: '', + getOption: false, + isGetCode: false, + optionArrUrl: [], + optionArr: {} + }, + visible: false, + setData: false + } + }, + created() { + }, + activated() { + }, + methods: { + init(id) { + this.dataForm.id = id || ""; + this.visible = true; + if (this.urlOptions.getOption) { + this.getArr() + } + this.$nextTick(() => { + this.$refs["dataForm"].resetFields(); + if (this.dataForm.id) { + this.urlOptions.infoURL(id).then(response => { + this.dataForm = response.data; + if (this.setData) { + this.setDataForm() + } + }); + } else { + if (this.urlOptions.isGetCode) { + this.getCode() + } + } + }); + }, + getCode() { + this.urlOptions.codeURL() + .then(({ data: res }) => { + this.dataForm.code = res; + }) + .catch(() => {}); + }, + getArr() { + const params = { + pageSize: 100, + pageNo: 1, + } + this.urlOptions.optionArrUrl.forEach((item, index) => { + item(params).then(({ data: res }) => { + this.$set(this.urlOptions.optionArr, `arr${index}`, res.list) + }) + .catch(() => { + }); + }); + }, + // 表单提交 + dataFormSubmit() { + this.$refs["dataForm"].validate((valid) => { + if (!valid) { + return false; + } + // 修改的提交 + if (this.dataForm.id) { + this.urlOptions.updateURL(this.dataForm).then(response => { + this.$modal.msgSuccess("修改成功"); + this.visible = false; + this.$emit("refreshDataList"); + }); + return; + } + // 添加的提交 + this.urlOptions.createURL(this.dataForm).then(response => { + this.$modal.msgSuccess("新增成功"); + this.visible = false; + this.$emit("refreshDataList"); + }); + }); + }, + formClear() { + this.$refs.dataForm.resetFields() + } + } +} diff --git a/src/views/packaging/mixins/basic-page.js b/src/views/packaging/mixins/basic-page.js new file mode 100644 index 00000000..28fa3b54 --- /dev/null +++ b/src/views/packaging/mixins/basic-page.js @@ -0,0 +1,170 @@ +/* + * @Author: zwq + * @Date: 2022-08-24 11:19:43 + * @LastEditors: zwq + * @LastEditTime: 2024-07-05 10:10:12 + * @Description: + */ +export default { + data() { + /* eslint-disable */ + return { + urlOptions: { + getDataListURL: '', + deleteURL: '', + statusUrl: '', + exportURL: '' + }, + tableData: [], + listQuery: { + pageSize: 10, + pageNo: 1, + total: 1, + }, + exportLoading: false, + dataListLoading: false, + addOrEditTitle: '', + addOrUpdateVisible: false, + } + }, + created() { + }, + mounted() { + this.getDataList() + }, + methods: { + // 获取数据列表 + getDataList() { + this.dataListLoading = true; + this.urlOptions.getDataListURL(this.listQuery).then(response => { + this.tableData = response.data.list; + this.listQuery.total = response.data.total; + this.dataListLoading = false; + }); + }, + // 每页数 + sizeChangeHandle(val) { + this.listQuery.pageSize = val; + this.listQuery.pageNo = 1; + this.getDataList(); + }, + // 当前页 + currentChangeHandle(val) { + this.listQuery.pageNo = val; + this.getDataList(); + }, + // 新增 + addOrUpdateHandle() { + this.addOrEditTitle = '新增'; + this.addOrUpdateVisible = true; + this.$nextTick(() => { + this.$refs.addOrUpdate.init(); + }); + }, + cancel(id) { + this.$refs["popover-" + id].showPopper = false; + }, + //改变状态 + changeStatus(id) { + this.$http + .post(this.urlOptions.statusUrl, { id }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } + this.$refs["popover-" + id].showPopper = false; + this.$message({ + message: this.$t("prompt.success"), + type: "success", + duration: 500, + onClose: () => { + this.getDataList(); + }, + }); + }) + .catch(() => { }); + }, + //tableBtn点击 + handleClick(val) { + console.log(val.data.packagingCode); + if (val.type === "edit") { + this.addOrUpdateVisible = true; + this.addOrEditTitle = "编辑"; + this.$nextTick(() => { + this.$refs.addOrUpdate.init(val.data.id); + }); + } else if (val.type === "delete") { + this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data.packagingCode ) + } else if (val.type === "change") { + this.changeStatus(val.data.id) + } else { + this.otherMethods(val) + } + }, + // 删除 + deleteHandle(id, name, index) { + this.$confirm(`是否确认删除${name ? ' 名称为'+ name : '[' + index + ']'}数据项?`, "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.urlOptions.deleteURL(id).then(({ data }) => { + this.$message({ + message: "操作成功", + type: "success", + duration: 1500, + onClose: () => { + this.getDataList(); + }, + }); + }); + }) + .catch(() => { }); + }, + //search-bar点击 + buttonClick(val) { + switch (val.btnName) { + case "search": + this.listQuery.xm1 = val.xm1; + this.listQuery.xm2 = val.xm2; + this.listQuery.pageNo = 1; + this.getDataList(); + break; + case "add": + this.addOrEditTitle = '新增' + this.addOrUpdateVisible = true; + this.addOrUpdateHandle() + break; + default: + console.log(val) + } + }, + handleCancel() { + this.$refs.addOrUpdate.formClear() + this.addOrUpdateVisible = false + this.addOrEditTitle = '' + }, + handleConfirm() { + this.$refs.addOrUpdate.dataFormSubmit() + }, + successSubmit() { + this.handleCancel() + this.getDataList() + }, + /** 导出按钮操作 */ + handleExport() { + // 处理查询参数 + let params = { ...this.queryParams }; + params.pageNo = undefined; + params.pageSize = undefined; + this.$modal.confirm('是否确认导出所有数据项?').then(() => { + this.exportLoading = true; + return this.urlOptions.exportURL(params); + }).then(response => { + this.$download.excel(response, '工厂.xls'); + this.exportLoading = false; + }).catch(() => { }); + } + } +} diff --git a/src/views/packaging/mixins/code-filter.js b/src/views/packaging/mixins/code-filter.js new file mode 100644 index 00000000..96061ff5 --- /dev/null +++ b/src/views/packaging/mixins/code-filter.js @@ -0,0 +1,85 @@ + +/* + * @Date: 2020-12-29 16:49:28 + * @LastEditors: zwq + * @LastEditTime: 2024-07-08 16:27:39 + * @FilePath: \basic-admin\src\filters\basicData\index.js + * @Description: + */ + +const table = { + lineStatus: { + 1: '生产中', + 2: '停止', + 3: '未知', + }, + reportType: { + 1: '日', + 2: '周', + 3: '月' + } +} + +// 日期格式化 +export function parseTime(time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm), ''); + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} +// 遍历树结构返回数组 +export function getTreeArr(arr) { + let result =[] + arr.forEach(item => { + if(item.children && item.children.length>0){ + let {children,...obj} = item + result.push(obj) + result = result.concat(getTreeArr(children)) + }else{ + let {children,...obj} = item + result.push(obj) + } + }); + return result +} + +export default function (dictTable) { + return function (val) { + return table?.[dictTable]?.[val] + } +} diff --git a/src/views/packaging/packagingPrintLog/SmallTitle.vue b/src/views/packaging/packagingPrintLog/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/packaging/packagingPrintLog/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + + + + + diff --git a/src/views/packaging/packagingPrintLog/add-or-updata.vue b/src/views/packaging/packagingPrintLog/add-or-updata.vue new file mode 100644 index 00000000..6b1d63b4 --- /dev/null +++ b/src/views/packaging/packagingPrintLog/add-or-updata.vue @@ -0,0 +1,418 @@ + + + + + {{ !dataForm.id ? '新增' : '编辑' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 + + 确定 + + + + + + + diff --git a/src/views/packaging/packagingPrintLog/index.vue b/src/views/packaging/packagingPrintLog/index.vue new file mode 100644 index 00000000..3e4ec4ea --- /dev/null +++ b/src/views/packaging/packagingPrintLog/index.vue @@ -0,0 +1,356 @@ + + + + + + + + + + + + + diff --git a/src/views/packaging/packagingPrintLog/unitDict.vue b/src/views/packaging/packagingPrintLog/unitDict.vue new file mode 100644 index 00000000..94702ab4 --- /dev/null +++ b/src/views/packaging/packagingPrintLog/unitDict.vue @@ -0,0 +1,15 @@ + + + + diff --git a/src/views/packaging/packagingPrintModel/SmallTitle.vue b/src/views/packaging/packagingPrintModel/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/packaging/packagingPrintModel/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + + + + + diff --git a/src/views/packaging/packagingPrintModel/add-or-updata.vue b/src/views/packaging/packagingPrintModel/add-or-updata.vue new file mode 100644 index 00000000..9e66ebe9 --- /dev/null +++ b/src/views/packaging/packagingPrintModel/add-or-updata.vue @@ -0,0 +1,441 @@ + + + + + {{ !dataForm.id ? '新增' : '编辑' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 模板设计 + + + + + + + + + + + + + + 取消 + + 确定 + + + + + + + + diff --git a/src/views/packaging/packagingPrintModel/index.vue b/src/views/packaging/packagingPrintModel/index.vue new file mode 100644 index 00000000..bc4a71e6 --- /dev/null +++ b/src/views/packaging/packagingPrintModel/index.vue @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + diff --git a/src/views/packaging/packagingPrintModel/unitDict.vue b/src/views/packaging/packagingPrintModel/unitDict.vue new file mode 100644 index 00000000..94702ab4 --- /dev/null +++ b/src/views/packaging/packagingPrintModel/unitDict.vue @@ -0,0 +1,15 @@ + + + + diff --git a/src/views/packaging/packagingPrintType/SmallTitle.vue b/src/views/packaging/packagingPrintType/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/packaging/packagingPrintType/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + + + + + diff --git a/src/views/packaging/packagingPrintType/add-or-updata.vue b/src/views/packaging/packagingPrintType/add-or-updata.vue new file mode 100644 index 00000000..469b5622 --- /dev/null +++ b/src/views/packaging/packagingPrintType/add-or-updata.vue @@ -0,0 +1,347 @@ + + + + + {{ !dataForm.id ? '新增' : '编辑' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 + + 确定 + + + + + + + diff --git a/src/views/packaging/packagingPrintType/index.vue b/src/views/packaging/packagingPrintType/index.vue new file mode 100644 index 00000000..740d250a --- /dev/null +++ b/src/views/packaging/packagingPrintType/index.vue @@ -0,0 +1,191 @@ + + + + + + + + + + + + + diff --git a/src/views/packaging/packagingPrintType/unitDict.vue b/src/views/packaging/packagingPrintType/unitDict.vue new file mode 100644 index 00000000..94702ab4 --- /dev/null +++ b/src/views/packaging/packagingPrintType/unitDict.vue @@ -0,0 +1,15 @@ + + + + diff --git a/src/views/quality/currentData/hourData.vue b/src/views/quality/currentData/hourData.vue index ac876041..a7acb694 100644 --- a/src/views/quality/currentData/hourData.vue +++ b/src/views/quality/currentData/hourData.vue @@ -43,8 +43,51 @@ export default { async getList() { const res = await getRecordInOneDay(); if (res.data) { - this.nameData = this.filterNameData(res.data.nameData); - this.list = this.filterData(res.data.data); + // this.nameData = this.filterNameData(res.data.nameData); + // this.list = this.filterData(res.data.data); + const seen = new Set(); // 用于去重 + const columns = []; + + res.data.nameData.forEach(item => { + if (item.tree === 1) { + const primaryHeader = item.name; + const children = res.data.nameData + .filter(child => child.tree === 2 && child.parentId === item.id) + .map(child => { + const key = `${primaryHeader}-${child.name}`; + if (!seen.has(key)) { + seen.add(key); + return { + label: child.name, + prop: child.id + }; + } + return null; + }) + .filter(Boolean); // 过滤掉 null + + if (children.length > 0) { + this.nameData.push({ + label: moment(primaryHeader).format('yyyy-MM-DD HH:mm:ss'), + children + }); + } + } + }); + this.list = res.data.data.map(item => { + const row = {}; + row.inspectionDetContent = item.inspectionDetContent; + item.data.forEach((inner) => { + inner.children.forEach((child) => { + row[child.id] = child.dynamicValue; + }); + }); + return row; + }); + // this.nameData = columns.filter((column, index, self) => + // index === self.findIndex(c => c.label === column.label) + // ); + console.log(this.list, this.nameData) } else { this.nameData = []; this.list = [];
暂无附件