优化

monkeyhouyi
1 parent 1dbea7ff
Showing 8 changed files with 178 additions and 41 deletions
src/main.js
src/utils/loadmore.js
src/views/DisposalSuggestions/index.vue
src/views/baseCaseHandling/Form.vue
src/views/baseCaseHandling/index.vue
src/views/baseInspectionReport/Form.vue
src/views/baseInspectionReport/index.vue
src/views/baseListHazardousSamples/index.vue
@@ -19,6 +19,7 @@ import store from &#39;./store&#39;
 import './permission'
 import moment from "moment";
 import i18n from './lang' // internationalization
+import selectLoadMore from '@/utils/loadmore.js';
  
  
 Vue.config.productionTip = false
@@ -44,20 +45,7 @@ Object.keys(filters).forEach(key =&gt; {
 })
  
 Vue.config.productionTip = false
-
-Vue.directive('loadMore', {
-  bind(el, binding) {
-    // 获取element-ui定义好的scroll盒子
-    const SELECTWRAP_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap')
-    SELECTWRAP_DOM.addEventListener('scroll', function () {
-
-      const CONDITION = this.scrollHeight - this.scrollTop <= this.clientHeight
-      if (CONDITION) {
-        binding.value()
-      }
-    })
-  }
-})
+Vue.directive('selectLoadMore', selectLoadMore)
 Vue.directive('removeAriaHidden', {
   bind(el, binding) {
     let ariaEls = el.querySelectorAll('.el-radio__original');
+export default {
+  bind(el, binding) {
+    const selectDom = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap')
+    selectDom.addEventListener('scroll', () => {
+      if (selectDom.scrollHeight - selectDom.scrollTop <= selectDom.clientHeight + 20) {
+        binding.value()
+      }
+    })
+  }
+};
 \ No newline at end of file
@@ -68,6 +68,21 @@
                 </div>
               </el-upload>
             <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()" >导出</el-button>
+            <el-button v-if="!isSHILevel" type="primary" icon="el-icon-download" size="mini" @click="exportMakeDemo()">导出处理模板</el-button>
+            <el-upload
+                v-if="!isSHILevel"
+                class="uploadXlax"
+                :action="define.APIURl + '/api/Extend/BaseInspectionReport/TaskBatchReport'"
+                :headers="uploadHeaders"
+                :on-success="uploadSuccess"
+                :on-error="uploadError"
+                :show-file-list="false"
+                name="excelfile"
+              >
+                <div class="avatar-box">
+                  <el-button type="info" icon="el-icon-upload" size="mini">批量上报</el-button>
+                </div>
+              </el-upload>
           </div>
           <div class="NCC-common-layout-main NCC-flex-main">
             <NCC-table v-loading="listLoading" :data="list">
@@ -79,7 +94,7 @@
                 <template slot-scope="scope">{{ scope.row.reportSource | dynamicTextUP(sourceOptions) }}</template>
               </el-table-column>
               <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left"/>
-              <el-table-column show-overflow-tooltip label="线索编号" prop="leadNumber" align="left"/>
+              <el-table-column show-overflow-tooltip label="线索编号" prop="leadNumber" align="left" width="180"/>
               <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> -->
               <!-- <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" /> -->
               <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/>
@@ -216,13 +231,19 @@ export default {
       });
       this.sourceOptions = data;
     },
+    getTime() {
+      if(!this.query.creatorTime) return;
+      return {
+        startTime: this.query.creatorTime[0] || '',
+        endTime: this.query.creatorTime[1] || '',
+      }
+    },
     initData() {
       this.listLoading = true;
       let _query = {
         ...this.listQuery,
         ...this.query,
-        startTime: this.query.creatorTime[0] || '',
-        endTime: this.query.creatorTime[1] || '',
+        ...this.getTime()
       };
       let query = {};
       for (let key in _query) {
@@ -344,16 +365,33 @@ export default {
         link.click();
       });
     },
-    uploadSuccess(response, file, fileList) {
-      this.$message({
-        showClose: true,
-        message: response.msg,
-        type: response.code == 200 ? 'success' : 'error',
-        close: () => {
-          response.code == 200 && this.initData();
-        }
+    exportMakeDemo() {
+      let obj = {
+        url: '/Extend/BaseInspectionReport/Actions/GenerateImportTemplateBatchReport',
+        method: "GET",
+        responseType: 'blob',
+      };
+      request(obj).then((res) => {
+        const blob = new Blob([res], {type: 'application/json'});
+        const url = window.URL.createObjectURL(blob);
+        let link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = url;
+        link.download = '处理表单模板.xlsx';
+        link.click();
       });
     },
+    uploadSuccess(response, file, fileList) {
+      if(response.code == 200) {
+        this.$message({
+          message: response.msg,
+          type: 'success'
+        });
+      } else {
+        this.$message.error(response.msg);
+      }
+      response.code == 200 && this.initData();
+    },
     uploadError() { 
       console.log('erroe');
     },
@@ -45,11 +45,15 @@
               style="width: 100%"
               @blur.native.capture="selectCompanyBlur"
               @visible-change="visibleNameCompanyChange"
-              :disabled="formType != 0"
               @change="(val) => companyChange(val, 'change')"
+              :disabled="formType != 0"
+              v-selectLoadMore="moreCompanyList"
+              :loading="name_loading"
+              :teleported="false"
+              :filter-method="filterMethod"
             >
               <el-option
-                v-for="item in companyOptions"
+                v-for="item in companyOptions.slice(0, company_currentPage)"
                 :key="item.id"
                 :label="item.companyName"
                 :value="item.id"
@@ -71,8 +75,10 @@
               @visible-change="visibleNameChange"
               @change="(val) => platformNameChange(val, 'change')"
               :disabled="formType != 0 || !dataForm.registeredEntity"
+              v-selectLoadMore="moreSystemList"
+              :teleported="false"
  			        :loading="system_loading">
- 			        <el-option v-for="item in systemOption" :key="item.value" :label="item.systemName" :value="item.id" />
+ 			        <el-option v-for="item in systemOption.slice(0, system_currentPage)" :key="item.value" :label="item.systemName" :value="item.id" />
  			      </el-select>
           </el-form-item>
         </el-col>
@@ -432,6 +438,9 @@ export default {
       btnLoading: false,
       companyOptions: [],
       platformTypeOptions: [],
+      company_currentPage: 20,
+      name_loading: false,
+      system_currentPage: 20,
     };
   },
   computed: {
@@ -463,6 +472,23 @@ export default {
         this.companyOptions = data;
       })
     },
+    moreCompanyList() {
+      if(this.company_currentPage > this.companyOptions.length) return;
+      this.company_currentPage += 10;
+    },
+    async filterMethod(val) {
+      this.company_currentPage = 20;
+      this.name_loading = true
+      let companyRes = await request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
+        params: {
+          companyName: val
+        }
+      });
+      this.companyOptions = companyRes.data;
+      this.name_loading = false;
+    },
     // 获取系统列表
     getSystemSelect(companyId) {
       this.system_loading = true;
@@ -475,6 +501,26 @@ export default {
         this.system_loading = false;
       })
     },
+    moreSystemList() {
+      if(this.system_currentPage > this.systemOption.length) return;
+      this.system_currentPage += 10;
+    },
+    async filterMethod_system(val) {
+      this.system_currentPage = 0;
+      this.system_loading = true;
+      this.systemOption.filter.includes
+      request({
+        url: "/Extend/basesysteminfo/GetNoPagingList",
+        method: "get",
+        params: { 
+          companyId: this.dataForm.registeredEntity,
+          systemName: val,
+        }
+      }).then(({data}) => {
+        this.systemOption = data;
+        this.system_loading = false;
+      })
+    },
     selectBlur(e) {
       let value = e.target.value;
       if(!value) return;
@@ -183,7 +183,7 @@ export default {
     },
   },
   created() {
-    this.initSystemOptions();
+    // this.initSystemOptions();
     this.initSystemTypeList();
     this.initAreaTypeList();
     this.initStateTypeOption();
@@ -203,13 +203,19 @@ export default {
       this.listQuery.sidx = !order ? "" : prop;
       this.initData();
     },
+    getTime() {
+      if(!this.query.registrationTime) return;
+      return {
+        startTime: this.query.registrationTime[0] || '',
+        endTime: this.query.registrationTime[1] || '',
+      }
+    },
     initData() {
       this.listLoading = true;
       let _query = {
         ...this.listQuery,
         ...this.query,
-        startTime: this.query.registrationTime[0] || '',
-        endTime: this.query.registrationTime[1] || '',
+        ...this.getTime()
       };
       let query = {};
       for (let key in _query) {
@@ -45,8 +45,12 @@
               @visible-change="visibleNameCompanyChange"
               @change="(val) => companyChange(val, 'change')"
               :disabled='!!this.dataForm.id'
+              v-selectLoadMore="initCompanyList"
+              :loading="name_loading"
+              :teleported="false"
+              :filter-method="filterMethod"
             >
-              <el-option v-for="item in companyOptions" :key="item.id" :label="item.companyName" :value="item.id"/>
+              <el-option v-for="item in companyOptions.slice(0, company_currentPage)" :key="item.id" :label="item.companyName" :value="item.id"/>
             </el-select>
           </el-form-item>
         </el-col>
@@ -62,9 +66,11 @@
               @blur.native.capture="selectBlur"
               @visible-change="visibleNameChange"
               @change="(val) => platformNameChange(val, 'change')"
-              :loading="name_loading"
+               v-selectLoadMore="moreSystemList"
+              :teleported="false"
+              :loading="system_loading"
               :disabled="!!this.dataForm.id || !dataForm.company">
-              <el-option v-for="item in nameOptions" :key="item.id" :label="item.systemName" :value="item.id"></el-option>
+              <el-option v-for="item in nameOptions.slice(0, system_currentPage)" :key="item.id" :label="item.systemName" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -364,6 +370,10 @@ export default {
       companyOptions: [],
       btnLoading: false,
       areaOptions: [],
+      company_currentPage: 20,
+      system_loading: false,
+      system_currentPage: 20,
+      system_loading: false,
     };
   },
   computed: {
@@ -402,12 +412,21 @@ export default {
       // this.name_loading = false;
     },
     async initCompanyList() {
-      request({
+      if(this.company_currentPage > this.companyOptions.length) return;
+      this.company_currentPage += 10;
+    },
+    async filterMethod(val) {
+      this.company_currentPage = 20;
+      this.name_loading = true
+      let companyRes = await request({
         url: `/Extend/basecomapnyinfo/GetNoPagingList`,
         method: "GET",
-      }).then(({data}) => {
-        this.companyOptions = data;
-      })
+        params: {
+          companyName: val
+        }
+      });
+      this.companyOptions = companyRes.data;
+      this.name_loading = false;
     },
     selectBlur(e) {
       let value = e.target.value;
@@ -474,6 +493,10 @@ export default {
         this.name_loading = false;
       })
     },
+    moreSystemList() {
+      if(this.system_currentPage > this.nameOptions.length) return;
+      this.system_currentPage += 10;
+    },
     async getplatformTypeOptions() {
       let list = this.$store.state.meta.system;
       !list && (list = await this.$store.dispatch("getTypeListByCode", "system"));
@@ -59,6 +59,7 @@
                           </div>
                         </el-upload>
                       <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
+                      
                     </div>
 				</el-form>
 			</el-row>
@@ -229,7 +230,7 @@
                 let obj = {}
                 if(type) {
                     obj = {
-                        url: '/Extend/BaseInspectionReport/Actions/GenerateImportTemplate',
+                        url: type == 'demo' ? '/Extend/BaseInspectionReport/Actions/GenerateImportTemplate' : '/Extend/BaseInspectionReport/Actions/GenerateImportTemplateBatchReport',
                         method: "GET",
                         responseType: 'blob',
                     }
@@ -262,7 +263,7 @@
                     let link = document.createElement('a');
                     link.style.display = 'none';
                     link.href = url;
-                    link.download = '线索录入模板.xlsx';
+                    link.download = type == 'demo' ? '线索录入模板.xlsx' : '处理表单模板.xlsx';
                     link.click();
                   } else {
                     if(res.code != 200) return;
@@ -42,9 +42,14 @@
                     v-model="query.company"
                     placeholder="请选择运营主体"
                     clearable
+                    filterable 
+                    v-selectLoadMore="moreCompanyList"
+                    :loading="name_loading"
+                    :teleported="false"
+                    :filter-method="filterMethod"
                   >
                     <el-option
-                      v-for="(item, index) in companyOptions"
+                      v-for="(item, index) in companyOptions.slice(0, company_currentPage)"
                       :key="index"
                       :label="item.companyName"
                       :value="item.id"
@@ -158,6 +163,8 @@ export default {
       exportBtnLoading: false,
       HandFormVisible: false,
       ReportFormVisible: false,
+      company_currentPage: 20,
+      name_loading: false,
     };
   },
   computed: {},
@@ -167,11 +174,29 @@ export default {
   },
   methods: {
     getcompanyOptions() {
+      this.name_loading = true;
       request({
         url: `/Extend/basecomapnyinfo/GetNoPagingList`,
         method: "GET",
       }).then(({data}) => {
         this.companyOptions = data;
+        this.name_loading = false;
+      })
+    },
+    moreCompanyList() {
+      if(this.company_currentPage > this.companyOptions.length) return
+      this.company_currentPage += 10;
+    },
+    filterMethod(val) {
+      this.company_currentPage = 20;
+      this.name_loading = true;
+      request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
+        params: { companyName: val }
+      }).then(({data}) => {
+        this.companyOptions = data;
+        this.name_loading = false;
       })
     },
     initData() {