Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/ProductMag/modules/addClass.vue

@@ -12,7 +12,11 @@
         height="500px"
         default-expand-all
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-        <el-table-column>
+        <el-table-column width="100">
+        </el-table-column>
+        <el-table-column
+            prop="itemclassnum"
+            :label="$t(`分类编号`)">
         </el-table-column>
         <el-table-column
           prop="itemclassname"
@@ -141,6 +145,7 @@ export default {
         let elNode = {
           itemclassname:node.itemclassfullname ? node.itemclassfullname : node.itemclassname,
           itemclassid:node.itemclassid,
+          itemclassnum:node.itemclassnum,
           children:[],
           disabled:first ? false : true
         }

src/HDrpManagement/codeManage/modules/add.vue

@@ -22,7 +22,7 @@
           </el-input>
         </div>
 
-        <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+        <selectClass style="overflow: auto;" ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
         <div>
           <tablelayout :layout="tablecols" :data="productsList" :custom="true" :checkbox="true" height="calc(100vh - 392px)" @checkboxCallBack="checkboxCallBack">
             <template v-slot:customcol="scope">

src/HDrpManagement/prodectFileData/components/add.vue

@@ -22,7 +22,7 @@
           </el-input>
         </div>
 
-        <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+        <selectClass style="overflow: auto;" ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
         <div>
           <tablelayout :layout="tablecols" :data="productsList" :custom="true" :checkbox="true" height="calc(100vh - 392px)" @checkboxCallBack="checkboxCallBack">
             <template v-slot:customcol="scope">

src/HDrpManagement/productMoneyOdd/components/add.vue

@@ -4,7 +4,7 @@
     <el-drawer :title="$t(`新 增 商 品`)" append-to-body :visible.sync="dialogFormVisible" size="1000px">
       <div class="container">
         <div>
-          <selectClass  @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" @clickAreaBase="clickAreaBase" @brandChange="brandChange" :default="true"></selectClass>
+          <selectClass style="overflow: auto;"  @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" @clickAreaBase="clickAreaBase" @brandChange="brandChange" :default="true"></selectClass>
           <el-input style="width:200px;margin-bottom:10px;margin-top:10px" size="small" :placeholder="$t(`请输入商品`)" @clear="getProductList(params.content.pageNumber=1)"
             @keyup.native.enter="getProductList(params.content.pageNumber=1)" v-model="params.content.where.condition" clearable />
         </div>

src/HDrpManagement/projectChange/modules/modules/productSet/add.vue

@@ -21,7 +21,7 @@
           </div>
         </div>
         <div class="container">
-          <selectClass ref="classShow"  @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickStandard="clickStandard" @clickField="clickField" :default="true"></selectClass>
+          <selectClass style="overflow: auto;" ref="classShow"  @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickStandard="clickStandard" @clickField="clickField" :default="true"></selectClass>
         </div>
         <div class="produtMag-panel">
           <el-table

src/HManagement/department/index.vue

@@ -158,7 +158,7 @@ export default {
       selectResult: 1,
       issale: 0,
       status: "0",
-      type:'0'
+      type:''
     };
   },
   methods: {

src/SDrpManagement/ProductGroup/index.vue

@@ -29,7 +29,7 @@
       <!--阀门选型-->
       <selectOption position="单独选型" style="margin-left: 10px" @handleParam="handleOptionParam"  v-if="tool.checkAuth($route.name,'optionSystem')"></selectOption>
     </div>
-    <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+    <selectClass style="overflow: auto;" ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
     <div class="content" v-if="Object.keys(productGroup).length > 0" style="padding: 0;margin-bottom: 0;height: calc(100vh - 360px)">
       <div class="group-list">
         <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">

src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="border-bottom">
-    <div>
+    <div >
       <ul class="normal-margin-new" ref="myUl">
         <li
           :class="areaBase === '' ? 'act' : ''"
@@ -69,10 +69,11 @@
           <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px"  :class="brand_act == item.sa_brandid ? 'act' : ''">{{ $t(item.brandname) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new" style="clear: both">
+      <ul class="flex-align-center normal-margin-new" style="clear: both;">
         <li
           :class="class_act === '' ? 'act' : ''"
           class="brand-item border-all"
+          style="min-width: 58px"
           @click="clickClass('')"
         >
           {{ $t("营销类别") }}

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

@@ -44,6 +44,7 @@
         </div>
         <div class="container">
           <selectClass
+            style="overflow: auto;"
             @brandChange="brandChange"
             @onClassChange="onClassChange"
             @Search="Search"

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

@@ -44,6 +44,7 @@
         </div>
         <div class="container">
           <selectClass
+            style="overflow: auto;"
             @brandChange="brandChange"
             @onClassChange="onClassChange"
             @Search="Search"

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -43,6 +43,7 @@
         <div class="container">
           <selectClass
             ref="classShow"
+            style="overflow: auto;"
             @brandChange="brandChange"
             @onClassChange="onClassChange"
             @Search="Search"

src/SDrpManagement/QuotedPrice/components/productTableProject.vue

@@ -43,6 +43,7 @@
         <div class="container">
           <selectClass
             ref="classShow"
+            style="overflow: auto;"
             @brandChange="brandChange"
             @onClassChange="onClassChange"
             @Search="Search"

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

@@ -100,6 +100,7 @@ export default {
       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) {

src/components/treeTable/index.vue

@@ -4,6 +4,7 @@
         :data="tableData"
         stripe
         ref="table"
+        height="calc(100vh - 200px)"
         row-key="itemclassid"
         default-expand-all
         size="small"

src/template/addProduct/index.vue

@@ -27,7 +27,7 @@
           </el-input>
           <slot name="optionSystem"></slot>
         </div>
-        <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+        <selectClass style="overflow: auto;" ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
         <div style="width: 100%;border-bottom: 1px solid #ebeef5;margin-bottom: 10px;"></div>
         <div >
           <tableTemp ref="tableTemp" :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">

src/template/addProductContract/index.vue

@@ -224,7 +224,7 @@
           >
           </el-input>
         </div>
-        <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+        <selectClass style="overflow: auto;" ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
         <div>
           <tableTemp
             ref="tableTemp"

src/template/addTool/index.vue

@@ -27,7 +27,7 @@
           </el-input>
           <slot name="optionSystem"></slot>
         </div>
-        <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+        <selectClass style="overflow: auto;" ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
         <div style="width: 100%;border-bottom: 1px solid #ebeef5;margin-bottom: 10px;"></div>
         <div >
           <tableTemp ref="table" :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">