style:系统通知

renchao@pashanhoo.com
Showing 7 changed files with 41 additions and 75 deletions
src/api/config.js
src/components/lbTable/lb-table.vue
src/views/system/xttz/xttz.vue
src/views/workflow/workFrameView.vue
src/views/ywbl/ywsq/components/selectJsydsyq.vue
src/views/ywbl/ywsq/javascript/selectJsydsyq.js
src/views/ywbl/ywsq/selectBdc.vue
--- a/src/api/config.js
View file @ecdddc3
+++ b/src/api/config.js
View file @ecdddc3
@@ -4,5 +4,5 @@
 * @LastEditTime: 2023-04-17 15:17:01
 */
 export default {
-  SERVERAPI: '/bdcdj' // 38服务器地址
+  SERVERAPI: 'service-bdcdj-th' // 38服务器地址
 }
\ No newline at end of file
--- a/src/components/lbTable/lb-table.vue
View file @ecdddc3
+++ b/src/components/lbTable/lb-table.vue
View file @ecdddc3
@@ -10,11 +10,11 @@
 <template>
  <div :class="['lb-table', customClass]">
-    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable"
+    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable" :border='border'
-      :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection"
+      :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection"
      :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :height="tableHeight" v-on="$listeners"
      :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
-      <el-table-column width="45" align="center" v-if="isRadio">
+      <el-table-column width="50" align="center" label="选择" v-if="isRadio">
        <template slot-scope="scope">
          <el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio>
        </template>
@@ -26,10 +26,10 @@
    <el-table v-else ref="elTable" class="table-fixed" :row-style="{ height: '50px' }" :border='border'
      :row-class-name="tableRowClassName" :show-header='showHeader'
-      :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :max-height="maxHeight"
+      :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :max-height="maxHeight" v-on="$listeners"
-      v-on="$listeners" :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
+      :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
-      <el-table-column width="45" align="center" v-if="isRadio">
+      <el-table-column width="50" align="center" label="选择" v-if="isRadio">
        <template slot-scope="scope">
          <el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio>
        </template>
--- a/src/views/system/xttz/xttz.vue
View file @ecdddc3
+++ b/src/views/system/xttz/xttz.vue
View file @ecdddc3
@@ -164,12 +164,7 @@ export default {
    },
    //编辑通知
    editNotice (item) {
-      this.$nextTick(() => {
+      this.$popupDialog("系统通知详情", "system/xttz/components/addDialog", { ...item, "isButtonFlag": true }, "50%")
-        this.isButtonFlag = true;
-        this.$refs.addDialog.getDetailInfo(item);
-        this.dialogTitle = '编辑系统通知'
-        this.isDialog = true;
-      })
    },
    downloadFile (item) {
      const href = item.noticeFileUrl
--- a/src/views/workflow/workFrameView.vue
View file @ecdddc3
+++ b/src/views/workflow/workFrameView.vue
View file @ecdddc3
@@ -4,22 +4,14 @@
    <div class="topButton">
      <!-- 左侧业务功能按钮 -->
      <ul>
-        <li
+        <li @click="operation(item)" v-for="(item, index) in leftButtonList" :key="index">
-          @click="operation(item)"
-          v-for="(item, index) in leftButtonList"
-          :key="index"
-        >
          <svg-icon :icon-class="item.icon" />
          <span class="iconName">{{ item.name }}</span>
        </li>
      </ul>
      <!-- 右侧流程按钮 -->
      <ul>
-        <li
+        <li @click="operation(item)" v-for="(item, index) in rightButtonList" :key="index">
-          @click="operation(item)"
-          v-for="(item, index) in rightButtonList"
-          :key="index"
-        >
          <svg-icon class="icon" :icon-class="item.icon" />
          <span class="iconName">{{ item.name }}</span>
        </li>
@@ -33,11 +25,7 @@
        <div v-if="this.isShowdrawer">
          <div class="title">申请单元列表({{ unitData.length }})</div>
          <el-menu :default-active="activeIndex" @select="unitClick">
-            <el-menu-item
+            <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
-              v-for="(item, index) in unitData"
-              :index="index.toString()"
-              :key="index"
-            >
              <div>
                <p>{{ item.bdcdyh }}</p>
                <p class="title-detail">{{ item.zl }}</p>
@@ -45,24 +33,16 @@
            </el-menu-item>
          </el-menu>
        </div>
-        <div
+        <div class="map-drawer-click map-drawer" v-if="!isShowdrawer" @click="
-          class="map-drawer-click map-drawer"
+          () => {
-          v-if="!isShowdrawer"
+            this.isShowdrawer = !this.isShowdrawer;
-          @click="
+          }
-            () => {
+        "></div>
-              this.isShowdrawer = !this.isShowdrawer;
+        <div class="map-drawer-expand map-drawer" v-else @click="
-            }
+          () => {
-          "
+            this.isShowdrawer = !this.isShowdrawer;
-        ></div>
+          }
-        <div
+        "></div>
-          class="map-drawer-expand map-drawer"
-          v-else
-          @click="
-            () => {
-              this.isShowdrawer = !this.isShowdrawer;
-            }
-          "
-        ></div>
      </div>
      <div class="leftCon">
        <!-- 分屏左侧预览 -->
@@ -72,19 +52,10 @@
        <!-- 表单内容区域 -->
        <div class="rightContainer">
          <el-tabs v-model="tabName" :before-leave="beforeLeave">
-            <el-tab-pane
+            <el-tab-pane :label="item.name" :name="item.value" v-for="(item, index) in tabList" :key="index">
-              :label="item.name"
-              :name="item.value"
-              v-for="(item, index) in tabList"
-              :key="index"
-            >
            </el-tab-pane>
          </el-tabs>
-          <component
+          <component :key="fresh" :is="componentTag" v-bind="currentSelectProps" />
-            :key="fresh"
-            :is="componentTag"
-            v-bind="currentSelectProps"
-          />
        </div>
      </div>
    </div>
@@ -105,7 +76,7 @@ export default {
  components: {
    NoticeBar,
  },
-  data() {
+  data () {
    return {
      // 流程图
      imgSrc: "",
@@ -143,14 +114,14 @@ export default {
      clxxTab: {},
    };
  },
-  mounted() {
+  mounted () {
    this.loadBdcdylist();
    this.flowInitParam();
  },
  methods: {
    //加载流程初始参数
-    flowInitParam() {
+    flowInitParam () {
      var formdata = new FormData();
      formdata.append("bsmSlsq", this.bsmSlsq);
      formdata.append("bestepid", this.bestepid);
@@ -163,7 +134,7 @@ export default {
      });
    },
    //流程环节操作按钮
-    operation(item) {
+    operation (item) {
      //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书
      //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
      switch (item.value) {
@@ -171,7 +142,7 @@ export default {
          getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(
            (res) => {
              let { result } = res;
-              popupDialog("流程图", "workflow/components/processViewer", {
+              this.$popupDialog("流程图", "workflow/components/processViewer", {
                xml: result.xml,
                finishedInfo: {
                  finishedTaskSet: result.finishedTaskSet,
@@ -180,7 +151,7 @@ export default {
                  finishedSequenceFlowSet: result.finishedSequenceFlowSet,
                },
                allCommentList: result.historyTaskList,
-              });
+              }, '70%', true);
            }
          );
          break;
@@ -207,7 +178,7 @@ export default {
      }
    },
    //读取申请单元信息
-    loadBdcdylist() {
+    loadBdcdylist () {
      var formdata = new FormData();
      formdata.append("bsmSlsq", this.bsmSlsq);
      formdata.append("bestepid", this.bestepid);
@@ -220,7 +191,7 @@ export default {
      });
    },
    //申请单元点击事件
-    unitClick(index) {
+    unitClick (index) {
      this.currentSelectProps = this.unitData[index];
      this.currentSelectProps.type = "ONLY_READ";
      getStepFormInfo(this.currentSelectProps).then((res) => {
--- a/src/views/ywbl/ywsq/components/selectJsydsyq.vue
View file @ecdddc3
+++ b/src/views/ywbl/ywsq/components/selectJsydsyq.vue
View file @ecdddc3
@@ -73,10 +73,10 @@ export default {
      tableData: {
        total: 0,
        columns: datas.columns(),
-        data: [],
+        data: []
      },
-      bdcdysz: [],
+      bdcdysz: []
-    };
+    }
  },
  mounted () {
    sendThis(this);
@@ -136,11 +136,11 @@ export default {
        bsmQlxx: row.bsmQlxx,
      };
      this.$popup("登记簿详情", "registerBook/djbFrame", {
-        formData: param,
+        formData: param
-      });
+      })
-    },
+    }
-  },
+  }
-};
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
--- a/src/views/ywbl/ywsq/javascript/selectJsydsyq.js
View file @ecdddc3
+++ b/src/views/ywbl/ywsq/javascript/selectJsydsyq.js
View file @ecdddc3
@@ -32,7 +32,6 @@ class data extends filter {
        render: (h, scope) => {
          return (
            <div>
-              {/* <a v-on:click="doSomething"></a> */}
              <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
--- a/src/views/ywbl/ywsq/selectBdc.vue
View file @ecdddc3
+++ b/src/views/ywbl/ywsq/selectBdc.vue
View file @ecdddc3
@@ -4,7 +4,8 @@
 * @LastEditTime: 2023-04-17 16:06:24
 -->
 <template>
-  <component :is="router" :sqywInfo="formData.sqywInfo" @updateDialog="updateDialog" />
+  <component :is="router" :sqywInfo="formData.sqywInfo" :isJump="formData.isJump ? formData.isJump : false"
+    @updateDialog="updateDialog" />
 </template>
 <script>
 import { queueDjywmc } from "./slectBdcdata.js";