--no commit message

xiaomiao
Showing 5 changed files with 55 additions and 35 deletions
package.json
src/components/Base/base.js
src/main.js
src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
--- a/package.json
View file @292daf2
+++ b/package.json
View file @292daf2
@@ -10,6 +10,7 @@
  "dependencies": {
    "@antv/g2": "^4.2.8",
    "@babel/polyfill": "^7.12.1",
+    "@riophae/vue-treeselect": "^0.4.0",
    "axios": "^0.21.1",
    "bpmn-js": "^7.4.0",
    "bpmn-js-properties-panel": "^0.37.2",
--- a/src/components/Base/base.js
View file @292daf2
+++ b/src/components/Base/base.js
View file @292daf2
@@ -7,12 +7,14 @@ import dialogBox from '@/components/DialogBox/dialogBox.vue'
 import LbTable from '@/components/LbTable/lb-table.vue'
 import Theme from '@/components/Theme/theme.vue'
 import Popup from '@/components/Popup/index'
+import Treeselect from '@riophae/vue-treeselect' //树形下拉框组件
 import MessageBox from '@/components/MessageBox/index.js'
 export default {
  install: (Vue) => {
    Vue.component('dialogBox', dialogBox);
    Vue.component('lbTable', LbTable);
    Vue.component('Theme', Theme);
+    Vue.component('Treeselect', Treeselect);
    Vue.prototype.$popup = Popup.install;
    Vue.prototype.$alertMes = MessageBox.alert;
  }
--- a/src/main.js
View file @292daf2
+++ b/src/main.js
View file @292daf2
@@ -6,16 +6,18 @@
 import Vue from 'vue'
 import App from './App'
 import 'normalize.css/normalize.css' // a modern alternative to CSS resets
-import Element from 'element-ui'
+import Element, { install } from 'element-ui'
 import axios from 'axios'
 import '@/styles/element-variables.scss'
 import '@/styles/index.scss'
 import Base from '@/components/Base/base' // 全局组件引入
 import mixin from '@/utils/mixin/theme.js'
 import Loading from '@/components/Loading/index.js';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
 Vue.mixin(mixin);
 Vue.use(Loading.directive);
 // 引入xml
 import x2js from 'x2js'
 Vue.prototype.$x2js = new x2js()
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @292daf2
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @292daf2
@@ -76,22 +76,22 @@
              <el-input v-model="ruleForm.qlxx.zl"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="土地使用权人：">
              <el-input v-model="ruleForm.fdcq2.tdsyqr"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="独用土地面积：">
              <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="分摊土地面积：">
              <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <!-- 下拉框 -->
            <el-form-item label="土地性质：" style="margin-bottom:3px">
              <treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
@@ -99,7 +99,7 @@
                :show-count="true" :options="dictData['A45']" />
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="房地产交易价格：">
              <div style="display:flex">
                <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
@@ -164,7 +164,7 @@
              <el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="分摊建筑面积：">
              <el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input>
            </el-form-item>
@@ -290,13 +290,27 @@ import { mapGetters } from "vuex";
 import { init,save } from "@/api/djbbl.js";
 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
+  // import the component
+// import Treeselect from '@riophae/vue-treeselect'
+//   // import the styles
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  components: { qlrCommonTable,tdytTable },
+  components: { qlrCommonTable,tdytTable},
  computed: {
    ...mapGetters(["dictData", "flag"]),
  },
  data() {
    return {
+         // 键名转换，方法默认是label和children进行树状渲染
+        normalizer (node) { //方法
+          if (node.children == null || node.children == 'null') {
+            delete node.children;
+          }
+          return {
+            id: node.dcode,
+            label: node.dname
+          }
+        },
      //表单是否可操作
      propsParam: this.$attrs,
      ableOperation: true,
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @292daf2
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @292daf2
@@ -80,29 +80,29 @@
            <el-form-item label="使用权面积：">
              <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
            </el-form-item>
-          </el-col> <!-- 
+          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="独用土地面积：">
-              <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.dytdmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="分摊土地面积：">
-              <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.fttdmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="土地性质：" style="margin-bottom:3px">
-              <treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
+              <treeselect v-model="ruleForm.jsydsyq.jedw" placeholder=""
                :normalizer="normalizer"
-                :show-count="true" :options="dictData['A45']" />
+                :show-count="true" :options="dictData['A9']" />
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="房地产交易价格：">
              <div style="display:flex">
-                <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
+                <el-input v-model="ruleForm.jsydsyq.qjjg" style="width:500%"></el-input>
-                <el-select v-model="ruleForm.fdcq2.jedw">
+                <el-select v-model="ruleForm.jsydsyq.jedw">
                  <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                  </el-option>
                </el-select>
@@ -111,7 +111,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="规划用途：">
-              <el-select v-model="ruleForm.fdcq2.ghyt">
+              <el-select v-model="ruleForm.jsydsyq.ghyt">
                <el-option v-for="item in dictData['A17']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                </el-option>
              </el-select>
@@ -119,17 +119,17 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="批准用途：">
-              <el-input v-model="ruleForm.fdcq2.pzyt"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.pzyt"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="实际用途：">
-              <el-input v-model="ruleForm.fdcq2.sjyt"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.sjyt"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="房屋性质：">
-              <el-select v-model="ruleForm.fdcq2.fwxz">
+              <el-select v-model="ruleForm.jsydsyq.fwxz">
                <el-option v-for="item in dictData['A19']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                </el-option>
              </el-select>
@@ -137,7 +137,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="房屋结构：">
-              <el-select v-model="ruleForm.fdcq2.fwjg">
+              <el-select v-model="ruleForm.jsydsyq.fwjg">
                <el-option v-for="item in dictData['A46']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                </el-option>
              </el-select>
@@ -145,34 +145,34 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="所在层：">
-              <el-input v-model="ruleForm.fdcq2.szc"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.szc"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="总层数：">
-              <el-input v-model="ruleForm.fdcq2.zcs"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.zcs"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="建筑面积：">
-              <el-input v-model="ruleForm.fdcq2.jzmj"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.jzmj"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="专有建筑面积：">
-              <el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.zyjzmj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8" v-if="ruleForm.fdcq2.ftjzmj">
+          <el-col :span="8">
            <el-form-item label="分摊建筑面积：">
-              <el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.ftjzmj"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="竣工时间：">
-              <el-input v-model="ruleForm.fdcq2.jgsj"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.jgsj"></el-input>
            </el-form-item>
-          </el-col> -->
+          </el-col>
          <el-col :span="8">
            <el-form-item label="不动产权证号：">
@@ -200,13 +200,13 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <!-- <el-row>
+        <el-row>
          <el-col :span="24">
            <el-form-item label="附记：">
-              <el-input v-model="ruleForm.fdcq2.fj"></el-input>
+              <el-input v-model="ruleForm.jsydsyq.fj"></el-input>
            </el-form-item>
          </el-col>
-        </el-row> -->
+        </el-row>
        <div class="slxx_title title-block">
          权利人信息
@@ -282,6 +282,7 @@ export default {
  },
  data() {
    return {
      //表单是否可操作
      propsParam: this.$attrs,
      ableOperation: true,