0807

src/views/networkAccess/registration.vue

@@ -65,7 +65,7 @@
                 </a-table>
               </a-modal>
             </div>
-            <a-button type="link" @click="keyupInfoSelect()">身份证件号码检索</a-button>
+<!--            <a-button type="link" @click="keyupInfoSelect()">身份证件号码检索</a-button>-->
             <a-row>
               <a-col :span="6">
                 <a-form-model-item required label="身份证件号码" prop="cardNo"  :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"    >
@@ -2898,7 +2898,7 @@ export default {
           }
         })
       } else {
-        data['newBusinessAddress']=this.model.businessAddress;
+        data['newBusinessAddress']=this.model.sysBusinessHall;
         postAction("/businessReminderCard/editById", data).then((res) => {
           if (res.success) {
             this.clearModel()

src/views/networkAccess/userStatistics.vue

@@ -37,9 +37,12 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="营业厅地址">
-                <j-input placeholder="请输入营业厅地址" v-model="queryParam.cardNo"></j-input>
+                <j-input placeholder="请输入营业厅地址" v-model="queryParam.sysBusinessHall"></j-input>
               </a-form-item>
             </a-col>
+
+
+
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -50,7 +53,41 @@
               </a>
             </span>
             </a-col>
+
+
           </a-row>
+          <template v-if="toggleSearchStatus">
+          <a-row  :gutter="24">
+
+            <a-col :span="6">
+              <a-form-model-item label="  判研结果 " :labelCol="{ span:5}"   :wrapperCol="{ span: 8 }">
+                <a-select placeholder="请选择判研结果"  v-model="queryParam.numberResults" >
+                  <a-select-option v-for="item in optionsWithDisabled"   :value="item.value">
+                    {{ item.text }}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+
+
+            </a-col>
+            <a-col :span="6">
+              <a-form-item label="  办理电话 " :labelCol="{ span:5}"   :wrapperCol="{ span: 8 }">
+                <j-input placeholder="请输入办理电话" v-model="queryParam.newPhone"></j-input>
+              </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>
+
+          </a-row>
+          </template>
         </a-form>
       </div>
 
@@ -141,8 +178,8 @@
           <template v-slot:createBy="text, record">
             <a @click="showByCreateBy(record)">{{text}}</a>
           </template>
-          <template v-slot:businessAddress="text, record">
-            <a @click="showByBusinessAddresse(record)">{{text}}</a>
+          <template v-slot:sysBusinessHall="text, record">
+            <div>{{getSysCompany(text)}}</div>
           </template>
           <template v-slot:cardNo="text, record">
             <a @click="showByCardNo(record)">{{text}}</a>
@@ -159,6 +196,9 @@
           <template v-slot:newPhone="text, record">
             <div>{{newPhone(text)}}</div>
           </template>
+          <template v-slot:newBusinessAddress="text, record">
+            <div>{{getSysCompany(text)}}</div>
+          </template>
           <template v-slot:rowIndex="text,records,index">
             {{ (ipagination.current - 1) * ipagination.pageSize + Number(index) + 1 }}
           </template>
@@ -184,6 +224,22 @@ export default {
   inject: ['closeCurrent'],
   data() {
     return {
+
+      optionsWithDisabled:
+        [{
+          text: '非高危',
+          value: '1',
+        }, {
+          text: '已报关停',
+          value: '2',
+
+        }, {
+          text: '已报蓝名单',
+          value: '3',
+        },{
+          text: '已报紫名单',
+          value: '4',
+        }],
       company:'',
       sysCompany: [],
       ipagination:{
@@ -217,6 +273,7 @@ export default {
       /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
       queryParam: {},
       url: {
+        getCompany: "/sysCompany/list",
         typeCount: "/businessReminderCard/type/count",
         list: "/businessReminderCard/list",
         delete: "/businessReminderCard/delete/flagById",
@@ -264,8 +321,8 @@ export default {
           title: '创建人所属营业厅',
           align: "center",
           sorter: true,
-          dataIndex: 'businessAddress',
-          scopedSlots: {customRender: 'businessAddress'}
+          dataIndex: 'sysBusinessHall',
+          scopedSlots: {customRender: 'sysBusinessHall'}
 
         }, {
           title: '更新人',
@@ -276,7 +333,8 @@ export default {
           title: '更新人营业厅',
           align: "center",
           sorter: true,
-          dataIndex: 'newBusinessAddress'
+          dataIndex: 'newBusinessAddress',
+          scopedSlots: {customRender: 'newBusinessAddress'}
           // },
           // {
           //   title: '拨测联系电话',
@@ -417,9 +475,9 @@ export default {
         '1': 'success',
         '2': 'processing',
         '3': 'warning',
-        '4': 'success',
-        '3,4': 'success',
-        '4,3': 'success',
+        '4': 'warning',
+        '3,4': 'warning',
+        '4,3': 'warning',
       }
       return statusTypeMap[type]
     },
@@ -438,8 +496,39 @@ export default {
   created() {
     /**获取研判结果统计数*/
     this.typeCount();
+    this.getSysCompanyData();
+
+
   },
   methods: {
+    getSysCompanyData(){
+      let data = {
+
+      };
+      getAction(this.url.getCompany, data).then((res) => {
+        if (res.success) {
+          let result = res.result;
+          console.log(result + "result");
+          if (result != null) {
+            this.sysCompany = result;
+          }
+        }
+      })
+    },
+    getSysCompany(id) {
+
+      for (var item of this.sysCompany) {
+
+        for (var it of item.sysBusinessHallList) {
+          if (it.id === id) {
+            return it.name
+          }
+        }
+
+      }
+    },
+
+
     newPhone(newPhones){
       var phone='';
       newPhones = newPhones.split(',');