Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/report/components/details/components/basicMessage.vue

@@ -20,6 +20,54 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <template v-if="form.reportType == 7">
+        <div>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="案件编号">
+                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'caseNumber' })"></span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="无效宣告请求人">
+                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'invalidApplication' })"></span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="发文序号">
+                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'issueNumber' })"></span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发明创造名称">
+                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'inventionName' })"></span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <el-form-item label="是否完成">
+        <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'status' })"></span>
+      </el-form-item>
+      <template v-if="form.status == 3">
+        <div>
+          <el-form-item v-if="form.reportType == 3" label="标的产品" prop="signProjectId">
+            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signProjectName' })"></span>
+          </el-form-item>
+          <el-form-item v-else label="标的专利" prop="signPatentNo">
+            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signPatentNo' })"></span>
+          </el-form-item>
+        </div>
+      </template>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="报告名称" prop="name">
+          <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'name' })"></span>
+        </el-form-item>
+      </el-col>
+      </el-row>
       <el-form-item label="是否完成">
         <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'status' })"></span>
       </el-form-item>

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

@@ -28,6 +28,34 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <template v-if="form.reportType == 7">
+          <div>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="案件编号">
+                  <el-input v-model="form.caseNumber" @change="getPatentNo" autocomplete="off" placeholder="请输入案件编号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="无效宣告请求人">
+                    <el-input v-model="form.invalidApplication" autocomplete="off" placeholder="请输入无效宣告请求人"></el-input>
+                  </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="发文序号">
+                  <el-input v-model="form.issueNumber" autocomplete="off" placeholder="请输入发文序号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="发明创造名称">
+                  <el-input v-model="form.inventionName" autocomplete="off" placeholder="请输入发明创造名称"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
         <el-form-item label="是否完成" v-if="!form.id">
           <el-switch v-model="form.status" active-color="#13ce66" inactive-color="#ff4949" @change="changeStatus"
             :active-value="3" :inactive-value="1">
@@ -156,35 +184,6 @@
             </el-row>
           </div>
         </template>
-
-        <template v-if="form.reportType == 7">
-          <div>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="案件编号">
-                  <el-input v-model="form.caseNumber" autocomplete="off" placeholder="请输入案件编号"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="发文序号">
-                  <el-input v-model="form.issueNumber" autocomplete="off" placeholder="请输入发文序号"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="发明创造名称">
-                  <el-input v-model="form.inventionName" autocomplete="off" placeholder="请输入发明创造名称"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="无效宣告请求人">
-                  <el-input v-model="form.invalidApplication" autocomplete="off" placeholder="请输入无效宣告请求人"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </template>
         <el-form-item :label="(!form.id && form.status == 3) ? '上传报告文档' : '上传附件'">
           <myUpload :file-list="form.systemFileList" @on-change="onchangeFile" @on-remove="onRemove"
             @on-preview="onPreview" style="height: 180px;" :autoUpload="true"></myUpload>
@@ -707,17 +706,30 @@ export default {
 
     //获取专利号且填入报告名称
     getPatentNo() {
-      if (!this.form.name) {
+      // if (!this.form.name) {
         var a = this.dictMessage.REPORT_TYPE.filter(item => { return item.value == this.form.reportType })[0].label
         if (this.form.signProjectId) {
-          let name = this.productList.data.filter(item => {
+          var product = this.productList.data.filter(item => {
             return item.id == this.form.signProjectId
           })
-          this.$set(this.form, 'name', name[0].name + a)
+          var name = ''
+          if(product.length>0){
+            name +=`${product[0].name}-`
+          }
+          name+=a
+          this.$set(this.form, 'name', name)
         } else {
-          this.$set(this.form, 'name', this.form.signPatentNo + a)
+          var name = ''
+          if(this.form.caseNumber){
+            name += `${this.form.caseNumber}-`
+          }
+          if(this.form.signPatentNo){
+            name+=`${this.form.signPatentNo}-`
+          }
+          name+=a
+          this.$set(this.form, 'name', name)
         }
-      }
+      // }
     },
 
     //修改需要复制的选项

src/views/report/components/index.vue

@@ -52,6 +52,7 @@
     </el-container>
     <CreateReport ref="ReportForm" @getList="isGetList"></CreateReport>
     <fields ref="field" type="reportProject" @getFieldList="getFieldList"></fields>
+    <Field-Drawer ref="FieldDrawer"></Field-Drawer>
   </div>
 </template>
 
@@ -62,6 +63,7 @@ import visual from './view/visual.vue'
 import mergeTable from './view/mergeTable.vue'
 import CreateReport from './dialog/addAndEditReport.vue'
 import fields from '@/views/components/dialog/fields.vue';
+import FieldDrawer from '@/views/components/drawer/Field.vue'
 export default {
   components: {
     Table,
@@ -70,6 +72,7 @@ export default {
     CreateReport,
     mergeTable,
     fields,
+    FieldDrawer
   },
   props: {
     isOperate: '',
@@ -487,7 +490,7 @@ export default {
           this.handleDetails(row)
           break
         case '3'://自定义字段
-          this.handleFields(row)
+          this.handleField(row)
           break
         case '4'://任务分配
           this.handleTask(row)
@@ -528,6 +531,10 @@ export default {
           break
       }
     },
+    //自定义栏位管理
+    handleField(row) {
+      this.$refs.FieldDrawer.open(row.id)
+    },
     //跳转到专利列表页面
     patentList(row){
       this.$router.push(