lilei 2 年之前
父节点
当前提交
8cb134431f

+ 1 - 1
public/version.json

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

+ 6 - 5
src/views/reportData/bulkReturnReport/detailList.vue

@@ -83,6 +83,7 @@
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.purchaseQty || totalData.purchaseQty==0)) ? totalData.purchaseQty : '--' }}</strong>;
+        退货总金额:<strong>{{ (totalData && (totalData.productTotalPrice || totalData.productTotalPrice==0)) ? toThousands(totalData.productTotalPrice) : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
           退货总成本:<strong>{{ (totalData && (totalData.purchaseTotalCost || totalData.purchaseTotalCost==0)) ? toThousands(totalData.purchaseTotalCost) : '--' }}</strong>;
         </div>
@@ -103,9 +104,9 @@
       @mouseleave="(record, index) => openPopid = ''"
       bordered>
       <template slot="cost" slot-scope="text, record">
-        <a-popover placement="top" :visible="openPopid == record.no">
+        <a-popover placement="top" :visible="openPopid == record.no && !!record.stockOutDetailList">
           <template slot="content">
-            <a-table bordered :columns="costColumns" :pagination="false" :data-source="record.tableData"></a-table>
+            <a-table bordered :columns="costColumns" :pagination="false" :data-source="record.stockOutDetailList"></a-table>
           </template>
           {{ toThousands(text) }}
         </a-popover>
@@ -189,9 +190,9 @@ export default {
     costColumns(){
       const _this = this
       return [
-        { title: '批次号', dataIndex: 'sparePartsReturnNo', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本单价', dataIndex: 'productTotalPrice', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '数量', dataIndex: 'purchaseQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '批次号', dataIndex: 'stockBatchNo', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '成本单价', dataIndex: 'putCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '数量', dataIndex: 'outQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
     },
     columns () {

+ 1 - 0
src/views/reportData/bulkReturnReport/list.vue

@@ -58,6 +58,7 @@
       <div class="ftext" slot="message">
         总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
+        退货总金额:<strong>{{ (totalData && (totalData.productTotalPrice || totalData.productTotalPrice==0)) ? toThousands(totalData.productTotalPrice) : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
           退货总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.103/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.103/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,