From 05fa1605bb9123d8f8dea343c299f18903388192 Mon Sep 17 00:00:00 2001
From: "LAPTOP-AKBAACR8\\An.Hr" <297504645@qq.com>
Date: Thu, 30 Mar 2023 16:49:34 +0800
Subject: [PATCH] =?UTF-8?q?GroupName=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=A4=A7?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pg-fis/basedate/m100Online/budaZHB.vue    |  6 ++--
 .../basedate/m100Online/normalPritIndex.vue   | 30 +++++++++----------
 .../views/pg-fis/basedate/select/index.vue    | 10 +++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
index 32402b78..e28a46a3 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
@@ -304,7 +304,7 @@ export default {
           newVal.forEach((element) => {
             this.customerInfo.printType = 2; //2时补打
             this.customerInfo.productLine = element.ProductLine;
-            this.customerInfo.Groupname = element.Groupname
+            this.customerInfo.GroupName = element.GroupName
           });
           if (this.customerInfo.productLine != "") {
             this.getList();
@@ -472,7 +472,7 @@ export default {
       if (this.customerInfo.productLine != "") {
         inputParam.productLine = this.customerInfo.productLine;
       }
-      inputParam.Groupname = this.customerInfo.Groupname;
+      inputParam.GroupName = this.customerInfo.GroupName;
       console.log(476,inputParam)
       console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
       this.$axios
@@ -508,7 +508,7 @@ export default {
         var params = {
           printType: 2,
           productLine: this.customerInfo.productLine,
-          Groupname: this.customerInfo.Groupname,
+          GroupName: this.customerInfo.GroupName,
           beginVin: beginVin1,
           endVin: endVin1,
 					m100IdList: []
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 5ae9103f..164fb38d 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -46,11 +46,11 @@
           </el-form-item>
           <!-- 柱护板时候显示 -->
           <el-form-item 
-            prop="Groupname" 
+            prop="GroupName" 
             v-show="this.listQuery.productType == 2"
           >
             <el-select
-              v-model="listQuery.Groupname"
+              v-model="listQuery.GroupName"
               clearable
               placeholder="请选择"
               size="medium"
@@ -571,7 +571,7 @@ export default {
         MaxResultCount: 15,
         productType: 1, //1:门板；2:柱护板
         ProductLine: undefined,
-        Groupname:undefined,//仅在柱护板时候显示
+        GroupName:undefined,//仅在柱护板时候显示
         Version: undefined,
         printBillNum: undefined,
         serialNumBegin: undefined,
@@ -610,7 +610,7 @@ export default {
       },
       hostSNQuery: {
         productLine: undefined,
-        Groupname: undefined
+        GroupName: undefined
       },
       hostCheckQuery: {
         printType: undefined, //0:打印;1:重打;2:补打;
@@ -627,7 +627,7 @@ export default {
         endHostSN: undefined,
         beginVin: undefined,
         endVin: undefined,
-        Groupname: undefined,
+        GroupName: undefined,
       },
       vinPrintQuery: {
         printType: undefined, //0:打印;1:重打;2:补打;
@@ -1153,7 +1153,7 @@ export default {
       this.listQueryList.BillStatus = 2; //状态
       this.listQueryList.ProductLine = this.listQuery.productLine; //产线
       this.listQueryList.CanNotPrint = false; //不可打印
-      this.listQueryList.GroupNmae = this.listQuery.Groupname
+      this.listQueryList.GroupNmae = this.listQuery.GroupName
       console.log("日常打印M100查询条件：" + JSON.stringify(this.listQueryList));
       //this.click();
       this.$axios
@@ -1216,7 +1216,7 @@ export default {
           {
             PrintType: 1,
             ProductLine: this.listQuery.productLine,
-            Groupname:this.listQuery.Groupname
+            GroupName:this.listQuery.GroupName
           },
         ];
       }
@@ -1276,7 +1276,7 @@ export default {
       }
       // 柱护板
       else if(type == 2){
-        _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.Groupname + ')'
+        _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.GroupName + ')'
       }
       return _name
     },
@@ -1289,7 +1289,7 @@ export default {
         endHostSN: undefined,
         beginVin: undefined,
         endVin: undefined,
-        Groupname: undefined,
+        GroupName: undefined,
       }),
       (this.hostCheckQuery.printType = 0);
       this.hostPrintQuery.printType = 0;
@@ -1301,7 +1301,7 @@ export default {
         });
         return;
       }
-      if(this.listQuery.productType == '2' && (this.listQuery.Groupname === "" || this.listQuery.Groupname === undefined)){
+      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
         this.$message({
           message: "请选择生产线",
           type: "warning",
@@ -1312,8 +1312,8 @@ export default {
         (this.printNumZHB = "24"),
         (this.hostSNQuery.productLine = this.listQuery.productLine);
       this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.hostPrintQuery.Groupname = this.listQuery.Groupname;
-      this.hostSNQuery.Groupname = this.listQuery.Groupname
+      this.hostPrintQuery.GroupName = this.listQuery.GroupName;
+      this.hostSNQuery.GroupName = this.listQuery.GroupName
       
       //后端服务更改了 前端跟着更改成以下方式
       if (this.listQuery.productType === 1) {
@@ -1431,7 +1431,7 @@ export default {
         });
         return;
       }
-      if(this.listQuery.productType == '2' && (this.listQuery.Groupname === "" || this.listQuery.Groupname === undefined)){
+      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
         this.$message({
           message: "请选择生产线",
           type: "warning",
@@ -1471,7 +1471,7 @@ export default {
         });
         return;
       }
-      if(this.listQuery.productType == '2' && (this.listQuery.Groupname === "" || this.listQuery.Groupname === undefined)){
+      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
         this.$message({
           message: "请选择生产线",
           type: "warning",
@@ -1836,7 +1836,7 @@ export default {
         return a.productLineCode - b.productLineCode;
       });
       this.listQuery.productLine = this.PLChildList[0].productLineCode;
-      this.listQuery.Groupname = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
+      this.listQuery.GroupName = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
       this.changeMainTableHeight()
       this.valueselectChange()
       //变更打印按钮文字
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index 190875d0..76af12c2 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -45,11 +45,11 @@
           </el-form-item>
           <!-- 柱护板时候显示 -->
           <el-form-item 
-            prop="Groupname" 
+            prop="GroupName" 
             v-show="listQuery.productType == 2"
           >
             <el-select
-              v-model="listQuery.Groupname"
+              v-model="listQuery.GroupName"
               clearable
               placeholder="请选择"
               size="medium"
@@ -507,7 +507,7 @@ export default {
         MaxResultCount: 15,
         productType: 1, //1:门板；2:柱护板
         ProductLine: undefined,
-        Groupname:undefined,//仅在柱护板时候显示
+        GroupName:undefined,//仅在柱护板时候显示
         Version: undefined,
         printBillNum: undefined,
         serialNumBegin: undefined,
@@ -1561,14 +1561,14 @@ export default {
       //console.log(this.PLList)
       //变更打印按钮文字
       if (this.listQuery.productType === 1) {
-        this.listQuery.Groupname = undefined
+        this.listQuery.GroupName = undefined
         this.$refs.btn1.$el.innerText = "打印门板发货排序单";
         this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
         this.$refs.btn3.$el.innerText = "补打门板发货排序单";
         this.listQuery.state.push(this.billState[0].id);
         this.isShowState = true;
       } else if (this.listQuery.productType === 2) {
-        this.listQuery.Groupname = this.PLChildGroupList[0]
+        this.listQuery.GroupName = this.PLChildGroupList[0]
         this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
         this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
         this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";