chenrui 1 tahun lalu
induk
melakukan
b947760978

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -23,7 +23,7 @@
           <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
           <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
           <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
           <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
-          <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
+          <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span><span v-if="detailData&&detailData.expenseType3">/{{ detailData&&detailData.expenseTypeName3 || '--' }}</span></a-descriptions-item>
           <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
           <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
           <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
           <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
           <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
@@ -162,7 +162,7 @@ import ImportGuideModal from './importGuideModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import { expenseAccountDetail, expenseAcctDetailDelete, expenseAcctDetailFindList, expenseAccountSubmit, expenseInsertImport } from '@/api/expenseManagement.js'
 import { expenseAccountDetail, expenseAcctDetailDelete, expenseAcctDetailFindList, expenseAccountSubmit, expenseInsertImport } from '@/api/expenseManagement.js'
 export default {
 export default {
-  name: 'expenseReimbursementEdit',
+  name: 'ExpenseReimbursementEdit',
   mixins: [commonMixin],
   mixins: [commonMixin],
   components: { VSelect, Upload, STable, epenseDetailModal, productInfoModal, baseDataModal, ImportGuideModal, chooseDepartUserModal },
   components: { VSelect, Upload, STable, epenseDetailModal, productInfoModal, baseDataModal, ImportGuideModal, chooseDepartUserModal },
   data () {
   data () {

+ 23 - 23
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -34,28 +34,28 @@
       </a-page-header>
       </a-page-header>
       <!-- 基础信息 -->
       <!-- 基础信息 -->
       <a-card size="small" :bordered="false" class="expenseManagementDetail-cont" v-show="showDetail">
       <a-card size="small" :bordered="false" class="expenseManagementDetail-cont" v-show="showDetail">
-         <a-descriptions size="small" :column="{ xs: 2, sm: 3, md: 4}" v-if="detailData">
-           <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
-           <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
-           <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
-           <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="打印状态">{{ detailData&&detailData.printStatusDictValue || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="详细说明" :span="4">
-             {{ detailData.content.join(',')||'' }}
-           </a-descriptions-item>
-           <a-descriptions-item label="附件" :span="4">
-             <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
-               {{ item.fileName }}
-             </a>
-           </a-descriptions-item>
-         </a-descriptions>
+        <a-descriptions size="small" :column="{ xs: 2, sm: 3, md: 4}" v-if="detailData">
+          <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span><span v-if="detailData&&detailData.expenseType3">/{{ detailData&&detailData.expenseTypeName3 || '--' }}</span></a-descriptions-item>
+          <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
+          <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="打印状态">{{ detailData&&detailData.printStatusDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="详细说明" :span="4">
+            {{ detailData.content.join(',')||'' }}
+          </a-descriptions-item>
+          <a-descriptions-item label="附件" :span="4">
+            <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
+              {{ item.fileName }}
+            </a>
+          </a-descriptions-item>
+        </a-descriptions>
       </a-card>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
       <a-card size="small" :bordered="false" class="pages-wrap">
         <a-alert type="info" style="margin-bottom:10px">
         <a-alert type="info" style="margin-bottom:10px">
@@ -136,7 +136,7 @@ export default {
       baseData: null,
       baseData: null,
       showTipModal: false,
       showTipModal: false,
       showDetail: false,
       showDetail: false,
-      printType:'',
+      printType: '',
       count: 0,
       count: 0,
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },

+ 4 - 1
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -121,7 +121,7 @@
           </template>
           </template>
           <!-- 费用类型 -->
           <!-- 费用类型 -->
           <template slot="expenseType" slot-scope="text, record">
           <template slot="expenseType" slot-scope="text, record">
-            <div>{{ record.expenseTypeName || '--' }}<span v-if="record.expenseType2">/{{ record.expenseTypeName2 || '--' }}</span></div>
+            <div>{{ record.expenseTypeName || '--' }}<span v-if="record.expenseType2">/{{ record.expenseTypeName2 || '--' }}</span><span v-if="record.expenseType3">/{{ record.expenseTypeName3 || '--' }}</span></div>
           </template>
           </template>
           <!-- 操作 -->
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
           <template slot="action" slot-scope="text, record">
@@ -221,6 +221,7 @@ export default {
         title: '', //  主题
         title: '', //  主题
         expenseType: undefined, // 费用类型
         expenseType: undefined, // 费用类型
         expenseType2: undefined, // 费用类型2
         expenseType2: undefined, // 费用类型2
+        expenseType3: undefined, // 费用类型3
         printStatus: undefined, // 打印状态
         printStatus: undefined, // 打印状态
         state: undefined, // 状态
         state: undefined, // 状态
         salesBillNo: ''// 销售单号
         salesBillNo: ''// 销售单号
@@ -348,6 +349,7 @@ export default {
       this.expenseTypes = val || []
       this.expenseTypes = val || []
       this.queryParam.expenseType = val && val[0] ? val[0] : ''
       this.queryParam.expenseType = val && val[0] ? val[0] : ''
       this.queryParam.expenseType2 = val && val[1] ? val[1] : ''
       this.queryParam.expenseType2 = val && val[1] ? val[1] : ''
+      this.queryParam.expenseType3 = val && val[2] ? val[2] : ''
     },
     },
     // 详情
     // 详情
     handleDetail (row) {
     handleDetail (row) {
@@ -420,6 +422,7 @@ export default {
         title: '', //  主题
         title: '', //  主题
         expenseType: undefined, // 费用类型
         expenseType: undefined, // 费用类型
         expenseType2: undefined, // 费用类型2
         expenseType2: undefined, // 费用类型2
+        expenseType3: undefined, // 费用类型3
         state: undefined, // 状态
         state: undefined, // 状态
         printStatus: undefined,
         printStatus: undefined,
         applyPersonSn: undefined,
         applyPersonSn: undefined,

+ 8 - 2
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -66,6 +66,8 @@
                   <custList v-show="queryParam.accountType=='CUSTOMER'" ref="custList" @change="accountNameSnChange" placeholder="请选择记账名称(输入名称搜索)"></custList>
                   <custList v-show="queryParam.accountType=='CUSTOMER'" ref="custList" @change="accountNameSnChange" placeholder="请选择记账名称(输入名称搜索)"></custList>
                   <!-- 供应商 -->
                   <!-- 供应商 -->
                   <supplier v-show="queryParam.accountType=='OUT_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></supplier>
                   <supplier v-show="queryParam.accountType=='OUT_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></supplier>
+                  <!-- 其它往来 -->
+                  <otherTransactions v-show="queryParam.accountType=='OTHER_ACCOUNT'" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></otherTransactions>
                   <a-select style="width: 100%" v-if="!queryParam.accountType" placeholder="请选择记账名称">
                   <a-select style="width: 100%" v-if="!queryParam.accountType" placeholder="请选择记账名称">
                     <a-select-option value="" :disabled="true">
                     <a-select-option value="" :disabled="true">
                       请先选择记账类型
                       请先选择记账类型
@@ -198,12 +200,13 @@ import custList from '@/views/common/custList.vue'
 import supplier from '@/views/common/supplier.js'
 import supplier from '@/views/common/supplier.js'
 import expenseType from '@/views/common/expenseType.js'
 import expenseType from '@/views/common/expenseType.js'
 import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
 import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
+import otherTransactions from '@/views/common/otherTransactions.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { hdExportExcel } from '@/libs/exportExcel'
 moment.locale('zh-cn')
 moment.locale('zh-cn')
 export default {
 export default {
   name: 'ExpenseReimbursementDetailList',
   name: 'ExpenseReimbursementDetailList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType },
+  components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType, otherTransactions },
   data () {
   data () {
     const _this = this
     const _this = this
     return {
     return {
@@ -228,7 +231,8 @@ export default {
         applyPersonSn: undefined, // 申请人
         applyPersonSn: undefined, // 申请人
         applyDepartmentSn: undefined, // 申请部门
         applyDepartmentSn: undefined, // 申请部门
         expenseType: undefined, //  费用类型
         expenseType: undefined, //  费用类型
-        xpenseType2: undefined, //  费用类型
+        xpenseType2: undefined, //  费用类型1
+        xpenseType3: undefined, //  费用类型2
         accountType: undefined, // 记账类型
         accountType: undefined, // 记账类型
         accountNameSn: undefined, // 记账名称
         accountNameSn: undefined, // 记账名称
         splitObjType: undefined, // 费用承担方类型
         splitObjType: undefined, // 费用承担方类型
@@ -311,6 +315,7 @@ export default {
       this.expenseTypes = val || []
       this.expenseTypes = val || []
       this.queryParam.expenseType = val && val[0] ? val[0] : ''
       this.queryParam.expenseType = val && val[0] ? val[0] : ''
       this.queryParam.expenseType2 = val && val[1] ? val[1] : ''
       this.queryParam.expenseType2 = val && val[1] ? val[1] : ''
+      this.queryParam.expenseType3 = val && val[2] ? val[2] : ''
     },
     },
     custChange (val) {
     custChange (val) {
       this.queryParam.splitObjSn = val.key
       this.queryParam.splitObjSn = val.key
@@ -369,6 +374,7 @@ export default {
         applyDepartmentSn: undefined, // 申请部门
         applyDepartmentSn: undefined, // 申请部门
         expenseType: undefined, //  费用类型
         expenseType: undefined, //  费用类型
         expenseType2: undefined, //  费用类型2
         expenseType2: undefined, //  费用类型2
+        expenseType3: undefined, //  费用类型3
         accountType: undefined, // 记账类型
         accountType: undefined, // 记账类型
         accountNameSn: undefined, // 记账名称
         accountNameSn: undefined, // 记账名称
         splitObjType: undefined, // 费用承担方类型
         splitObjType: undefined, // 费用承担方类型