标记单选修改

src/views/components/identificationCode/index.vue

@@ -80,6 +80,7 @@ export default {
             taskType: row.type,
             reportType: row.reportType,
             isResult: 1,
+            handlerType:row.handlerType,//1是外部协同人
           }
         })
         window.open(router.href, '_blank')
@@ -91,6 +92,7 @@ export default {
             projectId: row.projectId,
             isResult: 1,
             reportType: row.reportType,
+            handlerType:row.handlerType,//1是外部协同人
           }
         })
         window.open(router.href, '_blank')

src/views/project/patentDetails/components/PatentField.vue

@@ -18,8 +18,8 @@
             </el-dropdown>
           </div>
           <template v-if="(item.type === 0 || item.type === 2 || item.type === 1) && !item.showField">
-            <el-date-picker v-if="item.type === 1" v-model="item.selectedValue" value-format="yyyy-MM-dd" type="date" size="small"
-              placeholder="选择日期" class="width_100" @blur="onChange($event, item)"></el-date-picker>
+            <el-date-picker v-if="item.type === 1" v-model="item.selectedValue" value-format="yyyy-MM-dd" type="date"
+              size="small" placeholder="选择日期" class="width_100" @blur="onChange($event, item)"></el-date-picker>
             <el-input v-else type="textarea" v-model="item.selectedValue" placeholder="请输入内容" size="small"
               @blur="onChange($event, item)"></el-input>
           </template>
@@ -33,27 +33,30 @@
             </div>
             <el-radio-group v-model="item.selectedValue" v-show="item.show">
               <div v-for="option in item.option" :key="option.id">
-                <el-radio class="custom-radio" :label="option.id" @change="onChange($event, item)">{{
-                  option.name }}</el-radio>
+                <el-radio class="custom-radio" :label="option.id" @change="onChange($event, item)"
+                  @click.native.prevent="clickItem(option, item)">{{
+                    option.name }}</el-radio>
               </div>
             </el-radio-group>
           </template>
           <template v-if="item.type === 5 && !item.showField">
             <div class="showValue">
               <div>
-                <div v-for="fieldValue in item.selected" :key="fieldValue.valueId" class="value">{{ fieldValue.value }}</div>
+                <div v-for="fieldValue in item.selected" :key="fieldValue.valueId" class="value">{{ fieldValue.value }}
+                </div>
               </div>
               <el-button size="small" @click="$set(item, 'show', !item.show)">{{ item.show ? '收起' : '修改' }}</el-button>
             </div>
             <el-checkbox-group :value="item.selectedValue" v-show="item.show">
               <el-checkbox class="custom-checkbox" v-for="option in item.option" :label="option.id" :key="option.id"
-                @change="(val) => onChange(option, item, val)">{{ option.name}}</el-checkbox>
+                @change="(val) => onChange(option, item, val)">{{ option.name }}</el-checkbox>
             </el-checkbox-group>
           </template>
           <template v-if="item.type === 6 && !item.showField">
             <div class="showValue">
               <div>
-                <div v-for="fieldValue in item.selected" :key="fieldValue.valueId" class="value">{{ fieldValue.value }}</div>
+                <div v-for="fieldValue in item.selected" :key="fieldValue.valueId" class="value">{{ fieldValue.value }}
+                </div>
               </div>
               <el-button size="small" @click="$set(item, 'show', !item.show)">{{ item.show ? '收起' : '修改' }}</el-button>
             </div>
@@ -148,9 +151,16 @@ export default {
         }
       })
     },
+    // 
+    clickItem(data, item) {
+      this.gong(data, item)
+    },
     //切换选择
     onChange(data, item, checked) {
-      // console.log(data, item,checked);
+      this.gong(data, item, checked)
+    },
+    // change与clickItem公用
+    gong(data, item, checked) {
       var params = {
         projectId: this.projectId,
         taskId: this.taskId,
@@ -160,10 +170,22 @@ export default {
         patentNo: this.patentNo,
         optionType: '',
       }
-      if (item.type == 0 || item.type == 1 || item.type == 2) {
-        params.fieldValue[0] = item.selectedValue
-        if (data) {//单选的id
-          this.$set(item, 'selectedValue', data)
+      if (item.type == 0 || item.type == 1 || item.type == 2 || item.type == 4) {
+        if (item.type != 4) {
+          params.fieldValue[0] = item.selectedValue
+        } else {
+          if (item && item.selectedValue) {//单选的id
+            this.$set(item, 'selectedValue', '')
+            this.$set(item, 'selected', [])
+          } else {
+            this.$set(item, 'selectedValue', data.id)
+            item.selected.push(
+              {
+                value: data.name,
+                valueId: data.id
+              }
+            )
+          }
         }
         params.optionType = 2
       }
@@ -174,19 +196,19 @@ export default {
           var name = ''
           if (data.pathName == '/') {
             name = data.pathName + data.name
-          } else if(data.pathName) {
-            name = data.pathName+'/' + data.name
+          } else if (data.pathName) {
+            name = data.pathName + '/' + data.name
           } else {
-            name =data.name
+            name = data.name
           }
           item.selected.push(
             {
               value: name,
-              valueId:data.id
+              valueId: data.id
             }
-          ) 
+          )
           params.optionType = 1
-        } else  {
+        } else {
           let index = item.selectedValue.findIndex(valIndex => {
             return valIndex == data.id
           })
@@ -196,7 +218,7 @@ export default {
           }
           params.optionType = 0
         }
-      } 
+      }
       this.$api.addCustomFieldValue(params).then(response => {
         if (response.code == 200) {
           this.$message.success('修改成功')
@@ -209,9 +231,9 @@ export default {
     },
     //刷新
     refresh(item) {
-      this.$set(item,'showField',true)
+      this.$set(item, 'showField', true)
       this.$nextTick(() => {
-        this.$set(item,'showField',false)
+        this.$set(item, 'showField', false)
       })
     },
     // 获取栏位
@@ -378,17 +400,17 @@ export default {
       })
     },
     //获取产品或产品类别架构以及技术分类
-    queryProductCategory(item,type) {
+    queryProductCategory(item, type) {
       let params = {
         type: type,//类型：1产品类别，2产品，3技术分类，4自定义树
         typeId: item.id,//产品或类别id
       }
       this.$api.queryTreeNodeTree(params).then(res => {
         if (res.code == 200) {
-          
+
         }
       }).catch(err => {
-        
+
       })
     },
   }

src/views/project/patentDetails/index.vue

@@ -65,7 +65,8 @@ export default {
         {
           path: '/patentDetails/' + val,
           query: {
-            projectId: this.projectId
+            projectId: this.projectId,
+            taskId: this.taskId,
           }
         }
       )

src/views/report/tort/components/tortContrast.vue

@@ -3,7 +3,8 @@
   <div class="height_100 tortContrast">
 
     <div class="height_100" style="display: flex;">
-      <div class="iconBtnList">
+      <articleMenu :projectId="projectId" :patentNo="patentNo" @getPatentLeft="getPatentLeft"></articleMenu>
+      <!-- <div class="iconBtnList">
         <el-tooltip content="返回" placement="right">
           <div @click="goBack" class="iconBtn">
             <i class="el-icon-back"></i>
@@ -19,7 +20,8 @@
             <i class="el-icon-c-scale-to-original"></i>
           </div>
         </el-tooltip>
-      </div>
+        
+      </div> -->
       <myView style="height: 100%;width: calc(100% - 50px);" position="row" :showView="look">
         <el-container slot="left">
           <el-header class="headerBtn">
@@ -64,6 +66,7 @@ import splitPage from '../../components/splitPage/splitPage.vue'
 import informationEntry from './informationEntry/informationEntry.vue'
 import teamwork from '../../components/dialog/teamwork.vue'
 import patentDetailsPage from '@/views/project/patentDetails/components/patentDetails.vue'
+import articleMenu from '@/views/project/patentDetails/components/menu.vue'
 export default {
   //
   props: ['patentNo', 'projectId', 'reportType', 'taskId', 'isResult'],
@@ -73,6 +76,7 @@ export default {
     informationEntry,
     teamwork,
     patentDetailsPage,
+    articleMenu,
   },
   data() {
     return {
@@ -115,13 +119,36 @@ export default {
       ],
       // 查看详情
       look: false,
+      // 菜单
+      menu:[],
     }
   },
   mounted() {
+    if (this.reportType == 4) {
+      this.menu.push()
+    }
     this.getColumn()
     this.getList()
   },
   methods: {
+    // 上一篇下一篇
+    getPatentLeft(val) {
+      this.patentNo = val
+      this.$router.push(
+        {
+          path: '/tortIndex',
+          query: {
+            projectId: this.projectId,
+            taskId: this.taskId,
+            reportType: this.reportType,
+            patentNo: val,
+            isResult: this.isResult,
+          }
+        }
+      )
+      this.getColumn()
+      this.getList()
+    },
     // 处理栏位
     getColumn() {
       var a = {