Browse Source

bug修改

ljb 4 months ago
parent
commit
4e2cb69a29

+ 0 - 3
src/option/yfCostManage/basicDataSetting/wxzcDetail.js

@@ -180,9 +180,6 @@ export default {
       align: 'center',
       showOverflowTooltip: true,
       display: false,
-      formatter:(row, value)=>{
-        return value+'%'
-      }
     },
     {
       label: '月摊销额(每节点/套)(K)',

+ 0 - 3
src/option/yfCostManage/yfCostStatistics/amortizeCostSummaryList.js

@@ -116,9 +116,6 @@ export default {
       align: 'center',
       search: true,
       showOverflowTooltip: true,
-      formatter:(row, value)=>{
-        return value+'%'
-      }
     },
     {
       label: '月摊销额(每节点/套)',

+ 111 - 91
src/page/index/index.vue

@@ -1,23 +1,39 @@
 <template>
-  <div class="avue-contail" :class="{'avue--collapse':isCollapse}">
+  <div class="avue-contail" :class="{ 'avue--collapse': isCollapse }">
     <div class="avue-header">
       <!-- 顶部导航栏 -->
-      <top ref="top"/>
+      <top ref="top" />
     </div>
     <div class="avue-layout">
       <div class="avue-left">
         <!-- 左侧导航栏 -->
-        <sidebar/>
+        <sidebar />
       </div>
       <div class="avue-main">
         <!-- 顶部标签卡 -->
-        <tags/>
+        <tags />
         <transition name="fade-scale">
           <search class="avue-view" v-show="isSearch"></search>
         </transition>
         <!-- 主体视图层 -->
-        <div style="height:100%;overflow-y:auto;overflow-x:hidden;" id="avue-view" v-show="!isSearch">
-          <keep-alive :exclude="['userManage', 'projectBudgetPage', 'projectBudget', 'projectImplement', 'projectChange', 'projectAccept', 'projectResultTable', 'projectOutsourcing']">
+        <div
+          ref="avueViewRef"
+          style="height: 100%; overflow-y: auto; overflow-x: hidden"
+          id="avue-view"
+          v-show="!isSearch"
+        >
+          <keep-alive
+            :exclude="[
+              'userManage',
+              'projectBudgetPage',
+              'projectBudget',
+              'projectImplement',
+              'projectChange',
+              'projectAccept',
+              'projectResultTable',
+              'projectOutsourcing',
+            ]"
+          >
             <router-view />
           </keep-alive>
           <!-- <router-view class="avue-view" v-if="!$route.meta.keepAlive"/> -->
@@ -29,71 +45,75 @@
 </template>
 
 <script>
-  import {mapGetters} from "vuex";
-  import tags from "./tags";
-  import search from "./search";
-  import top from "./top/";
-  import sidebar from "./sidebar/";
-  import admin from "@/util/admin";
-  import {validatenull} from "@/util/validate";
-  import {calcDate} from "@/util/date.js";
-  import {getStore} from "@/util/store.js";
+import { mapGetters } from "vuex";
+import tags from "./tags";
+import search from "./search";
+import top from "./top/";
+import sidebar from "./sidebar/";
+import admin from "@/util/admin";
+import { validatenull } from "@/util/validate";
+import { calcDate } from "@/util/date.js";
+import { getStore } from "@/util/store.js";
 
-  export default {
-    components: {
-      top,
-      tags,
-      search,
-      sidebar
+export default {
+  components: {
+    top,
+    tags,
+    search,
+    sidebar,
+  },
+  name: "index",
+  provide() {
+    return {
+      index: this,
+    };
+  },
+  data() {
+    return {
+      //搜索控制
+      isSearch: false,
+      //刷新token锁
+      refreshLock: false,
+      //刷新token的时间
+      refreshTime: "",
+    };
+  },
+  watch: {
+    $route() {
+      this.$refs.avueViewRef.scrollTo(0, 0);
     },
-    name: "index",
-    provide() {
-      return {
-        index: this
-      };
+  },
+  created() {
+    //实时检测刷新token
+    //this.refreshToken();
+  },
+  mounted() {
+    this.init();
+  },
+  computed: mapGetters(["isMenu", "isLock", "isCollapse", "website", "menu"]),
+  props: [],
+  methods: {
+    showCollapse() {
+      this.$store.commit("SET_COLLAPSE");
     },
-    data() {
-      return {
-        //搜索控制
-        isSearch: false,
-        //刷新token锁
-        refreshLock: false,
-        //刷新token的时间
-        refreshTime: ""
+    // 初始化
+    init() {
+      this.$store.commit("SET_SCREEN", admin.getScreen());
+      window.onresize = () => {
+        setTimeout(() => {
+          this.$store.commit("SET_SCREEN", admin.getScreen());
+        }, 0);
       };
+      this.$store.dispatch("FlowRoutes").then(() => {});
     },
-    created() {
-      //实时检测刷新token
-      //this.refreshToken();
-    },
-    mounted() {
-      this.init();
-    },
-    computed: mapGetters(["isMenu", "isLock", "isCollapse", "website", "menu"]),
-    props: [],
-    methods: {
-      showCollapse() {
-        this.$store.commit("SET_COLLAPSE");
-      },
-      // 初始化
-      init() {
-        this.$store.commit("SET_SCREEN", admin.getScreen());
-        window.onresize = () => {
-          setTimeout(() => {
-            this.$store.commit("SET_SCREEN", admin.getScreen());
-          }, 0);
-        };
-        this.$store.dispatch("FlowRoutes").then(() => {
-        });
-      },
-      //打开菜单
-      openMenu(item = {}) {
-        this.$store.dispatch("GetMenu", item.id).then(data => {
-          if (data.length !== 0) {
-            this.$router.$avueRouter.formatRoutes(data, true);
-          }
-          //当点击顶部菜单后默认打开第一个菜单
-          /*if (!this.validatenull(item)) {
+    //打开菜单
+    openMenu(item = {}) {
+      this.$store.dispatch("GetMenu", item.id).then((data) => {
+        if (data.length !== 0) {
+          this.$router.$avueRouter.formatRoutes(data, true);
+        }
+        //当点击顶部菜单后默认打开第一个菜单
+        /*if (!this.validatenull(item)) {
             let itemActive = {},
               childItemActive = 0;
             if (item.path) {
@@ -113,31 +133,31 @@
               }, itemActive.meta)
             });
           }*/
-
-        });
-      },
-      // 定时检测token
-      refreshToken() {
-        this.refreshTime = setInterval(() => {
-          const token = getStore({
+      });
+    },
+    // 定时检测token
+    refreshToken() {
+      this.refreshTime = setInterval(() => {
+        const token =
+          getStore({
             name: "token",
-            debug: true
+            debug: true,
           }) || {};
-          const date = calcDate(token.datetime, new Date().getTime());
-          if (validatenull(date)) return;
-          if (date.seconds >= this.website.tokenTime && !this.refreshLock) {
-            this.refreshLock = true;
-            this.$store
-              .dispatch("RefreshToken")
-              .then(() => {
-                this.refreshLock = false;
-              })
-              .catch(() => {
-                this.refreshLock = false;
-              });
-          }
-        }, 10000);
-      }
-    }
-  };
+        const date = calcDate(token.datetime, new Date().getTime());
+        if (validatenull(date)) return;
+        if (date.seconds >= this.website.tokenTime && !this.refreshLock) {
+          this.refreshLock = true;
+          this.$store
+            .dispatch("RefreshToken")
+            .then(() => {
+              this.refreshLock = false;
+            })
+            .catch(() => {
+              this.refreshLock = false;
+            });
+        }
+      }, 10000);
+    },
+  },
+};
 </script>

+ 0 - 3
src/printOption/yfCostManage/basicDataSetting/wxzcDetail.js

@@ -75,9 +75,6 @@ export default {
       prop: 'jcz',
       width: 80,
       align: 'center',
-      formatter:(row, value)=>{
-        return value+'%'
-      }
     },
     {
       label: '月摊销额(每节点/套)(K)',

+ 140 - 73
src/views/external-reports/external-manage/high-comp-discount-details.vue

@@ -1,18 +1,31 @@
 <template>
   <basic-container v-loading="loading">
     <div class="btn-wrap">
-      <el-button type="primary" icon="el-icon-edit" :loading="confirmLoading" @click="handleSaveBtn">保存</el-button>
+      <el-button
+        type="primary"
+        icon="el-icon-edit"
+        :loading="confirmLoading"
+        @click="handleSaveBtn"
+        >保存</el-button
+      >
     </div>
     <div class="doc-page">
       <h3 class="page-title" style="margin: 24px 0 16px">{{ pageTitle }}</h3>
-      <div style="display: flex; margin: 12px 0; align-items: center; justify-content: space-between;">
-        <div style="display: flex;">
-          <year-month-select v-model="year" :showMonth="false" style="margin: 0 15px 0 0;"></year-month-select>
-          <el-button
-            type="primary"
-            size="small"
-            @click="handleReady"
-          >
+      <div
+        style="
+          display: flex;
+          margin: 12px 0;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
+        <div style="display: flex">
+          <year-month-select
+            v-model="year"
+            :showMonth="false"
+            style="margin: 0 15px 0 0"
+          ></year-month-select>
+          <el-button type="primary" size="small" @click="handleReady">
             读取数据
           </el-button>
           <el-button
@@ -25,20 +38,24 @@
             导出
           </el-button>
         </div>
-        
+
         <div>单位:元</div>
       </div>
       <table>
         <tbody>
           <tr>
             <td colspan="7" align="center">
-              <h4 style="margin: 6px 0;">税收优惠基本信息</h4>
+              <h4 style="margin: 6px 0">税收优惠基本信息</h4>
             </td>
           </tr>
           <tr>
             <td width="30px" align="center">1</td>
-            <td width="23%" align="center" rowspan="3">企业主要产品(服务)及特殊收入支持作用的技术所属范围</td>
-            <td rowspan="3" width="30%" align="center">国家重点支持的高新技术领域</td>
+            <td width="23%" align="center" rowspan="3">
+              企业主要产品(服务)及特殊收入支持作用的技术所属范围
+            </td>
+            <td rowspan="3" width="30%" align="center">
+              国家重点支持的高新技术领域
+            </td>
             <td colspan="3">一级领域</td>
             <td width="12%" align="center">{{ formData.d1 }}</td>
           </tr>
@@ -57,7 +74,7 @@
 
           <tr>
             <td colspan="7" align="center">
-              <h4 style="margin: 3px 0;">税收优惠有关情况</h4>
+              <h4 style="margin: 3px 0">税收优惠有关情况</h4>
             </td>
           </tr>
 
@@ -70,7 +87,9 @@
 
           <tr>
             <td width="30px" align="center">5</td>
-            <td colspan="4" style="padding-left: 30px;">其中:产品(服务)收入</td>
+            <td colspan="4" style="padding-left: 30px">
+              其中:产品(服务)收入
+            </td>
             <td>
               <input placeholder="请输入" type="number" v-model="formData.d5" />
             </td>
@@ -78,7 +97,7 @@
 
           <tr>
             <td width="30px" align="center">6</td>
-            <td colspan="4" style="padding-left: 60px;">技术性收入</td>
+            <td colspan="4" style="padding-left: 60px">技术性收入</td>
             <td>
               <input placeholder="请输入" type="number" v-model="formData.d6" />
             </td>
@@ -92,7 +111,7 @@
 
           <tr>
             <td width="30px" align="center">8</td>
-            <td colspan="4" style="padding-left: 30px;">其中:收入总额</td>
+            <td colspan="4" style="padding-left: 30px">其中:收入总额</td>
             <td align="center">
               <input placeholder="请输入" type="number" v-model="formData.d8" />
             </td>
@@ -100,7 +119,7 @@
 
           <tr>
             <td width="30px" align="center">9</td>
-            <td colspan="4" style="padding-left: 60px;">不征税收入</td>
+            <td colspan="4" style="padding-left: 60px">不征税收入</td>
             <td>
               <input placeholder="请输入" type="number" v-model="formData.d9" />
             </td>
@@ -108,7 +127,9 @@
 
           <tr>
             <td width="30px" align="center">10</td>
-            <td colspan="4">三、本年高新技术产品(服务)收入占企业总收入的比例</td>
+            <td colspan="4">
+              三、本年高新技术产品(服务)收入占企业总收入的比例
+            </td>
             <td align="center">{{ formData.d10 }}</td>
           </tr>
 
@@ -123,7 +144,11 @@
             <td width="30px" align="center">12</td>
             <td colspan="4">五、本年职工总数</td>
             <td>
-              <input placeholder="请输入" type="number" v-model="formData.d12" />
+              <input
+                placeholder="请输入"
+                type="number"
+                v-model="formData.d12"
+              />
             </td>
           </tr>
 
@@ -136,7 +161,7 @@
           <tr>
             <td width="30px" align="center" rowspan="2">14</td>
             <td rowspan="17" align="center">研发费用指标</td>
-            <td rowspan="2" style="padding-left: 30px;">高新研发费用归集年度</td>
+            <td rowspan="2" style="padding-left: 30px">高新研发费用归集年度</td>
             <td align="center">本年度</td>
             <td align="center">前一年度</td>
             <td align="center">前二年度</td>
@@ -170,7 +195,7 @@
 
           <tr>
             <td width="30px" align="center">17</td>
-            <td style="padding-left: 60px;">1.人员人工费用</td>
+            <td style="padding-left: 60px">1.人员人工费用</td>
             <td align="center">{{ formData.d17_1 }}</td>
             <td align="center">{{ formData.d17_2 }}</td>
             <td align="center">{{ formData.d17_3 }}</td>
@@ -179,7 +204,7 @@
 
           <tr>
             <td width="30px" align="center">18</td>
-            <td style="padding-left: 60px;">2.直接投入费用</td>
+            <td style="padding-left: 60px">2.直接投入费用</td>
             <td align="center">{{ formData.d18_1 }}</td>
             <td align="center">{{ formData.d18_2 }}</td>
             <td align="center">{{ formData.d18_3 }}</td>
@@ -188,7 +213,7 @@
 
           <tr>
             <td width="30px" align="center">19</td>
-            <td style="padding-left: 60px;">3.折旧费用与长期待摊费用</td>
+            <td style="padding-left: 60px">3.折旧费用与长期待摊费用</td>
             <td align="center">{{ formData.d19_1 }}</td>
             <td align="center">{{ formData.d19_2 }}</td>
             <td align="center">{{ formData.d19_3 }}</td>
@@ -197,7 +222,7 @@
 
           <tr>
             <td width="30px" align="center">20</td>
-            <td style="padding-left: 60px;">4.无形资产摊销费用</td>
+            <td style="padding-left: 60px">4.无形资产摊销费用</td>
             <td align="center">{{ formData.d20_1 }}</td>
             <td align="center">{{ formData.d20_2 }}</td>
             <td align="center">{{ formData.d20_3 }}</td>
@@ -206,7 +231,7 @@
 
           <tr>
             <td width="30px" align="center">21</td>
-            <td style="padding-left: 60px;">5.设计费用</td>
+            <td style="padding-left: 60px">5.设计费用</td>
             <td align="center">{{ formData.d21_1 }}</td>
             <td align="center">{{ formData.d21_2 }}</td>
             <td align="center">{{ formData.d21_3 }}</td>
@@ -215,7 +240,7 @@
 
           <tr>
             <td width="30px" align="center">22</td>
-            <td style="padding-left: 60px;">6.设备调试费与实验费用</td>
+            <td style="padding-left: 60px">6.设备调试费与实验费用</td>
             <td align="center">{{ formData.d22_1 }}</td>
             <td align="center">{{ formData.d22_2 }}</td>
             <td align="center">{{ formData.d22_3 }}</td>
@@ -224,7 +249,7 @@
 
           <tr>
             <td width="30px" align="center">23</td>
-            <td style="padding-left: 60px;">7.其他费用</td>
+            <td style="padding-left: 60px">7.其他费用</td>
             <td align="center">{{ formData.d23_1 }}</td>
             <td align="center">{{ formData.d23_2 }}</td>
             <td align="center">{{ formData.d23_3 }}</td>
@@ -233,7 +258,7 @@
 
           <tr>
             <td width="30px" align="center">24</td>
-            <td style="padding-left: 60px;">其中:可计入研发费用的其他费用</td>
+            <td style="padding-left: 60px">其中:可计入研发费用的其他费用</td>
             <td align="center">{{ formData.d24_1 }}</td>
             <td align="center">{{ formData.d24_2 }}</td>
             <td align="center">{{ formData.d24_3 }}</td>
@@ -251,7 +276,7 @@
 
           <tr>
             <td width="30px" align="center">26</td>
-            <td style="padding-left: 60px;">1.境内的外部研发费</td>
+            <td style="padding-left: 60px">1.境内的外部研发费</td>
             <td align="center">{{ formData.d26_1 }}</td>
             <td align="center">{{ formData.d26_2 }}</td>
             <td align="center">{{ formData.d26_3 }}</td>
@@ -260,7 +285,7 @@
 
           <tr>
             <td width="30px" align="center">27</td>
-            <td style="padding-left: 60px;">2.境外的外部研发费</td>
+            <td style="padding-left: 60px">2.境外的外部研发费</td>
             <td align="center">{{ formData.d27_1 }}</td>
             <td align="center">{{ formData.d27_2 }}</td>
             <td align="center">{{ formData.d27_3 }}</td>
@@ -269,7 +294,9 @@
 
           <tr>
             <td width="30px" align="center">28</td>
-            <td style="padding-left: 60px;">其中:可计入研发费用的境外的外部研发费</td>
+            <td style="padding-left: 60px">
+              其中:可计入研发费用的境外的外部研发费
+            </td>
             <td align="center">{{ formData.d28_1 }}</td>
             <td align="center">{{ formData.d28_2 }}</td>
             <td align="center">{{ formData.d28_3 }}</td>
@@ -279,10 +306,28 @@
           <tr>
             <td width="30px" align="center">29</td>
             <td>八、销售(营业)收入</td>
-            <td align="center"><input placeholder="请输入" type="number" v-model="formData.d2901" /></td>
-            <td align="center"><input placeholder="请输入" type="number" v-model="formData.d2902" /></td>
-            <td align="center"><input placeholder="请输入" type="number" v-model="formData.d2903" /></td>
-            <td align="center">{{ formData.d29_4 }}</td>
+            <td align="center">
+              <input
+                placeholder="请输入"
+                type="number"
+                v-model="formData.d2901"
+              />
+            </td>
+            <td align="center">
+              <input
+                placeholder="请输入"
+                type="number"
+                v-model="formData.d2902"
+              />
+            </td>
+            <td align="center">
+              <input
+                placeholder="请输入"
+                type="number"
+                v-model="formData.d2903"
+              />
+            </td>
+            <td align="center">{{ formData.d2904 }}</td>
           </tr>
 
           <tr>
@@ -294,14 +339,30 @@
 
           <tr>
             <td width="30px" align="center">31</td>
-            <td colspan="4">十、国家需要重点扶持的高新技术企业减征企业所得税</td>
-            <td align="center"><input placeholder="请输入" type="number" v-model="formData.d31" /></td>
+            <td colspan="4">
+              十、国家需要重点扶持的高新技术企业减征企业所得税
+            </td>
+            <td align="center">
+              <input
+                placeholder="请输入"
+                type="number"
+                v-model="formData.d31"
+              />
+            </td>
           </tr>
 
           <tr>
             <td width="30px" align="center">32</td>
-            <td colspan="4">十一、经济特区和上海浦东新区新设立的高新技术企业定期减免税额</td>
-            <td align="center"><input placeholder="请输入" type="number" v-model="formData.d32" /></td>
+            <td colspan="4">
+              十一、经济特区和上海浦东新区新设立的高新技术企业定期减免税额
+            </td>
+            <td align="center">
+              <input
+                placeholder="请输入"
+                type="number"
+                v-model="formData.d32"
+              />
+            </td>
           </tr>
         </tbody>
       </table>
@@ -329,24 +390,24 @@ export default {
       loading: false,
       confirmLoading: false,
       year: "",
-      formData: {}
+      formData: {},
     };
   },
   computed: {
-    ...mapGetters(['tag', 'pageYear']),
+    ...mapGetters(["tag", "pageYear"]),
     pageTitle() {
-      let yearCN = this.year ? moment(this.year).format('yyyy年') : '';
-      return `${yearCN}${this.tag.label}`
-    }
+      let yearCN = this.year ? moment(this.year).format("yyyy年") : "";
+      return `${yearCN}${this.tag.label}`;
+    },
   },
   watch: {
     year() {
       this.getData();
-    }
+    },
   },
   activated() {
     if (this.year != this.pageYear) {
-      this.year = this.pageYear
+      this.year = this.pageYear;
     }
   },
   methods: {
@@ -364,7 +425,7 @@ export default {
         if (node.value == targetId) {
           return node.label;
         }
-        
+
         // 如果有子节点,递归查找
         if (node.children && node.children.length > 0) {
           const result = this.findLabelById(node.children, targetId);
@@ -373,21 +434,23 @@ export default {
           }
         }
       }
-      
+
       // 如果没有找到,返回null或undefined
       return null;
     },
     getData() {
       this.loading = true;
-      getList({ year: this.year }).then(({ data }) => {
-        this.loading = false;
-        if (data.code == 200) {
-          this.isLoad = true;
-          this.formData = data.data;
-        }
-      }).catch(() => {
-        this.loading = false;
-      });
+      getList({ year: this.year })
+        .then(({ data }) => {
+          this.loading = false;
+          if (data.code == 200) {
+            this.isLoad = true;
+            this.formData = data.data;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     handleSaveBtn() {
       if (!this.isLoad) {
@@ -408,27 +471,26 @@ export default {
         d31: this.formData.d31,
         d32: this.formData.d32,
       };
-      update(params).then(({ data }) => {
-        this.confirmLoading = false;
-        if (data.code == 200) {
-          this.$message.success('保存成功!');
-          this.getData();
-        }
-      }).catch(err => {
-        this.confirmLoading = false;
-      });
+      update(params)
+        .then(({ data }) => {
+          this.confirmLoading = false;
+          if (data.code == 200) {
+            this.$message.success("保存成功!");
+            this.getData();
+          }
+        })
+        .catch((err) => {
+          this.confirmLoading = false;
+        });
     },
-    handleExport() {      
+    handleExport() {
       exportBlob(
         `/api/kd-scientific/gxjsqyyhqkjmxb/export?${
           this.website.tokenHeader
         }=${getToken()}`,
         { year: this.year }
       ).then((res) => {
-        downloadXls(
-          res.data,
-          `${this.pageTitle}.xlsx`
-        );
+        downloadXls(res.data, `${this.pageTitle}.xlsx`);
       });
     },
   },
@@ -491,7 +553,12 @@ tr td {
     box-sizing: border-box;
     text-align: center;
     color: blue;
-    padding-left: 17px;
+    padding-left: 0;
+  }
+  input[type="number"]::-webkit-inner-spin-button,
+  input[type="number"]::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
   }
 }
 </style>

+ 1 - 1
src/views/external-reports/external-manage/torch-develop-annual-report.vue

@@ -574,7 +574,7 @@
             <td>{{ formData.qi27 }}</td>
           </tr>
           <tr>
-            <td style="padding-left: 30px;">其中:形成国家或行业标准</td>
+            <td style="padding-left: 30px;">其中:当年形成国家或行业标准</td>
             <td align="center">项</td>
             <td align="center">qi27_1</td>
             <td>{{ formData.qi27_1 }}</td>

+ 1 - 1
src/views/wel/index.vue

@@ -276,7 +276,7 @@ export default {
           wwfyTotal = wwfyTotal.add(new Decimal(item.wwfy));
 
           monthArr.push(item.yearAndMonth);
-          monthSalesArr.push(Number(new Decimal(item.total).div(new Decimal(0.8))));
+          monthSalesArr.push(item.total);
         });
         // 研发费用总额
         let costAmount = ryrgfyTotal

+ 2 - 1
src/views/yf-cost-manage/yf-cost-statistics/wxzc-cost-statistics/amortize-cost-summary-list.vue

@@ -183,7 +183,8 @@ export default window.$crudCommon({
       item.gl = item.asset ? item.asset.gl : '';
       item.yt = item.asset ? item.asset.yt : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
-      item.jcz = new Decimal(item.asset.jcz || 0).mul(new Decimal(100));
+      // item.jcz = new Decimal(item.asset.jcz || 0).mul(new Decimal(100));
+      item.jcz = '/';
       item.ytxe = item.asset ? item.asset.yzje : '';
       item.attendanceHours = (item.attendanceHours || 0).toFixed(1);
       item.workHours = (item.workHours || 0).toFixed(1);