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

@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/bdcdj'
 
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'
+VUE_APP_API_BASE_URL = 'http://192.168.2.44:8018'

@@ -197,7 +197,22 @@ export default {
       }
     },
     handleMinus (index, row) {
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.tableData.splice(index, 1)
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     },
     // 上移下移
     moveUpward (index, row) {
@@ -210,4 +225,5 @@ export default {
 }
 </script>
 <style scoped lang='scss'>
+
 </style>
\ No newline at end of file

@@ -208,7 +208,7 @@ export default {
       })
     },
     itemShowFalse () {
-      this.tableData.forEach((item, index) => {
+      this.tableData.length > 0 && this.tableData.forEach((item, index) => {
         item.nodecodeShow = true
         item.nodenameShow = false
         item.djyyShow = false
@@ -219,6 +219,7 @@ export default {
         let container = this.$el.querySelector('.el-table__body-wrapper');
         container.scrollTop = container.scrollHeight;
       })
+      if (this.djqx.length > 0) {
         let code = this.tableData.slice(-1)[0].nodecode
         let codeQ = code.slice(0, 6)
         let len = ''
@@ -227,7 +228,6 @@ export default {
         } else {
           len = this.tableData.length + 1
         }
-
         this.tableData.push(
           {
             nodecode: codeQ + len,
@@ -237,11 +237,36 @@ export default {
             sfqydjyymb: '0'
           }
         )
+      } else {
+        this.tableData.push(
+          {
+            nodename: '',
+            enabled: '1',
+            djyy: '',
+            sfqydjyymb: '0'
+          }
+        )
+      }
       this.addIndexes()
       this.key++
     },
     handleMinus (index, row) {
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.tableData.splice(index, 1)
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     },
     nodecodeBlur (index, row) {
       let list = _.cloneDeep(this.tableData).filter(item => item.bsmSqyw != row.bsmSqyw)
@@ -257,12 +282,10 @@ export default {
     moveUpward (index, row) {
       upward(index, this.tableData)
       this.key++
-      console.log(this.tableData);
     },
     moveDown (index, row) {
       down(index, this.tableData)
       this.key++
-      console.log(this.tableData);
     }
   }
 }

@@ -107,6 +107,15 @@ export default {
       searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
         if (res.code === 200) {
           let { total, records } = res.result
+          let str = ''
+          records.forEach(item=>{
+            if(item.qlrmc.length!=0){
+               item.qlrmcStr = String(item.qlrmc)
+            }
+            if(item.ywrmc.length!=0){
+               item.ywrmcStr = String(item.ywrmc)
+            }
+          })
           this.tableData.total = total;
           this.tableData.data = records
         }

@@ -53,14 +53,24 @@ class data extends filter {
         width:'220'
       },
       {
-        prop: "qlrmc",
         label: "权利人",
-        width:'180'
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{scope.row.qlrmcStr}</span>
+            </div>
+          )
+        }
       },
       {
-        prop: "ywrmc",
         label: "义务人",
-        width:'180'
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{scope.row.ywrmcStr}</span>
+            </div>
+          )
+        }
       },
       {
         prop: "zl",
@@ -79,10 +89,16 @@ class data extends filter {
         width:'80'
       },
       {
-        prop: "zrsj",
         label: "转入时间",
         sortable: 'custom',
-        width:'150'
+        width:'160',
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{scope.row.zrsj[0]}</span>
+            </div>
+          )
+        }
       },
       {
         label: '操作',

@@ -62,9 +62,15 @@ class data extends filter {
         label: "受理人员",
       },
       {
-        prop: "zcsj",
         label: "转出时间",
-        sortable: 'custom'
+        sortable: 'custom',
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{scope.row.zcsj[0]}</span>
+            </div>
+          )
+        }
       },
       {
         label: '操作',

@@ -93,7 +93,7 @@
 //首次登记
 import { datas, sendThis } from "../javascript/jsydsyq200.js";
 import table from "@/utils/mixin/table";
-import { selectScBdcdy, startBusinessFlow } from "@/api/ywbl.js";
+import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
 export default {
   props: {
     bsmSqyw: { type: String, default: "" },
@@ -107,7 +107,7 @@ export default {
         bdcdyh: "",
         ywh: "",
         bdcqzh: "",
-        sqywbm: "A03100",
+        sqywbm: "A03200",
       },
       qllxs: [],
       tableData: {
@@ -133,7 +133,7 @@ export default {
     },
     fetchData() {
       if (this.bsmSqyw) {
-        selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
+        selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
           if (res.code === 200) {
             let { total, records } = res.result;
             this.tableData.total = total;

@@ -51,11 +51,11 @@ class data extends filter {
         label: "证件号",
       },
       {
-        prop: "qlxzmc",
+        prop: "qlxz",
         label: "权利性质",
       },
       {
-        prop: "zdmj",
+        prop: "mj",
         label: "使用权面积",
       },    
       {

@@ -100,6 +100,12 @@ export default {
                str = String(item.userNameList)
                item.blStatus = item.zbhj + '('+ str.replace(/,/g,"+") + ')'
             }
+            if(item.qlrmc.length!=0){
+               item.qlrmcStr = String(item.qlrmc)
+            }
+            if(item.ywrmc.length!=0){
+               item.ywrmcStr = String(item.ywrmc)
+            }
           })
           this.pageData.total = total;
           this.tableData.data = records

@@ -57,12 +57,24 @@ class data extends filter {
         label: "申请业务名称",
       },
       {
-        prop: "qlrmc",
         label: "权利人",
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{scope.row.qlrmcStr}</span>
+            </div>
+          )
+        }
       },
       {
-        prop: "ywrmc",
         label: "义务人",
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{scope.row.ywrmcStr}</span>
+            </div>
+          )
+        }
       },
       {
         prop: "zl",