style:申请

任超
Showing 6 changed files with 25 additions and 26 deletions
src/components/tanchuang/index.vue
src/utils/mixin/table.js
src/views/workflow/workFrame.vue
src/views/ywbl/ywsq/components/houseOwnership.vue
src/views/ywbl/ywsq/slectBdc.vue
src/views/ywbl/ywsq/ywsq.vue
--- a/src/components/tanchuang/index.vue
View file @ef07182
+++ b/src/components/tanchuang/index.vue
View file @ef07182
@@ -26,7 +26,7 @@ export default {
  name: 'index',
  data () {
    return {
-      btnShow:false,
+      btnShow: false,
      title: '提示',
      cancelText: '取消',
      confirmText: '确认',
@@ -38,7 +38,7 @@ export default {
      titleStyle: 'center',
      width: "75%",
      height: "auto",
-      formData: "",//父组件传递的参数 负责传给子组件
+      formData: undefined,//父组件传递的参数 负责传给子组件
      contentHeight: "",
      iconClass: "",
      key: 0
--- a/src/utils/mixin/table.js
View file @ef07182
+++ b/src/utils/mixin/table.js
View file @ef07182
-import { mapGetters } from 'vuex'
 export default {
  data () {
    return {
@@ -11,9 +10,6 @@ export default {
  created () {
    this.fetchData()
  },
-  computed: {
-    ...mapGetters(['dictData'])
-  },
  methods: {
    handleSizeChange (val) {
      this.pageData.currentPage = 1
--- a/src/views/workflow/workFrame.vue
View file @ef07182
+++ b/src/views/workflow/workFrame.vue
View file @ef07182
@@ -56,6 +56,7 @@
        </div>
      </div>
    </div>
+    <fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" />
  </div>
 </template>
@@ -74,10 +75,15 @@ import {
 } from "@/api/fqsq.js"
 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
 import { getForm } from "./flowform.js"
+import fqsqDialog from "@/views/ywbl/ywsq/slectBdc.vue"
 import { queueDjywmc } from '@/views/ywbl/ywsq/slectBdcdata.js';
 export default {
+  components: {
+    fqsqDialog
+  },
  data () {
    return {
+      isDialog: false,
      // 流程图
      imgSrc: '',
      // 折叠
@@ -151,11 +157,8 @@ export default {
      let that = this;
      switch (item.value) {
        case "B0":
-          let type = queueDjywmc(this.$route.query.sqywbm)
+          // let type = queueDjywmc(this.$route.query.sqywbm)
-          this.$popup({
+          this.isDialog = true
-            title: '查询权利信息',
-            editItem: 'ywbl/ywsq/components/houseOwnership',
-          })
          break;
        case "B1":
          getWorkFlowImage(this.bsmSlsq).then(res => {
--- a/src/views/ywbl/ywsq/components/houseOwnership.vue
View file @ef07182
+++ b/src/views/ywbl/ywsq/components/houseOwnership.vue
View file @ef07182
 <template>
  <div class="from-clues">
-    <!-- 表单部分 -->
    <div class="from-clues-header">
      <el-tabs v-model="activeName" @tab-click="handleTabClick">
        <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
@@ -42,7 +41,6 @@
        </el-row>
      </el-form>
    </div>
-    <!-- 表格 -->
    <div class="from-clues-content">
      <lb-table border :page-size="pageData.pageSize" :heightNum="400" :current-page.sync="pageData.currentPage"
        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
@@ -60,10 +58,13 @@
 import { mapGetters } from 'vuex'
 import { datas, sendThis } from "../javascript/houseOwnership.js";
 import table from "@/utils/mixin/table";
-import jump from "../components/mixin/jump";
+import jump from "@/views/ywbl/ywsq/components/mixin/jump";
 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
 export default {
  mixins: [table, jump],
+  props: {
+    djywbm: { type: String, default: '' }
+  },
  data () {
    return {
      activeName: 'zrz',
@@ -86,7 +87,7 @@ export default {
    sendThis(this)
  },
  computed: {
-    ...mapGetters(['dictData', 'bsmSqyw', 'djqxObj', 'djywbm']),
+    ...mapGetters(['dictData', 'bsmSqyw', 'djqxObj']),
  },
  methods: {
    closeDialog () {
--- a/src/views/ywbl/ywsq/slectBdc.vue
View file @ef07182
+++ b/src/views/ywbl/ywsq/slectBdc.vue
View file @ef07182
 <template>
  <dialogBox title="查询权利信息" width="85%" :isButton="false" @closeDialog="closeDialog" v-model="myValue">
-    <component :is="editItem" @closeDialog="closeDialog" :key="key" />
+    <component :is="editItem" @closeDialog="closeDialog" :djywbm="djywbm" :key="key" />
  </dialogBox>
 </template>
 <script>
-import { mapGetters } from 'vuex'
 import { queueDjywmc } from './slectBdcdata.js'
 export default {
  props: {
-    value: { type: Boolean, default: true }
+    value: { type: Boolean, default: true },
+    djywbm: { type: String, default: '' }
  },
  data () {
    return {
      key: 0,
      editItem: '',
-      myValue: this.value
+      myValue: this.value,
    }
  },
-  computed: {
-    ...mapGetters(['djywbm'])
-  },
  watch: {
    value (val) {
      this.myValue = val
      this.key++
    },
-    djywbm (val) {
+    'djywbm' (val) {
+      console.log(val);
      let dd = queueDjywmc(val)
      this.editItem = this.loadView(dd)
    }
--- a/src/views/ywbl/ywsq/ywsq.vue
View file @ef07182
+++ b/src/views/ywbl/ywsq/ywsq.vue
View file @ef07182
@@ -65,7 +65,7 @@
        <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
      </div>
    </div>
-    <fqsqDialog v-model="isDialog" />
+    <fqsqDialog v-model="isDialog" :djywbm="djywbm" />
  </div>
 </template>
 <script>
@@ -85,6 +85,7 @@ export default {
      djqxList: [],
      isDialog: false,
      btnDisabled: true,
+      djywbm: ''
    }
  },
  components: {
@@ -126,7 +127,7 @@ export default {
      if (item.sffqlc == '1') {
        this.btnDisabled = false
        this.$store.dispatch('ywbl/setBsmSqyw', item.parentid)
-        this.$store.dispatch('ywbl/setDjywbm', item.djywbm)
+        this.djywbm = item.djywbm
      }
    },
    handleList (list, obj) {
@@ -197,7 +198,7 @@ export default {
      if (item.sffqlc == '1') {
        this.btnDisabled = false
        this.$store.dispatch('ywbl/setBsmSqyw', item.bsmSqyw)
-        this.$store.dispatch('ywbl/setDjywbm', item.djywbm)
+        this.djywbm = item.djywbm
      } else {
        this.getNextNode(item.bsmSqyw, false)
      }