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

src/HDrpManagement/BrandManage/component/saleclass/components/dep_list.vue

@@ -25,6 +25,7 @@
 
 
 export default {
+  props:['data'],
   components:{
   },
   data () {
@@ -36,6 +37,7 @@ export default {
   },
   methods:{
     async department (callback) {
+      console.log(this.data,'品牌信息')
       const res = await this.$api.requested({
           "id": "20220922110403",
           "version":1,

src/HDrpManagement/BrandManage/component/saleclass/index copy.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="brand normal-panel">
+    <dep-list @onClick="onClick" ref="list">
+      <template v-slot:add="scope">
+        <Edit type="add" @addSuccess="addSuccess" :rowData="scope.data" v-if="tool.checkAuth($route.name,'insert')"/>
+      </template>
+      <template v-slot:edit="scope">
+        <Edit type="edit" @addSuccess="addSuccess" v-if="scope.data.itemclassid && tool.checkAuth($route.name,'update')" :rowData="scope.data"/>
+      </template>
+      <template v-slot:del="scope">
+        <Del :id="scope.data.itemclassid" @deleteSuccess="deleteSuccess" v-if="scope.data.itemclassid && tool.checkAuth($route.name,'delete')"/>
+      </template>
+    </dep-list>
+  </div>
+</template>
+
+<script>
+import DepList from './components/dep_list'
+import Edit from './components/edit'
+import Del from './components/delete'
+export default {
+  name: '',
+  
+  data() {
+    return {
+      tablecols1:'',
+      list:''
+    };
+  },
+  components: {DepList,Edit,Del},
+  computed:{
+  },
+  watch:{
+  },
+  created() {
+    this.tablecols1 = this.tool.tabelCol(this.$route.name).salesTable.tablecols
+  },
+  methods: {
+    onClick(node) {
+      console.log(node);
+      this.list = [node.data]
+      // this.list = node
+    },
+    addSuccess() {
+      this.$refs.list.department()
+    },
+    deleteSuccess() {
+      this.$refs.list.department()
+    }
+  },
+};
+</script>
+
+<style scoped>
+  .brand {
+    height: calc(100vh - 100px);
+    display:flex;
+  }
+</style>

src/HDrpManagement/BrandManage/component/saleclass/index.vue

@@ -20,6 +20,7 @@ import Edit from './components/edit'
 import Del from './components/delete'
 export default {
   name: '',
+  
   data() {
     return {
       tablecols1:'',

src/HDrpManagement/BrandManage/index.vue

@@ -17,7 +17,8 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'brandLoge'">
-          <img width="70" height="70" style="margin-top:10px;border-radius:4px" :src="scope.data.column.data.attinfos[0]?scope.data.column.data.attinfos[0].url:''" alt="">
+          <!-- <img width="70" height="70" style="margin-top:10px;border-radius:4px" :src="scope.data.column.data.attinfos[0]?scope.data.column.data.attinfos[0].url:''" alt=""> -->
+          <previewImage v-if="scope.data.column.data.attinfos[0]" style="height:40px;width:40px;" :image="scope.data.column.data.attinfos[0]" :list="scope.data.column.data.attinfos" :deletebtn="false"></previewImage>
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
@@ -34,11 +35,13 @@
 <script>
 import edit from './modules/edit'
 import brand_del from './modules/brand_del'
+import previewImage from '@/components/previewImage/index'
 
 export default {
   components:{
     edit,
-    brand_del
+    brand_del,
+    previewImage
   },
   data () {
     return {

src/HDrpManagement/BrandManage/modules/edit.vue

@@ -25,7 +25,7 @@
             </el-col>
           </el-form>
         </el-row>
-        <saleclass></saleclass>
+        <saleclass :data="data"></saleclass>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>

src/HDrpManagement/ProductMag/modules/saleClass.vue

@@ -9,6 +9,7 @@
       </ul>
       <div>
         <tree :data="activeBrandData"></tree>
+        <el-cascader-panel :options="activeBrandData" :props="{ checkStrictly: true }"></el-cascader-panel>
       </div>
       <div class="dialog-footer">
         <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>

src/HDrpManagement/competitor/modules/importCompetior.vue

@@ -103,7 +103,7 @@ export default {
         "id": "20221110162004",
         "content":{}
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HDrpManagement/productMoneyOdd/modules/importFile.vue

@@ -103,7 +103,7 @@ export default {
 
         }
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HDrpManagement/projectTask/modules/AssociateCustomerObject.vue

@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import layoutTable from '@/components/table/index2'
+import layoutTable from '@/components/table/index2.vue'
 export default {
   name: "AssociateCustomerObject",
   props:["data"],

src/HDrpManagement/publicCustomer/modules/importCustomer.vue

@@ -103,7 +103,7 @@ export default {
         "id": "20221028100502",
         "content":{}
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HDrpManagement/saleclass/components/treeTable.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="tree-panel">
+    <el-table
+      :data="deplist"
+      style="width: 100%;margin-bottom: 20px;"
+      row-key="id"
+      border
+      default-expand-all
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column
+        prop="label"
+        label="分类名称"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="姓名"
+        sortable
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="地址">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  components:{
+  },
+  data () {
+    return {
+      deplist:[],
+      departmentid:0,
+      currentKey:null
+    }
+  },
+  methods:{
+    async department (callback) {
+      const res = await this.$api.requested({
+          "id": "20220922110403",
+          "version":1,
+          "content": {
+            "sa_brandid":0
+          }
+      })
+      
+      // // 数据格式转换成elementui-tree所需的格式
+      res.data = res.data.map(item => {
+        item.ttemclass.forEach(item2 => {
+          item2.sa_brandid = item.sa_brandid
+        })
+        return {
+          brandname:item.brandname,
+          rowindex:item.rowindex,
+          sa_brandid:item.sa_brandid,
+          subdep:item.ttemclass
+        }
+      })
+      this.editId(res.data)
+      this.deplist = this.createMenu(res.data)
+      console.log(this.deplist,'---')
+      callback && callback()
+    },
+    editId(array) {
+      function _editId(id,data) {
+        data.sa_brandid = id
+        if(data.subdep && data.subdep.length > 0) {
+          data.subdep.forEach(item => {
+            _editId(id,item)
+          })
+        }
+        
+      }
+      array.forEach(item => {
+        _editId(item.sa_brandid,item)
+      })
+    },
+    createMenu (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        var elNode = {
+          label: node["brandname"] || node['itemclassname'],
+          parentid:node['parentid'],
+          value:node['itemclassid'],
+          sa_brandid:node['sa_brandid'],
+          changeby:node["changeby"],
+          changedate:node['changedate'],
+          createby:node['createby'],
+          createdate:node['createdate'],
+          itemclassfullname:node['itemclassfullname'],
+          itemclassfullnum:node["itemclassfullnum"],
+          itemclassid:node['itemclassid'],
+          itemclassname:node['itemclassname'],
+          itemclassnum:node['itemclassnum'],
+          children: []
+        }
+          
+        if (node.subdep && node.subdep.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subdep.length; index++) {
+          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+          elNode.children.push(convertToElementTree(node.subdep[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
+    handleClick (row,node,VueComponent) {
+      this.$emit('onClick',node)
+    },
+    setCurrentKey (id) {
+      this.currentKey = id
+      this.$nextTick(() => {
+        this.$refs['treeRef'].setCurrentKey(this.currentKey)
+      })
+    },
+  },
+  watch: {
+  },
+  mounted () {
+    this.department()
+  }
+}
+
+</script>
+<style>
+.tree-panel .el-tree {
+  background: none;
+}
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+  background: none;
+}
+</style>
+<style scoped>
+.tree-panel{
+  padding: 16px;
+  font-size: 14px;
+  width:100%;
+  background: #FAFAFA;
+}
+.icon_btn {
+  display: flex;
+  width: 100px;
+  justify-content: space-between;
+}
+</style>

src/HDrpManagement/saleclass/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="brand normal-panel">
-    <dep-list @onClick="onClick" ref="list">
+    <!-- <dep-list @onClick="onClick" ref="list">
       <template v-slot:add="scope">
         <Edit type="add" @addSuccess="addSuccess" :rowData="scope.data" v-if="tool.checkAuth($route.name,'insert')"/>
       </template>
@@ -10,12 +10,13 @@
       <template v-slot:del="scope">
         <Del :id="scope.data.itemclassid" @deleteSuccess="deleteSuccess" v-if="scope.data.itemclassid && tool.checkAuth($route.name,'delete')"/>
       </template>
-    </dep-list>
+    </dep-list> -->
+    <dep-list></dep-list>
   </div>
 </template>
 
 <script>
-import DepList from './components/dep_list'
+import DepList from './components/treeTable'
 import Edit from './components/edit'
 import Del from './components/delete'
 export default {

src/HManagement/marketing/area/modules/import_area.vue

@@ -105,7 +105,7 @@ export default {
         "content": { 
         }
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HManagement/marketing2/agent/area/modules/import_area.vue

@@ -105,7 +105,7 @@ export default {
         "content": { 
         }
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HManagement/marketing2/saler/area/modules/import_area.vue

@@ -105,7 +105,7 @@ export default {
         "content": { 
         }
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HManagement/marketing2/salerScope/area/modules/import_area.vue

@@ -105,7 +105,7 @@ export default {
         "content": { 
         }
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HManagement/personalTarget/target/modules/edit/components/importFile.vue

@@ -103,7 +103,7 @@ export default {
         "id": 20220913093102,
         "content": {},
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/HManagement/projectTarget/target/modules/edit/components/importFile.vue

@@ -103,7 +103,7 @@ export default {
         "id": 20220914154902,
         "content": {},
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/SDrpManagement/QuotedPrice/components/edit/importQuotedPrice.vue

@@ -102,7 +102,7 @@ export default {
         "id": "20221024141403",
         "content":{}
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/SDrpManagement/QuotedPrice/modules/importQuotedPrice.vue

@@ -103,7 +103,7 @@ export default {
         "id": "20221024141403",
         "content":{}
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/SManagement/sales_forecast/modules/modelDetail.vue

@@ -26,7 +26,7 @@
       <div slot="slot0">
         <el-row :gutter="20">
           <el-col :span="24">
-            <project :mainData="mainData" @queryProduct="queryProduct"></project>
+            <project :mainData="mainData" @queryProduct="queryProduct" ref="project"></project>
           </el-col>
           <el-col :span="24">
             <product  :mainData="mainData" ref="prod" @onSuccess='queryMainData'></product>
@@ -67,6 +67,7 @@ export default {
       })
       this.mainData = res.data[0]
       this.changeDataStructure()
+      this.$refs['project'].listData()
     },
     changeDataStructure() {
       let that = this

src/SManagement/sales_forecast/modules/product.vue

@@ -189,6 +189,7 @@ export default {
           }
         })
         this.tool.showMessage(res,()=>{
+          this.listData()
           this.$emit('onSuccess')
         })
       },1000)

src/SManagement/sales_forecast/modules/project.vue

@@ -73,7 +73,7 @@ export default {
           }
         }
       },
-      act_row:[],
+      act_row:{},
       list:[],
       currentPage:0,
       total:0,

src/components/import/importFile.vue

@@ -125,7 +125,7 @@ export default {
           "type":this.activeName === 'first'?'经销商':'业务员'
         }
       })
-      this.modelurl = res.msg
+      this.modelurl = res.data
     },
     // 获取华为云上传地址
     async getUploadUrl (file, ext) {

src/components/normal-basic-layout/details/index.vue

@@ -103,7 +103,7 @@ export default {
       this.total = res.total
       this.$emit('pageChange',res.data[0][this.idname],res.data[0].rowindex)
       this.$refs['tag']?this.$refs['tag'].queryTag():''
-      
+      this.refresh()
     },
     next () {
       this.rowindex += 1
@@ -184,7 +184,6 @@ export default {
   },
   watch:{
     mainAreaData () {
-      this.refresh()
     }
   }
 }