Browse Source

bug修改

ljb 9 months ago
parent
commit
77b6561fb7

+ 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,

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

@@ -20,6 +20,8 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import {downExcelTemp} from "@/api/common";
+
 export default {
 export default {
   name: "UploadExcelDialog",
   name: "UploadExcelDialog",
   props: {
   props: {
@@ -53,12 +55,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 +77,10 @@ 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");
-      // });
+      const link = document.createElement('a');
+      link.href = window.location.origin + '/oss/kd-kypt/upload/20250813/24d08f92c43742525a1c9557e5c52d39.xls';
+      link.download = '技术人员花名册.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",
           //验证码的值
           //验证码的值

+ 3 - 0
src/views/basic-resource/comp-basic-info/technician-roster.vue

@@ -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/wxzctx-cost.vue

@@ -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;