Browse Source

科研成果模块优化

ljb 8 months ago
parent
commit
a521d86163

+ 1 - 2
src/option/achievement/otherAchivement.js

@@ -16,7 +16,7 @@ export default {
   labelWidth: 110,
   menuWidth: 160,
   dialogClickModal: false,
-  dialogWidth: 560,
+  dialogWidth: 500,
   dialogType: "drawer",
   column: [
     {
@@ -150,7 +150,6 @@ export default {
     },
     {
       label: "关联研发项目情况",
-      prop: "canyunZhuchi",
       align: 'center',
       children: [
         {

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

@@ -15,13 +15,13 @@ export default {
   labelWidth: 120,
   menuWidth: 140,
   dialogClickModal: false,
-  dialogWidth: 760,
+  dialogWidth: 500,
   dialogType: "drawer",
   column: [
     {
       label: "专利号",
       prop: "zlh",
-      span: 12,
+      span: 24,
       width: 120,
       align: "center",
       showOverflowTooltip: true,
@@ -36,7 +36,7 @@ export default {
     {
       label: "专利名称",
       prop: "zlmc",
-      span: 12,
+      span: 24,
       search: true,
       minWidth: 160,
       showOverflowTooltip: true,
@@ -52,7 +52,7 @@ export default {
       label: "专利类型",
       prop: "zllx",
       type: "select",
-      span: 12,
+      span: 24,
       search: true,
       dicUrl: "/api/kd-system/dict/dictionary?code=patent_type",
       width: 100,
@@ -74,8 +74,8 @@ export default {
       label: "是否国防专利",
       prop: "sfgfzl",
       type: "select",
-      span: 12,
-      width: 100,
+      span: 24,
+      width: 60,
       search: true,
       align: "center",
       showOverflowTooltip: true,
@@ -96,7 +96,7 @@ export default {
       label: "国别",
       prop: "gb",
       type: "select",
-      span: 12,
+      span: 24,
       width: 70,
       search: true,
       dicUrl: "/api/kd-system/dict/dictionary?code=countries",
@@ -118,7 +118,7 @@ export default {
       label: "申请号/专利号",
       prop: "sqhZlh",
       type: "input",
-      span: 12,
+      span: 24,
       width: 100,
       align: "center",
       search: true,
@@ -135,7 +135,7 @@ export default {
       label: "申请日",
       prop: "shenqingRq",
       type: "date",
-      span: 12,
+      span: 24,
       width: 85,
       search: false,
       format: "yyyy-MM-dd",
@@ -154,7 +154,7 @@ export default {
       label: "授权日",
       prop: "shouquanRq",
       type: "date",
-      span: 12,
+      span: 24,
       width: 85,
       align: "center",
       search: false,
@@ -172,7 +172,7 @@ export default {
       label: "申请单位",
       prop: "sqdw",
       type: "input",
-      span: 12,
+      span: 24,
       width: 120,
       align: "center",
       search: true,
@@ -182,7 +182,7 @@ export default {
       label: "专利权人",
       prop: "zlqr",
       type: "input",
-      span: 12,
+      span: 24,
       width: 80,
       align: "center",
       search: true,
@@ -192,7 +192,7 @@ export default {
       label: "共有权人",
       prop: "gyqr",
       type: "input",
-      span: 12,
+      span: 24,
       width: 80,
       align: "center",
       search: false,
@@ -202,7 +202,7 @@ export default {
       label: "发明人",
       prop: "fmr",
       type: "input",
-      span: 12,
+      span: 24,
       width: 80,
       align: "center",
       search: false,
@@ -212,7 +212,7 @@ export default {
       label: "法律状态",
       prop: "flzt",
       type: "select",
-      span: 12,
+      span: 24,
       width: 80,
       align: "center",
       search: true,
@@ -239,7 +239,7 @@ export default {
           label: "研发项目名称",
           prop: 'xmId',
           width: 120,
-          span: 12,
+          span: 24,
           hide: true,
           // rules: [
           //   {
@@ -307,7 +307,7 @@ export default {
       label: "专利提醒功能",
       prop: "zltxgn",
       type: "select",
-      span: 12,
+      span: 24,
       width: 90,
       align: "center",
       display: false,

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

@@ -16,7 +16,7 @@ export default {
   labelWidth: 110,
   menuWidth: 160,
   dialogClickModal: false,
-  dialogWidth: 560,
+  dialogWidth: 500,
   dialogType: "drawer",
   column: [
     {

+ 1 - 2
src/option/achievement/technicalStandard.js

@@ -131,7 +131,7 @@ export default {
     },
     {
       label: "参与/主持",
-      prop: "canyunZhuchi",
+      prop: "cyZc",
       span: 24,
       width: 90,
       align: "center",
@@ -139,7 +139,6 @@ export default {
     },
     {
       label: "关联研发项目情况",
-      prop: "canyunZhuchi",
       align: 'center',
       children: [
         {

+ 2 - 2
src/printOption/achievement/patentAchievement.js

@@ -24,14 +24,14 @@ export default {
     {
       label: "是否国防专利",
       prop: "sfgfzl",
-      width: 100,
+      width: 70,
       align: "center",
       rowspan: 2,
     },
     {
       label: "国别",
       prop: "gb",
-      width: 100,
+      width: 70,
       align: 'center',
       rowspan: 2,
     },

+ 8 - 3
src/styles/element-ui.scss

@@ -119,12 +119,17 @@
 .avue-dialog__footer {
   z-index: 1;
 }
-.el-drawer .avue-form {
-  padding: 20px 20px 40px;
-}
 
 .el-table__cell .cell .avue-crud__img img {
   margin-top: 8px;
   border: 1px solid #999;
   border-radius: 6px;
+}
+
+.avue-form__group--flex .el-form-item--mini.el-form-item, .avue-form__group--flex .el-form-item--small.el-form-item {
+  margin-bottom: 10px;
+}
+
+.el-drawer__body .avue-form {
+  padding: 0 12px 50px;
 }

+ 29 - 1
src/views/achievement/other-achievements.vue

@@ -5,6 +5,7 @@
       v-on="onEvent"
       v-model="form"
       :page.sync="page"
+      :before-open="handleBeforeOpen"
       @on-load="getList"
     >
       <template slot="menuLeft">
@@ -78,6 +79,19 @@
         </el-date-picker>
       </template>
 
+      <template slot="qlrForm">
+        <avue-array v-model="form.qlr" placeholder="请输入 权利人"></avue-array>
+      </template>
+
+      <template slot="fmrForm">
+        <avue-array v-model="form.fmr" placeholder="请输入 发明人"></avue-array>
+      </template>
+
+      <template slot="canyunZhuchiForm">
+        <avue-array v-model="form.canyunZhuchi" placeholder="请输入 参与/主持"></avue-array>
+      </template>
+
+
       <template slot="attachment" slot-scope="{ row }">
         <div v-for="(file, index) of row.attachment" :key="index">
           <el-link type="primary" @click="handleDownFile(file)">{{ file.label }}</el-link>
@@ -134,6 +148,20 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    handleBeforeOpen(done, type) {
+      if (type == 'add') {
+        this.form = { qlr: [""], fmr: [""], canyunZhuchi: [""] };
+      } else if (type == 'edit') {
+        this.form = {
+          ...this.form,
+          qlr: this.form.qlr ? this.form.qlr.split(";") : [""],
+          fmr: this.form.fmr ? this.form.fmr.split(";") : [""],
+          canyunZhuchi: this.form.canyunZhuchi ? this.form.canyunZhuchi.split(";") : [""],
+        };
+      }
+      console.log(this.form)
+      done();
+    },
     getSearchParams() {
       const newParams = { ...this.params, ...this.extraParams };
       if (newParams.shouquanRq && newParams.shouquanRq.length) {
@@ -178,7 +206,7 @@ export default window.$crudCommon({
       this.getList(this.page);
     },
     getFormData() {
-      let newFormData = { ...this.form };
+      let newFormData = { ...this.form, qlr: this.form.qlr.join(";"), fmr: this.form.fmr.join(";"), canyunZhuchi: this.form.canyunZhuchi.join(";") };
       if (!!newFormData.xmId) {
         let projectList = this.$refs.proSelect.projectList;
         let selPro = projectList.find(item => item.id === newFormData.xmId );

+ 27 - 2
src/views/achievement/patent-achievement.vue

@@ -5,6 +5,7 @@
       v-on="onEvent"
       v-model="form"
       :page.sync="page"
+      :before-open="handleBeforeOpen"
       @on-load="getList"
     >
       <template slot="menuLeft">
@@ -50,6 +51,17 @@
         <div class="tip">提示:企业可自行上传全部历史专利信息和资料,如专利与系统中已建档的研究项目无关,则研发项目编号和研发项目名称非必填。</div>
       </template>
 
+      <template slot="zlqrForm">
+        <avue-array v-model="form.zlqr" placeholder="请输入 专利权人"></avue-array>
+      </template>
+
+      <template slot="gyqrForm">
+        <avue-array v-model="form.gyqr" placeholder="请输入 共有权人"></avue-array>
+      </template>
+
+      <template slot="fmrForm">
+        <avue-array v-model="form.fmr" placeholder="请输入 发明人"></avue-array>
+      </template>
 
       <template slot="xmIdForm">
         <project-select v-model="form.xmId" @change="handleProjectChange"></project-select>
@@ -70,7 +82,7 @@
       :print-title="pageTitle"
       :rows-per-page="30"
       :default-landscape="true"
-      :zoom="65"
+      :zoom="70"
     />
   </basic-container>
 </template>
@@ -104,8 +116,21 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    handleBeforeOpen(done, type) {
+      if (type == 'add') {
+        this.form = { zlqr: [""], gyqr: [""], fmr: [""] };
+      } else if (type == 'edit') {
+        this.form = {
+          ...this.form,
+          zlqr: this.form.zlqr ? this.form.zlqr.split(";") : [""],
+          gyqr: this.form.gyqr ? this.form.gyqr.split(";") : [""],
+          fmr: this.form.fmr ? this.form.fmr.split(";") : [""]
+        };
+      }
+      done();
+    },
     getFormData() {
-      let newFormData = { ...this.form };
+      let newFormData = { ...this.form, zlqr: this.form.zlqr.join(";"), gyqr: this.form.gyqr.join(";"), fmr: this.form.fmr.join(";") };
       if (!!newFormData.attachment) {
         newFormData.attachment = JSON.stringify(newFormData.attachment);
       }

+ 23 - 1
src/views/achievement/technical-standard.vue

@@ -5,6 +5,7 @@
       v-on="onEvent"
       v-model="form"
       :page.sync="page"
+      :before-open="handleBeforeOpen"
       @on-load="getList"
     >
       <template slot="menuLeft">
@@ -50,6 +51,14 @@
         <div class="tip">提示:企业可自行上传全部历史专利信息和资料,如专利与系统中已建档的研究项目无关,则研发项目编号和研发项目名称非必填。</div>
       </template>
 
+      <template slot="cyrForm">
+        <avue-array v-model="form.cyr" placeholder="请输入 参与人"></avue-array>
+      </template>
+
+      <template slot="cyZcForm">
+        <avue-array v-model="form.cyZc" placeholder="请输入 参与/主持"></avue-array>
+      </template>
+
       <template slot="attachment" slot-scope="{ row }">
         <div v-for="(file, index) of row.attachment" :key="index">
           <el-link type="primary" @click="handleDownFile(file)">{{ file.label }}</el-link>
@@ -105,6 +114,19 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    handleBeforeOpen(done, type) {
+      if (type == 'add') {
+        this.form = { cyr: [""], cyZc: [""] };
+      } else if (type == 'edit') {
+        this.form = {
+          ...this.form,
+          cyr: this.form.cyr ? this.form.cyr.split(";") : [""],
+          cyZc: this.form.cyZc ? this.form.cyZc.split(";") : [""],
+        };
+      }
+      console.log(this.form)
+      done();
+    },
     validCustom() {
       if (!isAlphanumericCombination(this.form.zbh)) {
         this.$message.warning("标准号必须是英文字母加数字组合!");
@@ -134,7 +156,7 @@ export default window.$crudCommon({
       this.getList(this.page);
     },
     getFormData() {
-      let newFormData = { ...this.form };
+      let newFormData = { ...this.form, cyr: this.form.cyr.join(";"), cyZc: this.form.cyZc.join(";"), };
       if (!!newFormData.xmId) {
         let projectList = this.$refs.proSelect.projectList;
         let selPro = projectList.find(item => item.id === newFormData.xmId );

+ 4 - 5
src/views/wel/index.vue

@@ -65,7 +65,7 @@
       <el-divider></el-divider>
 
       <basic-card title="本年度月研发归集趋势图">
-        <el-row style="margin-top: 45px">
+        <el-row style="margin-top: 10px">
           <el-col :span="24">
             <basic-chart
               style="width: 100%; height: 300px"
@@ -373,10 +373,10 @@ export default {
         // 本年度月研发归集趋势图
         this.monthAggregationBarOpt = {
           grid: {
-            top: "3%",
-            left: "3%",
+            top: "6%",
+            left: "5%",
             right: "3%",
-            bottom: "10%",
+            bottom: "1%",
           },
           tooltip: {
             trigger: "axis",
@@ -479,7 +479,6 @@ export default {
           {
             name: title,
             type: "pie",
-            radius: "50%",
             radius: ["45%", "70%"],
             center: ["25%", "50%"],
             avoidLabelOverlap: false,

+ 3 - 2
src/views/yf-cost-manage/basic-data-setting/yf-cost-bill.vue

@@ -74,8 +74,9 @@
     >
       <template slot="tableHeader">
         <div>
-          <span style="margin-right: 200px;">科目:研发支出/人民币</span>
-          <span>{{ `期间:${params.yearAndMonth}` }}</span>
+          <span style="margin-right: 200px;">科目:研发支出</span>
+          <span style="margin-right: 200px;">{{ `期间:${params.yearAndMonth}` }}</span>
+          <span style="margin-right: 200px;">币种:人民币</span>
         </div>
       </template>
     </WideTablePrinter>