接口联调

src/components/basic-import/main.vue

@@ -1,6 +1,7 @@
 <template>
     <el-dialog :title="title" append-to-body :modelValue="importBox" width="555px" @close="closeDialog">
-        <avue-form :option="importOption" v-model="importForm" :upload-after="uploadAfter">
+        <avue-form :option="importOption" v-model="importForm" :upload-after="uploadAfter"
+        :upload-error="uploadError">
         <template #excelTemplate>
             <el-button type="primary" @click="handleTemplate">
             点击下载<i class="el-icon-download el-icon--right"></i>
@@ -36,6 +37,10 @@ export default {
         importUrl:{
             type:String,
             default:''
+        },
+        showTips:{
+            type:String,
+            default:'请上传 .xls,.xlsx 标准格式文件'
         }
     },
     data(){
@@ -56,7 +61,7 @@ export default {
                         propsHttp: {
                             res: 'data',
                         },
-                        tip: '请上传 .xls,.xlsx 标准格式文件',
+                        tip: this.showTips,
                         action: this.importUrl,
                     },
                     {
@@ -89,6 +94,10 @@ export default {
             this.closeDialog()
             done();
         },
+        uploadError(error, column){
+            console.log('error-------------',error)
+            this.closeDialog()
+        }
     }
 }
 </script>

src/views/periodicTesting/components/addProjectCycleDialog.vue

@@ -106,6 +106,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="临期提醒：" prop="remind">
+            <template #label>
+              <el-tooltip class="item" effect="dark" content="临期提醒天数应大于提前下发天数，小于等于提前下发+试验时长" placement="top">
+                <div>
+                  <el-icon><InfoFilled /></el-icon>
+                  <span>临期提醒：</span>
+                </div>
+              </el-tooltip>
+            </template>
             <el-input-number
               v-model="projectForm.remind"
               controls-position="right"
@@ -350,8 +358,10 @@ export default {
           ...res.data.data,
           isPutOff:res.data.data.isPutOff == 1 ? true : false,
           testType:res.data.data.testType != '' ? res.data.data.testType + '' : '',
-          processUserIds:res.data.data.processUserId
+          processUserIds:res.data.data.processUserId,
+          jobType:res.data.data.jobType == -1 ? '' : res.data.data.jobType
         }
+        console.log('job---------',this.projectForm.jobType)
         if(this.projectForm.jobType == 1){
           this.projectForm = {
             ...this.projectForm,

src/views/periodicTesting/projectCycle.vue

@@ -175,10 +175,11 @@
     </el-dialog>
     <!-- 导入 -->
     <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
+      showTips="请上传 .xls,.xlsx 标准格式文件,请导入数据后维护试验周期！"
       templateUrl="/blade-desk/QA/CycleTest/download-excel-template"
       templateName="试验项目周期模板.xlsx"
       importUrl="/blade-desk/QA/CycleTest/import-excel"
-     @closeDialog="closeDialog"></basic-import>
+      @closeDialog="closeDialog"></basic-import>
   </basic-container>
 </template>
 
@@ -409,6 +410,7 @@ export default {
     },
     closeDialog(){
       this.showDialog = false;
+      this.isShowImport = false
       this.onLoad(this.page)
     },
     // 点击详情按钮
@@ -475,6 +477,9 @@ export default {
       if (this.selectionList.length == 0) {
         this.$message.error('请至少选择一条数据!');
       } else {
+        this.cycleForm = {}
+        this.cycleMonthTags = []
+        this.cycleYearTags = []
         this.cycleDialog = true
       }
     },
@@ -625,6 +630,13 @@ export default {
               isPutOff:this.cycleForm.isPutOff ? 1 : 0,
             }
             console.log('params===============',params)
+            setCycleBat(params).then(res =>{
+              if(res.data.code == 200){
+                this.$message.success('设置成功')
+                this.cycleDialog = false
+                this.onLoad(this.page)
+              }
+            })
         }
       })
     },