瀏覽代碼

Merge branch 'develop_yh63' of jianguan-web/qpls-md-html into pre-release

李磊 2 周之前
父節點
當前提交
fcacc6233a

+ 1 - 1
public/version.json

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

+ 17 - 12
src/views/financialManagement/accountStatement/confrontModal.vue

@@ -160,26 +160,31 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         params.verifyAccountBillSn = this.verifyAccountBillSn
+        const beginFlag = (!!params.beginDate && !!params.endDate)
+        const a = !params.bizNo && !params.changeType && !params.bizType
+        const b = !params.beginDate && !params.endDate
+        params.beginFlag = beginFlag && a || a && b ? 1 : 0
         return verifyAcountBillDetailQueryList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
             const no = 0
-            let prevTotalAmount = 0
             for (var i = 0; i < data.length; i++) {
               data[i].no = no + i + 1
-              const dates = data[i].bizDate.split('-')
-              data[i].year = dates[0]
-              data[i].month = dates[1]
-              data[i].day = dates[2].split(' ')[0]
-              // 正为借方, 负数为贷方
-              if (data[i].bizAmount > 0) {
-                data[i].debitAmount = Number(data[i].bizAmount).toFixed(2)
-              } else {
-                data[i].creditorAmount = Number(data[i].bizAmount * -1).toFixed(2)
+              if (data[i].bizDate) {
+                const dates = data[i].bizDate.split('-')
+                data[i].year = dates[0]
+                data[i].month = dates[1]
+                data[i].day = dates[2].split(' ')[0]
+              }
+              if (data[i].bizAmount) {
+                // 正为借方, 负数为贷方
+                if (data[i].bizAmount > 0) {
+                  data[i].debitAmount = Number(data[i].bizAmount).toFixed(2)
+                } else {
+                  data[i].creditorAmount = Number(data[i].bizAmount * -1).toFixed(2)
+                }
               }
-              data[i].totalAmount = Number(Number(prevTotalAmount || 0) + Number(data[i].debitAmount || 0) - Number(data[i].creditorAmount || 0)).toFixed(2)
-              prevTotalAmount = data[i].totalAmount
             }
             this.total = data.length || 0 + 1
             this.disabled = false

+ 37 - 24
src/views/financialManagement/accountStatement/list.vue

@@ -54,26 +54,32 @@
             <span class="table-td-link" v-if="$hasPermissions('B_verifyAccount_detail')" @click="handleDetail(record,0)">{{ record.verifyAccountBillNo }}</span>
             <span v-else>{{ record.verifyAccountBillNo }}</span>
           </template>
+          <!-- 业务时间区间 -->
+          <template slot="bizDate" slot-scope="text, record">
+            {{ record.bizFirstDate }} ~ {{ record.bizLastDate }}
+          </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button
-              size="small"
-              type="link"
-              class="button-info"
-              v-if="record.billStatus=='WAIT_VERIFY'&&$hasPermissions('B_verifyAccount_edit')"
-              @click="handleEdit(record)"
-            >
-              编辑
-            </a-button>
-            <a-button
-              v-if="record.billStatus=='WAIT_VERIFY'&&$hasPermissions('B_verifyAccount_check')"
-              size="small"
-              type="link"
-              class="button-info"
-              @click="checkAcount(record)"
-            >
-              对账
-            </a-button>
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="record.billStatus=='WAIT_VERIFY'&&$hasPermissions('B_verifyAccount_edit')"
+                @click="handleEdit(record)"
+              >
+                编辑
+              </a-button>
+              <a-button
+                v-if="record.billStatus=='WAIT_VERIFY'&&$hasPermissions('B_verifyAccount_check')"
+                size="small"
+                type="link"
+                class="button-info"
+                @click="checkAcount(record)"
+              >
+                对账
+              </a-button>
+            </div>
           </template>
         </s-table>
       </a-spin>
@@ -143,12 +149,19 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '对账单号', scopedSlots: { customRender: 'verifyAccountBillNo' }, width: '15%', align: 'center' },
-        { title: '余额', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '备注', dataIndex: 'remarks', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '对账状态', dataIndex: 'billStatusDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+        { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '对账单号', scopedSlots: { customRender: 'verifyAccountBillNo' }, width: '7%', align: 'center' },
+        { title: '借方', dataIndex: 'debitAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '贷方', dataIndex: 'creditAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '期初余额', dataIndex: 'beginBalance', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '余额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '业务单数', dataIndex: 'bizNum', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务时间区间', dataIndex: 'bizDate', scopedSlots: { customRender: 'bizDate' }, width: '10%', align: 'center' },
+        { title: '备注', dataIndex: 'remarks', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '对单时间', dataIndex: 'confirmDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '对账时间', dataIndex: 'verifyDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '对账状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       return arr
     }

+ 2 - 2
vue.config.js

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