ljb 7 ay önce
ebeveyn
işleme
8b6112eaf9

+ 2 - 2
src/api/basicResource/compSubjectSetting.js

@@ -32,8 +32,8 @@ export const update = (row) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/kd-scientific/subject/enterprise/remove',
-    method: 'post',
+    url: `/api/kd-scientific/subject/enterprise/remove/${ids}`,
+    method: 'delete',
     params: {
       ids
     }

+ 2 - 1
src/api/techPerson/monthSjcyry.js

@@ -22,7 +22,8 @@ export const add = (row) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/kd-scientific/technician/xm/monthly/remove',
+    // url: '/api/kd-scientific/technician/xm/monthly/remove',
+    url: `/api/kd-scientific/technician/xm/monthly/remove/${ids}`,
     method: 'delete',
     params: {
       ids,

+ 1 - 1
src/option/techPerson/monthSjcyry.js

@@ -6,7 +6,7 @@ export default {
   searchMenuSpan: 6,
   border: true,
   index: true,
-  selection: true,
+  selection: false,
   addBtn: true,
   editBtn: false,
   labelWidth: 120,

+ 10 - 1
src/views/RD-system-manage/list.vue

@@ -227,9 +227,18 @@ export default window.$crudCommon({
     },
     handleDownFileAll() {
       let downParams = { year: this.params.yearAndMonth };
+      const loading = this.$loading({
+        lock: true,
+        text: '文件正在下载中,请耐心等待...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       exportBlob(`/api/kd-scientific/yfzd/download?${this.website.tokenHeader}=${getToken()}`, downParams).then(res => {
+        loading.close();
         downloadXls(res.data, `${this.pageTitle}.zip`);
-      });
+      }).catch(() => {
+        loading.close();
+      });;
     },
   },
 

+ 9 - 0
src/views/archive-manage/file-supplement.vue

@@ -203,10 +203,19 @@ export default window.$crudCommon({
     },
     handleDownAll() {
       let downParams = { year: this.params.year };
+      const loading = this.$loading({
+        lock: true,
+        text: '文件正在下载中,请耐心等待...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       exportBlob(`/api/kd-scientific/archive/fjbczl/download?${this.website.tokenHeader}=${getToken()}`, downParams, (progress) => {
         // console.log(progress)
       }).then(res => {
+        loading.close();
         downloadXls(res.data, `${this.pageTitle}.zip`);
+      }).catch(() => {
+        loading.close();
       });
     },
     handleRowDown(row) {

+ 2 - 2
src/views/tech-person/month-cjcyry.vue

@@ -8,7 +8,7 @@
       :page.sync="page"
     >
       <template slot="menuLeft">
-        <el-button
+        <!-- <el-button
           type="danger"
           size="small"
           icon="el-icon-delete"
@@ -16,7 +16,7 @@
           @click="handleDelete"
         >
           删 除
-        </el-button>
+        </el-button> -->
         <el-button
           type="warning"
           size="small"