合同，报价单调整添加产品类别明细

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

@@ -106,6 +106,7 @@ export default {
 
     },
     createTreeData (array) {
+      console.log('3333333333/////')
       var that = this
       let arr = []
       function convertToElementTree(node) {

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -6,51 +6,52 @@
         <p class="normal-title normal-margin">{{$t(`产品类别`)}}</p>
         <div class="drawer__panel" style="margin-bottom: 0 !important;">
           <div style="margin-bottom: 10px">
-            <uploadAllData
-                style="display: inline-block !important;"
-                :total="total"
-                @handlePullApi="handlePullApi"
-                @handleUploadApi="handleUploadApi"
-                @onSuccess="onSuccess"
-            ></uploadAllData>
-            <el-button type="primary" class="inline-16" size="small" :disabled="selectProductLength == 0" @click="onSumit">{{$t(`批 量 添 加`)}}</el-button>
+            <el-button type="primary"  size="small" :disabled="tableSelectData == 0" @click="batchSelect">{{$t(`批 量 添 加`)}}</el-button>
+            <el-button
+                class="inline-16"
+                type="primary"
+                size="small"
+                @click="allSelect"
+            >{{$t('一键全选')}}</el-button
+            >
             <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" :placeholder="`${$t(`编号`)}、${$t(`类别名称`)}、${$t(`品牌`)}`" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
           </div>
-          <Table :checkbox="true"  height="calc(100vh - 220px)" @selectionChange="selectArr" ref="table" id="itemclassid"  v-model="itemno" :layout="tablecols" :data="productList" :custom="true"   @upDateData="upDateData">
-            <template v-slot:customcol="scope">
-              <div v-if="scope.column.columnname == 'attinfos'">
-                <previewImage
-                    v-if="scope.column.data.attinfos[0]"
-                    style="width:38px;height:38px;margin:0px"
-                    class="image"
-                    :image="scope.column.data.attinfos[0]"
-                    :list="scope.column.data.attinfos"
-                    :deletebtn="false"
-                ></previewImage>
-              </div>
-              <div v-else-if="scope.column.columnname == 'brand'">
-                {{scope.column.data[scope.column.columnname][0] ? $t(scope.column.data[scope.column.columnname])[0].brandname : '--'}}
-              </div>
-              <div v-else>{{$t(scope.column.data[scope.column.columnname])}}</div>
-              <span v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'">--</span>
-            </template>
-            <template v-slot:opreation="scope">
-              <el-button type="text" size="mini" @click="addProduct(scope.data)">{{$t('添 加')}}</el-button>
-            </template>
-          </Table>
-          <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
-            <!--            <el-pagination
-                            style="display:inline-block"
-                            background
-                            small
-                            @size-change="handleSizeChange"
-                            @current-change="handleCurrentChange"
-                            :current-page="params.content.pageNumber"
-                            :page-sizes="[20, 50, 100, 200]"
-                            layout="total, prev, pager, next, jumper"
-                            :total="total">
-                        </el-pagination>-->
-          </div>
+<!--          <Table :checkbox="true"  height="calc(100vh - 220px)" @selectionChange="selectArr" ref="table" id="itemclassid"  v-model="itemno" :layout="tablecols" :data="productList" :custom="true"   @upDateData="upDateData">-->
+<!--            <template v-slot:customcol="scope">-->
+<!--              <div v-if="scope.column.columnname == 'attinfos'">-->
+<!--                <previewImage-->
+<!--                    v-if="scope.column.data.attinfos[0]"-->
+<!--                    style="width:38px;height:38px;margin:0px"-->
+<!--                    class="image"-->
+<!--                    :image="scope.column.data.attinfos[0]"-->
+<!--                    :list="scope.column.data.attinfos"-->
+<!--                    :deletebtn="false"-->
+<!--                ></previewImage>-->
+<!--              </div>-->
+<!--              <div v-else-if="scope.column.columnname == 'brand'">-->
+<!--                {{scope.column.data[scope.column.columnname][0] ? $t(scope.column.data[scope.column.columnname])[0].brandname : '&#45;&#45;'}}-->
+<!--              </div>-->
+<!--              <div v-else>{{$t(scope.column.data[scope.column.columnname])}}</div>-->
+<!--              <span v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'">&#45;&#45;</span>-->
+<!--            </template>-->
+<!--            <template v-slot:opreation="scope">-->
+<!--              <el-button type="text" size="mini" @click="addProduct(scope.data)">{{$t('添 加')}}</el-button>-->
+<!--            </template>-->
+<!--          </Table>-->
+<!--          <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">-->
+<!--            &lt;!&ndash;            <el-pagination-->
+<!--                            style="display:inline-block"-->
+<!--                            background-->
+<!--                            small-->
+<!--                            @size-change="handleSizeChange"-->
+<!--                            @current-change="handleCurrentChange"-->
+<!--                            :current-page="params.content.pageNumber"-->
+<!--                            :page-sizes="[20, 50, 100, 200]"-->
+<!--                            layout="total, prev, pager, next, jumper"-->
+<!--                            :total="total">-->
+<!--                        </el-pagination>&ndash;&gt;-->
+<!--          </div>-->
+          <treeTable ref="treeRef" :table-data="productList" @rowSelect="rowSelect"></treeTable>
         </div>
 
 
@@ -90,7 +91,7 @@ export default {
       itemno:'',
       total:0,
       params: {
-        "id": 20221124140102,
+        "id": 2026012213242302,
         "content": {
             "sa_contractid": '',
             "pageNumber": 1,
@@ -99,7 +100,8 @@ export default {
                 "condition": ""
             }
         },
-      }
+      },
+      tableSelectData:[]
     };
   },
   computed:{
@@ -134,11 +136,40 @@ export default {
     async getProductList () {
       this.params.content.sa_contractid = this.$route.query.id
       let res = await this.$api.requested(this.params)
-      this.productList = res.data
+      this.productList = this.createMenu(res.data);
       this.total = res.total
-      this.params.content.pageNumber = res.pageNumber
-      console.log(this)
-      this.$refs.table.$refs.table.doLayout()
+      // this.params.content.pageNumber = res.pageNumber
+      // console.log(this)
+      // this.$refs.table.$refs.table.doLayout()
+    },
+    createMenu (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        var elNode = {
+          itemclassname: node["itemclassname"],
+          itemclassnum:node["itemclassnum"],
+          brandname:node["brandname"],
+          num:node["num"],
+          isCheck:node["isCheck"],
+          itemclassid:node['itemclassid'],
+          selected:false,
+          children: []
+        }
+        if (node.subitemclass && node.subitemclass.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subitemclass.length; index++) {
+            // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+            elNode.children.push(convertToElementTree(node.subitemclass[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
     },
     createTreeData (array) {
       var that = this
@@ -192,28 +223,27 @@ export default {
         this.$emit('onSuccess')
       })
     },
-    async onSumit () {
-      let item = this.$refs.table.allArr.map(item => {
-        return {
-          "sa_contract_itemsaleclassid": 0,
-          "itemclassid": item.itemclassid,
-          "discountrate":  item.discountrate
-        }
-      })
-
+    async onSubmit () {
       let res = await this.$api.requested({
         "id": 20221124110202,
         "content": {
             "sa_contractid": this.$route.query.id,
-            "items": item
+            "items": this.tableSelectData
         },
       })
-      this.tool.showMessage(res,() => {
-        // this.drawer = false
-        this.$emit('onSuccess')
-        this.getProductList()
-        this.$refs.table.allArr = []
-      })
+      if (res.code == 0){
+        this.tableSelectData = []
+        this.tool.showMessage(res,()=>{})
+      }else {
+        this.tool.showMessage(res,() => {
+          // this.drawer = false
+          this.tableSelectData = []
+          this.drawer = false
+          this.$emit('onSuccess')
+          // this.getProductList()
+          // this.$refs.table.allArr = []
+        })
+      }
     },
     upDateData (data) {
       this.selectProductLength = data.length
@@ -260,6 +290,62 @@ export default {
     onSuccess () {
       this.getProductList()
     },
+    batchSelect(){
+      this.onSubmit()
+    },
+    rowSelect (row) {
+      console.log(row)
+      const exists = this.tableSelectData.some(item => item.itemclassid === row.itemclassid);
+      if (exists) {
+        // 移除
+        this.tableSelectData = this.tableSelectData.filter(
+            item => item.itemclassid !== row.itemclassid
+        );
+      } else {
+        // 新增
+        this.tableSelectData = [
+          ...this.tableSelectData,
+          {
+            sa_quotedprice_itemclassid: 0,
+            itemclassid: row.itemclassid
+          }
+        ];
+      }
+      // this.tableSelectData.push({
+      //   sa_quotedprice_itemclassid: 0,
+      //   itemclassid: row.itemclassid
+      // })
+      console.log(this.tableSelectData)
+    },
+    allSelect(){
+      this.tableSelectData = []
+      this.productList.forEach(row => {
+        this.tableSelectData.push({
+          sa_quotedprice_itemclassid: 0,
+          itemclassid: row.itemclassid
+        })
+        console.log(row,'row输出')
+        if (row.children.length > 0){
+          row.children.forEach(item => {
+            console.log(item,'item')
+            this.tableSelectData.push({
+              sa_quotedprice_itemclassid: 0,
+              itemclassid: item.itemclassid
+            })
+            if (item.children.length > 0){
+              item.children.forEach(kow => {
+                this.tableSelectData.push({
+                  sa_quotedprice_itemclassid: 0,
+                  itemclassid: kow.itemclassid
+                })
+              })
+            }
+          })
+        }
+      })
+      this.onSubmit()
+      console.log(this.tableSelectData)
+    },
   },
 };
 </script>

src/SDrpManagement/QuotedPrice/detail/modules/itemClass/add.vue

@@ -11,7 +11,7 @@
       :title="$t(`添加`)"
       :visible.sync="dialogProductVisible"
       append-to-body
-      size="80%"
+      size="800px"
       :show-close="false"
       direction="rtl"
       @close="onColes"
@@ -19,20 +19,19 @@
       <div class="drawer__panel" style="margin-bottom: 0 !important;">
         <div class="flex-between" style="margin-bottom: 10px">
           <el-button
-              class="inline-16"
               type="primary"
               size="small"
               @click="batchSelect"
               :disabled="tableSelectData.length === 0"
           >{{$t('批量添加')}}</el-button
           >
-          <uploadAllData
-            style="display: inline-block !important"
-            :total="total"
-            @handlePullApi="handlePullApi"
-            @handleUploadApi="handleUploadApi"
-            @onSuccess="onSuccess"
-          ></uploadAllData>
+          <el-button
+              class="inline-16"
+              type="primary"
+              size="small"
+              @click="allSelect"
+          >{{$t('一键全选')}}</el-button
+          >
           <el-input
             size="small"
             style="width: 200px"
@@ -46,14 +45,13 @@
           >&nbsp;
         </div>
         <div class="produtMag-panel">
-
+          <treeTable ref="treeRef" :table-data="list" @rowSelect="rowSelect"></treeTable>
         </div>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="onColes" class="normal-btn-width">{{
+        <el-button size="small" @click="cancelClick" class="normal-btn-width">{{
           $t("取 消")
         }}</el-button>
-        <!--        <el-button size="small" type="primary" @click="onSubmit"  class="normal-btn-width">{{$t('确 定')}}</el-button>-->
       </div>
     </el-drawer>
   </div>
@@ -96,10 +94,12 @@ export default {
     onShow() {
       this.dialogProductVisible = true;
       this.listData();
+
     },
     async listData() {
       const res = await this.$api.requested(this.params);
       this.list = this.createMenu(res.data);
+      this.total = res.total
       console.log(this.list,'输出111')
     },
     createMenu (array) {
@@ -108,14 +108,15 @@ export default {
       function convertToElementTree(node) {
         // 新节点
         var elNode = {
-          label: node["itemclassname"],
+          itemclassname: node["itemclassname"],
           itemclassnum:node["itemclassnum"],
-          disabled:!node["isCheck"],
+          brandname:node["brandname"],
+          num:node["num"],
           isCheck:node["isCheck"],
           itemclassid:node['itemclassid'],
+          selected:false,
           children: []
         }
-
         if (node.subitemclass && node.subitemclass.length > 0) {
           // 如果存在子节点
           for (var index = 0; index < node.subitemclass.length; index++) {
@@ -145,90 +146,72 @@ export default {
         id: 20230219161303,
         content: {
           sa_quotedpriceid: this.$route.query.id, //sat_notice_classid<=0时 为新增
-          items: this.selectData,
+          items: this.tableSelectData,
         },
       });
-      this.tool.showMessage(res, () => {
-        this.$emit("itemClassAdd");
-        this.listData();
-        this.selectListData();
-      });
-    },
-    onSelect(val) {
-      this.tableSelectData = [];
-      this.tableSelectData[0] = val;
-      let obj = this.tableSelectData.map((e) => {
-        return {
-          sa_quotedprice_itemclassid: 0,
-          itemclassid: e.itemclassid,
-          discountrate: e.discountrate,
-        };
-      });
-      this.selectData = obj;
-      /*this.$nextTick(()=>{
-        this.onSubmit()
-      })*/
-      this.debounce(this.onSubmit, 300)();
-    },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val;
-      this.productData();
-    },
-    handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val;
-      this.productData();
+      if (res.code == 0){
+        this.tableSelectData = []
+        this.tool.showMessage(res,()=>{})
+      }else {
+        this.tool.showMessage(res, () => {
+          this.tableSelectData = []
+          this.dialogProductVisible = false
+          this.$emit("itemClassAdd");
+        });
+      }
     },
-    selectionChange(val) {
-      this.tableSelectData = [];
-      this.tableSelectData = val;
-      let obj = this.tableSelectData.map((e) => {
-        return {
-          sa_quotedprice_itemclassid: 0,
-          itemclassid: e.itemclassid,
-          discountrate: e.discountrate,
-        };
-      });
-      this.selectData = obj;
+    cancelClick(){
+      this.dialogProductVisible = false;
     },
     onColes() {
-      this.dialogProductVisible = false;
       this.params.content.where.condition = "";
-      this.$emit("closeDrawer");
-    },
-    /*已选产品数据*/
-    async selectListData() {
-      const res = await this.$api.requested({
-        id: 20230219161403,
-        content: {
-          sa_quotedpriceid: this.$route.query.id, //sat_notice_classid<=0时 为新增
-        },
-      });
-      this.selectTotal = res.total;
-    },
-    /*拉取数据*/
-    handlePullApi(pullApi) {
-      pullApi.content = JSON.parse(JSON.stringify(this.params.content));
-      pullApi.id = this.params.id;
-      /*pullApi.content.sa_projectid = this.$route.query.id*/
+      this.$refs.treeRef.clearAll()
     },
-    /*上传数据*/
-    handleUploadApi(uploadApi, data) {
-      this.$emit("uploadData", uploadApi, data);
-    },
-    onSuccess() {
-      this.listData();
-    },
-    handleClick (row,node,VueComponent) {
-      console.log(row)
-
-      this.tableSelectData.push({
-        sa_quotedprice_itemclassid: 0,
-        itemclassid: row.itemclassid,
-        discountrate: row.discountrate,
+    allSelect(){
+      this.tableSelectData = []
+      this.list.forEach(row => {
+        this.tableSelectData.push({
+          sa_quotedprice_itemclassid: 0,
+          itemclassid: row.itemclassid
+        })
+        if (row.children.length > 0){
+          row.children.forEach(item => {
+            console.log(item,'item')
+            this.tableSelectData.push({
+              sa_quotedprice_itemclassid: 0,
+              itemclassid: item.itemclassid
+            })
+            if (item.children.length > 0){
+              item.children.forEach(kow => {
+                this.tableSelectData.push({
+                  sa_quotedprice_itemclassid: 0,
+                  itemclassid: kow.itemclassid
+                })
+              })
+            }
+          })
+        }
       })
-
+      this.onSubmit()
+      console.log(this.tableSelectData)
+    },
+    rowSelect (row) {
+      const exists = this.tableSelectData.some(item => item.itemclassid === row.itemclassid);
+      if (exists) {
+        // 移除
+        this.tableSelectData = this.tableSelectData.filter(
+            item => item.itemclassid !== row.itemclassid
+        );
+      } else {
+        // 新增
+        this.tableSelectData = [
+          ...this.tableSelectData,
+          {
+            sa_quotedprice_itemclassid: 0,
+            itemclassid: row.itemclassid
+          }
+        ];
+      }
     },
   },
   mounted() {},

src/SDrpManagement/QuotedPrice/detail/modules/itemClass/index.vue

@@ -4,6 +4,7 @@
       <el-input
         size="small"
         style="width: 230px"
+        class="inline-16"
         suffix-icon="el-icon-search"
         v-model="param.content.where.condition"
         :placeholder="$t(`编号、类别名称、品牌`)"
@@ -12,8 +13,7 @@
         clearable
       >
       </el-input
-      >&nbsp;
-      <!--      <product_table style="float: right" :data="data"  ref="quoterPrice" @productAdd="productInitialization" ></product_table>-->
+      >
       <uploadAllData
         v-if="
           tool.checkAuth($route.name, 'itemClassDetails') &&
@@ -49,7 +49,6 @@
         "
         class="inline-16"
         @itemClassAdd="listData"
-        @uploadData="uploadData"
         ref="addProduct"
         @closeDrawer="closeDrawer"
       ></add>
@@ -91,7 +90,6 @@
         </template>
       </table-new-layout>
       <div style="height: 35px; margin-top: 20px">
-        <!--        <div style="float: left">总金额(元)：{{ totalPrice }}</div>-->
         <div style="float: right">
           <el-pagination
             background
@@ -144,22 +142,19 @@ export default {
   methods: {
     async listData() {
       const res = await this.$api.requested(this.param);
-      this.list = res.data;
-      this.total = res.total;
-      for (var i = 0; i < res.data.length; i++) {
-        /*if (this.list[i].discountrate <= 1){
-          this.list[i].discountrate = Math.round((res.data[i].discountrate * 100)*100)/100
-        }else {
-          this.list[i].discountrate = Math.round((res.data[i].discountrate)*100)/100
-        }*/
-        if (this.list[i].discountrate === 0) {
-          this.list[i].discountrate = 0;
-        } else {
-          this.list[i].discountrate =
-            Math.round(res.data[i].discountrate * 100 * 100) / 100;
+      if (res.code == 0){
+        this.tool.showMessage(res,()=>{})
+      }else {
+        this.list = res.data;
+        this.total = res.total;
+        for (var i = 0; i < res.data.length; i++) {
+          if (this.list[i].discountrate === 0) {
+            this.list[i].discountrate = 0;
+          } else {
+            this.list[i].discountrate =
+                Math.round(res.data[i].discountrate * 100 * 100) / 100;
+          }
         }
-
-        /* this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price*/
       }
     },
     handleSizeChange(val) {
@@ -268,22 +263,6 @@ export default {
       };
       this.listData();
     },
-    /*一键全选*/
-    uploadData(uploadApi, data) {
-      uploadApi.id = 20230219161303;
-      uploadApi.content = {
-        sa_quotedpriceid: this.$route.query.id, //订单ID
-        items: data.map((e) => {
-          return {
-            sa_quotedprice_itemclassid: 0,
-            itemclassid: e.itemclassid,
-            discountrate: e.discountrate,
-          };
-        }),
-      };
-      this.listData();
-      this.$refs.addProduct.listData();
-    },
     closeDrawer() {
       this.listData();
     },

src/components/treeTable/index.vue

@@ -1,10 +1,59 @@
 <template>
-
+  <div>
+    <el-table
+        :data="tableData"
+        stripe
+        ref="table"
+        row-key="itemclassid"
+        default-expand-all
+        size="small"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column
+          width="35">
+      </el-table-column>
+      <el-table-column width="35">
+        <template #header>
+          <span></span>
+        </template>
+        <template #default="{ row }">
+          <el-checkbox v-model="row.selected" :checked="row.selected" @change="onRowSelect(row)" :disabled="row.disabled"></el-checkbox>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="itemclassname"
+          show-overflow-tooltip
+          :label="$t(`类别名称`)"
+          width="200">
+        <template slot-scope="scope">
+          <span style="color:#3874f6"><b>{{scope.row.itemclassname}}</b></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="brandname"
+          :label="$t(`品牌`)">
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 
 <script>
 export default {
-  name: "index"
+  name: "index",
+  props:["tableData"],
+  methods:{
+    onRowSelect(row){
+      this.$emit('rowSelect',row)
+    },
+    clearAll(){
+      this.tableData.forEach(row => {
+        row.selected = false
+        row.children.forEach(item => {
+          item.selected = false
+        })
+      })
+      this.$refs.table.clearSelection()
+    }
+  }
 }
 </script>
 

src/main.js

@@ -33,6 +33,7 @@ import btnDelete from './components/btn-delete/index'
 import customBtn from './components/customBtn/index'
 import tagPanl from '@/components/tagPanl/tagPanl'
 import selectTemp from '@/components/selectTemp/index';
+import treeTable from "@/components/treeTable/index";
 
 import confirmSelection from '@/template/buttonTemplate/confirmSelection'
 import popoverTemp from './components/selectPopover/index'
@@ -89,6 +90,7 @@ Vue.component('deleteBtn',deleteBtn)
 Vue.component('btnDelete',btnDelete)
 Vue.component('customBtn',customBtn)
 Vue.component('selectTemp',selectTemp)
+Vue.component('treeTable',treeTable)
 
 Vue.component('confirmSelection',confirmSelection)
 Vue.component('popoverTemp',popoverTemp)