efb0088c by renchao@pashanhoo.com

Merge branch 'dev'

2 parents d3e87ac7 e8c11b93
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @Author: sakuya 4 * @Author: sakuya
5 * @Date: 2021年6月10日10:04:07 5 * @Date: 2021年6月10日10:04:07
6 * @LastEditors: Please set LastEditors 6 * @LastEditors: Please set LastEditors
7 * @LastEditTime: 2023-07-28 09:49:26 7 * @LastEditTime: 2023-11-07 10:04:18
8 --> 8 -->
9 9
10 <template> 10 <template>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled" 12 :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled"
13 @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear"> 13 @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
14 <template #empty> 14 <template #empty>
15 <div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading"> 15 <div class="sc-table-select__table" :style="{width: '100%'}" v-loading="loading">
16 <div class="sc-table-select__header"> 16 <div class="sc-table-select__header">
17 <slot name="header" :form="formData" :submit="formSubmit"></slot> 17 <slot name="header" :form="formData" :submit="formSubmit"></slot>
18 </div> 18 </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 :show-message="false" 4 :show-message="false"
5 * @LastEditTime: 2023-11-03 14:46:48 5 * @LastEditTime: 2023-11-07 09:25:19
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
49 :rules="rules.ztQlxxrules"> 49 :rules="rules.ztQlxxrules">
50 <select-table 50 <select-table
51 v-model="ruleForm.ztQlxx" 51 v-model="ruleForm.ztQlxx"
52 :table-width="730"
53 :tableData="ztQlxxList" 52 :tableData="ztQlxxList"
54 :props="props" 53 :props="props"
55 @change="ztQlxxchange"> 54 @change="ztQlxxchange">
...@@ -138,7 +137,6 @@ ...@@ -138,7 +137,6 @@
138 v-if="ruleForm.qlxx.djlx == '300'"> 137 v-if="ruleForm.qlxx.djlx == '300'">
139 <select-table 138 <select-table
140 v-model="ruleForm.ssQlxx" 139 v-model="ruleForm.ssQlxx"
141 :table-width="730"
142 :tableData="ssQlxxList" 140 :tableData="ssQlxxList"
143 :props="props" 141 :props="props"
144 @change="ssQlxxchange"> 142 @change="ssQlxxchange">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-03 14:54:52 4 * @LastEditTime: 2023-11-07 10:04:24
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
49 :rules="rules.ztQlxxrules"> 49 :rules="rules.ztQlxxrules">
50 <select-table 50 <select-table
51 v-model="ruleForm.ztQlxx" 51 v-model="ruleForm.ztQlxx"
52 table-width="100%"
53 :tableData="ztQlxxList" 52 :tableData="ztQlxxList"
54 :props="props" 53 :props="props"
55 @change="ztQlxxchange"> 54 @change="ztQlxxchange">
...@@ -132,7 +131,6 @@ ...@@ -132,7 +131,6 @@
132 :rules="rules.ssQlxxrules"> 131 :rules="rules.ssQlxxrules">
133 <select-table 132 <select-table
134 v-model="ruleForm.ssQlxx" 133 v-model="ruleForm.ssQlxx"
135 :table-width="730"
136 :tableData="ssQlxxList" 134 :tableData="ssQlxxList"
137 :props="props" 135 :props="props"
138 @change="ssQlxxchange"> 136 @change="ssQlxxchange">
...@@ -383,7 +381,7 @@ ...@@ -383,7 +381,7 @@
383 type="date" 381 type="date"
384 class="width100" 382 class="width100"
385 placeholder="选择日期" 383 placeholder="选择日期"
386 value-format="yyyy-MM-dd HH:mm:ss" 384 value-format="yyyy-MM-dd"
387 format="yyyy-MM-dd"> 385 format="yyyy-MM-dd">
388 </el-date-picker> 386 </el-date-picker>
389 </el-form-item> 387 </el-form-item>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-26 13:26:40 4 * @LastEditTime: 2023-11-07 09:25:27
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
43 <div class="count"> 43 <div class="count">
44 <el-form-item 44 <el-form-item
45 label="地役权不动产情况" 45 label="地役权不动产情况"
46 style="display:flex"
46 prop="ztQlxx.bdcqzh" 47 prop="ztQlxx.bdcqzh"
47 :rules="rules.ztQlxxrules"> 48 :rules="rules.ztQlxxrules">
48 <select-table 49 <select-table
49 v-model="ruleForm.ztQlxx" 50 v-model="ruleForm.ztQlxx"
50 :table-width="730"
51 :tableData="ztQlxxList" 51 :tableData="ztQlxxList"
52 :props="props" 52 :props="props"
53 @change="ztQlxxchange"> 53 @change="ztQlxxchange">
...@@ -130,7 +130,6 @@ ...@@ -130,7 +130,6 @@
130 :rules="rules.ssQlxxrules"> 130 :rules="rules.ssQlxxrules">
131 <select-table 131 <select-table
132 v-model="ruleForm.ssQlxx" 132 v-model="ruleForm.ssQlxx"
133 :table-width="730"
134 :tableData="ssQlxxList" 133 :tableData="ssQlxxList"
135 :props="props" 134 :props="props"
136 @change="ssQlxxchange"> 135 @change="ssQlxxchange">
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
48 :rules="rules.ssQlxxrules"> 48 :rules="rules.ssQlxxrules">
49 <select-table 49 <select-table
50 v-model="ruleForm.ssQlxx" 50 v-model="ruleForm.ssQlxx"
51 :table-width="730"
52 :tableData="ssQlxxList" 51 :tableData="ssQlxxList"
53 :props="props" 52 :props="props"
54 @change="ssQlxxchange"> 53 @change="ssQlxxchange">
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
45 :rules="rules.ssQlxxrules"> 45 :rules="rules.ssQlxxrules">
46 <select-table 46 <select-table
47 v-model="ruleForm.ssQlxx" 47 v-model="ruleForm.ssQlxx"
48 :table-width="730"
49 :tableData="ssQlxxList" 48 :tableData="ssQlxxList"
50 :props="props" 49 :props="props"
51 @change="ssQlxxchange"> 50 @change="ssQlxxchange">
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
47 :rules="rules.ssQlxxrules"> 47 :rules="rules.ssQlxxrules">
48 <select-table 48 <select-table
49 v-model="ruleForm.ssQlxx" 49 v-model="ruleForm.ssQlxx"
50 :table-width="730"
51 :tableData="ssQlxxList" 50 :tableData="ssQlxxList"
52 :props="props" 51 :props="props"
53 @change="ssQlxxchange"> 52 @change="ssQlxxchange">
......
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
44 <el-form-item 44 <el-form-item
45 label="上手权利信息:" 45 label="上手权利信息:"
46 prop="ssQlxx.bdcqzh" 46 prop="ssQlxx.bdcqzh"
47 style="display:flex"
47 :rules="rules.ssQlxxrules"> 48 :rules="rules.ssQlxxrules">
48 <select-table 49 <select-table
49 v-model="ruleForm.ssQlxx" 50 v-model="ruleForm.ssQlxx"
50 :table-width="730"
51 :tableData="ssQlxxList" 51 :tableData="ssQlxxList"
52 :props="props" 52 :props="props"
53 @change="ssQlxxchange"> 53 @change="ssQlxxchange">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-02 13:27:43 4 * @LastEditTime: 2023-11-07 09:26:12
5 :show-message="false" 5 :show-message="false"
6 --> 6 -->
7 <template> 7 <template>
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
45 <div class="count"> 45 <div class="count">
46 <el-form-item 46 <el-form-item
47 label="预告买卖登记" 47 label="预告买卖登记"
48 style="display:flex"
48 prop="ztQlxx.bdcqzh" 49 prop="ztQlxx.bdcqzh"
49 :rules="rules.ztQlxxrules"> 50 :rules="rules.ztQlxxrules">
50 <select-table 51 <select-table
51 v-model="ruleForm.ztQlxx" 52 v-model="ruleForm.ztQlxx"
52 table-width="100%"
53 :tableData="ztQlxxList" 53 :tableData="ztQlxxList"
54 :props="props" 54 :props="props"
55 @change="ztQlxxchange"> 55 @change="ztQlxxchange">
...@@ -127,10 +127,10 @@ ...@@ -127,10 +127,10 @@
127 <el-form-item 127 <el-form-item
128 label="上手权利信息:" 128 label="上手权利信息:"
129 prop="ssQlxx.bdcqzh" 129 prop="ssQlxx.bdcqzh"
130
130 :rules="rules.ssQlxxrules"> 131 :rules="rules.ssQlxxrules">
131 <select-table 132 <select-table
132 v-model="ruleForm.ssQlxx" 133 v-model="ruleForm.ssQlxx"
133 table-width="100%"
134 :tableData="ssQlxxList" 134 :tableData="ssQlxxList"
135 :props="props" 135 :props="props"
136 @change="ssQlxxchange"> 136 @change="ssQlxxchange">
......
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
45 <div class="count" v-if="ssqlxxshow"> 45 <div class="count" v-if="ssqlxxshow">
46 <el-form-item 46 <el-form-item
47 label="上手权利信息:" 47 label="上手权利信息:"
48 style="display:flex"
48 prop="ssQlxx.bdcqzh" 49 prop="ssQlxx.bdcqzh"
49 :rules="rules.ssQlxxrules"> 50 :rules="rules.ssQlxxrules">
50 <select-table 51 <select-table
51 v-model="ruleForm.ssQlxx" 52 v-model="ruleForm.ssQlxx"
52 :table-width="730"
53 :tableData="ssQlxxList" 53 :tableData="ssQlxxList"
54 :props="props" 54 :props="props"
55 @change="ssQlxxchange"> 55 @change="ssQlxxchange">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-08 09:35:26 4 * @LastEditTime: 2023-11-07 09:26:20
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -44,11 +44,11 @@ ...@@ -44,11 +44,11 @@
44 <div class="count"> 44 <div class="count">
45 <el-form-item 45 <el-form-item
46 label="抵押不动产信息:" 46 label="抵押不动产信息:"
47 style="display:flex"
47 prop="ztQlxx.bdcqzh" 48 prop="ztQlxx.bdcqzh"
48 :rules="rules.ztQlxxrules"> 49 :rules="rules.ztQlxxrules">
49 <select-table 50 <select-table
50 v-model="ruleForm.ztQlxx" 51 v-model="ruleForm.ztQlxx"
51 :table-width="550"
52 :tableData="ztQlxxList" 52 :tableData="ztQlxxList"
53 :props="props" 53 :props="props"
54 @change="ztQlxxchange"> 54 @change="ztQlxxchange">
...@@ -125,11 +125,11 @@ ...@@ -125,11 +125,11 @@
125 <div class="count" v-if="ssqlxxshow"> 125 <div class="count" v-if="ssqlxxshow">
126 <el-form-item 126 <el-form-item
127 label="上手权利信息:" 127 label="上手权利信息:"
128 style="display:flex"
128 prop="ssQlxx.bdcqzh" 129 prop="ssQlxx.bdcqzh"
129 :rules="rules.ssQlxxrules"> 130 :rules="rules.ssQlxxrules">
130 <select-table 131 <select-table
131 v-model="ruleForm.ssQlxx" 132 v-model="ruleForm.ssQlxx"
132 :table-width="550"
133 :tableData="ssQlxxList" 133 :tableData="ssQlxxList"
134 :props="props" 134 :props="props"
135 @change="ssQlxxchange"> 135 @change="ssQlxxchange">
......