commit

src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html

@@ -667,6 +667,7 @@ layout("/layouts/platform.html"){
                     contentType: false,
                     success: (data) => {
                         if (data.code === 0){
+                            this.$message.success(data.msg)
                             this.pageData();
                             this.importVisible = false
                         }else {

src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html

@@ -852,7 +852,7 @@ layout("/layouts/platform.html"){
             },
             async doImport() {
                 if (this.importData.fileList.length === 0) {
-                    this.$message.warning("请选择文件！")
+                    this.notifyWarning("请选择文件！")
                     return
                 }
                 const data = new FormData();
@@ -860,12 +860,20 @@ layout("/layouts/platform.html"){
                     data.append("file", val.raw, val.raw.name);
                 });
                 this.importLoading = true
-                const resp = await $.post(loc() + "/travelLineImport",data)
+                const resp = await $.ajax({
+                    url: loc() + '/travelLineImport',
+                    type: 'POST',
+                    data: data,
+                    processData: false,
+                    contentType: false
+                })
                 if (resp.code === 0){
+                    this.$message.success(resp.msg)
                     this.pageData();
                     this.importVisible = false
+                    this.importLoading = false
                 }else {
-                    this.$message.warning("导入失败")
+                    this.notifyWarning("导入失败")
                     this.importLoading = false
                 }
             },

src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html

@@ -403,7 +403,7 @@ layout("/layouts/platform.html"){
             },
             async doImport() {
                 if (this.importData.fileList.length === 0) {
-                    this.$message.warning("请选择文件！")
+                    this.notifyWarning("请选择文件！")
                     return
                 }
                 const data = new FormData();
@@ -413,13 +413,20 @@ layout("/layouts/platform.html"){
                 });
                 this.importLoading = true
 
-                const resp = await $.post(loc() + '/travelAgencyImport',data)
+                const resp = await $.ajax({
+                    url: loc() + '/travelAgencyImport',
+                    type: 'POST',
+                    data: data,
+                    processData: false,
+                    contentType: false
+                })
                 if (resp.code===0){
+                    this.$message.success(resp.msg)
                     this.pageData();
                     this.importVisible = false
                     this.importLoading = false
                 }else {
-                    this.$message.warning("导入失败")
+                    this.notifyWarning("导入失败")
                     this.importLoading = false
                 }
             },

src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html

@@ -95,6 +95,15 @@ layout("/layouts/platform.html"){
                                     </el-option>
                                 </el-select>
                             </el-col>
+                            <el-col :span="12">
+                                <span>是否参加：</span>
+                                <el-radio-group @change="doSearch();getXlLxsUserCount()" size="medium"
+                                                v-model="pageForm.isTakePartIn">
+                                    <el-radio-button label="">全部</el-radio-button>
+                                    <el-radio-button label="1">已参加</el-radio-button>
+                                    <el-radio-button label="0">未参加</el-radio-button>
+                                </el-radio-group>
+                            </el-col>
                             <!--  <el-col :span="12">
                                   <span>所属单位：</span>
                                   <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" @change="doSearch"
@@ -619,6 +628,7 @@ layout("/layouts/platform.html"){
                     regionalNature: '',
                     signUpMode: '',
                     lotId:'',
+                    isTakePartIn:'',
                     takePartInLineId:'',
                 },
                 multipleSelection: [],
@@ -688,6 +698,7 @@ layout("/layouts/platform.html"){
                     state,
                     lotId,
                     linePlayTime,
+                    isTakePartIn,
                 } = this.pageForm
                 let types = this.pageForm.state == 1 ? JSON.stringify(['line']) : JSON.stringify(['base'])
                 window.open(loc() + "/doExport?takePartInBaseManagementId=" + takePartInBaseManagementId +
@@ -702,6 +713,7 @@ layout("/layouts/platform.html"){
                     "&takePartInLineId=" + takePartInLineId +
                     "&state=" + state +
                     "&lotId=" + lotId +
+                    "&isTakePartIn=" + isTakePartIn +
                     "&satisfyPeople=false" +
                     "&types=" + types +
                     "&linePlayTime=" + linePlayTime)
@@ -970,6 +982,7 @@ layout("/layouts/platform.html"){
                     unionId: this.pageForm.unionId,
                     startYear: this.pageForm.startYear,
                     endYear: this.pageForm.endYear,
+                    isTakePartIn: this.pageForm.isTakePartIn,
                     signUpMode: this.pageForm.signUpMode
                 })
                 this.options.forEach((v, index) => {