Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" @click="drawer=true">新 建</el-button>
+    <el-button type="primary" size="small" @click="drawer=true">新 建</el-button>
     <el-drawer title="创建商品组" :visible.sync="drawer" size="80%" direction="rtl" append-to-body @close="onCancel" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
@@ -143,6 +143,8 @@ export default {
           this.groupdata = res.data
           this.index = 0
           this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/productGroupDetail',query:{id:res.data.sa_itemgroupid,rowindex:res.data.rowindex}})
         })
         }
       })

src/HDrpManagement/ProductMag/modules/add.vue

@@ -549,6 +549,8 @@ export default {
           this.$emit('onSuccess')
           this.refresh()
           this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/productmagDetail',query:{id:res.data.itemid,rowindex:res.data.rowindex}})
         })
       })
       
@@ -566,8 +568,8 @@ export default {
             "itemname":'',
             "model": "",
             "spec": "",
-            "orderminqty": '', //订单起订量
-            "orderaddqty": '', //订单增量
+            "orderminqty": 1, //订单起订量
+            "orderaddqty": 1, //订单增量
             "orderminqty_auxunit": 0, //订单起订量控制单位（0:主单位；1:辅助单位）
             "orderaddqty_auxunit": 0, //订单增量控制单位（0:主单位；1:辅助单位
             "remarks": "", //可选
@@ -605,8 +607,8 @@ export default {
         "itemname":'',
         "model": "",
         "spec": "",
-        "orderminqty": '', //订单起订量
-        "orderaddqty": '', //订单增量
+        "orderminqty": 1, //订单起订量
+        "orderaddqty": 1, //订单增量
         "orderminqty_auxunit": 0, //订单起订量控制单位（0:主单位；1:辅助单位）
         "orderaddqty_auxunit": 0, //订单增量控制单位（0:主单位；1:辅助单位
         "remarks": "", //可选

src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -152,7 +152,7 @@ export default {
             "id": "20221025165904",
             "content": {
                 "sa_itempriceadjustid": this.$route.query.id,
-                "marketprice":this.form.oldprice1,
+                "marketprice":this.form.price1,
                 "sa_itempriceadjust_itemsid":this.data.sa_itempriceadjust_itemsid,
                 "sa_itempriceadjust_itemprice": content
             }

src/HManagement/clueManage/m_activity/modules/selectAgent/agent/list.vue

@@ -83,7 +83,7 @@ export default {
   },
   created () {
     // 获取角色表结构
-    this.tablecols = this.tool.tabelCol(this.$route.name)['activitylist'].tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name)['peopleTable'].tablecols
   }
 }