chenrui před 6 měsíci
rodič
revize
089611d17c

+ 13 - 7
src/views/numsGoodsShelves/withdrawalManagementNew/billFlowModal.vue

@@ -5,7 +5,7 @@
     class="billFlowModal-modal jg-page-wrap"
     :visible="isShow"
     @close="isShow=false"
-    width="75%"
+    width="78%"
     :get-container="false"
     :wrap-style="{ position: 'absolute' }">
     <a-spin :spinning="spinning" tip="Loading...">
@@ -25,7 +25,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="关联单号">
-                <a-input id="billFlowModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号"/>
+                <a-input id="billFlowModal-tradeOrderNo" v-model.trim="queryParam.tradeOrderNo" allowClear placeholder="请输入关联单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -89,6 +89,13 @@
         :scroll="{ y: 450 }"
         :defaultLoadData="false"
         bordered>
+        <!-- 金额 -->
+        <template slot="tradeAmount" slot-scope="text, record">
+          <div v-if="record.tradeAmount">
+            {{ record.tradeType=='SK'? '+'+(record.tradeAmount).toFixed(2):'-'+(record.tradeAmount).toFixed(2) }}
+          </div>
+          <div v-else>{{ (record.tradeAmount&&record.tradeAmount==0)?(record.tradeAmount).toFixed(2):'--' }}</div>
+        </template>
         <!-- 交易状态 -->
         <template slot="status" slot-scope="text, record">
           <div v-if="record.dealState&&record.dealStateDictValue">
@@ -118,7 +125,6 @@ export default {
     }
   },
   data () {
-    const _this = this
     return {
       spinning: false,
       isShow: this.openModal, //  是否打开弹框
@@ -129,7 +135,7 @@ export default {
         endDate: '', // 创建结束时间
         customerName: undefined, // 客户名称
         customerSn: undefined, // 客户Sn
-        bizNo: '', // 关联财务单号
+        tradeOrderNo: '', // 关联单号
         bizType: undefined, // 收支类型
         tradeType: undefined, // 交易类型
         dealState: undefined // 交易状态
@@ -139,8 +145,8 @@ export default {
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customerName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '关联单号', dataIndex: 'bizOrderNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额(¥)', dataIndex: 'tradeAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '关联单号', dataIndex: 'tradeOrderNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金额(¥)', dataIndex: 'tradeAmount', width: '8%', align: 'right', scopedSlots: { customRender: 'tradeAmount' } },
         { title: '交易类型', dataIndex: 'tradeTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '交易状态', dataIndex: 'dealStateDictValue', width: '8%', align: 'center', scopedSlots: { customRender: 'status' } }
       ],
@@ -200,7 +206,7 @@ export default {
       this.queryParam.endDate = ''
       this.queryParam.customerName = undefined
       this.queryParam.customerSn = undefined
-      this.queryParam.bizNo = ''
+      this.queryParam.tradeOrderNo = ''
       this.queryParam.bizType = undefined
       this.queryParam.tradeType = undefined
       this.queryParam.dealState = undefined