Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -74,6 +74,7 @@ export default {
       form: {
         sa_brandid: '',
         groupname: '',
+        itemid:'0',
         itemno: '',
         itemname:'',
         sequence:'1',
@@ -111,6 +112,7 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemid:'0',
         itemname:'',
         tag: []
       },
@@ -159,6 +161,7 @@ export default {
     },
     productChange (data) {
       this.form.itemno = data.itemno
+      this.form.itemid = data.itemid
       this.form.itemname = data.itemname
       this.$refs.product.visible = false
     },
@@ -170,6 +173,7 @@ export default {
           "sa_brandid":this.groupdata.sa_brandid,
           "groupname":this.groupdata.groupname,
           "itemno":this.tableData[0].itemno,
+          "itemid":this.tableData[0].itemid,
           "tag": []
         }
       })

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -55,6 +55,7 @@ export default {
       brandList:[],
       form: {
         sa_brandid: '',
+        itemid:'',
         groupname: '',
         itemno: '',
         tag: [],
@@ -96,6 +97,7 @@ export default {
     },
     productChange (data) {
       this.form.itemno = data.itemno
+      this.form.itemid = data.itemid
       this.form.itemname = data.itemname
       this.$refs.product.visible = false
     },
@@ -133,12 +135,13 @@ export default {
           "sa_brandid":this.groupdata.sa_brandid,
           "groupname":this.groupdata.groupname,
           "itemno":this.tableData[0].itemno,
+          "itemid":this.tableData[0].itemid,
           "tag": []
         }
       })
       this.$emit('onSuccess')
       this.drawer = false
-      
+
     }
   }
 }
@@ -159,4 +162,4 @@ export default {
   text-align: center;
   margin-top: 10px;
 }
-</style>
+</style>

src/HDrpManagement/ProductGroupMag/modules/editHeader.vue

@@ -49,7 +49,8 @@ export default {
         groupname: '',
         itemno: '',
         tag: [],
-        sequence:''
+        sequence:'',
+        itemid:''
       },
       rules: {
         sa_brandid: [
@@ -78,6 +79,7 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemid:'',
         tag: []
       },
       this.tableData = []
@@ -93,7 +95,7 @@ export default {
       })
     },
     async submit() {
-      if (this.tableData.length === 0) 
+      if (this.tableData.length === 0)
       const res = await this.$api.requested({
         "id": "20220922164303",
         "content": {
@@ -101,6 +103,7 @@ export default {
           "sa_brandid":this.form.sa_brandid,
           "groupname":this.form.groupname,
           "itemno":"",
+          "itemid":"",
           "sequence":this.form.sequence,
           "tag": []
         }
@@ -119,7 +122,6 @@ export default {
         }
       })
       this.brandList = res.data
-      console.log(this.brandList,'品牌');
     },
     async onSuccess () {
       const res = await this.$api.requested({
@@ -129,12 +131,13 @@ export default {
           "sa_brandid":this.groupdata.sa_brandid,
           "groupname":this.groupdata.groupname,
           "itemno":this.tableData[0].itemno,
+          "itemid":this.tableData[0].itemid,
           "tag": []
         }
       })
       this.$emit('onSuccess')
       this.drawer = false
-      
+
     }
   }
 }
@@ -155,4 +158,4 @@ export default {
   text-align: center;
   margin-top: 10px;
 }
-</style>
+</style>