1

monkeyhouyi
1 parent 759b1291
Showing 2 changed files with 19 additions and 22 deletions
src/views/DisposalSuggestions/index.vue
src/views/baseCaseHandling/index.vue
@@ -36,6 +36,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="3">
+                <el-form-item label="">
+                  <el-select v-model="query.state" placeholder="请选择类型" clearable>
+                    <el-option v-for="item in stateOptions" :key="item" :label="item" :value="item"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
                   <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
@@ -102,26 +109,13 @@
                 </template>
               </el-table-column>
             </NCC-table>
-            <pagination
-              :total="total"
-              :page.sync="listQuery.currentPage"
-              :limit.sync="listQuery.pageSize"
-              @pagination="initData"
-            />
+            <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
           </div>
         </div>
 		    <ADDNCCForm v-if="addformVisible" ref="ADDNCCForm" @refresh="refresh" />
         <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
-        <HandleForm
-          v-if="HandleFormVisible"
-          ref="HandleForm"
-          @refresh="refresh"
-        />
-        <ReportForm
-          v-if="ReportFormVisible"
-          ref="ReportForm"
-          @refresh="refresh"
-        />
+        <HandleForm v-if="HandleFormVisible" ref="HandleForm" @refresh="refresh"/>
+        <ReportForm v-if="ReportFormVisible" ref="ReportForm" @refresh="refresh"/>
       </div>
     </div>
   </div>
@@ -153,6 +147,7 @@ export default {
         questionType: undefined,
         questionClass: undefined,
         creatorTime: [],
+        state: undefined,
       },
       list: [],
       listLoading: true,
@@ -196,6 +191,7 @@ export default {
       HandleFormVisible: false,
       ReportFormVisible: false,
       addformVisible: false,
+      stateOptions: ['待研判', '待进一步处置', '已处置待研判', '转执法', '已存档', '不采纳'],
     };
   },
   computed: {
@@ -225,8 +221,8 @@ export default {
       let _query = {
         ...this.listQuery,
         ...this.query,
-        startTime: this.query.creatorTime[0],
-        endTime: this.query.creatorTime[1],
+        startTime: this.query.creatorTime[0] || '',
+        endTime: this.query.creatorTime[1] || '',
       };
       let query = {};
       for (let key in _query) {
@@ -236,7 +232,7 @@ export default {
           query[key] = _query[key];
         }
       }
-      delete query.creatorTime;
+      query.creatorTime && delete query.creatorTime;
  
       getListForJudge(query).then((res) => {
         this.list = res.data.list;
@@ -286,6 +282,7 @@ export default {
       for (let key in this.query) {
         this.query[key] = undefined;
       }
+      this.query.creatorTime = [];
       this.listQuery = {
         currentPage: 1,
         pageSize: 20,
@@ -208,8 +208,8 @@ export default {
       let _query = {
         ...this.listQuery,
         ...this.query,
-        startTime: this.query.registrationTime[0],
-        endTime: this.query.registrationTime[1],
+        startTime: this.query.registrationTime[0] || '',
+        endTime: this.query.registrationTime[1] || '',
       };
       let query = {};
       for (let key in _query) {
@@ -293,7 +293,6 @@ export default {
       }
       delete query.registrationTime;
       this.exportBtnLoading = true;
-      console.log(111);
       request({
         url: `/Extend/BaseCaseHandling/Actions/Export`,
         method: "POST",
@@ -325,6 +324,7 @@ export default {
       for (let key in this.query) {
         this.query[key] = undefined;
       }
+      this.query.registrationTime = [];
       this.listQuery = {
         currentPage: 1,
         pageSize: 20,