定期更新

src/views/components/import/conditionImport/components/projectListDialog.vue

@@ -157,6 +157,7 @@
               </el-option>
             </el-select>
           </el-form-item>
+          
           <el-form-item label="是否更新" prop="ifUpdate" v-if="!form.patentNos || form.patentNos.length==0">
             <el-switch
               v-model="form.ifUpdate"
@@ -195,23 +196,44 @@
               </el-form-item> -->
             </div>
           </template>
+          <el-form-item label="立即导入" prop="importNow" v-if="form.isUpdateCriteria && (!form.patentNos || form.patentNos.length==0)">
+            <el-switch
+              v-model="form.importNow"
+              :active-value="true"
+              :inactive-value="false"
+              active-color="#13ce66"
+            >
+            </el-switch>
+          </el-form-item>
         </el-form>
         <div class="button">
-          <el-button
-            v-if="form.importToType == 0"
-            type="primary"
-            size="small"
-            @click="onSubmit(2)"
-            :loading="btnLoading2"
-            >仅保存为定期更新条件</el-button
-          >
-          <el-button
-            type="primary"
-            size="small"
-            @click="onSubmit(1)"
-            :loading="btnLoading"
-            >导入</el-button
-          >
+          <template v-if="form.isUpdateCriteria">
+            <el-button
+              v-if="form.importToType == 0"
+              type="primary"
+              size="small"
+              @click="onSubmit(2)"
+              :loading="btnLoading2"
+              >保存定期更新条件</el-button
+            >
+          </template>
+          <template v-else>
+            <el-button
+              v-if="form.importToType == 0"
+              type="primary"
+              size="small"
+              @click="onSubmit(2)"
+              :loading="btnLoading2"
+              >仅保存为定期更新条件</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              @click="onSubmit(1)"
+              :loading="btnLoading"
+              >导入</el-button
+            >
+          </template>
           <el-button size="small" @click="handleClose">取消</el-button>
         </div>
       </div>
@@ -285,7 +307,11 @@ export default {
       if (this.form.importToId) {
 
       }
-      await this.getUpdateCycle()
+      if(this.form.isUpdateCriteria){
+        this.title = '保存定期更新条件'
+        this.$set(this.form,'ifUpdate',true)
+      }
+      // await this.getUpdateCycle()
       this.dialogVisible = true;
     },
     async getUpdateCycle(){
@@ -478,6 +504,10 @@ export default {
     },
     //保存定期更新条件
     addUpdateCriteria(form){
+      if(form.importNow){
+        this.addImportTask(this.form)
+        return
+      }
       var conditionImport = this.$s.getSession('conditionImport')
       var params = {
         importToId:form.importToId,

src/views/components/import/conditionImport/searchResult.vue

@@ -22,7 +22,7 @@
           <p><el-link style="width: 50px;color: #409EFF;" @click="searches">检索式</el-link></p>
         </div>
         <div>
-          <el-button type="primary" size="small" @click="importToProject">导入专利</el-button>
+          <el-button type="primary" size="small" @click="importToProject">{{condition.isUpdateCriteria?'保存定期更新条件':'导入专利'}}</el-button>
           <el-button size="small" type="warning" @click="handleFieldManage">显示栏位管理</el-button>
         </div>
       </el-header>

src/views/project/components/updateCriteria/updateCriteria.vue

@@ -178,6 +178,7 @@ export default {
             importToType:0,
             type:4,
             ifUpdate:this.update.ifUpdate,
+            isUpdateCriteria:true
         }
         this.$commonJS.toImportParent(form,4)
     },