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

@@ -28,44 +28,107 @@
       </el-table-column>
       <el-table-column prop="xmmc" label="项目名称" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">{{ scope.row.xmmc }}</div>
+          <el-input
+            class="item"
+            :disabled="!ableOperation"
+            v-model="scope.row.xmmc"
+            placeholder="请输入内容"
+            @input="updaterow(scope.row)"
+          >
+          </el-input>
         </template>
       </el-table-column>
-      <el-table-column prop="zcs" label="总层数" min-width="100">
+
+      <el-table-column prop="ghyt" label="房屋用途" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">{{ scope.row.zcs }}</div>
+          <treeselect
+            v-model="scope.row.ghyt"
+            :disabled="!ableOperation"
+            noOptionsText="暂无数据"
+            placeholder=""
+            :show-count="true"
+            :options="dictData['A17']"
+            :normalizer="normalizer"
+            :appendToBody="true"
+            z-index="9999"
+            @input="updaterow(scope.row)"
+          />
         </template>
       </el-table-column>
-      <el-table-column prop="ytmc" label="房屋用途" min-width="100">
+      <el-table-column prop="fwjg" label="房屋结构" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">{{ scope.row.ytmc }}</div>
+          <treeselect
+            v-model="scope.row.fwjg"
+            :disabled="!ableOperation"
+            noOptionsText="暂无数据"
+            placeholder=""
+            :show-count="true"
+            :options="dictData['A46']"
+            :normalizer="normalizer"
+            :appendToBody="true"
+            z-index="9999"
+            @input="updaterow(scope.row)"
+          />
         </template>
       </el-table-column>
-      <el-table-column prop="fwjgmc" label="房屋结构" min-width="100">
+      <el-table-column prop="jzmj" label="建筑面积" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">{{ scope.row.fwjgmc }}</div>
+          <el-input
+            class="item"
+            :disabled="!ableOperation"
+            oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
+            v-model="scope.row.jzmj"
+            placeholder="请输入内容"
+            @input="updaterow(scope.row)"
+          >
+          </el-input>
         </template>
       </el-table-column>
-      <el-table-column prop="jzmj" label="建筑面积" min-width="100">
+      <el-table-column prop="jgsj" label="竣工时间" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">{{ scope.row.jzmj }}</div>
+          <el-date-picker
+            v-model="scope.row.jgsj"
+            type="date"
+            :disabled="!ableOperation"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd"
+            @input="updaterow(scope.row)"
+          >
+          </el-date-picker>
         </template>
       </el-table-column>
-      <el-table-column prop="jgsj" label="竣工时间" min-width="100">
+      <el-table-column prop="zcs" label="总层数" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">{{ scope.row.jgsj }}</div>
+          <el-input
+            class="item"
+            :disabled="!ableOperation"
+            oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
+            v-model="scope.row.zcs"
+            placeholder="请输入内容"
+            @input="updaterow(scope.row)"
+          >
+          </el-input>
         </template>
       </el-table-column>
       <el-table-column prop="zts" label="总套数" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">{{ scope.row.zts }}</div>
+          <el-input
+            class="item"
+            :disabled="!ableOperation"
+            oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
+            v-model="scope.row.zts"
+            placeholder="请输入内容"
+            @input="updaterow(scope.row)"
+          >
+          </el-input>
         </template>
       </el-table-column>
     </el-table>
   </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 
 export default {
   computed: {
@@ -82,15 +145,27 @@ export default {
       type: Boolean,
       default: false,
     },
+
   },
   data() {
     return {
       // 键名转换，方法默认是label和children进行树状渲染
       key: 0,
       tableDataList: [],
+      normalizer(node) {
+        if (node.children == null || node.children == "null") {
+          delete node.children;
+        }
+        return {
+          id: node.dcode,
+          label: node.dname,
+          children: node.children,
         };
       },
-  mounted() {},
+    };
+  },
+  mounted() {
+  },
   watch: {
     tableData: {
       handler: function (val, oldVal) {
@@ -122,20 +197,14 @@ export default {
     renderHeader() {
       return (
         <div>
-          {" "}
-          {!this.ableOperation ? (
-            "序号"
-          ) : (
-            <i
-              class="el-icon-plus pointer"
-              onClick={() => {
-                this.addClick();
-              }}
-            ></i>
-          )}
+          {"序号"}
         </div>
       );
     },
+    updaterow(a) {
+      console.log("updaterow:"+JSON.stringify(a));
+      this.$emit("updateFdcwxmList", this.tableDataList);
+    }
   },
 };
 </script>

@@ -141,7 +141,7 @@
           <fdcqxmTable
             :ableOperation="viewEdit"
             :tableData="ruleForm.fdcqxm"
-            @upDateTdytxxList="upDateTdytxxList" />
+            @updateFdcwxmList="updateFdcwxmList" />
           <div class="slxx_title title-block">
             土地用途
             <div class="triangle"></div>
@@ -299,6 +299,10 @@
       };
     },
     methods: {
+      updateFdcwxmList (val) {
+        this.ruleForm.fdcqxm && (this.ruleForm.fdcqxm = _.cloneDeep(val));
+        this.key++;
+      },
       /**
        * @description: 更新土地用途信息
        * @param {*} val