lilei 2 роки тому
батько
коміт
5a2daeba5b

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.6",
+    "version": "2.2.7",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 3 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -201,9 +201,11 @@ export default {
       ]
       if (this.$hasPermissions('B_dispatchDetail_salesPrice')) { //  售价权限
         arr.splice(5, 0, { title: '销售价格', dataIndex: 'price', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(6, 0, { title: '市级销售价格', dataIndex: 'cityPrice', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(9, 0, { title: '本次下推金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
+      if (this.$hasPermissions('B_dispatchDetail_cityPrice')) { //  市级权限
+        arr.splice(6, 0, { title: '市级销售价格', dataIndex: 'cityPrice', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
       return arr
     }
   },

+ 18 - 12
src/views/salesManagement/salesQuery/printModal.vue

@@ -132,20 +132,12 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          // 销售分类无权限不打印
-          if(!_this.$hasPermissions('B_salesTypePrint_salesPrice')){
-            _this.form.priceType = 'SALES_BILL_TYPE'
-          }
-          // 销售打印无权限不打印
-          if(!_this.$hasPermissions('B_salesPrint_salesPrice')){
-            _this.form.priceType = 'SALES_BILL'
-          }
-          // 销售导出无权限不导出
-          if(!_this.$hasPermissions('B_salesDetailExport_salesPrice')){
-            _this.form.priceType = _this.form.dataScope == 'ENOUGH' ? 'SALES_BILL_NOT_LACK':'SALES_BILL'
-          }
           // 分类打印
           if (_this.nowType == 'SALES_BILL_TYPE') {
+            // 销售分类无权限不打印
+            if(!_this.$hasPermissions('B_salesTypePrint_salesPrice')){
+              _this.form.priceType = 'SALES_BILL_TYPE'
+            }
             const item = _this.typeList.find(item => item.id == _this.form.id)
             if (item) {
               const obj = {
@@ -163,6 +155,10 @@ export default {
               _this.$emit('ok', obj)
             }
           } else if (_this.nowType == 'SALES_BILL') {
+            // 销售打印无权限不打印
+            if(!_this.$hasPermissions('B_salesPrint_salesPrice')){
+              _this.form.priceType = 'SALES_BILL'
+            }
             const obj = {
               salesBillSn: _this.itemData.salesBillSn,
               priceType: _this.form.priceType,
@@ -170,6 +166,10 @@ export default {
             }
             _this.$emit('ok', obj)
           } else if (_this.nowType == 'export') {
+            // 销售导出无权限不导出
+            if(!_this.$hasPermissions('B_salesDetailExport_salesPrice')){
+              _this.form.priceType = _this.form.dataScope == 'ENOUGH' ? 'SALES_BILL_NOT_LACK':'SALES_BILL'
+            }
             const obj = {
               salesBillSn: _this.itemData.salesBillSn,
               priceType: _this.form.priceType,
@@ -214,6 +214,12 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+        this.form = {
+          id: 'all',
+          dataScope: 'all',
+          priceType: undefined,
+          orderBy: undefined
+        }
         this.$refs.ruleForm.resetFields()
       } else {
         if (this.nowType == 'SALES_BILL_TYPE') {

+ 2 - 2
src/views/salesReturnManagement/salesReturn/detail.vue

@@ -202,14 +202,14 @@ export default {
         { title: '坏件数量', dataIndex: 'badQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '良品数量', dataIndex: 'goodQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货原因', dataIndex: 'returnReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '实际退货单价说明', dataIndex: 'priceRemark', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '退货原因', dataIndex: 'returnReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_salesReturnDetail_salesPrice') && this.showFlag != 0) { //  售价权限
         arr.splice(10, 0, { title: '参考退货单价', dataIndex: 'initialPrice', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(11, 0, { title: '参考退货金额', dataIndex: 'initialAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(12, 0, { title: '实际退货单价', dataIndex: 'price', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(13, 0, { title: '实际退货金额', dataIndex: 'totalAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(14, 0, { title: '实际退货单价说明', dataIndex: 'priceRemark', width: '12%', align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     }