0807

src/views/networkAccess/registration.vue

@@ -631,7 +631,7 @@
                         </a-select>
                       </a-col>
                       <a-col :span="10">
-                        <a-select placeholder="请选择营业厅地址" v-model="model.sysBusinessHall" style="margin: 0px 0px">
+                        <a-select placeholder="请选择营业厅地址" v-model="model.sysBusinessHall" style="margin: 0px 0px;width: 200px">
                           <a-select-option v-for="item in sysBusinessHallList" :key="item.id" :value="item.id"
                                            @click="searchKeyWordsysBusinessHall('中国电信'+item.name,'businessAddress')">
                             {{ item.name }}
@@ -1859,7 +1859,7 @@ export default {
         if (parseFloat(this.distance1) > parseFloat(this.distance) || parseFloat(this.distance2) > parseFloat(this.distance) || parseFloat(this.distance3) > parseFloat(this.distance)) {
           this.model.judgmentResearch = "1";
         } else {
-          this.model.judgmentResearch = "4";
+          this.model.judgmentResearch = "2";
         }
 
       }
@@ -2123,16 +2123,16 @@ export default {
                   }
                 }
                 this.isSizeNumberResults = result[0]["isSizeNumberResults"];
-                // if (this.model.wordAddress!=='' && this.model.wordAddress!==null){
-                //   this.searchKeyWordsysBusinessHall(this.model.wordAddress,'wordAddress');
-                // }
-                //
-                // if (this.hallName!=='' && this.hallName!==null){
-                //   this.searchKeyWordsysBusinessHall('中国电信'+this.hallName,'businessAddress');
-                // }
-                // if (this.model.currentAddress!=='' && this.model.currentAddress!==null){
-                //   this.searchKeyWordsysBusinessHall(this.model.currentAddress,'currentAddress');
-                // }
+                if (this.model.wordAddress!=='' && this.model.wordAddress!==null){
+                  this.searchKeyWordsysBusinessHall(this.model.wordAddress,'wordAddress');
+                }
+
+                if (this.hallName!=='' && this.hallName!==null){
+                  this.searchKeyWordsysBusinessHall('中国电信'+this.hallName,'businessAddress');
+                }
+                if (this.model.currentAddress!=='' && this.model.currentAddress!==null){
+                  this.searchKeyWordsysBusinessHall(this.model.currentAddress,'currentAddress');
+                }
                 if (info===''){
                   this.model.id=null;
                 }

src/views/networkAccess/userStatistics.vue

@@ -2,22 +2,22 @@
   <div>
     <a-card :bordered="false">
       <div>
-        <a-tabs v-has="'user:userStatistics:tab'" :active-key="currentTab" default-active-key="all"
-                @change="tabChange">
-          <a-tab-pane key="all" :tab="tabAll"></a-tab-pane>
-          <a-tab-pane key="undo" :tab="tabUndo"></a-tab-pane>
-          <a-tab-pane key="uncheck" :tab="tabUncheck"></a-tab-pane>
-          <a-tab-pane key="checked" :tab="tabChecked"></a-tab-pane>
-        </a-tabs>
-
-        <a-tabs v-has="'admin:userStatistics:tab'" :active-key="currentTab" default-active-key="all"
-                @change="tabChange">
-          <a-tab-pane key="all" :tab="tabAll"></a-tab-pane>
-          <a-tab-pane key="undo" :tab="tabUndo"></a-tab-pane>
-          <a-tab-pane key="uncheck" :tab="tabUncheck"></a-tab-pane>
-          <a-tab-pane key="checked" :tab="tabChecked"></a-tab-pane>
-          <a-tab-pane key="del" :tab="tabDelCheck"></a-tab-pane>
-        </a-tabs>
+<!--        <a-tabs v-has="'user:userStatistics:tab'" :active-key="currentTab" default-active-key="all"-->
+<!--                @change="tabChange">-->
+<!--          <a-tab-pane key="all" :tab="tabAll"></a-tab-pane>-->
+<!--          <a-tab-pane key="undo" :tab="tabUndo"></a-tab-pane>-->
+<!--          <a-tab-pane key="uncheck" :tab="tabUncheck"></a-tab-pane>-->
+<!--          <a-tab-pane key="checked" :tab="tabChecked"></a-tab-pane>-->
+<!--        </a-tabs>-->
+
+<!--        <a-tabs v-has="'admin:userStatistics:tab'" :active-key="currentTab" default-active-key="all"-->
+<!--                @change="tabChange">-->
+<!--          <a-tab-pane key="all" :tab="tabAll"></a-tab-pane>-->
+<!--          <a-tab-pane key="undo" :tab="tabUndo"></a-tab-pane>-->
+<!--          <a-tab-pane key="uncheck" :tab="tabUncheck"></a-tab-pane>-->
+<!--          <a-tab-pane key="checked" :tab="tabChecked"></a-tab-pane>-->
+<!--          <a-tab-pane key="del" :tab="tabDelCheck"></a-tab-pane>-->
+<!--        </a-tabs>-->
       </div>
 
 
@@ -76,24 +76,33 @@
               </a-form-item>
             </a-col>
 
-            <a-col :span="11" >
-                <a-form-item label="创建时间"  prop="industry"      :labelCol="{ span:9}"   :wrapperCol="{ span: 10 }">
-                  <j-date :show-time="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间" class="query-group-cust"
-                          id ="cardStartTime"  v-model="queryParam.createDateStart" ></j-date>
-                  <span class="query-group-split-cust"></span>
-                  <j-date :show-time="true" date-format="YYYY-MM-DD" placeholder="请选择结束时间" class="query-group-cust"
-                          id="cardEndTime"  v-model="queryParam.createDateEnd" ></j-date>
-                </a-form-item>
+            <a-col :span="6">
+              <a-form-item label="  创建人 " :labelCol="{ span:5}"   :wrapperCol="{ span: 8 }">
+                <j-input placeholder="请输入创建人" v-model="queryParam.createBy"></j-input>
+              </a-form-item>
             </a-col>
 
           </a-row>
+
+          <a-row>
+            <a-col :span="11" >
+              <a-form-item label="创建时间"  prop="industry"      :labelCol="{ span:9}"   :wrapperCol="{ span: 10 }">
+                <j-date :show-time="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间" class="query-group-cust"
+                        id ="cardStartTime"  v-model="queryParam.createDateStart" ></j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date :show-time="true" date-format="YYYY-MM-DD" placeholder="请选择结束时间" class="query-group-cust"
+                        id="cardEndTime"  v-model="queryParam.createDateEnd" ></j-date>
+              </a-form-item>
+            </a-col>
+
+            </a-row>
           </template>
         </a-form>
       </div>
 
       <!-- 操作按钮区域 -->
       <div class="table-operator">
-<!--        <a-button type="primary" icon="download" @click="handleExportXls('客户列表')">导出</a-button>-->
+        <a-button type="primary" icon="download" @click="handleExportXls('客户列表')">导出</a-button>
         <!-- 高级查询区域 -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
@@ -102,9 +111,9 @@
               删除
             </a-menu-item>
           </a-menu>
-          <a-button style="margin-left: 8px"> 批量操作
-            <a-icon type="down"/>
-          </a-button>
+<!--          <a-button style="margin-left: 8px"> 批量操作-->
+<!--            <a-icon type="down"/>-->
+<!--          </a-button>-->
         </a-dropdown>
       </div>
 
@@ -280,6 +289,7 @@ export default {
         removeById: "/businessReminderCard/deleteById",
         restoreById: "/businessReminderCard/restoreById",
         notice: "/smsCheck/customerInfo/notice",
+        exportXlsUrl: "/businessReminderCard/exportXls",
       },
       /**表单
        * 入网用户统计：身份证号/姓名/办理电话/创建人/创建人所属营业厅/更新人/更新人营业厅/研判结果/
@@ -487,8 +497,8 @@ export default {
         '2': '已报关停',
         '3': '已报蓝名单',
         '4': '已报紫名单',
-        '3,4':'已报蓝紫名单',
-        '4,3':'已报蓝紫名单',
+        '3,4':'已报蓝/紫名单',
+        '4,3':'已报蓝/紫名单',
       }
       return statusMap[status]
     }
@@ -557,7 +567,11 @@ export default {
       let queryParam = {
         "createBy":record.createBy,
         "cardNo":this.queryParam.cardNo,
-        "cardName":this.queryParam.cardName
+        "cardName":this.queryParam.cardName,
+        "newPhone":this.queryParam.newPhone,
+        "createDateStart":this.queryParam.createDateStart,
+        "createDateEnd":this.queryParam.createDateEnd,
+        "sysBusinessHall":this.queryParam.sysBusinessHall
       }
       this.loadData(null,queryParam);
       this.selectedRowKeys = [];
@@ -568,7 +582,10 @@ export default {
       let queryParam = {
         "businessAddress":record.businessAddress,
         "cardNo":this.queryParam.cardNo,
-        "cardName":this.queryParam.cardName
+        "cardName":this.queryParam.cardName,
+        "newPhone":this.queryParam.newPhone,
+        "createDateStart":this.queryParam.createDateStart,
+        "createDateEnd":this.queryParam.createDateEnd
       }
       this.loadData(null,queryParam);
       this.selectedRowKeys = [];
@@ -579,7 +596,11 @@ export default {
       let queryParam = {
         "phone":record.phone,
         "cardNo":this.queryParam.cardNo,
-        "cardName":this.queryParam.cardName
+        "cardName":this.queryParam.cardName,
+        "newPhone":this.queryParam.newPhone,
+        "createDateStart":this.queryParam.createDateStart,
+        "createDateEnd":this.queryParam.createDateEnd,
+        "sysBusinessHall":this.queryParam.sysBusinessHall
       }
       this.loadData(null,queryParam);
       this.selectedRowKeys = [];
@@ -599,7 +620,11 @@ export default {
     showByCardName(record){
       let queryParam = {
         "cardNo":this.queryParam.cardNo,
-        "cardName":record.cardName
+        "cardName":record.cardName,
+        "newPhone":this.queryParam.newPhone,
+        "createDateStart":this.queryParam.createDateStart,
+        "createDateEnd":this.queryParam.createDateEnd,
+        "sysBusinessHall":this.queryParam.sysBusinessHall
       }
       this.loadData(null,queryParam);
       this.selectedRowKeys = [];
@@ -675,10 +700,10 @@ export default {
     },
     /**修改*/
     showImproveAndUpload(record) {
-        // if (!record.createTime.match(RegExp(this.getDate()))){
-        //   this.$message.warning('此输入非天创建 禁止修改', 3);
-        //   return
-        // }
+        if (!record.createTime.match(RegExp(this.getDate()))){
+          this.$message.warning('此输入非天创建 禁止修改', 3);
+          return
+        }
       this.$router.push({path: '/networkAccess/registration', query: {id: record.id,cardNo: record.cardNo}});
     },
     showImproveAndUploadAdmin(record) {