zhuliu 5 months ago
parent
commit
199eb822ae

+ 1 - 1
src/utils/model/retrieval/search.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="searchComponent">
     <div class="field">
-      <el-select v-model="label" size="small" @change="getObject">
+      <el-select v-model="label" filterable size="small" @change="getObject">
         <el-option v-for="item in SearchFields" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
     </div>

+ 2 - 2
src/views/project/components/drawer/form.vue

@@ -21,8 +21,8 @@
                     </div>
                   </mySelectButton>
                 </el-form-item>
-                <el-form-item label="委托部门" prop="departmentId" v-else>
-                  <mySelectTree style="width:100%" v-model="ruleForm.departmentId" :options="departmentList">
+                <el-form-item label="委托部门" prop="entrustId" v-else>
+                  <mySelectTree style="width:100%" v-model="ruleForm.entrustId" :options="departmentList">
                   </mySelectTree>
                 </el-form-item>
               </div>

+ 15 - 4
src/views/project/patentDetails/components/notPatentDetails.vue

@@ -25,9 +25,16 @@
         </div>
       </el-header>
       <el-main>
-        <div class="height_100" style="width:100%" v-loading="loading">
+        <template v-if="evidence  && evidence.systemFiles && evidence.systemFiles.length">
+          <div class="height_100" style="width:100%" v-loading="loading">
             <myIframe id="checkIframe" :src="url" height="100%" frameborder="0" width="100%"></myIframe>
-        </div>
+          </div>
+        </template>
+        <template v-else>
+          <div>
+            暂无文件
+          </div>
+        </template>
       </el-main>
     </el-container>
     <contrast ref="contrast"></contrast>
@@ -83,8 +90,12 @@ export default {
   methods: {
     getUrl(){
         if(Object.keys(this.evidence).length>0){
-          var guid = this.evidence.literatureNo
-          this.url = this.$commonJS.checkGuid(guid,this.evidence.systemFile.type)
+          if(this.evidence.systemFiles && this.evidence.systemFiles.length){
+            let file = this.evidence.systemFiles[0]
+            var guid = file.guid
+            this.url = this.$commonJS.checkGuid(guid,file.type)
+          }
+          
         }
     },
     load(){

+ 2 - 2
src/views/report/components/details/components/basicMessage.vue

@@ -128,8 +128,8 @@
               <el-form-item label="委托方:" prop="entrustId" v-if="userinfo.tenantType == 1">
                 <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'entrustName' })"></div>
               </el-form-item>
-              <el-form-item label="委托部门:" prop="departmentId" v-else>
-                <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'departmentName' })"></div>
+              <el-form-item label="委托部门:" prop="entrustId" v-else>
+                <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'entrustName' })"></div>
               </el-form-item>
             </div>
           </template>

+ 2 - 2
src/views/report/components/dialog/addAndEditReport.vue

@@ -189,8 +189,8 @@
                     </div>
                   </mySelectButton>
                 </el-form-item>
-                <el-form-item label="委托部门" prop="departmentId" v-else>
-                  <mySelectTree style="width:100%" v-model="form.departmentId" :options="departmentList"></mySelectTree>
+                <el-form-item label="委托部门" prop="entrustId" v-else>
+                  <mySelectTree style="width:100%" v-model="form.entrustId" :options="departmentList"></mySelectTree>
                 </el-form-item>
               </div>
             </template>