Browse Source

修改bug

chenrui 2 years ago
parent
commit
ede9895b43

+ 2 - 2
src/views/reportData/purchaseReturnReport/purchaseReturnDetail.vue

@@ -50,7 +50,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
-                <ProductBrand id="purchaseReceiptDetailList-productBrandSn" v-model="queryParam.returnTargetSn"></ProductBrand>
+                <ProductBrand id="purchaseReceiptDetailList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -197,7 +197,7 @@ export default {
         { title: '出库时间', dataIndex: 'outStockTime', width: '16%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) { //  售价权限
-        arr.splice(6, 0, { title: '成本', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '成本', dataIndex: 'cost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 1 - 1
src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue

@@ -162,7 +162,7 @@ export default {
         { title: '出库时间', dataIndex: 'outStockTime', width: '16%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) { //  售价权限
-        arr.splice(4, 0, { title: '成本', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '成本', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }