zhuliu 1 год назад
Родитель
Сommit
e7c7c04b2c

+ 1 - 0
src/views/components/import/conditionImport/components/projectListDialog.vue

@@ -56,6 +56,7 @@
                   v-model="customFieldId"
                   @change="changeCustomField"
                   placeholder="请选择"
+                  clearable
                 >
                   <el-option
                     v-for="item in customField"

+ 55 - 6
src/views/components/import/task/components/index.vue

@@ -20,7 +20,7 @@
             <template slot-scope="scope">
               <div v-if="item.value == 'type'">
                 <span v-html="$commonJS.getColumnData(scope.row, item, null, { data: importType })"></span>
-                <span style="margin-left:10px"><el-button type="text" size="small" @click="checkDetail(scope.row)">查看{{scope.row.fileGuid?'文件信息':'导入内容'}}</el-button></span>
+                <span style="margin-left:10px"><el-button type="text" size="small" @click="checkDetail(scope.row)">{{ getTypeTitle(scope.row) }}</el-button></span>
               </div>
               <div v-else-if="item.value == 'state'"
                 v-html="$commonJS.getColumnData(scope.row, item, null, { data: state })">
@@ -272,6 +272,18 @@ export default {
       })
       this.showViews()
     },
+    
+    getTypeTitle(row){
+      if(row.fileGuid){
+        return '查看文件信息'
+      }
+      if(row.type == 2){
+        return '查看专利号'
+      }
+      if(row.type == 4){
+        return '查看检索式'
+      }
+    },
     getOption(type) {
       var obj = this.searchFiled.find(item => {
         return item.value == type
@@ -378,8 +390,8 @@ export default {
     checkDetail(row){
       var title = ''
       var content = ''
+      title = this.getTypeTitle(row)
       if(row.fileGuid){
-        title = '查看文件信息'
         content = '文件名称:'+row.systemFile?.originalName
         this.$confirm(content, title, {
           confirmButtonText: '下载',
@@ -393,11 +405,48 @@ export default {
            
           });
       }else{
-        title = '查看导入信息'
+       
         content=row.searchCondition
-        this.$alert(content,title, {
-          dangerouslyUseHTMLString: true
-        });
+        // if(row.type == 4){
+        //   this.$confirm(content, title, {
+        //     confirmButtonText: '保存到定期更新条件',
+        //     cancelButtonText: '关闭',
+        //     dangerouslyUseHTMLString: true,
+        //   }) .then(() => {
+        //     console.log(row)
+        //     return
+        //     var params = {
+        //       importToId:row.importToId,
+        //       importContent:row.importContent,
+        //       ifUpdate:true,
+        //       searchCondition:row.searchCondition,
+        //       searchSetting:'',
+        //       DBType:form.DBType,
+        //       fieldDTOS:form.fieldDTOS
+        //     }
+        //     this.btnLoading2 = true
+        //     this.$api.addQuartzCondition(params).then(response=>{
+        //       if(response.code == 200){
+        //         this.$message.success('定期更新条件保存成功')
+        //         this.btnLoading2 = false
+        //         if(form.isUpdateCriteria){
+        //           this.handleClose()
+        //         }
+        //       }
+        //     }).catch(error=>{
+        //       this.$message.error('定期更新条件保存失败')
+        //       this.btnLoading2 = false
+        //     })
+        //   })
+        //   .catch(action => {
+           
+        //   });
+        // }else{
+          this.$alert(content,title, {
+            dangerouslyUseHTMLString: true
+          });
+        // }
+        
       }
  
     },