合同，商品组优化

src/HDrpManagement/contractManage/components/itemClass/add.vue

@@ -18,15 +18,10 @@
               trigger="click"
               v-model="priceShow"
               @show="priceList">
-            <el-input
-                style="width:300px;margin-bottom: 10px"
-                placeholder="请输入内容"
-                v-model="params2.content.where.condition"
-                clearable
-                @clear="priceList(params2.content.pageNumber = 1)"
-                size="mini"
-                @keyup.enter.native="priceList(params2.content.pageNumber = 1)">
-              <i slot="prefix" class="el-icon-search" @click="priceList(params2.content.pageNumber = 1)"></i>
+            <el-input  style="width:200px;" placeholder="单号、提交人"
+                       :suffix-icon="params2.content.where.condition?params2.content.where.condition.length > 0?'':'':'el-icon-search'"
+                       v-model="params2.content.where.condition" @keyup.native.enter="priceList(params2.content.pageNumber = 1)"
+                       @clear="priceList(params2.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
             </el-input>
             <el-table :data="priceData" @row-click="priceDataSelect" height="396px" size="mini">
               <el-table-column
@@ -64,9 +59,10 @@
                   small
                   @size-change="handleSizeChangePrice"
                   @current-change="handleCurrentChangePrice"
-                  :page-sizes="[10,20,50,100]"
+                  :page-sizes="[20,50,100,200]"
+                  :page-size="20"
                   layout="total,sizes, prev, pager, next, jumper"
-                  :current-page="currentPage2"
+                  :current-page="params2.content.pageNumber"
                   :total="total2">
               </el-pagination>
             </div>
@@ -153,7 +149,7 @@
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="params.content.pageNumber"
-                  :page-sizes="[20, 50, 100, 200]"
+                  :page-sizes="[ 100,150, 200]"
                   :page-size="100"
                   layout="total,sizes, prev, pager, next, jumper"
                   :total="total">
@@ -313,13 +309,13 @@ export default {
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
-      this.productData()
+      this.params.content.pageSize = val
+      this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val
-      this.productData()
+      this.params.content.pageNumber = val
+      this.listData()
     },
     selectionChange(val){
       this.tableSelectData = []
@@ -365,10 +361,12 @@ export default {
     handleSizeChangePrice(val) {
       // console.log(`每页 ${val} 条`);
       this.params2.content.pageSize = val
+      this.priceList()
     },
     handleCurrentChangePrice(val) {
       // console.log(`当前页: ${val}`);
       this.params2.content.pageNumber = val
+      this.priceList()
     },
     priceDataSelect(row){
       this.billno = row.billno
@@ -438,5 +436,13 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ input::-webkit-input-placeholder {
+  color: #58585d;
+}
+/deep/ input::-moz-input-placeholder {
+  color: #58585d;
+}
+/deep/ input::-ms-input-placeholder {
+  color: #58585d;
+}
 </style>

src/HDrpManagement/contractManage/components/seleteReceipt.vue

@@ -81,7 +81,7 @@ export default {
           "pageSize": 20,
           "where": {
             "condition": "",
-            "workaddress": ""
+            "workaddress": "0"
           }
         },
       },
@@ -119,4 +119,4 @@ export default {
 
 <style >
 
-</style>
+</style>

src/SDrpManagement/ProductGroup/index.vue

@@ -34,8 +34,8 @@
             <el-image style="width:100%;width: 200px" :src="item.attinfos[0].url" fit="contain" />
           </div>
           <div class="bottom">
-            <p class="title">{{item.groupname}}</p>
-            <p class="descript">{{item.groupnum}}</p>
+            <div class="title">{{item.groupname}}</div>
+<!--            <p class="descript">{{item.groupnum}}</p>-->
             <p class="descript"><span v-for="(cls,index) in item.itemclass" :key="cls.index">{{index === item.itemclass.length -1 ?cls.itemclassfullname:cls.itemclassfullname + ','}}</span></p>
             <p class="price descript">价格：<span style="color:red;font-size:16px"><small>¥</small>{{item.minprice}}</span>&nbsp;~&nbsp;<span style="color:red;font-size:16px"><small>¥</small>{{item.maxprice}}</span></p>
           </div>
@@ -294,9 +294,11 @@ export default {
   font-weight: bold;
   color: #333333;
   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  -webkit-line-clamp: 1;
+  /*text-overflow: ellipsis;*/
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  /*white-space: nowrap;*/
+  -webkit-line-clamp: 2;
   width: 100%;
   margin-bottom: 5px;
 }

src/template/addProductContract/index.vue

@@ -18,6 +18,11 @@
               trigger="click"
               v-model="queryShow"
               @show="queryQuotationData">
+            <el-input  style="width:200px;" placeholder="单号、提交人"
+                       :suffix-icon="quotationParams.content.where.condition?quotationParams.content.where.condition.length > 0?'':'':'el-icon-search'"
+                       v-model="quotationParams.content.where.condition" @keyup.native.enter="queryQuotationData(quotationParams.content.pageNumber = 1)"
+                       @clear="queryQuotationData(quotationParams.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+            </el-input>
             <el-table ref="tableQuotation" :data="quotationData" @row-click="rowClick">
               <el-table-column
                   prop="status"
@@ -39,6 +44,18 @@
                   label="提交时间">
               </el-table-column>
             </el-table>
+            <div class="container normal-panel" style="text-align:right">
+              <el-pagination
+                  background
+                  @size-change="handleSizeChangeQuotation"
+                  @current-change="handleCurrentChangeQuotation"
+                  :current-page="quotationParams.content.pageNumber"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="20"
+                  layout="total,sizes, prev, pager, next, jumper"
+                  :total="quotationTotal">
+              </el-pagination>
+            </div>
             <el-input slot="reference" readonly type="text" placeholder="选择报价单" style="width:200px" size="small"  v-model="billno"></el-input>
           </el-popover>
         </div>
@@ -163,7 +180,7 @@
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :current-page="params.content.pageNumber"
-                :page-sizes="[20, 50, 100, 200]"
+                :page-sizes="[100,150, 200]"
                 :page-size="100"
                 layout="total,sizes, prev, pager, next, jumper"
                 :total="total">
@@ -194,6 +211,7 @@ export default {
       itemmaterial:'',
       list:[],
       total:0,
+      quotationTotal:0,
       options:{
         brands:[],
         itemclass:[],
@@ -248,6 +266,7 @@ export default {
       const res = await this.$api.requested(this.quotationParams)
       console.log(res,'报价单')
       this.quotationData = res.data
+      this.quotationTotal = res.total
       this.$refs.tableQuotation.doLayout()
     },
     /*选择报价单*/
@@ -398,6 +417,16 @@ export default {
       this.params.content.pageNumber = val
       this.listData()
     },
+    handleSizeChangeQuotation(val) {
+      // console.log(`每页 ${val} 条`);
+      this.quotationParams.content.pageSize = val
+      this.queryQuotationData()
+    },
+    handleCurrentChangeQuotation(val) {
+      // console.log(`当前页: ${val}`);
+      this.quotationParams.content.pageNumber = val
+      this.queryQuotationData()
+    },
   },
   mounted() {
   },