0807

src/views/networkAccess/registration.vue

@@ -1488,7 +1488,9 @@ export default {
       if (data!==null && data!==''){
         this.industryNull=false;
       }
-
+      if (data!=='其它'){
+        this.model.industryQiTa='';
+      }
       if (data==='其它'){
         this.industryNullQiTa=true
         this.industryNull=true;
@@ -2152,13 +2154,15 @@ export default {
               this.dataList=result;
                 if (info===''){
                   this.resultData(result,newPhones);
-                  this.showModal()
+                  if (result[0]["isSizeNumberResults"] === 'is') {
+                    this.showModal()
+                  }
                 }
 
 
               this.disabledListAdd()
               this.showCheck0('all');
-              // if (result[0]["isSizeNumberResults"] === 'is') {
+
               //   this.$confirm({
               //     title: "确认是否继续...",
               //     content: '该用户有多个不友好研判结果',
@@ -2782,7 +2786,9 @@ export default {
       }
       if (info==='submit'){
         if (this.industryQiTa!=='' || this.industryQiTa!==null){
-          this.model.industry = this.industryQiTa;
+          if (this.model.industry==='其它'){
+            this.model.industry = this.industryQiTa;
+          }
         }
       }
       if (info==='submit'){
@@ -2915,7 +2921,7 @@ export default {
           }
         })
       } else {
-        data['newBusinessAddress']=this.model.sysBusinessHall;
+        //data['newBusinessAddress']=this.model.sysBusinessHall;  更新人营业厅地址从用户获取
         postAction("/businessReminderCard/editById", data).then((res) => {
           if (res.success) {
             this.clearModel()

src/views/networkAccess/userStatistics.vue

@@ -36,8 +36,8 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="营业厅地址">
-                <j-input placeholder="请输入营业厅地址" v-model="queryParam.sysBusinessHall"></j-input>
+              <a-form-item label="创建人营业厅地址">
+                <j-input placeholder="请输入营业厅地址" v-model="queryParam.businessAddress"></j-input>
               </a-form-item>
             </a-col>
 
@@ -314,25 +314,25 @@ export default {
           title: '姓名',
           align: "center",
           sorter: true,
-          dataIndex: 'cardName',
-          scopedSlots: {customRender: 'cardName'}
+          dataIndex: 'cardName'
+         // scopedSlots: {customRender: 'cardName'}
         }, {
           title: '创建人',
           align: "center",
           sorter: true,
-          dataIndex: 'createBy',
-          scopedSlots: {customRender: 'createBy'}
+          dataIndex: 'createBy'
+         // scopedSlots: {customRender: 'createBy'}
         }, {
           title: '创建时间',
           align: "center",
           sorter: true,
           dataIndex: 'createTime'
         }, {
-          title: '创建人所属营业厅',
+          title: '创建人营业厅地址',
           align: "center",
           sorter: true,
-          dataIndex: 'sysBusinessHall',
-          scopedSlots: {customRender: 'sysBusinessHall'}
+          dataIndex: 'businessAddress'
+          //scopedSlots: {customRender: 'sysBusinessHall'}
 
         }, {
           title: '更新人',
@@ -343,8 +343,8 @@ export default {
           title: '更新人营业厅',
           align: "center",
           sorter: true,
-          dataIndex: 'newBusinessAddress',
-          scopedSlots: {customRender: 'newBusinessAddress'}
+          dataIndex: 'newBusinessAddress'
+          //scopedSlots: {customRender: 'newBusinessAddress'}
           // },
           // {
           //   title: '拨测联系电话',