lilei преди 2 години
родител
ревизия
76dc45b775

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1676257336090
+  "version": 1676267659085
 }

+ 2 - 2
src/views/common/shopingCatModal.vue

@@ -48,7 +48,7 @@ export default {
       if (newValue) {
          setTimeout(()=>{
            this.$refs.shopingCat.pageInit(this.paramsData)
-         },200)
+         },500)
       }
     },
   },
@@ -75,7 +75,7 @@ export default {
     padding: 13px 20px;
   }
   .ant-drawer-body {
-    padding: 10px;
+    padding: 0 5px;
     height: calc(100% - 50px);
     display: flex;
     flex-direction: column;

+ 2 - 2
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -41,8 +41,8 @@
                 </a-form-item>
               </a-col>
               <a-col flex="auto">
-                <a-button type="primary" @click="searchForm" :disabled="disabled" id="purchaseOrderEdit-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="purchaseOrderEdit-reset">重置</a-button>
+                <a-button type="primary" @click="searchForm" id="purchaseOrderEdit-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" id="purchaseOrderEdit-reset">重置</a-button>
               </a-col>
             </a-row>
           </a-form>

+ 5 - 4
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -61,7 +61,7 @@
     <s-table
       class="sTable"
       ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
+      :style="modes=='pages'?{ height: tableHeight+84.5+'px' }:{}"
       size="small"
       :row-selection="modes=='pages'?{ columnWidth: 40 }:{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: !record.productEntity.purchasePrice || !(record.productEntity.onlineFalg == 1&& record.dealerScopeFlag == 1) } }) }"
       @rowSelection="rowSelectionFun"
@@ -69,8 +69,9 @@
       :rowKey="(record) => record.productSn"
       :columns="columns"
       :data="loadData"
-      :scroll="modes=='modals'?{ y: tableHeight }:{ x:tableWidth, y: tableHeight }"
+      :scroll="modes=='pages'?{ y: tableHeight }:{ x:tableWidth, y: tableHeight }"
       :defaultLoadData="false"
+      :pageSize="30"
       bordered>
       <!-- 采购数量 -->
       <template slot="purchaseQty" slot-scope="text, record">
@@ -126,7 +127,7 @@ export default {
     return {
       loading: false,
       tableHeight: 0,
-      tableWidth: 950,
+      tableWidth: 960,
       productType: [],
       queryParam: { //  查询条件
         code: '', //  产品编码
@@ -348,7 +349,7 @@ export default {
     setTableH () {
       this.$nextTick(() => { // 页面渲染完成后的回调
         const tableSearchH = this.$refs.tableSearch.offsetHeight
-        this.tableHeight = window.innerHeight - tableSearchH - (this.modes == 'pages' ? 200 : 320)
+        this.tableHeight = window.innerHeight - tableSearchH - (this.modes == 'pages' ? 200 : 290)
       })
     }
   },