lilei 2 years ago
parent
commit
dc274671af
4 changed files with 21 additions and 22 deletions
  1. 1 1
      public/version.json
  2. 1 1
      src/store/modules/app.js
  3. 17 18
      src/views/productManagement/productInfoJg/list.vue
  4. 2 2
      vue.config.js

+ 1 - 1
public/version.json

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

+ 1 - 1
src/store/modules/app.js

@@ -252,7 +252,7 @@ const app = {
         pageNo: 1,
         pageSize: 1000,
         lookupCode: code,
-        isEnable: isEnable ? 1 : undefined
+        isEnable: isEnable || undefined
       }).then(res => {
         if (res.status == 200) {
           commit('SET_returnReason', res.data.list)

+ 17 - 18
src/views/productManagement/productInfoJg/list.vue

@@ -73,24 +73,21 @@
           <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
         </a-col>
         <a-col class="gutter-row " :span="16" style="text-align: right;">
-          <a-popover trigger="hover" placement="bottom">
-            <template slot="content">
-              <div class="setTableList">
-                <p>
+          <a-dropdown v-model="showCell">
+              <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
+              <a-menu slot="overlay">
+                <a-menu-item>
                   <a-checkbox v-model="isTerminalPrice">
                     自定义终端价
                   </a-checkbox>
-                </p>
-                <a-checkbox v-model="isCarOwnersPrice">
-                  自定义车主价
-                </a-checkbox>
-              </div>
-            </template>
-            <a-button type="link" class="button-default">
-              <a-icon type="setting" />
-              显示
-            </a-button>
-          </a-popover>
+                </a-menu-item>
+                <a-menu-item>
+                  <a-checkbox v-model="isCarOwnersPrice">
+                    自定义车主价
+                  </a-checkbox>
+                </a-menu-item>
+              </a-menu>
+          </a-dropdown>
           <a-divider type="vertical" style="margin:5px 0;"/>
           <a-dropdown>
             <a-menu slot="overlay" @click="handleActions">
@@ -171,7 +168,8 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { productList, getCurrentDealer, productUpdate, productExportPrice } from '@/api/product'
+import { getCurrentDealer, productUpdate, productExportPrice } from '@/api/product'
+import { dealerProductList } from '@/api/dealerProduct'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import { STable, VSelect } from '@/components'
@@ -185,6 +183,7 @@ export default {
   data () {
     return {
       advanced: true, // 高级搜索 展开/关闭
+      showCell: false,
       tableHeight: 0,
       productType: [],
       queryParam: { //  查询条件
@@ -212,7 +211,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return productList(Object.assign(parameter, this.queryParam)).then(res => {
+        return dealerProductList(Object.assign(parameter, this.queryParam)).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -308,10 +307,10 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.onlineFalg = ''
       this.queryParam.enabledFlag = '1'
+      this.queryParam.stockEmptyFlag = undefined
       this.productType = []
       this.$refs.table.refresh(true)
       this.rowSelectionInfo = null
-      this.queryParam.stockEmptyFlag = undefined
       this.$refs.table.clearSelected()
     },
     // 获取省级经销商、市级经销商和特约经销商信息

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.183:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.103/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,