lilei il y a 2 semaines
Parent
commit
13b84ec3fb

+ 1 - 1
src/views/financialManagement/accountStatement/edit.vue

@@ -221,7 +221,7 @@ export default {
         { title: '日', dataIndex: 'day', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'bizStatusDictValue', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '业务状态', dataIndex: 'bizStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '费用/调拨类型', dataIndex: 'expenseAllocateType', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '摘要', dataIndex: 'digestInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客诉索赔编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },

+ 1 - 1
src/views/financialManagement/accountStatement/queryPart.vue

@@ -211,7 +211,7 @@ export default {
         { title: '日', dataIndex: 'day', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'bizStatusDictValue', width: '8%', align: 'left', customRender: function (text, record) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'bizStatusDictValue', width: '8%', align: 'center', customRender: function (text, record) { return text || '--' } },
         { title: '费用/调拨类型', dataIndex: 'expenseAllocateType', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '摘要', dataIndex: 'digestInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客诉索赔编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },

+ 1 - 1
src/views/financialManagement/accountStatementBill/baseModal.vue

@@ -88,7 +88,7 @@ export default {
       verifyAccountBillCreate(form).then(res => {
         if (res.status == 200) {
           _this.$message.success(res.message)
-          _this.$emit('refashData')
+          _this.$emit('refashData', res.data)
           _this.cancel()
         }
         _this.spinning = false

+ 7 - 2
src/views/financialManagement/accountStatementBill/list.vue

@@ -92,7 +92,7 @@
         </s-table>
       </a-spin>
     </a-card>
-    <baseModal v-drag ref="baseModal" :show="openModal" @cancel="openModal=false" @refashData="$refs.table.refresh()"></baseModal>
+    <baseModal v-drag ref="baseModal" :show="openModal" @cancel="openModal=false" @refashData="creatOrder"></baseModal>
   </div>
 </template>
 
@@ -178,7 +178,6 @@ export default {
   methods: {
     // 区域分区
     subareaChange (val) {
-      console.log(val)
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -198,6 +197,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.bizUserSn = undefined
+      this.dealerType = []
       this.$refs.subarea.clearData()
       this.queryParam.kdMidCustomerFnumber = ''
       this.$refs.table.refresh(true)
@@ -215,6 +215,11 @@ export default {
       this.openModal = true
       this.$refs.baseModal.pageInit(row)
     },
+    // 创建对账单成功
+    creatOrder (data) {
+      this.$refs.table.refresh()
+      this.$router.push({ name: 'accountStatementEdit', params: { sn: data.verifyAccountBillSn } })
+    },
     // 详情
     handleDetail (row) {
       this.$router.push({ name: 'accountStatementBillDetail', params: { sn: row.dealerSn, name: row.dealerName } })

+ 5 - 4
src/views/financialManagement/manualEntryForm/list.vue

@@ -99,14 +99,14 @@
               @click="auditStatus(record)"
               class="button-info"
             >
-              审核状态
+              审核进度
             </a-button>
           </template>
         </s-table>
       </a-spin>
     </a-card>
     <!-- 审核进度 -->
-    <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
+    <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" ref="verifyModal" @close="openModal=false"></verifyModal>
     <!-- 基础信息 -->
     <baseModal v-drag :show="baseModal" :itemSn="itemSn" @cancel="baseModal=false" @ok="hanldAudit"></baseModal>
     <!-- 提交  选择审批人员 -->
@@ -183,11 +183,11 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调账单号', dataIndex: 'changeNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调账单号', dataIndex: 'changeNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '借方', dataIndex: 'borrowAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '贷方', dataIndex: 'loanAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '备注', dataIndex: 'remarks', width: '30%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remarks', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'statusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'actions' }, width: '8%', align: 'center' }
@@ -229,6 +229,7 @@ export default {
     },
     // 审核进度
     auditStatus (row) {
+      this.$refs.verifyModal.auditDate = row.auditDate
       this.openModal = true
       this.itemSn = row.changeSn
     },

+ 2 - 4
src/views/financialManagement/manualEntryForm/verifyModal.vue

@@ -8,6 +8,7 @@
     @cancel="isShow=false"
     width="50%">
     <p>说明:以下信息来自钉钉</p>
+    <p>提审时间:{{ auditDate }}</p>
     <a-spin :spinning="spinning" tip="Loading...">
       <s-table
         class="sTable fixPagination"
@@ -39,16 +40,13 @@ export default {
     itemSn: {
       type: [Number, String],
       default: ''
-    },
-    itemId: {
-      type: [Number, String],
-      default: ''
     }
   },
   data () {
     return {
       spinning: false,
       isShow: this.openModal,
+      auditDate: '',
       columns: [{ title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
         { title: '人员姓名', width: '12%', dataIndex: 'approvalName', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '人员类型', dataIndex: 'processTaskType', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },