lilei 2 days ago
parent
commit
5a966d426b

+ 1 - 1
public/version.json

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

+ 1 - 36
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -118,7 +118,6 @@
                   :loading="delLoading"
                   style="margin-left: 10px"
                   id="salesReturn-delAll">清空列表</a-button>
-                <hideCellMenus placeholder="显示" @change="showCellChange" :defHiddenKes="colsArr" v-model="showCell"></hideCellMenus>
               </div>
             </a-col>
           </a-row>
@@ -217,7 +216,6 @@ import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 import queryPart from './queryPart.vue'
 import chooseCustomModal from './chooseCustomModal.vue'
-import hideCellMenus from '@/views/common/hideCellMenus'
 // 接口
 import { warehouseCascadeList } from '@/api/warehouse'
 import { getCurrentDealer } from '@/api/product'
@@ -230,8 +228,7 @@ export default {
     VSelect,
     queryPart,
     chooseCustomModal,
-    Print,
-    hideCellMenus
+    Print
   },
   mixins: [commonMixin],
   data () {
@@ -295,35 +292,6 @@ export default {
     }
   },
   computed: {
-    colsArr () {
-      const _this = this
-      // 省级且有市级价权限
-      if (_this.currentDealerInfo && _this.currentDealerInfo.dealerLevel == 'PROVINCE' && _this.$hasPermissions('M_ShowAllCityPrice')) {
-        return [
-          {
-            title: '批发价',
-            key: 'wholesalePrice',
-            disabled: false,
-            checked: false
-          },
-          {
-            title: '终端价',
-            key: 'terminalPrice',
-            disabled: false,
-            checked: false
-          }
-        ]
-      } else {
-        return [
-          {
-            title: '终端价',
-            key: 'terminalPrice',
-            disabled: false,
-            checked: false
-          }
-        ]
-      }
-    },
     columns () {
       const _this = this
       const arr = [
@@ -357,9 +325,6 @@ export default {
     handleBack () {
       this.$router.push({ name: 'salesReturnList' })
     },
-    showCellChange (val) {
-      this.$refs.queryPart.showCell = val
-    },
     // 获取省级经销商、市级经销商和特约经销商信息
     getCurrentDealerInfo () {
       getCurrentDealer().then(res => {

+ 4 - 40
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -123,7 +123,6 @@
                   :loading="delLoading"
                   style="margin-left: 10px"
                   id="salesReturnGrabEdit-del-all">清空列表</a-button>
-                <hideCellMenus placeholder="显示" @change="showCellChange" :defHiddenKes="colsArr" v-model="showCell"></hideCellMenus>
               </div>
             </a-col>
           </a-row>
@@ -207,7 +206,6 @@ import queryPart from './queryPart.vue'
 import chooseCustomModal from './chooseCustomModal.vue'
 import { warehouseCascadeList } from '@/api/warehouse'
 import { getCurrentDealer } from '@/api/product'
-import hideCellMenus from '@/views/common/hideCellMenus'
 import { salesReturnDetail, salesReturnQueryCount, salesReturnDetailList, salesReturnDiscount, salesReturnDelAll, salesReturnDetailDel, salesReturnSaveProduct, salesReturnSubmit, salesReturnDetailPrint, salesDetailExport } from '@/api/salesReturn'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
@@ -218,12 +216,10 @@ export default {
     VSelect,
     queryPart,
     chooseCustomModal,
-    Print,
-    hideCellMenus
+    Print
   },
   mixins: [commonMixin],
   data () {
-    const _this = this
     return {
       spinning: false,
       disabled: false,
@@ -283,35 +279,6 @@ export default {
     }
   },
   computed: {
-    colsArr () {
-      const _this = this
-      // 省级且有市级价权限
-      if (_this.currentDealerInfo && _this.currentDealerInfo.dealerLevel == 'PROVINCE' && _this.$hasPermissions('M_ShowAllCityPrice')) {
-        return [
-          {
-            title: '批发价',
-            key: 'wholesalePrice',
-            disabled: false,
-            checked: false
-          },
-          {
-            title: '终端价',
-            key: 'terminalPrice',
-            disabled: false,
-            checked: false
-          }
-        ]
-      } else {
-        return [
-          {
-            title: '终端价',
-            key: 'terminalPrice',
-            disabled: false,
-            checked: false
-          }
-        ]
-      }
-    },
     // 表头
     columns () {
       const _this = this
@@ -335,10 +302,10 @@ export default {
       ]
       // 省级且有市级价权限
       if (_this.currentDealerInfo && _this.currentDealerInfo.dealerLevel == 'PROVINCE' && _this.$hasPermissions('M_ShowAllCityPrice')) {
-        arr.splice(5, 0, { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(6, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '批发价', dataIndex: 'wholesalePrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       } else {
-        arr.splice(5, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '终端价', dataIndex: 'terminalPrice', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr.filter(item => !_this.showCell.includes(item.dataIndex))
     }
@@ -348,9 +315,6 @@ export default {
     handleBack () {
       this.$router.push({ name: 'salesReturnList' })
     },
-    showCellChange (val) {
-      this.$refs.queryPart.showCell = val
-    },
     // 获取省级经销商、市级经销商和特约经销商信息
     getCurrentDealerInfo () {
       getCurrentDealer().then(res => {