lilei 11 月之前
父节点
当前提交
1db35125ca

+ 6 - 1
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -94,6 +94,10 @@
             <div>{{ text }}</div>
             <div v-if="record.accountNameFnumber">({{ record.accountNameFnumber }})</div>
           </template>
+          <!-- 原记账名称 -->
+          <template slot="yjzname" slot-scope="text,record">
+            <div>{{ text == record.accountName || !text ? '--' : text }}</div>
+          </template>
           <!-- 费用承担方 -->
           <template slot="fycdf" slot-scope="text,record">
             <div v-for="(item,index) in record.detailSplitList" :key="item.id+'-'+index">
@@ -211,7 +215,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '10%' },
-        { title: '原记账名称', dataIndex: 'origAccountName', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
+        { title: '原记账名称', dataIndex: 'origAccountName', scopedSlots: { customRender: 'yjzname' }, align: 'center', width: '10%' },
         { title: '所属区域', dataIndex: 'subareaNames', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属分区', dataIndex: 'subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '5%', customRender: function (text) { return text || '--' } },
@@ -302,6 +306,7 @@ export default {
             params.push({
               expenseAccountDetailSn: item.expenseAccountDetailSn,
               origAccountName: item.origAccountName,
+              origAccountNameSn: item.origAccountNameSn,
               accountNameSn: data.accountNameSn,
               accountType: data.accountType,
               provinceName: data.provinceName,

+ 5 - 1
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -80,6 +80,10 @@
             <div>{{ text }}</div>
             <div v-if="record.accountNameFnumber">({{ record.accountNameFnumber }})</div>
           </template>
+          <!-- 原记账名称 -->
+          <template slot="yjzname" slot-scope="text,record">
+            <div>{{ text == record.accountName || !text ? '--' : text }}</div>
+          </template>
           <!-- 费用承担方 -->
           <template slot="fycdf" slot-scope="text,record">
             <div v-for="(item,index) in record.detailSplitList" :key="item.id+'-'+index">
@@ -143,7 +147,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '8%' },
-        { title: '原记账名称', dataIndex: 'origAccountName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '原记账名称', dataIndex: 'origAccountName', scopedSlots: { customRender: 'yjzname' }, align: 'center', width: '8%' },
         { title: '所属区域', dataIndex: 'subareaNames', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属分区', dataIndex: 'subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },