1

src/views/report/components/dialog/addAndEditReport.vue

@@ -48,28 +48,24 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="无效决定号" prop="issueNumber">
                   <el-input v-model="form.issueNumber" autocomplete="off" placeholder="请输入无效决定号"></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="发明创造名称" prop="inventionName">
                   <el-input v-model="form.inventionName" autocomplete="off" placeholder="请输入发明创造名称"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-
-            <!-- 新增 -->
-            <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="案件阶段" prop="caseStage">
                   <el-select v-model="form.caseStage" placeholder="请选择案件阶段" clearable  style="width:100%">
                     <el-option label="无效" value="无效"></el-option>
                     <el-option label="行诉状态" value="行诉状态"></el-option>
                   </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="国知局受理年份" prop="acceptYear">
                   <el-date-picker
@@ -84,11 +80,23 @@
             </el-row>
             <el-row>
               <el-col :span="12">
+                <el-form-item label="主被动类型" prop="actType">
+                  <el-select v-model="form.actType" @change="changeActType" placeholder="请选择" style="width:100%">
+                    <el-option
+                      v-for="item in actTypes "
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" v-if="form.actType == 0">
                 <el-form-item label="请求人代理所" prop="applicantAgency">
                   <el-input v-model="form.applicantAgency" autocomplete="off" placeholder="请输入请求人代理所"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="12" v-if="form.actType == 1">
                 <el-form-item label="专利权人代理所" prop="rightHolderAgency">
                   <el-input v-model="form.rightHolderAgency" autocomplete="off" placeholder="请输入专利权人代理所"></el-input>
                 </el-form-item>
@@ -97,18 +105,7 @@
           </div>
         </template>
         <el-row>
-              <el-col :span="12" v-if="form.reportType == 7">
-                <el-form-item label="主被动类型" prop="actType">
-                  <el-select v-model="form.actType" placeholder="请选择" style="width:100%">
-                    <el-option
-                      v-for="item in actTypes "
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
+              
               <el-col :span="12">
                 <el-form-item label="是否完成" v-if="!form.id" prop="status">
                   <el-switch v-model="form.status" active-color="#13ce66"  @change="changeStatus"
@@ -116,16 +113,19 @@
                   </el-switch>
                 </el-form-item>
               </el-col>
+              <el-col :span="24">
+                <el-form-item :label="form.reportType == '7'?'无效结果':'报告结果'" prop="cronIds">
+                  <el-checkbox-group v-model="form.cronIds" class="reportCheckbox">
+                    <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{
+                      item.label }}</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
             </el-row>
         
         <template>
           <div>
-            <el-form-item :label="form.reportType == '7'?'无效结果':'报告结果'" prop="cronIds">
-              <el-checkbox-group v-model="form.cronIds">
-                <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{
-                  item.label }}</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
+            
             <el-form-item label="结论论述" prop="cronDescription">
               <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结论论述"></el-input>
             </el-form-item>
@@ -160,7 +160,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="userinfo.roleType == 1 || userinfo.roleType == 2 || userinfo.id == form.created || userinfo.id == form.headId">
           <el-col :span="24">
             <el-form-item label="处理人：">
               <div class="manage">
@@ -398,6 +398,9 @@ export default {
         signPatentNo: [{ required: true, validator: isExist, trigger: 'blur' },],//专利
         headId: [{ required: true, message: '请选择负责人', trigger: 'change' },],
         entrustId: [{ required: true, message: '请选择委托方', trigger: 'change' },],
+        actType:[
+          { required: true, message: '请选择主被动类型', trigger: 'change' }
+        ]
       },
       patentLoading:false,
       taskId:null,
@@ -526,6 +529,12 @@ export default {
     this.initTask()
   },
   methods: {
+    //切换主被动类型
+    changeActType(value){
+      let str = this.form.applicantAgency//请求人代理所
+      this.$set(this.form,'applicantAgency',this.form.rightHolderAgency)
+      this.$set(this.form,'rightHolderAgency',str)
+    },
     // 打开处理人 人员弹窗
     showHeadDialog() {
       this.$refs.choosePerson.open(this.form.adminIds, this.form.adminPersons)
@@ -807,6 +816,7 @@ export default {
         }
 
       } else {
+        this.$set(this.form,'actType',1)
         this.$set(this.form, 'matterIds', form.matterId)
         this.form.scenarioIds = form.scenarioId
         this.$set(this.form, 'systemFileList', [])
@@ -1362,4 +1372,9 @@ export default {
   // .el-input__inner:empty{
   //   content:'--'
   // }
+  .reportCheckbox{
+    .el-checkbox{
+      width: fit-content;
+    }
+  }
 </style>