1

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

@@ -48,11 +48,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <!-- <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 :span="12">
                 <el-form-item label="发明创造名称" prop="inventionName">
                   <el-input v-model="form.inventionName" autocomplete="off" placeholder="请输入发明创造名称"></el-input>
@@ -105,7 +101,11 @@
           </div>
         </template>
         <el-row>
-              
+              <el-col :span="12" v-if="form.reportType == 7">
+                <el-form-item label="无效决定号" prop="issueNumber">
+                  <el-input v-model="form.issueNumber" autocomplete="off" placeholder="请输入无效决定号"></el-input>
+                </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"

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

@@ -184,16 +184,16 @@ export default {
     },
     //编辑
     edit(row){
-      if(this.model != 'list' ){
-        this.$message.warning('已有数据正在编辑，请先保存修改的数据')
-        return
-      }
-      this.currentEditField = null
-        this.model = 'edit'
+        if(this.model != 'list' ){
+            this.$message.warning('已有数据正在编辑，请先保存修改的数据')
+            return
+        }
+        this.currentEditField = null
         if(row.assoAccountId){
             this.focusPerson(row.accountName)
         }
         this.editMessage = JSON.parse(JSON.stringify(row))
+        this.model = 'edit'
     },
     //移除配案人员
     remove(row){