优化

RMS-FrontEnd/src/api/index.js

@@ -1,10 +1,12 @@
 
 import report from "./report";
 import admin from "./admin";
-import patent from './patent'
+import patent from './patent';
+import permission from './permission';
 
 export default {
   ...report,
   ...admin,
-  ...patent
+  ...patent,
+  ...permission
 }

RMS-FrontEnd/src/api/permission.js

@@ -0,0 +1,17 @@
+import axios from '@/utils/axios';
+
+export default{
+    /** 
+ * 根据租户ID查询部门
+ */
+ getTenantDepartments(){
+    return axios.get('/permission/api/department/getTenantDepartments')
+  },
+  /** 
+   * 根据租户ID查询人员
+   */
+  getTenantPersonnel(){
+    return axios.get('/permission/api/system/getTenantPersonnel')
+  },
+
+}

RMS-FrontEnd/src/views/report/components/CreateReport.vue

@@ -24,7 +24,7 @@
                 <el-option v-for="item in personnelList" :key="item.id" :label="item.personnelName" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="委托方" prop="clientId" >
+            <el-form-item label="委托方" prop="clientId" v-if="tenantType == 1">
               <el-select v-model="form.clientId" placeholder="请选择委托方" filterable :popper-append-to-body="false">
                 <el-option v-for="item in clientList" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -177,7 +177,19 @@ export default {
         callback(new Error('请选择时间'))
       }
     }
+    const isClientId = (rule,value,callback)=>{
+      if(this.tenantType == 1){
+        if(value){
+          callback()
+        }else{
+          callback(new Error('请选择委托方'))
+        }
+      }else{
+        callback()
+      }
+    }
     return {
+      tenantType:'',
       customColors: [
         {color: '#f56c6c', percentage: 20},
         {color: '#e6a23c', percentage: 40},
@@ -209,7 +221,7 @@ export default {
         name: [{ required: true, message: '请输入报告名称', trigger: 'blur' },],
         signPatentNo: [{ required: true, validator:isExist, trigger: 'blur' },],
         personId: [{ required: true, message: '请选择负责人', trigger: 'change' },],
-        clientId: [{ required: true, message: '请选择委托方', trigger: 'change' },],
+        clientId: [{ required: true, validator:isClientId, trigger: 'change' },],
         departmentId: [{ required: true, validator:isDepartmentId, trigger: 'change' },],
       },
       TaskRules:{
@@ -226,10 +238,13 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['webSocket', 'userinfo']),
+    ...mapGetters(['webSocket',]),
     dictMessage() {
       return this.$store.state.dictMessage.dictMessage
     },
+    userinfo() {
+      return this.$store.state.admin.userinfo
+    },
   },
 
   mounted() {
@@ -440,7 +455,7 @@ export default {
     },
     //获取全部人员
     getAllPersonnelList(){
-      this.$api.getAllPersonnel().then(response=>{
+      this.$api.getTenantPersonnel().then(response=>{
         // console.log(response)
         this.personnelList = response.data
       })
@@ -453,7 +468,7 @@ export default {
     },
     //获取全部部门
     getAllDepartmentList(){
-      this.$api.getAllDepartment().then(response=>{
+      this.$api.getTenantDepartments().then(response=>{
         // console.log(response)
         this.departmentList = response.data
       })
@@ -467,6 +482,7 @@ export default {
     },
     //接收创建报告类型
     open(row,dictMessage) {
+      this.tenantType = this.userinfo.tenantType
       this.verify=true
       var a = ''
       this.form = row

RMS-FrontEnd/src/views/report/components/ReportTemplate.vue

@@ -10,7 +10,7 @@
                 align="center">
                 <template slot-scope="scope">
                     <div>
-                        <el-radio v-model="templateId" @input="getTemplateId(scope.row.id)"></el-radio>
+                        <el-radio v-model="templateId" :label="scope.row.id" @input="getTemplateId(scope.row.id)">{{  }}</el-radio>
                     </div>
                 </template>
             </el-table-column>
@@ -102,6 +102,7 @@ export default {
             this.getList()
         },
         getTemplateId(val){
+            console.log(val)
             this.$emit('getReportTemplateId',val)
         },
     },

RMS-FrontEnd/src/views/report/reportDetails/components/common/customTable.vue

@@ -24,6 +24,15 @@
               </template>
             </el-table-column>
             <el-table-column prop="name" sortable label="专利标题"  width="300" align="center"></el-table-column>
+            <el-table-column prop="applicationDate" sortable label="申请日"  width="150" align="center"></el-table-column>
+            <el-table-column prop="publicDate" sortable label="公开日"  width="150" align="center"></el-table-column>
+            <el-table-column prop="applicant" sortable label="权利人"  width="300" align="center">
+              <template slot-scope="scope">
+                <div>
+                  <p v-for="item in scope.row.applicant.filter(a => a.dataType === 1)">{{ item.name }}</p>
+                </div>
+              </template>
+            </el-table-column>
             <!-- <el-table-column prop="state" label="状态" sortable  align="center"></el-table-column> -->
             <el-table-column prop="simpleStatus" label="状态" align="center" >
               <!-- <template slot-scope="scope">

RMS-FrontEnd/src/views/report/reportDetails/components/taskDetails.vue

@@ -89,7 +89,7 @@
   <script>
   export default {
 	// props:['activeName','reportType','status'],
-	props:['reportId'],
+	props:['reportId','row'],
 	data() {
     return {
       // customColors: [
@@ -197,6 +197,12 @@
     },
     //点击任务名称
     rowTaskType(row) { 
+      console.log(this.row)
+      row.reportType = this.row.type
+      row.reportName = this.row.name
+      row.reportId = this.row.id
+      row.signPatentNo = this.row.signPatentNo
+      this.$s.setSession('params', row)
       if (row.type==1) {
         let a=this.$router.resolve({
           path: '/Incomplete',

RMS-FrontEnd/src/views/task/components/Incomplete.vue

@@ -153,12 +153,7 @@ export default {
       this.taskWorkRemakShow = false
       //console.log(this.taskWorkRemakShow);
     }
-    this.$s.setSession('params', {
-      reportName:this.queryParams.reportName,
-      reportId: this.reportId,
-      reportType:this.reportType,
-      signPatentNo:this.signPatentNo,
-    })
+    
     //console.log(this.queryParams,this.reportId,this.coordination,this.reportType,);
   },
   mounted() {