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

@@ -21,6 +21,5 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
-/src/api/config.js
 
 package-lock.json

+/*
+ * @Description: api请求配置文件
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-02 13:56:25
+ */
+export default {
+  SERVERAPI: '/service-jiao', // 泽平
+  // SERVERAPI: '/service-bdcdj' // 38服务器地址
+}
\ No newline at end of file

@@ -210,7 +210,7 @@ export function selectZrz (data) {
 }
 
 /*
-业务办理-选择单元-查询自然幢信息
+业务办理-选择单元-查询多幢幢信息
 */
 export function selectDz (data) {
     return request({

+/*
+ * @Description: 引入公共组件
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-02 13:25:48
+ */
 import dialogBox from '@/components/dialogBox/dialogBox.vue'
 import LbTable from '@/components/LbTable/lb-table.vue'
 import Theme from '@/components/Theme/theme.vue'

@@ -91,22 +91,10 @@
           </el-row>
           <el-row>
             <el-col :span="7">
-              <el-form-item label="自然幢号">
-                <el-input placeholder="请输入自然幢号" v-model="querydzForm.zrzh" clearable>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
               <el-form-item label="项目名称">
                 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
-              <el-form-item label="建筑物名称">
-                <el-input placeholder="请输入建筑物名称" v-model="querydzForm.jzwmc" clearable>
-                </el-input>
-              </el-form-item>
-            </el-col>
 
             <el-col :span="3" class="btnColRight">
               <el-form-item>
@@ -136,7 +124,7 @@
   // import { datasduo, sendThisduo } from "../javascript/fwsyqduo.js";
   import table from "@/utils/mixin/table";
   import jump from "@/views/ywbl/ywsq/components/mixin/jump";
-  import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectH } from "@/api/ywbl.js";
+  import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js";
   export default {
     mixins: [table, jump],
     props: {
@@ -195,7 +183,7 @@
           } else {
             this.querydzForm.sqywbm = this.sqywInfo.djywbm;
             this.querydzForm.fwfl = this.activeName;
-            selectH({ ...this.querydzForm, ...this.pageData }).then((res) => {
+            selectDz({ ...this.querydzForm, ...this.pageData }).then((res) => {
               if (res.code === 200) {
                 this.dztableData.total = res.result.total;
                 this.dztableData.data = res.result.records;

@@ -177,14 +177,14 @@ class data extends filter {
         prop: "xmmc",
         label: "项目名称",
       },
-      {
-        prop: "zrzh",
-        label: "自然幢号",
-      },
-      {
-        prop: "jzwmc",
-        label: "建筑物名称",
-      },
+      // {
+      //   prop: "zrzh",
+      //   label: "自然幢号",
+      // },
+      // {
+      //   prop: "jzwmc",
+      //   label: "建筑物名称",
+      // },
       {
         label: "土地/房屋性质",
         render: (h, scope) => {
@@ -200,7 +200,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              {(scope.row.zdmj) + (' / ') + (scope.row.scjzmj)}
+              {(scope.row.zdmj) + (' / ') + (scope.row.dzmj)}
             </div>
           )
         }
@@ -227,17 +227,17 @@ class data extends filter {
       },
       {
         prop: "zl",
-        label: "自然幢坐落",
-      },
-      {
-        label: '操作',
-        width: '80',
-        align: 'center',
-        fixed: 'right',
-        render: (h, scope) => {
-          return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
-        }
+        label: "多幢坐落",
       }
+      // {
+      //   label: '操作',
+      //   width: '80',
+      //   align: 'center',
+      //   fixed: 'right',
+      //   render: (h, scope) => {
+      //     return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
+      //   }
+      // }
     ]
   }
 

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-02 14:04:16
+-->
 <template>
   <dialogBox :title="title" width="85%" @closeDialog="closeDialog" v-model="value" isMain :isButton="false">
     <component :is="router" :sqywInfo="sqywInfo" @closeDialog="closeDialog" @updateDialog="updateDialog" />
@@ -9,6 +14,7 @@ export default {
   props: {
     value: { type: Boolean, default: true },
     sqywInfo: { type: Object, default: () => { } },
+    djywbm: { type: String, default: '' }
   },
   data () {
     return {
@@ -20,7 +26,7 @@ export default {
     value (val) {
       if (val) {
         this.title = "申请业务：" + this.sqywInfo?.djywmc ? this.sqywInfo?.djywmc : '';
-        let view = queueDjywmc(this.sqywInfo?.djywbm);
+        let view = queueDjywmc(this.sqywInfo?.djywbm || this.djywbm);
         this.router = this.loadView(view);
       }
     },