From 7acccd3de021721329f11fcfb4c817ee12be5c95 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 12 Oct 2023 15:40:05 +0800 Subject: [PATCH] bugfix zentao --- src/api/core/base/lineBindProductLog.js | 6 +- .../equipment/components/EquipmentDrawer.vue | 19 ++- src/views/core/base/equipmentType/index.vue | 22 ++- .../core/base/lineBindProductLog/index.vue | 5 +- src/views/core/base/product/add-or-updata.vue | 77 +++++---- .../base/productionLine/add-or-updata.vue | 146 +++++++++++------- src/views/core/base/productionLine/index.vue | 2 +- .../equipment/analysis/quality/index.vue | 21 ++- 8 files changed, 201 insertions(+), 97 deletions(-) diff --git a/src/api/core/base/lineBindProductLog.js b/src/api/core/base/lineBindProductLog.js index 5d402106..baf4655d 100644 --- a/src/api/core/base/lineBindProductLog.js +++ b/src/api/core/base/lineBindProductLog.js @@ -35,11 +35,11 @@ export function getLineBindProductLog(id) { } // 获得产线目前生产产品表 主要为更新分页 -export function getLineBindProductLogPage(query) { +export function getLineBindProductLogPage(data) { return request({ url: '/base/line-bind-product-log/page', - method: 'get', - params: query + method: 'post', + data }) } diff --git a/src/views/core/base/equipment/components/EquipmentDrawer.vue b/src/views/core/base/equipment/components/EquipmentDrawer.vue index bd418137..16221ddf 100644 --- a/src/views/core/base/equipment/components/EquipmentDrawer.vue +++ b/src/views/core/base/equipment/components/EquipmentDrawer.vue @@ -44,8 +44,8 @@ + + + @@ -160,7 +168,12 @@ export default { }, ], ], - attrQuery: null, // 属性列表的请求 + attrQuery: { + params: { + pageNo: 1, + pageSize: 10, + }, + }, // 属性列表的请求 infoQuery: null, // 基本信息的请求 attrFormSubmitting: false, attrListLoading: false, diff --git a/src/views/core/base/equipmentType/index.vue b/src/views/core/base/equipmentType/index.vue index 14297f79..6fa94502 100644 --- a/src/views/core/base/equipmentType/index.vue +++ b/src/views/core/base/equipmentType/index.vue @@ -38,6 +38,21 @@ @cancel="cancel" @confirm="submitForm"> +
+

文件列表

+
+
    +
  • + {{ JSON.stringify(item) }} +
    • +
+
+
    +
  • + {{ JSON.stringify(item) }} +
    • +
+
@@ -86,9 +101,9 @@ export default { width: 180, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, - { prop: 'name', label: '设备类型名称', }, - { prop: 'code', label: '检测类型编码', }, - { prop: 'remark', label: '备注', }, + { prop: 'name', label: '设备类型名称' }, + { prop: 'code', label: '检测类型编码' }, + { prop: 'remark', label: '备注' }, ], searchBarFormConfig: [ { @@ -236,6 +251,7 @@ export default { const id = row.id; getEquipmentType(id).then((response) => { this.form = response.data; + debugger; this.open = true; this.title = '修改设备类型'; }); diff --git a/src/views/core/base/lineBindProductLog/index.vue b/src/views/core/base/lineBindProductLog/index.vue index 1569ba98..50ec8e33 100644 --- a/src/views/core/base/lineBindProductLog/index.vue +++ b/src/views/core/base/lineBindProductLog/index.vue @@ -86,7 +86,8 @@ export default { rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', - param: 'createTime', + param: 'startTime', + valueFormat: 'timestamp' }, { type: 'button', @@ -126,7 +127,7 @@ export default { this.listQuery.pageSize = 10; this.listQuery.productionLineId = val.productionLineId; this.listQuery.productId = val.productId; - this.listQuery.createTime = val.createTime; + this.listQuery.startTime = val.startTime; this.getDataList(); break; case 'reset': diff --git a/src/views/core/base/product/add-or-updata.vue b/src/views/core/base/product/add-or-updata.vue index 9989a25f..eb5b51b1 100644 --- a/src/views/core/base/product/add-or-updata.vue +++ b/src/views/core/base/product/add-or-updata.vue @@ -43,7 +43,7 @@ + v-model="dataForm.area" + placeholder="请输入单位平方数" /> @@ -111,6 +111,8 @@ :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" + :add-button-show="isdetail ? null : '添加属性'" + @emitButtonClick="addNew()" :table-data="productAttributeList"> -
+ + +
+ 取消 + + 编辑 + + 确定
Float(val)', - // }, + { + type: 'number', + message: '请输入正确的数值', + trigger: 'change', + transform: (val) => Number(val), + }, ], processTime: [ { @@ -263,12 +273,12 @@ export default { message: '完成单位产品用时不能为空', trigger: 'blur', }, - // { - // type: 'number', - // message: '完成单位产品用时为浮点类型', - // trigger: 'blur', - // transfom: 'val => Number(val)', - // }, + { + type: 'number', + message: '请输入正确的数值', + trigger: 'blur', + transform: (val) => Number(val), + }, ], }, isdetail: false, @@ -277,6 +287,7 @@ export default { methods: { initData() { this.productAttributeList.splice(0); + this.listQuery.total = 0; }, init(id, isdetail) { this.initData(); @@ -304,12 +315,10 @@ export default { getList() { // 获取产品的属性列表 - const params = { - pageSize: 10, - pageNo: 1, + getProductAttrPage({ + ...this.listQuery, productId: this.dataForm.id, - }; - getProductAttrPage(params).then((response) => { + }).then((response) => { this.productAttributeList = response.data.list; this.listQuery.total = response.data.total; }); @@ -390,6 +399,8 @@ export default { diff --git a/src/views/core/base/productionLine/add-or-updata.vue b/src/views/core/base/productionLine/add-or-updata.vue index b26c203d..32b83db5 100644 --- a/src/views/core/base/productionLine/add-or-updata.vue +++ b/src/views/core/base/productionLine/add-or-updata.vue @@ -7,53 +7,84 @@ --> @@ -65,22 +96,20 @@ import { getProductionLine, getCode, } from '@/api/core/base/productionLine'; -import { - getFactoryPage, -} from '@/api/core/base/factory'; +import { getFactoryPage } from '@/api/core/base/factory'; export default { mixins: [basicAdd], data() { return { urlOptions: { - getOption: true, - isGetCode: true, - codeURL: getCode, + getOption: true, + isGetCode: true, + codeURL: getCode, createURL: createProductionLine, updateURL: updateProductionLine, infoURL: getProductionLine, - optionArrUrl: [getFactoryPage], + optionArrUrl: [getFactoryPage], }, dataForm: { id: undefined, @@ -99,13 +128,26 @@ export default { name: [ { required: true, message: '产线名称不能为空', trigger: 'blur' }, ], - factoryId: [ + factoryId: [ { required: true, message: '工厂不能为空', trigger: 'change' }, ], + tvalue: [ + { + type: 'number', + message: '请输入正确的数字', + trigger: 'change', + transform: (val) => Number(val), + }, + ], }, }; }, - methods: { - }, + methods: {}, }; + + diff --git a/src/views/core/base/productionLine/index.vue b/src/views/core/base/productionLine/index.vue index 29ac73d2..4eb84248 100644 --- a/src/views/core/base/productionLine/index.vue +++ b/src/views/core/base/productionLine/index.vue @@ -29,7 +29,7 @@ @cancel="handleCancel" @confirm="handleConfirm" :before-close="handleCancel" - width="70%"> + width="50%"> diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue index 89859e5e..8b023489 100644 --- a/src/views/equipment/analysis/quality/index.vue +++ b/src/views/equipment/analysis/quality/index.vue @@ -29,7 +29,10 @@ @emitFun="handleEmitFun"> -
+
各设备加工数量
@@ -87,6 +90,7 @@ export default { rangeSeparator: '-', startPlaceholder: '开始日期', endPlaceholder: '结束日期', + defaultTime: ['00:00:00', '23:59:59'], param: 'recordTime', defaultSelect: [ new Date(y, m, d) @@ -246,7 +250,9 @@ export default { created() { this.fillLineOptions(); this.fillProductOptions(); - this.getList(); + }, + mounted() { + this.$refs['search-bar'].headBtnClick('search'); }, methods: { handleTabClick(tab, event) { @@ -307,12 +313,16 @@ export default { }, handleSearchBarBtnClick(btn) { - console.log('handleSearchBarBtnClick', btn); + // debugger; switch (btn.btnName) { case 'search': this.queryParams.lineId = btn.lineId; this.queryParams.productId = btn.productId; - this.queryParams.recordTime = btn.recordTime ? btn.recordTime.map(time => moment(new Date(time)).format('YYYY-MM-DD HH:mm:ss')) : null; + this.queryParams.recordTime = btn.recordTime + ? btn.recordTime.map((time) => + moment(new Date(time)).format('YYYY-MM-DD HH:mm:ss') + ) + : null; this.$nextTick(() => { this.getList(); }); @@ -388,7 +398,7 @@ export default { font-size: 14px; &::before { - content: ""; + content: ''; position: absolute; left: 0; top: 6px; @@ -398,5 +408,4 @@ export default { background: #0b58ff; } } -