Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -120,7 +120,6 @@ export default {
     // 单选
     singleElection (row) {
       this.selected = this.data.indexOf(row);
-      console.log(this.selected);
     },
 
     tableRowClassName ({ row, rowIndex }) {

@@ -120,7 +120,6 @@ export default {
     // 单选
     singleElection (row) {
       this.selected = this.data.indexOf(row);
-      console.log(this.selected);
     },
 
     tableRowClassName ({ row, rowIndex }) {

@@ -49,6 +49,14 @@ export default {
   created () {
     this.queryNoticeList()
   },
+  mounted () {
+    let that = this
+    window.addEventListener('message', function (messageEvent) {
+      if (messageEvent.data.update) {
+        that.queryNoticeList()
+      }
+    }, false)
+  },
   methods: {
     queryNoticeList () {
       getHomeNoticeList().then(res => {

@@ -69,10 +69,8 @@
         }
     }
 
-
-
     .el-form-item--small.el-form-item {
-        margin-bottom: 0px;
+        margin-bottom: 5px;
     }
 }
 

@@ -15,6 +15,9 @@ export default {
     if (this.fetchData) {
       this.fetchData()
     }
+    if (this.queryClick) {
+      this.queryClick()
+    }
   },
   methods: {
     handleSizeChange (val) {

@@ -97,6 +97,9 @@ export default {
       this.myValue = val;
       let that = this
       if (val) {
+        this.form.sqrList = []
+        this.form.qlrList = []
+        this.isSearch = false
         if (this.sqcxBsm == "") {
           that.add("sqr");
           that.add("qlr");
@@ -121,9 +124,6 @@ export default {
   },
   methods: {
     closeDialog () {
-      this.form.sqrList = []
-      this.form.qlrList = []
-      this.isSearch = false
       this.$emit("input", false);
     },
     loadData () {
@@ -131,7 +131,7 @@ export default {
       getJtfcInfo({ sqcxBsm: this.sqcxBsm }).then((res) => {
         this.$endLoading();
         if (res.code == 200) {
-          this.form = _.cloneDeep(res.result);
+          this.form = res.result;
           this.isSearch = true;
         }
       });

@@ -88,6 +88,7 @@ export default {
       console.log(name, sort);
     },
     handleAdd () {
+      this.sqcxBsm = ''
       this.isDialog = true;
     },
     handleViewClick (row) {

@@ -129,6 +129,7 @@ export default {
         publishNotice({ "bsmNotice": item.bsmNotice }).then(res => {
           if (res.code == 200) {
             this.$message.success('发布成功')
+            this.postMessage()
             this.queryClick();
           } else {
             this.$message.error(res.message)
@@ -141,6 +142,9 @@ export default {
         });
       });
     },
+    postMessage () {
+      window.parent.postMessage({ update: true }, '*')
+    },
     //取消发布
     toUnPublish (item) {
       this.$confirm('是否确定取消发布', '提示', {

@@ -7,13 +7,23 @@ export default {
     }
   },
   created () {
-    getHomeNoticeList().then(res => {
-      if (res.result) {
-        this.noticeList = res.result.noticeList
+    this.getHomeNotice()
+  },
+  mounted () {
+    window.addEventListener('message', function (messageEvent) {
+      if (messageEvent.data.update) {
+        this.getHomeNotice()
       }
-    })
+    }, false)
   },
   methods: {
+    getHomeNotice () {
+      getHomeNoticeList().then(res => {
+        if (res.result) {
+          this.noticeList = res.result.noticeList
+        }
+      })
+    },
     //右侧表单选项卡事件
     beforeLeave (activeName, oldActiveName) {
       if (activeName && activeName != 0) this.getFromRouter(activeName)
@@ -21,8 +31,8 @@ export default {
     //切换选项卡内容组件
     getFromRouter (tabname) {
       //根据tabname获取选中的表单  此操作为了获取后端返回的表单对象，使用里面的是否可操作的属性
-      for(let item of this.tabList){
-        if(item.value === tabname){
+      for (let item of this.tabList) {
+        if (item.value === tabname) {
           this.currentSelectTab = item
           break;
         }

@@ -105,7 +105,6 @@ export default {
   },
   mounted () {
     sendThis(this);
-    this.queryClick()
   },
   watch: {
     queryForm: {

@@ -41,7 +41,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -82,7 +82,6 @@ export default {
   mixins: [table, searchMin],
   mounted () {
     sendThis(this);
-    this.queryClick()
   },
   computed: {
     ...mapGetters(['dictData'])

 <template>
   <div class="from-clues">
-    <div class="from-clues-header">
-      <el-tabs v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick"  v-if="!isJump">
         <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
         <el-tab-pane label="多幢" name="h"></el-tab-pane>
       </el-tabs>
+
+    <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" label-width="110px">
         <el-row>
           <el-col :span="7">
             <el-form-item label="宗地代码">
-              <el-input placeholder="宗地代码" v-model="queryForm.zddm" clearable>
+              <el-input placeholder="请输入宗地代码" v-model="queryForm.zddm" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="土地证号">
-              <el-input placeholder="土地证号" v-model="queryForm.bdcqzh" clearable>
+              <el-input placeholder="请输入土地证号" v-model="queryForm.bdcqzh" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="土地坐落">
-              <el-input placeholder="土地坐落" v-model="queryForm.zl" clearable>
+              <el-input placeholder="请输入土地坐落" v-model="queryForm.zl" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -30,25 +31,25 @@
         <el-row>
           <el-col :span="7">
             <el-form-item label="自然幢号">
-              <el-input placeholder="自然幢号" v-model="queryForm.zrzh" clearable>
+              <el-input placeholder="请输入自然幢号" v-model="queryForm.zrzh" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="项目名称">
-              <el-input v-model="queryForm.xmmc"></el-input>
+              <el-input placeholder="请输入项目名称" v-model="queryForm.xmmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="建筑物名称">
-              <el-input placeholder="建筑物名称" v-model="queryForm.jzwmc" clearable>
+              <el-input placeholder="请输入建筑物名称" v-model="queryForm.jzwmc" clearable>
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="3" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -112,7 +113,7 @@ export default {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
+    queryClick () {
       if (!this.isJump) {
         //从业务办理进入
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
@@ -148,7 +149,7 @@ export default {
     },
     handleTabClick () {
       this.pageData.currentPage = 1;
-      this.fetchData();
+      this.queryClick();
     },
     submitForm () {
       if (this.bdcdysz.length == 0) {
@@ -209,4 +210,5 @@ export default {
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/public.scss";
+
 </style>

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -78,7 +78,7 @@ export default {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
+    queryClick () {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -75,7 +75,7 @@ export default {
     closeDialog () {
       this.$emit("closeDialog");
     },
-    fetchData () {
+    queryClick () {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -33,7 +33,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -103,7 +103,7 @@ export default {
       this.$emit("closeDialog");
     },
     //默认加载表格信息
-    fetchData() {
+    queryClick() {
       this.queryForm.bsmSqyw = this.bsmSqyw;
       selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -80,7 +80,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -32,7 +32,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -88,7 +88,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,9 +79,6 @@ export default {
       this.$emit("closeDialog");
     },
     queryClick() {
-      this.fetchData();
-    },
-    fetchData() {
       this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,7 +104,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
      this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectYgdj100({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,7 +104,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
      this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,7 +104,7 @@ export default {
     closeDialog() {
       this.$emit("closeDialog");
     },
-    fetchData() {
+    queryClick() {
      this.queryForm.sqywbm = this.sqywInfo.djywbm;
       selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {

@@ -36,7 +36,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>

@@ -38,7 +38,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,7 +64,6 @@ export default {
   mixins: [table],
   mounted () {
     sendThis(this);
-    this.queryClick()
   },
   computed: {
     ...mapGetters(['dictData'])

@@ -32,7 +32,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -57,7 +57,6 @@ export default {
   mixins: [table],
   mounted () {
     sendThis(this)
-    this.queryClick()
   },
   data () {
     return {

@@ -6,32 +6,32 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="不动产权证号" label-width="100px">
-              <el-input placeholder="请输入不动产权证号" class="width100" @clear="queryClick()" v-model="queryForm.bdcqzh">
+              <el-input placeholder="请输入不动产权证号" class="width100" @clear="queryClick" v-model="queryForm.bdcqzh">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="印刷序列号" label-width="100px">
-              <el-input placeholder="请输入印刷序列号" class="width100" @clear="queryClick()" v-model="queryForm.ysxlh">
+              <el-input placeholder="请输入印刷序列号" class="width100" @clear="queryClick" v-model="queryForm.ysxlh">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" class="width100" @clear="queryClick()" v-model="queryForm.ywh">
+              <el-input placeholder="请输入业务号" class="width100" @clear="queryClick" v-model="queryForm.ywh">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="领取人">
-              <el-input placeholder="请输入领取人" class="width100" @clear="queryClick()" v-model="queryForm.lqr">
+              <el-input placeholder="请输入领取人" class="width100" @clear="queryClick" v-model="queryForm.lqr">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
+              <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
             </el-form-item>
           </el-col>

@@ -33,10 +33,10 @@
             <el-form-item>
               <el-button
                 type="primary"
-                @click="queryClick()"
+                @click="queryClick"
                 >查询</el-button
               >
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>