From f423d71a7c39921397dca0a2f3c7ab20ce3a179a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 17 Apr 2024 17:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=BE=E6=A0=BCPC=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=E3=80=912024-04-17=E9=9C=80=E6=B1=82=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue/src/router/modules/fisprint.js | 4 +-
.../pg-fis/basedate/m100Online/ScrapMB.vue | 9 ++-
.../basedate/m100Online/normalPritIndex.vue | 52 +++++++++-----
.../pg-fis/basedate/planControl/index.vue | 26 +++----
.../views/pg-fis/basedate/select/index.vue | 71 +++++++++++--------
5 files changed, 96 insertions(+), 66 deletions(-)
diff --git a/vue/src/router/modules/fisprint.js b/vue/src/router/modules/fisprint.js
index 4962305..ac79e23 100644
--- a/vue/src/router/modules/fisprint.js
+++ b/vue/src/router/modules/fisprint.js
@@ -21,7 +21,7 @@ const pgfisPrint = {
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
name: 'pg-M100Online',//命名路由
meta: {
- title: '日常打印M100信息',
+ title: '日常打印E001信息',
//roles: ['SettleAccount.Reports'],
icon: '客户零件'
}
@@ -31,7 +31,7 @@ const pgfisPrint = {
component: () => import('@/views/pg-fis/basedate/select'),
name: 'select',//命名路由
meta: {
- title: 'M100查询',
+ title: 'E001查询',
//roles: ['SettleAccount.Reports'],
icon: '结算对比'
}
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index b5d3110..20d230d 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -283,6 +283,10 @@ export default {
return [];
},
},
+ handleDeleteCallBack:{
+ type: Function,
+ default:null
+ }
},
data() {
const validVersion = (rule, value, callback) => {
@@ -393,7 +397,7 @@ export default {
});
},
created() {
- this.getList();
+ this.handleFilter()
},
watch: {
customerInfosMB: {
@@ -675,7 +679,6 @@ export default {
handleDelete() {
//debugger;
let params = this.zuofei;
-
this.$axios
.posts("/api/newjit/MenBanPackingList/scrap", params)
.then((response) => {
@@ -690,9 +693,9 @@ export default {
duration: 2000,
});
this.getList();
+ if(this.handleDeleteCallBack)this.handleDeleteCallBack()
});
this.dialogTableVisible = false;
-
},
//作废操作，支持批量操作-门板
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 506e202..0d8de59 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -203,7 +203,11 @@
@open="opens()"
size="900px"
>
-
+
{
@@ -978,7 +989,6 @@ export default {
},
//抽屉
handleDrawerOpen(param) {
- debugger
this.drawer = true;
var parentId = param.assemblyID; //主键id
this.customerInfos = [
@@ -1002,7 +1012,6 @@ export default {
},
/** 导出功能 assembly-cfg-erp/export */
handleDownload() {
- debugger
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
@@ -1109,7 +1118,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
- return { 1: "未解析", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]];
+ return { 1: "未匹配", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]];
}
if (column.property === "zHBBillStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
@@ -1171,7 +1180,6 @@ export default {
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
- debugger
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
@@ -1209,7 +1217,6 @@ export default {
},
// 向子组件更新值
valueselectChange(val) {
- debugger
this.$forceUpdate();
@@ -1892,7 +1899,6 @@ export default {
//获取所有产线
getProductLine() {
- debugger
this.listPLQuery.UserId = this.userInfo == null ? null : this.userInfo.userId;
// console.log(
// "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
@@ -2080,6 +2086,14 @@ export default {
padding: 10px;
line-height: 20px;
}
+
+/deep/ .el-table .error-row {
+ background: #fbd6d6 !important;
+
+ td{
+ background: #fbd6d6 !important;
+ }
+}
diff --git a/vue/src/views/pg-fis/basedate/planControl/index.vue b/vue/src/views/pg-fis/basedate/planControl/index.vue
index e269e42..a9bcf1a 100644
--- a/vue/src/views/pg-fis/basedate/planControl/index.vue
+++ b/vue/src/views/pg-fis/basedate/planControl/index.vue
@@ -35,7 +35,7 @@
/>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-->
-
+
-
+
{
@@ -1693,6 +1700,12 @@ export default {
margin-left: 5px;
margin-right: 5px;
}
+/deep/ .el-table .error-row {
+ background: #fbd6d6 !important;
+ td{
+ background: #fbd6d6 !important;
+ }
+}