zhangqiOMG 2 years ago
parent
commit
631bcdf7da

+ 1 - 0
src/HDrpManagement/ProductMag/index.vue

@@ -12,6 +12,7 @@
       :apiId="{query:20220923140602,del:20220923152202}"
       :options="options"
       @onFixedClick="rows"
+      :specialKey="[{key:'itemclass',value:null},{key:'tradefield',value:null},{key:'brand',value:null}]"
       @checkboxCallBack="rows"
       :detailPath="{
         path:'/productmagDetail'

+ 6 - 6
src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -30,9 +30,9 @@
               <el-button type="text" size="mini" @click="addProduct(scope.data)">添 加</el-button>
             </template>
           </Table>
-          <!-- <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
+           <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
             <span>已添加产品数:{{addProductLength}}</span>
-            <el-pagination
+<!--            <el-pagination
                 style="display:inline-block"
                 background
                 small
@@ -42,8 +42,8 @@
                 :page-sizes="[20, 50, 100, 200]"
                 layout="total, prev, pager, next, jumper"
                 :total="total">
-            </el-pagination>
-          </div> -->
+            </el-pagination>-->
+          </div>
       </div>
       
       <div class="fixed__btn__panel">
@@ -159,7 +159,7 @@ export default {
               {
                 "sa_contract_itemsaleclassid": 0,
                 "itemclassid": data.itemclassid,
-                "discountrate": '100'
+                "discountrate": '1'
               }
             ]
         },
@@ -174,7 +174,7 @@ export default {
         return {
           "sa_contract_itemsaleclassid": 0,
           "itemclassid": item.itemclassid,
-          "discountrate": '100'
+          "discountrate": '1'
         }
       })
       

+ 3 - 0
src/HDrpManagement/contractManage/components/productClassList/productClassList.vue

@@ -135,11 +135,14 @@ export default {
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
+      console.log("翻译")
       this.params.content.pageSize = val
+      this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.listData()
     },
   },
 };

+ 3 - 1
src/HDrpManagement/contractManage/components/productDetailList/addProduct.vue

@@ -8,7 +8,7 @@
           <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
           <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
         </div>
-        <Table @selectArr="selectArr" ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData" @selection="selectArr" @onSelect="addProduct">
+        <Table @selectArr="selectArr" ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="400px"  @upDateData="upDateData" @selection="selectArr" @onSelect="addProduct">
         </Table>
         <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
           <span>已添加产品数:{{addProductLength}}</span>
@@ -149,10 +149,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
+      this.getProductList()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.getProductList()
     },
   },
 };

+ 3 - 3
src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -54,7 +54,7 @@
         <el-button size="mini" @click="cancel()">取消</el-button>
       </div>
     </el-dialog>
-    <el-drawer append-to-body size="80%" :with-header="false" :visible.sync="drawer">
+    <el-drawer append-to-body size="80%" :with-header="false"  :show-close="false" :visible.sync="drawer">
 
       <div class="container">
         <p class="normal-title normal-margin">产品清单</p>
@@ -81,8 +81,7 @@
               @current-change="handleCurrentChange"
               :current-page="params.content.pageNumber"
               :page-sizes="[20, 50, 100, 200]"
-              :page-size="params.content.pageSize"
-              layout="total, prev,size, pager, next, jumper"
+              layout="total, prev,sizes, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -176,6 +175,7 @@ export default {
       this.getProductList(data)
     },
     addBtn () {
+      console.log("执行")
       this.drawer = true
       this.getQuotationList()
     },

+ 1 - 1
src/components/productTable/indexQty.vue

@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column
           prop="qty"
-          label="数量111"
+          label="数量"
           fixed="right"
           width="100">
         <template slot-scope="scope">

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites