style:申请查询

任超
Showing 5 changed files with 43 additions and 29 deletions
src/layout/components/Navbar.vue
src/views/sqcx/sqcxjl/sqcxjl.vue
src/views/system/xttz/xttz.vue
src/views/workflow/mixin/public.js
src/views/workflow/workFrame1.vue
--- a/src/layout/components/Navbar.vue
View file @5d22d45
+++ b/src/layout/components/Navbar.vue
View file @5d22d45
@@ -57,6 +57,9 @@ export default {
      }
    }, false)
  },
+  destroyed () {
+    window.removeEventListener('message')
+  },
  methods: {
    queryNoticeList () {
      getHomeNoticeList().then(res => {
--- a/src/views/sqcx/sqcxjl/sqcxjl.vue
View file @5d22d45
+++ b/src/views/sqcx/sqcxjl/sqcxjl.vue
View file @5d22d45
@@ -2,47 +2,53 @@
  <div class="from-clues">
    <!-- 表单部分 -->
    <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">       
+      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="100px">
        <el-row>
-          <el-col :span="3">
+          <el-col :span="6">
            <el-form-item label="查询来源">
-              <el-select v-model="queryForm.cxbh" placeholder="请选择活动区域">
+              <el-select v-model="queryForm.cxbh" class="width100" placeholder="请选择活动区域">
                <el-option label="区域一" value="shanghai"></el-option>
                <el-option label="区域二" value="beijing"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="3">
+          <el-col :span="6">
            <el-form-item label="查询类型">
-              <el-select v-model="queryForm.cxbh" placeholder="请选择活动区域">
+              <el-select v-model="queryForm.cxbh" class="width100" placeholder="请选择活动区域">
                <el-option label="区域一" value="shanghai"></el-option>
                <el-option label="区域二" value="beijing"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="3">
+          <el-col :span="6">
            <el-form-item label="查询编号">
              <el-input placeholder="请输入编号" @clear="queryClick" v-model="queryForm.cxbh" class="width100" clearable>
              </el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
            <el-form-item label="申请人">
              <el-input placeholder="请输入申请人" @clear="queryClick" v-model="queryForm.sqr" class="width100" clearable>
              </el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+        </el-row>
-            <el-form-item label="查询时间">
+        <el-row>
-              <el-date-picker v-model="queryForm.sqr" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
+          <el-col :span="6">
-                clearable>
+            <el-form-item label="开始日期" class="marginbtm0">
-              </el-date-picker> 至
+              <el-date-picker class="width100" v-model="queryForm.sqr" type="date" placeholder="开始日期"
-              <el-date-picker v-model="queryForm.sqr" type="date" placeholder="结束日期" value-format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd" clearable>
-                clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束日期" class="marginbtm0">
+              <el-date-picker class="width100" v-model="queryForm.sqr" type="date" placeholder="结束日期"
+                value-format="yyyy-MM-dd" clearable>
              </el-date-picker>
            </el-form-item>
          </el-col>
-          <el-col :span="3" class="btnColRight">
+          <el-col :span="12" class="btnColRight">
            <el-form-item>
              <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
              <el-button @click="moreQueryClick()">高级查询</el-button>
@@ -53,7 +59,7 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
+      <lb-table :page-size="pageData.size" :heightNum="305" class="loadingtext" @sort-change="handleSort"
        :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
      </lb-table>
@@ -67,11 +73,11 @@ import { getJtfcPage } from "@/api/sqcx";
 export default {
  name: "sqcxjl",
  mixins: [table],
-  mounted() {
+  mounted () {
    sendThis(this);
    this.queryClick();
  },
-  data() {
+  data () {
    return {
      queryForm: {
        cxbh: "",
@@ -86,7 +92,7 @@ export default {
  },
  methods: {
    // 初始化数据
-    queryClick() {
+    queryClick () {
      this.$startLoading();
      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
        this.$endLoading();
@@ -97,23 +103,27 @@ export default {
        }
      });
    },
-    handleSort(name, sort) {
+    handleSort (name, sort) {
      console.log(name, sort);
    },
    // 查看
-    handleViewClick(scope) {
+    handleViewClick (scope) {
      var sqcxBsm = scope.row.bsmSqcx;
      this.$popup("申请查询记录", "sqcx/sqcxjl/components/sqcxjlInfo", {
        formData: {
          sqcxBsm: sqcxBsm,
        },
-        cancel: function () {}, //取消事件的回调
+        cancel: function () { }, //取消事件的回调
-        confirm: function () {},
+        confirm: function () { },
      });
    },
  },
 };
 </script>
 <style scoped lang="scss">
+.marginbtm0 {
+  margin-bottom: 0
+}
 @import "~@/styles/public.scss";
 </style>
--- a/src/views/system/xttz/xttz.vue
View file @5d22d45
+++ b/src/views/system/xttz/xttz.vue
View file @5d22d45
@@ -154,6 +154,7 @@ export default {
      }).then(() => {
        unPublishNotice({ "bsmNotice": item.bsmNotice }).then(res => {
          if (res.code == 200) {
+            this.postMessage()
            this.$message.success('删除成功')
            this.queryClick();
          } else {
--- a/src/views/workflow/mixin/public.js
View file @5d22d45
+++ b/src/views/workflow/mixin/public.js
View file @5d22d45
@@ -10,10 +10,10 @@ export default {
    this.getHomeNotice()
  },
  mounted () {
+    let that = this
    window.addEventListener('message', function (messageEvent) {
-      if (messageEvent.data.update) {
+      console.log(23333333333333333);
-        this.getHomeNotice()
+      that.getHomeNotice()
-      }
    }, false)
  },
  methods: {
--- a/src/views/workflow/workFrame1.vue
View file @5d22d45
+++ b/src/views/workflow/workFrame1.vue
View file @5d22d45
@@ -25,7 +25,7 @@
        <el-menu :default-active="activeIndex" @select="batchUnitClick" class="title-batch" v-if="showBatch">
          <el-menu-item index="-1" key="-1" class="menus">
            <div>{{ batchButtonName }}</div>
-          </el-menu-item> 
+          </el-menu-item>
        </el-menu>
        <div v-if="this.isShowdrawer">
          <div class="title">
@@ -194,7 +194,7 @@ export default {
          //默认加载第一个表单信息
          this.tabName = res.result[0].value;
          //批量操作无分屏按钮 
-          if(index != null){
+          if (index != null) {
            //处理分屏材料信息  
            let that = this;
            this.tabList.forEach(function (item, index) {
@@ -216,7 +216,7 @@ export default {
      this.stepForm(index);
    },
    //批量按钮点击事件
-    batchUnitClick(){
+    batchUnitClick () {
      this.currentSelectProps.batchOperation = true;
      this.activeIndex = "-1";
      this.stepForm();