Browse Source

加计扣除费用化明细表功能优化

ljb 9 months ago
parent
commit
b9300dfd80

+ 8 - 8
src/page/index/top/index.vue

@@ -27,14 +27,14 @@
           <top-color></top-color>
         </div>
       </el-tooltip>
-      <el-tooltip v-if="showDebug"
+      <!-- <el-tooltip v-if="showDebug"
                   effect="dark"
                   :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
                   placement="bottom">
         <div class="top-bar__item">
           <top-logs></top-logs>
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
       <el-tooltip v-if="showLock"
                   effect="dark"
                   :content="$t('navbar.lock')"
@@ -51,20 +51,20 @@
           <top-theme></top-theme>
         </div>
       </el-tooltip>
-      <el-tooltip effect="dark"
+      <!-- <el-tooltip effect="dark"
                   :content="$t('navbar.notice')"
                   placement="bottom">
         <div class="top-bar__item top-bar__item--show">
           <top-notice></top-notice>
         </div>
-      </el-tooltip>
-      <el-tooltip effect="dark"
+      </el-tooltip> -->
+      <!-- <el-tooltip effect="dark"
                   :content="$t('navbar.language')"
                   placement="bottom">
         <div class="top-bar__item top-bar__item--show">
           <top-lang></top-lang>
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
       <el-tooltip v-if="showFullScren"
                   effect="dark"
                   :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"
@@ -88,8 +88,8 @@
           <el-dropdown-item>
             <router-link to="/info/index"><i class="icon-yonghu" /> {{$t('navbar.userinfo')}}</router-link>
           </el-dropdown-item>
-          <el-dropdown-item @click.native="switchDept"><i class="icon-guanlianshebei" /> {{$t('navbar.switch')}}
-          </el-dropdown-item>
+          <!-- <el-dropdown-item @click.native="switchDept"><i class="icon-guanlianshebei" /> {{$t('navbar.switch')}}
+          </el-dropdown-item> -->
           <el-dropdown-item @click.native="logout" divided><i class="icon-tuichu" /> {{$t('navbar.logOut')}}
           </el-dropdown-item>
         </el-dropdown-menu>

+ 26 - 12
src/views/external-reports/jjkc-standards/components/common-list.vue

@@ -3,7 +3,9 @@
     <div style="width: 100%; display: flex; align-items: center; justify-content: space-between;">
       <div class="left" style="display: flex;">
         <div style="margin-right: 50px;">研发项目编号:{{ data[0].xmbh }}</div>
-        <div>项目项目名称:{{ data[0].xmmc }}</div>
+        <div style="margin-right: 50px;">项目项目名称:{{ data[0].xmmc }}</div>
+        <div style="margin-right: 50px;">支出类型:<span style="color: #409EFF;">{{ getCostName }}</span></div>
+        <div>金额单位:元</div>
       </div>
       <div class="right">
         <el-button
@@ -30,6 +32,8 @@ import {downloadXls} from "@/util/util";
 
 export default {
   props: {
+    // 支出类型
+    costType: [String, Number],
     data: {
       type: Array,
       default: () => []
@@ -59,20 +63,24 @@ export default {
         showSummary: true,
         sumColumnList: [
           {
-            label:'合计',
-            name: 'ryrg',
+            label: '合计',
+            name: 'kjpzje',
+            type: 'sum'
+          },
+          {
+            name: 'amount',
             type: 'sum',
           },
           {
-            name: 'zjtr',
+            name: 'ryrgfy',
             type: 'sum',
           },
           {
-            name: 'zjfyycqdtfy',
+            name: 'zjtrfy',
             type: 'sum'
           },
           {
-            name: 'sjf',
+            name: 'zjfy',
             type: 'sum'
           },
           {
@@ -80,21 +88,21 @@ export default {
             type: 'sum'
           },
           {
-            name: 'zbtsfyysyfy',
+            name: 'xcpsjfd',
             type: 'sum'
           },
           {
-            name: 'qtfy',
+            name: 'qtxgfy',
             type: 'sum'
           },
           {
-            name: 'wwyf',
+            name: 'wtjnjgfy',
             type: 'sum'
           },
           {
-            name: 'amount',
+            name: 'wtjwjgfy',
             type: 'sum'
-          }
+          },
         ],
         column: [
           {
@@ -133,7 +141,7 @@ export default {
           },
           {
             label: '会计凭证记载金额',
-            prop: '',
+            prop: 'kjpzje',
             width: 120,
             align: 'center',
             showOverflowTooltip: true,
@@ -225,6 +233,12 @@ export default {
       },
     };
   },
+  computed: {
+    getCostName() {
+      let costTypeObj = {1: '费用化', 2: '资本化'};
+      return costTypeObj[this.costType];
+    }
+  },
   methods: {
     handleExport() {
       this.$message.error("暂未开发");

+ 5 - 2
src/views/external-reports/jjkc-standards/jjkc-auxiliary-details.vue

@@ -16,7 +16,7 @@
       </el-radio-group>
     </div>
     <template v-if="listData.length">
-      <common-list v-for="(item, index) of listData" :data="item" :key="index" style="margin-bottom: 25px;"></common-list>
+      <common-list v-for="(item, index) of listData" :data="item" :cost-type="costType" :key="index" style="margin-bottom: 25px;"></common-list>
     </template>
     <el-empty v-else description="暂无数据"></el-empty>
   </basic-container>
@@ -56,6 +56,9 @@ export default {
   watch: {
     yearAndMonth() {
       this.loadData();
+    },
+    costType() {
+      this.loadData();
     }
   },
   mounted() {
@@ -73,7 +76,7 @@ export default {
         if (data.code == 200) {
           let allList = data.data.map(item => {
             let childArr = item.costList.map(costItem => {
-              return { xmmc: item.xmmc, xmbh: item.xmbh, ...costItem };
+              return { xmmc: item.xmmc, xmbh: item.xmbh, ...costItem, kjpzje: costItem.amount };
             });
             return childArr;
           });