Browse Source

bug修改

ljb 9 months ago
parent
commit
ccbe3a2b9e

+ 1 - 1
src/option/RDSystemManage/list.js

@@ -14,13 +14,13 @@ export default {
   searchMenuSpan: 6,
   border: true,
   index: true,
+  delBtn: false,
   searchLabelWidth: 160,
   labelWidth: 145,
   menuWidth: 160,
   dialogClickModal: false,
   dialogType: "drawer",
   dialogWidth: 520,
-
   addBtnText: "上传制度",
   column: [
     {

+ 7 - 7
src/option/achievement/otherAchivement.js

@@ -157,13 +157,13 @@ export default {
           width: 120,
           span: 24,
           hide: true,
-          rules: [
-            {
-              required: true,
-              message: "请选择项目",
-              trigger: "blur",
-            },
-          ],
+          // rules: [
+          //   {
+          //     required: true,
+          //     message: "请选择项目",
+          //     trigger: "blur",
+          //   },
+          // ],
         },
         {
           label: "研发项目名称",

+ 7 - 7
src/option/achievement/patentAchievement.js

@@ -239,13 +239,13 @@ export default {
           width: 120,
           span: 12,
           hide: true,
-          rules: [
-            {
-              required: true,
-              message: "请选择研发项目名称",
-              trigger: "blur",
-            },
-          ],
+          // rules: [
+          //   {
+          //     required: true,
+          //     message: "请选择研发项目名称",
+          //     trigger: "blur",
+          //   },
+          // ],
         },
         {
           label: "研发项目名称",

+ 7 - 7
src/option/achievement/researchPaper.js

@@ -139,13 +139,13 @@ export default {
           width: 120,
           span: 24,
           hide: true,
-          rules: [
-            {
-              required: true,
-              message: "请选择项目",
-              trigger: "blur",
-            },
-          ],
+          // rules: [
+          //   {
+          //     required: true,
+          //     message: "请选择项目",
+          //     trigger: "blur",
+          //   },
+          // ],
         },
         {
           label: "研发项目名称",

+ 7 - 7
src/option/achievement/softWorks.js

@@ -138,13 +138,13 @@ export default {
           width: 120,
           span: 24,
           hide: true,
-          rules: [
-            {
-              required: true,
-              message: "请选择项目",
-              trigger: "blur",
-            },
-          ],
+          // rules: [
+          //   {
+          //     required: true,
+          //     message: "请选择项目",
+          //     trigger: "blur",
+          //   },
+          // ],
         },
         {
           label: "研发项目名称",

+ 7 - 7
src/option/achievement/technicalStandard.js

@@ -146,13 +146,13 @@ export default {
           width: 120,
           span: 24,
           hide: true,
-          rules: [
-            {
-              required: true,
-              message: "请选择项目",
-              trigger: "blur",
-            },
-          ],
+          // rules: [
+          //   {
+          //     required: true,
+          //     message: "请选择项目",
+          //     trigger: "blur",
+          //   },
+          // ],
         },
         {
           label: "研发项目名称",

+ 6 - 1
src/option/yfCostManage/yfCostStatistics/zjtlCostSummaryList.js

@@ -63,10 +63,15 @@ export default {
     },
     {
       label: '研发项目名称',
+      prop: 'xmmc',
+      search: true,
+      hide: true,
+    },
+    {
+      label: '研发项目名称',
       prop: 'XMMC',
       minWidth: 120,
       align: 'center',
-      search: true,
       showOverflowTooltip: true,
     },
     {

+ 15 - 2
src/views/RD-system-manage/list.vue

@@ -39,6 +39,18 @@
         </div>
       </template>
 
+      <template slot="menu" slot-scope="{ row, size }">
+        <el-button
+          type="text"
+          :size="size"
+          icon="el-icon-delete"
+          :disabled="!isDel"
+          @click="rowDel(row)"
+        >
+          删 除
+        </el-button> 
+      </template>
+
       <template slot="zdwjdzSearch">
         <el-input placeholder="请输入制度文件关键字" v-model="params.zdwjmc"></el-input>
       </template>
@@ -83,7 +95,7 @@
 <script>
 import {exportBloByPost} from "@/api/common";
 import YearMonthSelect from "@/components/year-month-select";
-import moment from "moment";
+import moment, { isDate } from "moment";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
 
@@ -184,10 +196,11 @@ export default window.$crudCommon({
             ...item,
             zdwjdz: !!item.zdwjdz ? JSON.parse(item.zdwjdz) : [],
             zdsszm: !!item.zdsszm ? JSON.parse(item.zdsszm) : [],
+            isDel: true
           });
         });
       } else {
-        newList.push({ wjlx: fileType });
+        newList.push({ wjlx: fileType, isDel: false, });
       }
     });
 

+ 1 - 1
src/views/archive-manage/file-supplement.vue

@@ -163,7 +163,7 @@ export default window.$crudCommon({
     handleDownFile(file) {
       let urlObj = new URL(file.value);
       const link = document.createElement('a');
-      link.href = window.location.origin + '/oss' + urlObj.pathname;
+      link.href = window.location.origin + urlObj.pathname;
       link.download = file.label; // 设置下载文件名
       link.click();
     },