Ver Fonte

Merge branch 'xiaoqin' into mergeBranch

codeMan há 2 anos atrás
pai
commit
bc63662450

+ 7 - 7
src/HDrpManagement/toolBorrowingMag/modules/add.vue

@@ -166,13 +166,13 @@ export default {
       })
       this.sa_brandidOptions = res.data
 
-      const res1 = await this.$api.requested({
-        "id": 20221223141802,
-        "content": {
-          "pageSize": 999,
-        }
-      })
-      this.tradefieldOptions = res1.data
+      // const res1 = await this.$api.requested({
+      //   "id": 20221223141802,
+      //   "content": {
+      //     "pageSize": 999,
+      //   }
+      // })
+      // this.tradefieldOptions = res1.data
     },
     rowClick (row) {
       this.form.sys_enterpriseid = row.sys_enterpriseid

+ 6 - 2
src/HManagement/marketing2/saler/area/detail/index.vue

@@ -10,7 +10,7 @@
         idname="sa_salearea_hrid"
         ownertable="sa_salearea_hr"
         tags=""
-        :tabs="['详细信息']"
+        :tabs="['详细信息','领域授权']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -21,14 +21,18 @@
       <div slot="slot0" >
         <detailed :detailData="mainData"></detailed>
       </div>
+      <div slot="slot1">
+        <TradefieldList :mainData="mainData"></TradefieldList>
+      </div>
     </basicDetails>
   </div>
 </template>
 
 <script>
 import detailed from './modules/detailedData'
+import TradefieldList from './modules/tradefieldList'
 export default {
-  components:{detailed},
+  components:{detailed,TradefieldList},
   data () {
     return {
       mainData:{},

+ 92 - 0
src/HManagement/marketing2/saler/area/detail/modules/tradefieldList.vue

@@ -0,0 +1,92 @@
+
+<template>
+  <div>
+    <!-- <el-input
+        style="width:300px"
+        placeholder="请输入内容"
+        v-model="param.content.where.condition"
+        clearable
+        size="small"
+        @keyup.enter.native="queryClick()">
+    </el-input> -->
+    <el-table
+      :data="tableData"
+      stripe
+      size="mini"
+      style="width: 100%"
+      border>
+      <el-table-column
+        prop="tradefield"
+        label="领域">
+      </el-table-column>
+    </el-table>
+    <div class="container normal-panel" style="text-align:right">
+      <el-pagination
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['mainData'],
+  data () {
+    return {
+      tableData:[],
+      param:{
+          "classname": "sysmanage.develop.optiontype.optiontype",
+          "method": "optiontypeselect",
+          "content": {
+              "pageNumber": 1,
+              "pageSize": 20,
+              "typename": "saletradefield",
+              "parameter": {
+                  "siteid": "",
+                  "hrid": ""
+              }
+          }
+      },
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async queryfinancialinfo () {
+      this.param.content.parameter.siteid = 11
+      this.param.content.parameter.hrid = this.mainData.hrid
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.queryfinancialinfo()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.queryfinancialinfo()
+    },
+  },
+  mounted () {
+    this.queryfinancialinfo()
+  }
+}
+
+</script>
+<style scoped>
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
+</style>

+ 1 - 1
src/SDrpManagement/ProductGroup/index.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import selectClass from './modules/Select.vue'
+import selectClass from './modules/Select2.vue'
 import selectPeople from './modules/selectPeople'
 import { log } from '@antv/g2plot/lib/utils';
 export default {

+ 177 - 0
src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -0,0 +1,177 @@
+<template>
+  <div class="border-bottom">
+    <div>
+      <ul class="flex-align-center normal-margin-new" >
+        <!-- <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField({})" >全部领域</li> -->
+        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" style="margin-left:0" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+      </ul>
+      <ul class="flex-align-center normal-margin-new">
+        <!-- <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li> -->
+        <li  :class="brand_act == item.sa_brandid?'act':''" class="brand-item " style="margin-left:0" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
+      </ul>
+      <ul class="flex-align-center normal-margin-new">
+        <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
+        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+      </ul>
+      <classTree ref="tree" style="padding-left:80px" :data="activeClass.subdep" @onClassChange="change"></classTree>
+    </div>
+  </div>
+</template>
+
+<script>
+import classTree from './classTree.vue'
+export default {
+  data () {
+    return {
+      value:'',
+      brands:[],
+      fields:[],
+      itemclass:[],
+      activeClass:{},
+      field_act:'',
+      tradefield:'',
+      brand_act:0,
+      class_act:''
+    }
+  },
+  provide () {
+    return {
+      selectThis:() => this
+    }
+  },
+  inject:['sys_enterpriseid'],
+  props: {
+    default: {
+      type: Boolean,
+      default:() => false
+    }
+  },
+  components:{
+    classTree
+  },
+  methods:{
+    async queryAgentiInfo (callback) {
+      let param = {
+        "id": 20230418142202,
+        "content": {
+            "sys_enterpriseid":this.sys_enterpriseid(),
+            "where": {
+              "condition": ""
+            }
+        }
+      }
+      if (!this.sys_enterpriseid()) delete param.content.sys_enterpriseid
+      const res1 = await this.$api.requested(param)
+      this.fields = res1.data
+      if (this.fields.length) {
+        this.field_act = res1.data[0].sys_enterprise_tradefieldid
+        this.tradefield = res1.data[0].tradefield
+        // this.clickField({sys_enterprise_tradefieldid:this.field_act,tradefield:res1.data[0].tradefield})
+      } else {
+        this.field_act = 0
+        this.tradefield = ''
+        // this.clickField(false)
+      }
+      callback && callback()
+    },
+    async queryBrands (callback) {
+      let param = {
+        "id": "20220924163702",
+        "content": {
+          "pageSize":1000,
+          "sys_enterpriseid":this.sys_enterpriseid(),
+          "where":{
+            "condition":""
+          }
+        }
+      }
+      if (!this.sys_enterpriseid()) delete param.content.sys_enterpriseid
+      const res = await this.$api.requested(param)
+      this.brands = res.data
+      if (this.brands.length) {
+        this.brand_act = res.data[0].sa_brandid
+        // this.clickBrand(res.data[0].sa_brandid)
+      } else {
+        this.brand_act = 0
+        // this.clickBrand(this.brand_act)
+      }
+      callback && callback()
+      
+    },
+
+    async queryClass () {
+      let param = {
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,"sys_enterpriseid":this.sys_enterpriseid(),where:{istool:0}}
+      }
+      if (!this.sys_enterpriseid()) delete param.content.sys_enterpriseid
+      const res = await this.$api.requested(param)
+      console.log(res.data);
+      
+      this.itemclass = res.data.length ? res.data[0].ttemclass : []
+    },
+    clickBrand (id) {
+      this.brand_act = id ? id : 0
+      this.queryClass()
+      this.$emit('brandChange',[this.brand_act])
+      
+    },
+    clickField (item) {
+      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
+      this.$emit('clickField',item)
+    },
+    clickClass (item) {
+      if (item) {
+        this.activeClass = item
+        this.class_act = item.itemclassnum
+        this.$emit('onClassChange',item)
+      } else {
+        this.class_act = ''
+        this.$refs.tree.class_act = 0
+        this.$emit('onClassChange',item)
+      }
+      
+    },
+    change(n) {
+      this.$emit('onClassChange',n)
+    },
+    clearSearch() {
+      this.$emit('clearSearch')
+    }
+  },
+  mounted () {
+    this.queryClass()
+    this.queryAgentiInfo()
+    this.queryBrands()
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.brand-item{
+  margin:2px 40px;
+  color: #333;
+  cursor: pointer;
+  transition: .2s all linear;
+  font-size: 14px;
+}
+.act{
+  color:#3874f6;
+  font-weight: bold;
+}
+.normal-margin-new{
+  margin-bottom: 2px !important;
+}
+.border-bottom{
+  padding-bottom:16px;
+  border-bottom: 1px solid #e3e5ea;
+}
+.border-all{
+  margin-left: 0px
+}
+.margin-notAll{
+  margin-left: -18px
+}
+
+</style>

+ 21 - 18
src/SDrpManagement/Products/modules/Select copy.vue → src/SDrpManagement/Products/modules/Select2.vue

@@ -1,22 +1,19 @@
 <template>
   <div class="border-bottom">
     <div>
-      <ul class="flex-align-center normal-margin-new">
-        <li :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField">全部领域</li>
-        <li :class="field_act === item.tradefield?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+      <ul class="flex-align-center normal-margin-new" >
+        <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField(null)" >全部领域</li>
+        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin-new">
-        <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand">全部品牌</li>
-        <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
+        <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand(null)">全部品牌</li>
+        <li  :class="brand_act == item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin-new">
-        <li :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass">全部分类</li>
-        <li :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+        <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
+        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
-      <classTree style="padding-left:31px" :data="activeClass.subdep" @onClassChange="change"></classTree>
-    </div>
-    <div>
-
+      <classTree v-if="brand_act !== ''" style="padding-left:80px" :data="activeClass.subdep" @onClassChange="change"></classTree>
     </div>
   </div>
 </template>
@@ -32,7 +29,7 @@ export default {
       itemclass:[],
       activeClass:{},
       field_act:'',
-      brand_act:0,
+      brand_act:'',
       class_act:''
     }
   },
@@ -58,7 +55,6 @@ export default {
         }
       })
       this.fields = res1.data
-      
       this.field_act = ''
     },
     async queryBrands () {
@@ -72,7 +68,8 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = 0
+      this.brand_act = ''
+      // this.clickBrand(res.data[0].sa_brandid)
     },
 
     async queryClass () {
@@ -82,22 +79,28 @@ export default {
       this.itemclass = res.data[0].ttemclass
     },
     clickBrand (id) {
-      this.brand_act = id ? id : 0
+      this.brand_act = id ? id : ''
       this.queryClass()
+      
     },
     clickField (item) {
-      this.field_act = item ? item.tradefield : ''
+      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
+      console.log( item,this.field_act)
       this.$emit('clickField',item)
     },
     clickClass (item) {
       if (item) {
         this.activeClass = item
+        console.log(item);
+        
         this.class_act = item.itemclassnum
         this.change(item)
       } else {
         this.class_act = ''
         this.$emit('onClassChange',item)
       }
+      console.log(this.class_act);
+      
       
     },
     change(n) {
@@ -120,11 +123,11 @@ export default {
 </style>
 <style scoped>
 .brand-item{
-  margin:0 25px;
+  margin:5px 40px;
   color: #333;
   cursor: pointer;
   transition: .2s all linear;
-  font-size: 13px;
+  font-size: 14px;
 }
 .act{
   color:#3874f6;

+ 7 - 7
src/SDrpManagement/salerToolBorrowing/modules/add.vue

@@ -170,13 +170,13 @@ export default {
       })
       this.sa_brandidOptions = res.data
 
-      const res1 = await this.$api.requested({
-        "id": 20221223141802,
-        "content": {
-          "pageSize": 999,
-        }
-      })
-      this.tradefieldOptions = res1.data
+      // const res1 = await this.$api.requested({
+      //   "id": 20221223141802,
+      //   "content": {
+      //     "pageSize": 999,
+      //   }
+      // })
+      // this.tradefieldOptions = res1.data
     },
     rowClick (row) {
       this.form.sys_enterpriseid = row.sys_enterpriseid

+ 7 - 7
src/SDrpManagement/toolBorrowing/modules/add.vue

@@ -165,13 +165,13 @@ export default {
       })
       this.sa_brandidOptions = res.data
 
-      const res1 = await this.$api.requested({
-        "id": 20221223141802,
-        "content": {
-          "pageSize": 999,
-        }
-      })
-      this.tradefieldOptions = res1.data
+      // const res1 = await this.$api.requested({
+      //   "id": 20221223141802,
+      //   "content": {
+      //     "pageSize": 999,
+      //   }
+      // })
+      // this.tradefieldOptions = res1.data
     },
     // rowClick (row) {
     //   this.form.sys_enterpriseid = row.sys_enterpriseid