瀏覽代碼

Merge branch 'develop_yh17_fencang' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh17_fencang

chenrui 2 年之前
父節點
當前提交
dd2229a0ca
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 1 1
      public/version.json
  2. 5 5
      src/views/productManagement/productInfoJg/list.vue

+ 1 - 1
public/version.json

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

+ 5 - 5
src/views/productManagement/productInfoJg/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="productInfoList-wrap">
     <!-- 搜索条件 -->
     <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchForm">
+      <a-form layout="inline" @keyup.enter.native="searchForm(true)">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="产品编码">
@@ -49,7 +49,7 @@
           </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="searchForm" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+            <a-button type="primary" @click="searchForm(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
@@ -162,7 +162,7 @@
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
     <!-- 自定义报价弹窗 -->
-    <editPriceModal :openModal="openEditPriceModal" :itemId="itemId" @ok="searchForm" @close="openEditPriceModal=false"></editPriceModal>
+    <editPriceModal :openModal="openEditPriceModal" :itemId="itemId" @ok="searchForm(false)" @close="openEditPriceModal=false"></editPriceModal>
   </a-card>
 </template>
 
@@ -291,9 +291,9 @@ export default {
       this.$router.push({ name: 'viewProduct', params: { sn: row.productSn } })
     },
     // 查询
-    searchForm () {
+    searchForm (flag) {
       this.$refs.table.clearSelected() // 清空表格选中项
-      this.$refs.table.refresh(true)
+      this.$refs.table.refresh(flag)
     },
     //  重置
     resetSearchForm () {