Browse Source

档案中心和系统科目调整

ljb 7 months ago
parent
commit
288501bc97

+ 76 - 56
src/views/archive-manage/archive-list.vue

@@ -3,14 +3,14 @@
     <avue-crud
     <avue-crud
       v-bind="bindVal"
       v-bind="bindVal"
       v-on="onEvent"
       v-on="onEvent"
-      v-model="form"
-      :before-open="handleBeforeOpen"
+      :data="list"
     >
     >
       <template slot="menuLeft">
       <template slot="menuLeft">
         <el-button
         <el-button
           type="primary"
           type="primary"
           size="small"
           size="small"
           icon="el-icon-download"
           icon="el-icon-download"
+          :disabled="confirmLoading"
           @click="handleDownAll('/api/kd-scientific/archive/center/download', 0)"
           @click="handleDownAll('/api/kd-scientific/archive/center/download', 0)"
         >
         >
           一键下载
           一键下载
@@ -20,6 +20,7 @@
           size="small"
           size="small"
           plain
           plain
           icon="el-icon-download"
           icon="el-icon-download"
+          :disabled="confirmLoading"
           @click="handleDownAll('/api/kd-scientific/archive/center/download', 1)"
           @click="handleDownAll('/api/kd-scientific/archive/center/download', 1)"
         >
         >
           一键导出高新备查
           一键导出高新备查
@@ -29,6 +30,7 @@
           size="small"
           size="small"
           plain
           plain
           icon="el-icon-download"
           icon="el-icon-download"
+          :disabled="confirmLoading"
           @click="handleDownAll('/api/kd-scientific/archive/center/download', 2)"
           @click="handleDownAll('/api/kd-scientific/archive/center/download', 2)"
         >
         >
           一键导出加计备查
           一键导出加计备查
@@ -40,22 +42,6 @@
         <h3 class="page-title">{{ pageTitle }}</h3>
         <h3 class="page-title">{{ pageTitle }}</h3>
         <year-month-select v-model="params.year" :showMonth="false"></year-month-select>
         <year-month-select v-model="params.year" :showMonth="false"></year-month-select>
       </template>
       </template>
-
-      <!-- <template slot="menu" slot-scope="{row}">
-        <el-button type="text" icon="el-icon-download" size="mini" @click="handleRowDown(row)">下载</el-button>
-      </template> -->
-
-      <template slot="fileList" slot-scope="{row}">
-        <el-link
-          v-for="(item, index) of row.fileList"
-          :key="index"
-          type="primary"
-          @click="handleDownFile(item)"
-          :style="{marginRight: index === row.fileList.length - 1 ? 0 : '16px'}"
-        >
-          {{ item.label }}
-        </el-link>
-      </template>
       
       
     </avue-crud>
     </avue-crud>
   </basic-container>
   </basic-container>
@@ -86,8 +72,66 @@ export default window.$crudCommon({
 
 
       wideTableColumns: [],
       wideTableColumns: [],
       printTitle: "",
       printTitle: "",
+      confirmLoading: false,
 
 
-      currIndex: 0
+      currIndex: 0,
+      list: [{
+        fileName: '高新技术企业资格证书',
+      }, {
+        fileName: '高新技术企业认定资料',
+      }, {
+        fileName: '加计扣除情况说明',
+      }, {
+        fileName: '研发立项决议文件',
+      }, {
+        fileName: '高新研发项目汇总表',
+      }, {
+        fileName: '加计扣除研发项目汇总表',
+      }, {
+        fileName: '高新研发项目全套技术资料',
+      }, {
+        fileName: '加计扣除研发项目全套技术资料',
+      }, {
+        fileName: '高新研发人员与科技人员资料',
+      }, {
+        fileName: '加计扣除研发人员与科技人员资料',
+      }, {
+        fileName: '全部知识产权资料',
+      }, {
+        fileName: '高新项目知识产权资料',
+      }, {
+        fileName: '加计扣除项目知识产权资料',
+      }, {
+        fileName: '高新口径研发费用辅助账',
+      }, {
+        fileName: '加计扣除口径研发费用辅助账',
+      }, {
+        fileName: '会计口径研发费用辅助账',
+      }, {
+        fileName: '会计口径研发费用附件凭证资料及相关说明',
+      }, {
+        fileName: '高新研发费用附件凭证资料及相关说明',
+      }, {
+        fileName: '加计扣除研发费用附件凭证资料及相关说明',
+      }, {
+        fileName: 'A107012研发费用加计扣除优惠明细表',
+      }, {
+        fileName: '当年和前两个会计年度研发费用总额及占同期销售收入比例的说明',
+      }, {
+        fileName: '年度主要产品(服务)发挥核心支持作用的技术属于《国家重点支持的高新技术领域》规定范围的说明',
+      }, {
+        fileName: '高新技术产品(服务)及对应收入资料',
+      }, {
+        fileName: '研发管理制度',
+      }, {
+        fileName: '高新项目技术鉴定资料',
+      }, {
+        fileName: '加计扣除项目技术鉴定资料',
+      }, {
+        fileName: '其他高新备查资料',
+      }, {
+        fileName: '其他加计扣除备查资料',
+      }],
     };
     };
   },
   },
   watch: {
   watch: {
@@ -104,6 +148,7 @@ export default window.$crudCommon({
   },
   },
   methods: {
   methods: {
     loadData() {
     loadData() {
+      return;
       this.loading = true;
       this.loading = true;
       this.api.getList(this.getSearchParams()).then(({ data }) => {
       this.api.getList(this.getSearchParams()).then(({ data }) => {
         
         
@@ -228,18 +273,6 @@ export default window.$crudCommon({
         this.loading = false;
         this.loading = false;
       })
       })
     },
     },
-    handleBeforeOpen(done) {
-      this.currIndex = this.form.$index + 1;
-      done();
-    },
-    handleExport() {
-      exportBlob(`/api/kd-scientific/fjbczl/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
-        downloadXls(res.data, `${this.params.year}附件补充.xlsx`);
-      });
-    },
-    handleDownFile(file) {
-      downloadFileByUrl(file.value, file.label);
-    },
     handleDownAll(downUrl, type) {
     handleDownAll(downUrl, type) {
       let fileNameObj = {
       let fileNameObj = {
         0: '全部档案资料',
         0: '全部档案资料',
@@ -256,9 +289,20 @@ export default window.$crudCommon({
           setStore({ name: storeName, content: taskId });
           setStore({ name: storeName, content: taskId });
 
 
           if (status == 2) {
           if (status == 2) {
+            this.confirmLoading = true;
+            const loading = this.$loading({
+              lock: true,
+              text: '文件正在下载中,请耐心等待...',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            });
             exportBlob(`${downUrl}?${this.website.tokenHeader}=${getToken()}`, { taskId }).then(res => {
             exportBlob(`${downUrl}?${this.website.tokenHeader}=${getToken()}`, { taskId }).then(res => {
+              loading.close();
+              this.confirmLoading = false;
               downloadXls(res.data, `${this.params.year}年${fileNameObj[type]}.zip`);
               downloadXls(res.data, `${this.params.year}年${fileNameObj[type]}.zip`);
-              removeStore({ name: storeName })
+            }).catch(() => {
+              this.confirmLoading = false;
+              loading.close();
             });
             });
           } else if (status == 3) {
           } else if (status == 3) {
             this.$message.warning("下载任务已过期,请点击按钮,重新生成下载任务...");
             this.$message.warning("下载任务已过期,请点击按钮,重新生成下载任务...");
@@ -270,30 +314,6 @@ export default window.$crudCommon({
         
         
       })
       })
     },
     },
-    handleRowDown() {
-      this.$message.warning("功能建设中...");
-    },
-    getFormData() {
-      return { id: this.form.id, yearAndMonth: this.params.year, [`d${this.currIndex}`]: JSON.stringify(this.form.fileList) }
-    },
-    handleDownTemp(templateKey) {
-      getDictValueByKey('fjbczl-template', templateKey).then(({ data }) => {
-        if (data.code == 200) {
-          if (typeof data.data === 'object') {
-            this.$message.error('暂未配置模板');
-            return;
-          }
-          let tempObj = {
-            'template1': '当年和前两个会计年度研发费用总额及占同期销售收入比例的说明.doc',
-            'template2': '年度职工和科技人员情况说明.doc',
-            'template3': '年度主要产品(服务)发挥核心支持作用的技术属于《国家重点支持的高新技术领域》规定范围的说明.doc',
-            'template4': '研发费用结构明细表.xls'
-          };
-
-          downloadFileByUrl(data.data, tempObj[templateKey]);
-        }
-      })
-    },
   },
   },
 }, {
 }, {
   // 模块路径
   // 模块路径

+ 18 - 9
src/views/basic-resource/basic-database/subject-setting.vue

@@ -10,15 +10,20 @@
       @search-reset="searchReset"
       @search-reset="searchReset"
       @row-save="rowSave"
       @row-save="rowSave"
       @row-update="rowUpdate"
       @row-update="rowUpdate"
-      @row-del="rowDel"
     >
     >
       <template slot="icon" slot-scope="scope">
       <template slot="icon" slot-scope="scope">
         <i :class="scope.row.icon" style="font-size: 24px"></i>
         <i :class="scope.row.icon" style="font-size: 24px"></i>
       </template>
       </template>
       <template slot="menu" slot-scope="{ row, size, type }">
       <template slot="menu" slot-scope="{ row, size, type }">
-        <el-button v-if="row.level !== 4" :size="size" :type="type" @click="handleAdd(row)">
+        <el-button v-if="row.level === 3" :size="size" :type="type" icon="el-icon-plus" @click="handleAdd(row)">
           新增子级
           新增子级
         </el-button>
         </el-button>
+        <el-button v-if="row.type === 0" :size="size" :type="type" icon="el-icon-edit" @click="handleEdit(row)">
+          编辑
+        </el-button>
+        <el-button v-if="row.type === 0" :size="size" :type="type" icon="el-icon-delete" @click="rowDel(row)">
+          删除
+        </el-button>
       </template>
       </template>
 
 
       <template slot="body">
       <template slot="body">
@@ -48,7 +53,7 @@ export default {
         border: true,
         border: true,
         searchLabelWidth: 140,
         searchLabelWidth: 140,
         labelWidth: 160,
         labelWidth: 160,
-        menuWidth: 220,
+        menuWidth: 130,
         dialogClickModal: false,
         dialogClickModal: false,
         dialogWidth: 500,
         dialogWidth: 500,
         dialogType: "drawer",
         dialogType: "drawer",
@@ -56,6 +61,9 @@ export default {
         rowParentKey: "parentId",
         rowParentKey: "parentId",
         defaultExpandAll: true,
         defaultExpandAll: true,
         tree: true,
         tree: true,
+        addBtn: false,
+        editBtn: false,
+        delBtn: false,
         column: [
         column: [
           {
           {
             label: "上级科目",
             label: "上级科目",
@@ -64,7 +72,7 @@ export default {
             dicData: [],
             dicData: [],
             span: 24,
             span: 24,
             hide: true,
             hide: true,
-            addDisabled: false,
+            disabled: true,
             props: {
             props: {
               value: "id",
               value: "id",
               label: "name"
               label: "name"
@@ -101,6 +109,7 @@ export default {
             search: true,
             search: true,
             width: 120,
             width: 120,
             align: 'center',
             align: 'center',
+            display: false,
             showOverflowTooltip: true,
             showOverflowTooltip: true,
             rules: [
             rules: [
               {
               {
@@ -242,21 +251,18 @@ export default {
       this.loadData(params);
       this.loadData(params);
       done();
       done();
     },
     },
-    rowDel(row, index, done) {
+    rowDel(row) {
       this.$confirm('确定将选择数据删除?', '提示', {
       this.$confirm('确定将选择数据删除?', '提示', {
         confirmButtonText: '确定',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonText: '取消',
         type: 'warning'
         type: 'warning'
       }).then(() => {
       }).then(() => {
         remove(row.id).then(({ data }) => {
         remove(row.id).then(({ data }) => {
-          done();
           if (data.code == 200) {
           if (data.code == 200) {
             this.$message.success("删除成功!");
             this.$message.success("删除成功!");
             this.loadData();
             this.loadData();
           }
           }
-        }).catch(() => {
-          done();
-        })
+        });
       })
       })
     },
     },
     findParentNames(categories, childId, parentNames = []) {
     findParentNames(categories, childId, parentNames = []) {
@@ -309,6 +315,9 @@ export default {
         done();
         done();
       })
       })
     },
     },
+    handleEdit(row) {
+      this.$refs.crud.rowEdit(row);
+    },
     rowUpdate(row, index, done) {
     rowUpdate(row, index, done) {
       const params = this.getFormData(row);
       const params = this.getFormData(row);
       update(params).then(({ data }) => {
       update(params).then(({ data }) => {

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

@@ -9,7 +9,7 @@
       :permission="permissionList"
       :permission="permissionList"
     >
     >
       <template slot="menuLeft">
       <template slot="menuLeft">
-        <el-button
+        <!-- <el-button
           v-if="!isSelAnnual"
           v-if="!isSelAnnual"
           type="danger"
           type="danger"
           size="small"
           size="small"
@@ -18,7 +18,7 @@
           @click="handleDelete"
           @click="handleDelete"
         >
         >
           删 除
           删 除
-        </el-button>
+        </el-button> -->
         <el-button
         <el-button
           v-if="!isSelAnnual"
           v-if="!isSelAnnual"
           type="success"
           type="success"