商品组结构上传

src/HDrpManagement/ProductGroupMag/index.vue

@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <div class="container normal-panel normal-margin">
+      <add></add>
+    </div>
+    <div class="container normal-panel">
+      <list></list>
+    </div>
+  </div>
+</template>
+
+<script>
+import list from './modules/list'
+
+import add from './modules/add'
+export default {
+  components:{
+    list,
+    add
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -0,0 +1,12 @@
+<template>
+  <div>add</div>
+</template>
+
+<script>
+export default {
+
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/ProductGroupMag/modules/list.vue

@@ -0,0 +1,12 @@
+<template>
+  <div>list</div>
+</template>
+
+<script>
+export default {
+
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/ProductMag/index.vue

@@ -1,18 +1,22 @@
 <template>
   <div>
-    <selectClass></selectClass>
+    <selectClass>
+      <add slot="add"></add>
+    </selectClass>
     <list></list>
   </div>
 </template>
 
 <script>
 import selectClass from './modules/Select'
+import add from './modules/add'
 
 import list from './modules/list'
 export default {
   components:{
     selectClass,
-    list
+    list,
+    add
   }
 }
 

src/HDrpManagement/ProductMag/modules/Select.vue

@@ -6,7 +6,7 @@
       </ul>
       <div class="flex-align-center">
         <el-input size="small" v-model="value" placeholder="产品名称,编号" clearable></el-input>&nbsp;
-        <el-button type="primary" size="small">新增产品</el-button>
+        <slot name="add"></slot>
       </div>
     </div>
     <div>

src/HDrpManagement/ProductMag/modules/add.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <el-button type="primary" size="small" @click="dialogTableVisible=true">新增产品</el-button>
+    <el-dialog title="新增产品" :visible.sync="dialogTableVisible">
+      <el-row :gutter="20">
+        <el-form label-position="left" inline label-width="80px" :model="form" size="small">
+          <el-col :span="12">
+            <el-form-item label="产品编号">
+              <el-input v-model="form.itemno"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品名称">
+              <el-input v-model="form.itemname"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="型号">
+              <el-input v-model="form.model"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规格">
+              <el-input v-model="form.spec"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      dialogTableVisible:false,
+      form:{
+        itemid:0,
+        itemno:'',
+        itemname:''
+      }
+    }
+  }
+}
+
+</script>
+<style>
+</style>

src/HManagement/marketing/agent/list.vue

@@ -77,12 +77,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.query_agent(this.param.content.sa_saleareaid)
+      this.query_agent(this.param.content.sa_saleareaids[0])
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.query_agent(this.param.content.sa_saleareaid)
+      this.query_agent(this.param.content.sa_saleareaids[0])
     }
   },
   mounted () {

src/HManagement/marketing/saler/list.vue

@@ -55,7 +55,7 @@ export default {
   },
   methods:{
     async query_saler (sa_saleareaid) {
-      this.param.content.sa_saleareaid = sa_saleareaid
+      this.param.content.sa_saleareaids = [sa_saleareaid]
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
@@ -64,12 +64,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.query_saler(this.param.content.sa_saleareaid)
+      this.query_saler(this.param.content.sa_saleareaids[0])
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.query_saler(this.param.content.sa_saleareaid)
+      this.query_saler(this.param.content.sa_saleareaids[0])
     }
   },
   mounted () {

src/HManagement/salesForecastTemplate/modules/templateList.vue

@@ -4,7 +4,7 @@
     <p class="normal-title normal-margin">预测模板</p>
     <div class="flex-align-center  search-panel normal-margin">
       <p>搜索:</p>
-      <el-input style="width:200px" size="small" placeholder="模板名称" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" v-model="params.content.where.condition" prefix-icon="el-icon-search" clearable></el-input>
+      <el-input style="width:200px" size="small" placeholder="模板名称,模板编号" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" v-model="params.content.where.condition" prefix-icon="el-icon-search" clearable></el-input>
     </div>
     <!-- 表格主题 -->
     <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="300px" @rowClick="rowClick">

src/router/HDrpManagement.js

@@ -18,6 +18,16 @@ const HDrpManagement = [
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/unit/index')
   },
+  {
+    path: '/productgroupmag',
+    name: 'productgroupmag',
+    meta: {
+      title: '商品组管理',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/ProductGroupMag/index')
+  },
   {
     path: '/productmag',
     name: 'productmag',