From 9f9542a26a4db3a6e8d9bc3fb6604782b477aec8 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 12 Aug 2025 10:33:01 +0800 Subject: [PATCH] =?UTF-8?q?2025-08-12=20=E7=89=A9=E6=96=99=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qc/qc.js | 2 - src/assets/scss/global.scss | 31 + src/views/modules/common/Chooselist_eam.vue | 8 +- .../labelSetting/customer_label_setting.vue | 92 ++- .../labelSetting/default_label_setting.vue | 84 ++- .../modules/labelSetting/label_setting.vue | 106 ++- .../labelSetting/label_setting_printer.vue | 87 ++- src/views/modules/qc/qcPartAttribute.vue | 619 +++++++++++++----- src/views/modules/qc/qc_upload.vue | 2 +- 9 files changed, 659 insertions(+), 372 deletions(-) diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 964e6d0..97d6456 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -67,8 +67,6 @@ export const getPlanLists = data => createAPI(`/pms/qc/getPlanLists`,'post',data // ===================================== 物料属性设置 ===================================== export const qcPartAttributeSearch = data => createAPI(`/pms/qc/qcPartAttributeSearch`,'post',data) -export const qcPartAttributeSave = data => createAPI(`/pms/qc/qcPartAttributeSave`,'post',data) -export const qcPartAttributeDelete = data => createAPI(`/pms/qc/qcPartAttributeDelete`,'post',data) export const searchPartAttributeDetails = data => createAPI(`/pms/qc/searchPartAttributeDetails`,'post',data) export const savePartAttributeDetails = data => createAPI(`/pms/qc/savePartAttributeDetails`,'post',data) export const deletePartAttributeDetails = data => createAPI(`/pms/qc/deletePartAttributeDetails`,'post',data) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index bfdf7b8..2cce891 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -368,7 +368,38 @@ div.table-text-input input.el-input__inner{ text-align: center; } +.el-input-number{ + width: 100%; +} + +.el-input-number .el-input__inner { + text-align: right; + padding-right: 5px !important; + padding-left: 0 !important; +} + +.el-input-number--medium .el-input-number__decrease, .el-input-number--medium .el-input-number__increase{ + width: 18px; + height: 18px; + font-size: 14px; + line-height: 1.5; +} +.el-input-number--mini{ + line-height: 20px +} +.el-input-number--mini .el-input-number__decrease, .el-input-number--mini .el-input-number__increase{ + width: 18px; + height: 18px; + font-size: 14px; + line-height: 1.5; +} +.el-input .el-input--medium{ + line-height: 20px; +} +.el-input-number .el-input--medium{ + line-height: 20px; +} /*a标签全局无下划线 2022-01-18 LR*/ diff --git a/src/views/modules/common/Chooselist_eam.vue b/src/views/modules/common/Chooselist_eam.vue index 4e4f38a..dacc7d2 100644 --- a/src/views/modules/common/Chooselist_eam.vue +++ b/src/views/modules/common/Chooselist_eam.vue @@ -228,17 +228,17 @@ export default { } if (this.tagNo <= 500 && this.tagNo !== 93 && this.tagNo !== 201) { if (this.param7) { - sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " + " and bu_no in (select bu_no from AccessBu where username = '" + this.param7 + "')" + sql += " and site in (select site from accessSite where userID = '" + this.param7 + "') " + " and bu_no in (select bu_no from AccessBu where username = '" + this.param7 + "')" } } if (this.tagNo > 500 && this.tagNo < 1000) { if (this.param7) { - sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " + sql += " and site in (select site from accessSite where userID = '" + this.param7 + "') " } } sql += this.conSql getChooselistDataEam({"sqlcode": sql}).then(({data}) => { - if (data.code == 0) { + if (data.code === 0) { this.dataList = data.baseListData; } else { this.$message.error(data.msg) @@ -248,7 +248,7 @@ export default { getRowData (row) { this.visible = false - this.$emit('getBaseData',row) + this.$emit('getBaseData', row) }, closeDialog () { diff --git a/src/views/modules/labelSetting/customer_label_setting.vue b/src/views/modules/labelSetting/customer_label_setting.vue index e0d7648..9d438f8 100644 --- a/src/views/modules/labelSetting/customer_label_setting.vue +++ b/src/views/modules/labelSetting/customer_label_setting.vue @@ -15,54 +15,50 @@ - {{ buttons.searchButton }} + {{ buttons.searchButton }} - {{ buttons.addButton }} + {{ buttons.addButton }} - - - - - - - - - - - + + + + + + + + + @@ -136,7 +132,7 @@ export default { tableName: '客户标签自定义列表', columnProp: 'labelType', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '标签类型', columnWidth: 100, columnHidden: false, @@ -153,7 +149,7 @@ export default { tableName: '客户标签自定义列表', columnProp: 'customerId', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '客户编码', columnWidth: 100, columnHidden: false, @@ -170,7 +166,7 @@ export default { tableName: '客户标签自定义列表', columnProp: 'customerDesc', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '客户名称', columnWidth: 100, columnHidden: false, @@ -189,7 +185,7 @@ export default { headerAlign: 'center', align: 'center', columnLabel: '标签编号', - columnWidth: 160, + columnWidth: 120, columnHidden: false, columnImage: false, columnSortable: true, @@ -204,7 +200,7 @@ export default { tableName: '客户标签自定义列表', columnProp: 'labelName', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '报表文件名', columnWidth: 220, columnHidden: false, @@ -354,7 +350,7 @@ export default { mounted() { this.$nextTick(() => { - this.height = window.innerHeight - 165; + this.height = window.innerHeight - 145; }) }, methods: { diff --git a/src/views/modules/labelSetting/default_label_setting.vue b/src/views/modules/labelSetting/default_label_setting.vue index 542a9e9..722a084 100644 --- a/src/views/modules/labelSetting/default_label_setting.vue +++ b/src/views/modules/labelSetting/default_label_setting.vue @@ -12,54 +12,50 @@ - {{ buttons.searchButton }} + {{ buttons.searchButton }} - {{ buttons.addButton }} + {{ buttons.addButton }} - - - - - - - - - - + + + + + + + + @@ -132,7 +128,7 @@ export default { tableName: '默认标签列表', columnProp: 'labelType', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '标签类型', columnWidth: 80, columnHidden: false, @@ -183,7 +179,7 @@ export default { tableName: '默认标签列表', columnProp: 'labelName', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '报表文件名', columnWidth: 220, columnHidden: false, @@ -298,7 +294,7 @@ export default { mounted() { this.$nextTick(() => { - this.height = window.innerHeight - 165; + this.height = window.innerHeight - 145; }) }, methods: { diff --git a/src/views/modules/labelSetting/label_setting.vue b/src/views/modules/labelSetting/label_setting.vue index 32be727..a6b9916 100644 --- a/src/views/modules/labelSetting/label_setting.vue +++ b/src/views/modules/labelSetting/label_setting.vue @@ -12,64 +12,60 @@ - {{ buttons.searchButton }} + {{ buttons.searchButton }} - {{ buttons.addButton }} + {{ buttons.addButton }} - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -157,7 +153,7 @@ export default { tableName: '标签自定义列表', columnProp: 'labelType', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '标签类型', columnWidth: 100, columnHidden: false, @@ -175,7 +171,7 @@ export default { tableName: '标签自定义列表', columnProp: 'labelName', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '报表文件名', columnWidth: 220, columnHidden: false, @@ -280,7 +276,7 @@ export default { mounted() { this.$nextTick(() => { - this.height = window.innerHeight - 165; + this.height = window.innerHeight - 145; }) }, methods: { diff --git a/src/views/modules/labelSetting/label_setting_printer.vue b/src/views/modules/labelSetting/label_setting_printer.vue index 7a0ad80..a1bd007 100644 --- a/src/views/modules/labelSetting/label_setting_printer.vue +++ b/src/views/modules/labelSetting/label_setting_printer.vue @@ -12,54 +12,51 @@ - {{ buttons.searchButton }} + {{ buttons.searchButton }} - {{ buttons.addButton }} + {{ buttons.addButton }} - - - - - - - - - - - + + + + + + + + + + @@ -133,7 +130,7 @@ export default { tableName: '标签打印机列表', columnProp: 'userId', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '用户ID', columnWidth: 100, columnHidden: false, @@ -150,7 +147,7 @@ export default { tableName: '标签打印机列表', columnProp: 'userDisplay', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '用户名', columnWidth: 95, columnHidden: false, @@ -300,7 +297,7 @@ export default { mounted() { this.$nextTick(() => { - this.height = window.innerHeight - 165; + this.height = window.innerHeight - 145; }) }, methods: { diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 77319a3..1ee5536 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -28,11 +28,9 @@ - 查询 - 新增 + 查询 - 导入 {{'导出'}} @@ -42,6 +40,11 @@ :height="height" :data="dataList" border + v-loading="searchLoading" + ref="partTable" + :row-style="rowStyle" + @row-click="partClickRow" + @current-change="changeCurrentRow" style="width: 100%;"> @@ -91,47 +94,223 @@ - - - - - - {{ i.sitename }} - - {{ i.buDesc }} - - - + + + + - - 是否免检
+ + + + + - - - 物料编码: - 物料编码: - + + + - - + + + + + 物料有效期管理 + + + + + + - - - + + + + + + 入库默认仓库 + 入库默认仓库 + + + + + 默认库位 + + - - 保存 + + + + + + 领料默认仓库 + + + + + + + + + + + + + IQC检验 + + + FAI检验 + + + IPQC检验 + + + PQC检验 + + + FQC检验 + + + OQC检验 + + + + + + + + + + + + + + + 保存 关闭 + + + + + + 新增 + + + + + + + + + + + + + + 新增 + + + + + + + + + + + + + + 新增 + + + + + + + + + + + + + + + + @@ -652,8 +831,6 @@