lilei 2 年之前
父節點
當前提交
fb6a73f4d8

+ 2 - 2
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -31,7 +31,7 @@
         <div slot="message">
           <span>产品款数:<strong>{{ statisticsObj&&statisticsObj.totalCategory|| '--' }}</strong>;</span>
           <span>申请退货总数量:<strong>{{ statisticsObj&&statisticsObj.qty||'--' }}</strong>;</span>
-          <span v-if="$hasPermissions('B_isShowPrice')">退货金额:<strong>{{ statisticsObj&&statisticsObj.totalCost || '--' }}</strong></span>
+          <span v-if="$hasPermissions('B_isShowCost')">退货金额:<strong>{{ statisticsObj&&statisticsObj.totalCost || '--' }}</strong></span>
         </div>
       </a-alert>
       <s-table
@@ -106,7 +106,7 @@ export default {
         { title: '入库数量', dataIndex: 'putQty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '申请退货数量', dataIndex: 'qty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      if (this.$hasPermissions('B_isShowCost')) { //  售价权限
         arr.splice(7, 0, { title: '退货单价', dataIndex: 'cost', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toFixedDecimal(text, 2) : '--') } })
         arr.splice(9, 0, { title: '退货金额', dataIndex: 'totalCost', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toFixedDecimal(text, 2) : '--') } })
       }

+ 2 - 2
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -117,8 +117,8 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'AUDIT_REJECT'"
-            @click="$hasPermissions('B_purchaseReturnSubmit') &&handleResubmit(record)"
+            v-if="$hasPermissions('B_purchaseReturnSubmit') && record.state == 'AUDIT_REJECT'"
+            @click="handleResubmit(record)"
             class="button-info"
             id="bulkWarehousingOrderList-edit-btn">再次提交</a-button>
           <a-button

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -50,7 +50,7 @@
           <div slot="message" class="total-bar">
             <div>
               <span>申请退货数量:{{ statisticsObj && (statisticsObj.qty || statisticsObj.qty == 0) ? statisticsObj.qty : '--' }};</span>
-              <span v-if="$hasPermissions('B_isShowPrice')">退货金额:{{ statisticsObj && statisticsObj.totalCost }}元;</span>
+              <span v-if="$hasPermissions('B_isShowCost')">退货金额:{{ statisticsObj && statisticsObj.totalCost }}元;</span>
             </div>
           </div>
         </a-alert>

+ 1 - 2
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -150,14 +150,13 @@ export default {
         { title: '产品名称', dataIndex: 'product.name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'sparePartsBatchNo', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
-
         { title: '入库数量', dataIndex: 'productQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '最大可退数量', dataIndex: 'currentStockQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '申请退货数量', width: '9%', align: 'center', scopedSlots: { customRender: 'qty' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) {
+      if (this.$hasPermissions('B_isShowCost')) {
         arr.splice(6, 0, { title: '入库单价', dataIndex: 'productCost', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toFixedDecimal(text, 2) : '--') } })
       }
       return arr