Browse Source

Merge branch 'kd-dev' of https://gitee.com/zhoulisky/kd-web into kd-dev

zhouli 9 months ago
parent
commit
f98f4c8f78

+ 10 - 5
src/views/basic-resource/comp-basic-info/comp-info-setting.vue

@@ -135,7 +135,7 @@ export default {
   },
   watch: {
     yearAndMonth(newVal) {
-      console.log(newVal)
+      this.getAttenDetailFunc(newVal)
     }
   },
   mounted() {
@@ -163,10 +163,15 @@ export default {
     },
     getAttenDetailFunc(yearAndMonth) {
       getAttenDetail(yearAndMonth).then(({ data }) => {
-        if (data.code == 200 && Object.keys(data.data).length) {
-          const _data = data.data;
-          this.picForm = { id: _data.id, yearAndMonth: _data.yearAndMonth, highTechUrl: _data.highTechUrl ? _data.highTechUrl.split(',') : [] };
-          this.attendForm = { id: _data.id, yearAndMonth: _data.yearAndMonth, workHours: _data.workHours };
+        if (data.code == 200) {
+          if (Object.keys(data.data).length) {
+            const _data = data.data;
+            this.picForm = { id: _data.id, yearAndMonth: _data.yearAndMonth, highTechUrl: _data.highTechUrl ? _data.highTechUrl.split(',') : [] };
+            this.attendForm = { id: _data.id, yearAndMonth: _data.yearAndMonth, workHours: _data.workHours };
+          } else {
+            this.picForm = { highTechUrl: [] };
+            this.attendForm = { workHours: undefined };
+          }
         }
       })
     },

+ 269 - 0
src/views/external-reports/external-manage/107-2.vue

@@ -0,0 +1,269 @@
+<template>
+  <basic-container>
+    <div class="doc-page">
+      <h3 class="page-title" style="margin: 24px 0 16px">企业研究开发活动及相关情况</h3>
+      <div>
+        <year-month-select v-model="yearAndMonth" :showMonth="false"></year-month-select>
+      </div>
+      <table>
+        <thead>
+          <tr>
+            <th>指标名称</th>
+            <th>计量单位</th>
+            <th>代码</th>
+            <th>数量</th>
+          </tr>
+          <tr>
+            <th width="40%">甲</th>
+            <th width="20%">乙</th>
+            <th width="20%">丙</th>
+            <th width="20%">1</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr style="font-weight: 600;">
+            <td align="center">一、研究开发人员情况</td>
+            <td align="center">—</td>
+            <td align="center">—</td>
+            <td align="center">—</td>
+          </tr>
+          <tr>
+            <td align="center">研究开发人员合计</td>
+            <td align="center">人</td>
+            <td align="center">1</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">其中:管理和服务人员</td>
+            <td align="center">人</td>
+            <td align="center">2</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">其中:女性</td>
+            <td align="center">人</td>
+            <td align="center">3</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">其中:全职人员</td>
+            <td align="center">人</td>
+            <td align="center">4</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">其中:本科毕业及以上人员</td>
+            <td align="center">人</td>
+            <td align="center">5</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">二、研究开发费用情况</td>
+            <td align="center" style="font-weight: 600;">—</td>
+            <td align="center" style="font-weight: 600;">—</td>
+            <td align="center" style="font-weight: 600;">—</td>
+          </tr>
+          <tr>
+            <td align="center">研究开发费用合计</td>
+            <td align="center">千元</td>
+            <td align="center">7</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">1.人员人工费用</td>
+            <td align="center">千元</td>
+            <td align="center">8</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">2.直接投入费用</td>
+            <td align="center">千元</td>
+            <td align="center">9</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">3.折旧费用与长期待摊费用</td>
+            <td align="center">千元</td>
+            <td align="center">10</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">4.无形资产摊销费用</td>
+            <td align="center">千元</td>
+            <td align="center">11</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">5.设计费用</td>
+            <td align="center">千元</td>
+            <td align="center">12</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">6.装备调试费用与试验费用</td>
+            <td align="center">千元</td>
+            <td align="center">13</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">7.委托外部研究开发费用</td>
+            <td align="center">千元</td>
+            <td align="center">14</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">①委托境内研究机构</td>
+            <td align="center">千元</td>
+            <td align="center">15</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">②委托境内高等学校</td>
+            <td align="center">千元</td>
+            <td align="center">16</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">③委托境内企业</td>
+            <td align="center">千元</td>
+            <td align="center">17</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">④委托境外机构</td>
+            <td align="center">千元</td>
+            <td align="center">18</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">8.其他费用</td>
+            <td align="center">千元</td>
+            <td align="center">19</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">三、研究开发资产情况</td>
+            <td align="center" style="font-weight: 600;">—</td>
+            <td align="center" style="font-weight: 600;">—</td>
+            <td align="center" style="font-weight: 600;">—</td>
+          </tr>
+          <tr>
+            <td align="center">当年形成用于研发开发的固定资产</td>
+            <td align="center">千元</td>
+            <td align="center">20</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">其中:仪器和设备</td>
+            <td align="center">千元</td>
+            <td align="center">21</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">四、研究开发支出资金来源</td>
+            <td align="center" style="font-weight: 600;">—</td>
+            <td align="center" style="font-weight: 600;">—</td>
+            <td align="center" style="font-weight: 600;">—</td>
+          </tr>
+          <tr>
+            <td align="center">1.来自企业自筹</td>
+            <td align="center">千元</td>
+            <td align="center">57</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">2.来自政府部门</td>
+            <td align="center">千元</td>
+            <td align="center">43</td>
+            <td align="center"></td>
+          </tr>
+          <tr>
+            <td align="center">3.来自银行贷款</td>
+            <td align="center">千元</td>
+            <td align="center">58</td>
+            <td align="center">
+              <input placeholder="请输入" type="number" />
+            </td>
+          </tr>
+          <tr>
+            <td align="center">4.来自风险投资</td>
+            <td align="center">千元</td>
+            <td align="center">55</td>
+            <td align="center">
+              <input placeholder="请输入" type="number" />
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import moment from "moment";
+import yearMonthSelect from "@/components/year-month-select";
+
+export default {
+  components: {
+    yearMonthSelect,
+  },
+  data() {
+    return {
+      yearAndMonth: moment(new Date()).format('YYYY'),
+    };
+  },
+  watch: {
+    "yearAndMonth"(newVal) {
+      console.log(newVal)
+    },
+  },
+  mounted() {
+  },
+  methods: {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-title {
+  text-align: center;
+  font-size: 24px;
+}
+
+.doc-page {
+  width: 900px;
+  margin: 30px auto;
+}
+table {
+  width: 100%;
+  border: 1px solid #333;
+}
+.doc-label {
+  text-align: center;
+  padding: 6px;
+  color: #777;
+  font-size: 14px;
+  width: 15%;
+}
+.doc-input {
+  text-align: center;
+  color: #333;
+  width: 35%;
+}
+
+.el-input__inner {
+  border: none;
+}
+tr td {
+  border: 1px solid #333;
+  padding: 9px 3px;
+  font-size: 14px;
+  color: #666;
+  input {
+    border: none;
+    width: 100%;
+    box-sizing: border-box;
+    text-align: center;
+  }
+}
+</style>

+ 4 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/dev-depre-allocation.vue

@@ -136,6 +136,8 @@ export default window.$crudCommon({
   name: 'yfCostManage/yfCostStatistics/devDepreAllocation',
   res: ({ data }) => {
     data.records = data.records.map(item => {
+      let _yanfaFenTanLv = item.yanfaFenTanLv;
+
       item.zcbm = item.asset ? item.asset.zcbm : '';
       item.zcmc = item.asset ? item.asset.zcmc : '';
       item.zclb = item.asset ? item.asset.zclb : '';
@@ -144,7 +146,8 @@ export default window.$crudCommon({
       item.jcz = item.asset ? item.asset.jcz : '';
       item.yzje = item.asset ? item.asset.yzje : '';
       item.attendanceHours = item.asset ? item.asset.zgs : '';
-      item.yanfaTanXiao = Number(new Decimal(item.yzje || 0).mul(item.yanfaFenTanLv || 0)).toFixed(2);
+      item.yanfaFenTanLv = new Decimal(item.yanfaFenTanLv).mul(new Decimal(100));
+      item.yanfaTanXiao = Number(new Decimal(item.yzje || 0).mul(_yanfaFenTanLv || 0)).toFixed(2);
       return item;
     });
     return data;