lilei 2 tahun lalu
induk
melakukan
f653ba9b61

+ 7 - 4
src/views/salesReturnManagement/custConfirm/list.vue

@@ -266,12 +266,16 @@ export default {
         { title: '坏件数量', dataIndex: 'badQty', align: 'center', width: '10%', scopedSlots: { customRender: 'badQty' } },
         { title: '良品数量', dataIndex: 'goodQty', align: 'center', width: '10%', scopedSlots: { customRender: 'goodQty' } },
         { title: '返库数量', dataIndex: 'backStockQty', align: 'center', width: '10%', scopedSlots: { customRender: 'backStockQty' } },
-        { title: '实际退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '实际退货金额', dataIndex: 'totalAmount', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '实际退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '实际退货金额', dataIndex: 'totalAmount', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货单价说明', dataIndex: 'priceRemark', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货原因', dataIndex: 'returnReason', width: '15%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' }
       ]
+      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+        arr.splice(9, 0, { title: '实际退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(10, 0, { title: '实际退货金额', dataIndex: 'totalAmount', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      }
       return arr
     }
   },
@@ -317,8 +321,7 @@ export default {
     // 设置价格成功
     setPriceOk () {
       this.showSetPriceModal = false
-      this.rowSelectionInfo = null
-      this.$refs.table.clearTable()
+      this.$refs.table.clearSelected()
       this.resetSearchForm(false)
     },
     // 保存

+ 1 - 1
src/views/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -51,7 +51,7 @@
         </div>
         <a-divider>请给以下产品设置新的退货单价</a-divider>
         <!-- 搜索条件 -->
-        <div>
+        <div style="overflow: hidden;">
           <a-form layout="inline" style="margin-bottom:10px;float:left;" @keyup.enter.native="searchProduct">
             <a-form-item label="产品编码">
               <a-input id="setPrice-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />