Browse Source

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

zhoulisky 9 months ago
parent
commit
70a628531e

+ 1 - 1
src/api/externalReports/jjkcAuxiliarySumList.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 
 export const getList = (current, size, params) => {
 export const getList = (current, size, params) => {
   return request({
   return request({
-    url: '/api/kd-scientific/page',
+    url: '/api/kd-scientific/xm/cost/details/deduction-summary',
     method: 'get',
     method: 'get',
     params: {
     params: {
       ...params,
       ...params,

+ 8 - 0
src/api/system/dict.js

@@ -87,3 +87,11 @@ export const getDictionary = (params) => {
     params,
     params,
   })
   })
 }
 }
+
+export const getDictValueByKey = (code, dictKey) => {
+  return request({
+    url: `/api/kd-system/dict/${code}/${dictKey}`,
+    method: 'get',
+  })
+  
+}

+ 26 - 10
src/components/upload-excel-dialog/index.vue

@@ -20,10 +20,17 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import { getDictValueByKey } from '@/api/system/dict';
+import {downExcelTemp} from "@/api/common";
+
 export default {
 export default {
   name: "UploadExcelDialog",
   name: "UploadExcelDialog",
   props: {
   props: {
     uploadAfter: Function,
     uploadAfter: Function,
+    // 导入模板的key,用于下载模板时使用
+    templateKey: String,
+    // 下载模板后的名称
+    templateName: String
   },
   },
   data() {
   data() {
     return {
     return {
@@ -53,12 +60,12 @@ export default {
             tip: "请上传 .xls,.xlsx 标准格式文件",
             tip: "请上传 .xls,.xlsx 标准格式文件",
             action: this.url,
             action: this.url,
           },
           },
-          // {
-          //   label: "模板下载",
-          //   prop: "excelTemplate",
-          //   formslot: true,
-          //   span: 24,
-          // },
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24,
+          },
         ],
         ],
       };
       };
     },
     },
@@ -75,10 +82,19 @@ export default {
       done();
       done();
     },
     },
     handleTemplate() {
     handleTemplate() {
-      this.$message.warning("暂未设置模板");
-      // exportBlob(`/api/kd-system/region/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-      //   downloadXls(res.data, "技术人员花名册.xlsx");
-      // });
+      getDictValueByKey('import-template', this.templateKey).then(({ data }) => {
+        if (data.code == 200) {
+          if (typeof data.data === 'object') {
+            this.$message.error('暂未配置模板');
+            return;
+          }
+          let urlObj = new URL(data.data);
+          const link = document.createElement('a');
+          link.href = window.location.origin + '/oss' + urlObj.pathname;
+          link.download = this.templateName + '.xls'; // 设置下载文件名
+          link.click();
+        }
+      })
     },
     },
   },
   },
 };
 };

+ 0 - 9
src/option/externalReports/jjkcAuxiliarySumList.js

@@ -205,14 +205,5 @@ export default {
         }]
         }]
       }],
       }],
     },
     },
-    {
-      label: '开始时间',
-      prop: 'kssj',
-      type: 'date',
-      search: true,
-      align: 'center',
-      showOverflowTooltip: true,
-      hide: true,
-    },
   ],
   ],
 };
 };

+ 1 - 1
src/page/login/userlogin.vue

@@ -100,7 +100,7 @@
           //用户名
           //用户名
           username: "admin",
           username: "admin",
           //密码
           //密码
-          password: "admin",
+          password: "kd2025!",
           //账号类型
           //账号类型
           type: "account",
           type: "account",
           //验证码的值
           //验证码的值

+ 1 - 1
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -95,7 +95,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="科研资产清单-导入模板" templateName="科研资产清单-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 4 - 1
src/views/basic-resource/comp-basic-info/technician-roster.vue

@@ -56,7 +56,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="技术人员花名册-导入模板" templateName="技术人员花名册-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"
@@ -128,6 +128,9 @@ export default window.$crudCommon({
       }
       }
       return true;
       return true;
     },
     },
+    getFormData() {
+      return { ...this.form, yearAndMonth: this.params.yearAndMonth };
+    },
     addBefore(loading, callback) {
     addBefore(loading, callback) {
       if (!this.validCustom()) {
       if (!this.validCustom()) {
         loading();
         loading();

+ 1 - 1
src/views/external-reports/high-tech/gx-auxiliary-sum-list.vue

@@ -19,7 +19,7 @@
         <print-table-btn @click="printTable" />
         <print-table-btn @click="printTable" />
         
         
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
-          <year-month-select v-model="params.yearAndMonth"></year-month-select>
+          <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
         </div>
         </div>
       </template>
       </template>
     </avue-crud>
     </avue-crud>

+ 3 - 14
src/views/external-reports/jjkc-standards/jjkc-auxiliary-sum-list.vue

@@ -19,22 +19,12 @@
         <print-table-btn @click="printTable" />
         <print-table-btn @click="printTable" />
         
         
         <div style="display: flex; align-items: center;">
         <div style="display: flex; align-items: center;">
-          <year-month-select v-model="params.yearAndMonth"></year-month-select>
+          <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
         </div>
         </div>
       </template>
       </template>
 
 
-      <!-- 开始时间 -->
-      <template slot="kssjSearch">
-        <el-date-picker
-          v-model="params.kssjRange"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="yyyy-MM-dd"
-          style="width: 240px !important;"
-        >
-        </el-date-picker>
+      <template slot="footer">
+        <div>234</div>
       </template>
       </template>
       
       
     </avue-crud>
     </avue-crud>
@@ -79,7 +69,6 @@ export default window.$crudCommon({
     }
     }
   },
   },
   methods: {
   methods: {
-    loadData() {},
     handleExport() {
     handleExport() {
       exportBlob(`/api/kd-scientific/attendance/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
       exportBlob(`/api/kd-scientific/attendance/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.params.yearAndMonth}研发费用汇总表.xlsx`);
         downloadXls(res.data, `${this.params.yearAndMonth}研发费用汇总表.xlsx`);

+ 1 - 1
src/views/project-manage/components/design-cost.vue

@@ -52,7 +52,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-设计费用" templateName="预算-设计费用-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/project-manage/components/other-cost.vue

@@ -54,7 +54,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-其他费用" templateName="预算-其他费用-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/project-manage/components/outsourcing-cost.vue

@@ -54,7 +54,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-委托外部研究开发费" templateName="预算-委托外部研究开发费-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/project-manage/components/person-cost.vue

@@ -57,7 +57,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-人员人工费用" templateName="预算-人员人工费用-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 2 - 2
src/views/project-manage/components/wxzctx-cost.vue

@@ -57,7 +57,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-无形资产摊销费用" templateName="预算-无形资产摊销费用-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"
@@ -179,7 +179,7 @@ export default window.$crudCommon({
       this.loadData();
       this.loadData();
     },
     },
     getFormData() {
     getFormData() {
-      return { ...this.form, xmId: this.params.xmId }
+      return { assetId: this.currZcObj.id, ...this.form, xmId: this.params.xmId,  }
     },
     },
     handleProjectChange(data) {
     handleProjectChange(data) {
       this.selProject = data;
       this.selProject = data;

+ 1 - 1
src/views/project-manage/components/zb-cost.vue

@@ -54,7 +54,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-装备调试费用与试验费用" templateName="预算-装备调试费用与试验费用-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/project-manage/components/zjfyycqdtfy-cost.vue

@@ -57,7 +57,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-折旧费用与长期待摊费用" templateName="预算-折旧费用与长期待摊费用-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/project-manage/components/zztl-cost.vue

@@ -52,7 +52,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="预算-直接投入费用" templateName="预算-直接投入费用-导入模板" :uploadAfter="uploadAfter"/>
 
 
     <WideTablePrinter
     <WideTablePrinter
       ref="printWideTable"
       ref="printWideTable"

+ 1 - 1
src/views/yf-cost-manage/basic-data-setting/month-salary-list.vue

@@ -58,7 +58,7 @@
       
       
     </avue-crud>
     </avue-crud>
 
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
+    <upload-excel-dialog ref="uploadExcelDialog" templateKey="每月工资信息" templateName="每月工资信息-导入模板" :uploadAfter="uploadAfter"/>
 
 
 
 
     <WideTablePrinter
     <WideTablePrinter