瀏覽代碼

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

# Conflicts:
#	public/version.json
#	src/views/purchasingManagement/purchaseOrder/list.vue
#	src/views/purchasingManagement/purchaseOrderNew/list.vue
lilei 2 年之前
父節點
當前提交
78c5a97675

+ 1 - 1
public/version.json

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

+ 4 - 4
src/config/router.config.js

@@ -3270,8 +3270,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '系统参数',
-              icon: 'sound'
-              // permission: 'M_systemSettingsList'
+              icon: 'sound',
+              permission: 'M_systemSettingsList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -3282,8 +3282,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '系统参数',
                   icon: 'sound',
-                  hidden: true
-                  // permission: 'M_systemSettingsList'
+                  hidden: true,
+                  permission: 'M_systemSettingsList'
                 }
               }
             ]

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -217,7 +217,7 @@ export default {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
-        if(!params.billStatus){
+        if (!params.billStatus) {
           params.billStatus = undefined
         }
         // 获取统计数据

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -209,7 +209,7 @@ export default {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
-        if(!params.billStatus){
+        if (!params.billStatus) {
           params.billStatus = undefined
         }
         // 获取统计数据

+ 4 - 3
src/views/salesManagement/salesReturn/queryPart.vue

@@ -164,9 +164,10 @@ export default {
       loadData: parameter => {
         this.disabled = true
         // 抓单时
-        if (this.grabFlag == 1) {
-          this.queryParam.buyerSn = this.buyerSn
-        }
+        // if (this.grabFlag == 1) {
+        //   this.queryParam.buyerSn = this.buyerSn
+        // }
+        this.queryParam.buyerSn = this.buyerSn
         const fun = [stockList, salesReturnProductList]
         if (this.grabFlag == 0) {
           this.queryParam.salePriceType = this.priceType

+ 15 - 10
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="shoppingCar-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()">
         <a-row type="flex" :gutter="12" justify="start">
           <a-col flex="auto">
             <a-form-item label="产品编码">
@@ -37,8 +37,8 @@
             </a-form-item>
           </a-col>
           <a-col flex="auto" style="margin-bottom:10px;">
-            <a-button type="primary" @click="searchForm" :disabled="disabled" id="shoppingCar-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shoppingCar-reset">重置</a-button>
+            <a-button type="primary" @click="searchForm()" :disabled="disabled" id="shoppingCar-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="shoppingCar-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -167,12 +167,15 @@ export default {
   methods: {
     ...mapActions(['getCartList']),
     // 查询
-    searchForm () {
-      // this.$refs.table.clearSelected() // 清空表格选中项
+    searchForm (flag) {
       this.$refs.table.refresh(true)
+      if (flag) {
+        this.$refs.table.clearSelected()
+        this.rowSelectionInfo = null
+      }
     },
     //  重置
-    resetSearchForm () {
+    resetSearchForm (flag) {
       this.queryParam.code = ''
       this.queryParam.name = ''
       this.queryParam.productBrandSn = undefined
@@ -182,8 +185,10 @@ export default {
       this.queryParam.onlineFalg = undefined
       this.productType = []
       this.$refs.table.refresh(true)
-      this.rowSelectionInfo = null
-      this.$refs.table.clearSelected()
+      if (flag) {
+        this.$refs.table.clearSelected()
+        this.rowSelectionInfo = null
+      }
     },
     // 设置表头
     getColumns () {
@@ -254,7 +259,7 @@ export default {
             if (res.status == 200) {
               this.$message.info(res.message)
               this.getCartList()
-              this.searchForm()
+              this.searchForm(true)
             }
             this.loading = false
           })
@@ -328,7 +333,7 @@ export default {
             if (res.status == 200) {
               _this.$emit('ok')
               _this.getCartList()
-              _this.searchForm()
+              _this.searchForm(true)
               _this.loading = false
             } else {
               _this.loading = false