Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
5de904b9 by tianhaohao@pashanhoo.com
Options

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

2 parents 134ba77c 3b4b0bc7
Inline Side-by-side
Showing 14 changed files with 131 additions and 31 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-21 16:35:04 4 * @LastEditTime: 2023-07-04 16:07:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
26 <el-upload class="fileUpdate" ref="upload" action="" :show-file-list="false" :multiple="true" :auto-upload="false" 26 <el-upload class="fileUpdate" ref="upload" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
27 :on-change="handleChange" 27 :on-change="handleChange"
28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload"> 28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
29 <el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype">上传</el-button> 29 <el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype && ableOperation">上传</el-button>
30 </el-upload> 30 </el-upload>
31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete" 31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
32 v-if="!this.$route.query.viewtype && thumbnailImages.length>0">删除</el-button> 32 v-if="!this.$route.query.viewtype && thumbnailImages.length>0 && ableOperation">删除</el-button>
33 <div v-if="!this.$route.query.viewtype" class="pl-5"> 33 <div v-if="!this.$route.query.viewtype" class="pl-5">
34 <el-button type="primary" @click="handleOpenScan">{{scanTitle}}</el-button> 34 <el-button type="primary" @click="handleOpenScan" v-if="ableOperation">{{scanTitle}}</el-button>
35 <el-button type="primary" @click="handleViewScan" v-if="isScan">拍照</el-button> 35 <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
36 </div> 36 </div>
37 </div> 37 </div>
38 <ul> 38 <ul>
...@@ -58,6 +58,10 @@ ...@@ -58,6 +58,10 @@
58 previewImg: { 58 previewImg: {
59 type: Object, 59 type: Object,
60 default: () => { } 60 default: () => { }
61 },
62 ableOperation: {
63 type: Boolean,
64 default: true
61 } 65 }
62 }, 66 },
63 components: { 67 components: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-21 15:34:44 4 * @LastEditTime: 2023-07-04 16:05:44
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </div> 33 </div>
34 </div> 34 </div>
35 </div> 35 </div>
36 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 36 <image-preview ref='imageRef' v-if="tableData.length>0" :ableOperation="ableOperation" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
37 @prevPriview="prevPriview" /> 37 @prevPriview="prevPriview" />
38 </div> 38 </div>
39 </div> 39 </div>
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
49 components: { clxxAddDialog, imagePreview }, 49 components: { clxxAddDialog, imagePreview },
50 data () { 50 data () {
51 return { 51 return {
52 //表单是否可操作
53 ableOperation: true,
52 isDialog: false, 54 isDialog: false,
53 menuList: [ 55 menuList: [
54 { 56 {
...@@ -214,6 +216,7 @@ ...@@ -214,6 +216,7 @@
214 ...mapGetters(["dictData"]) 216 ...mapGetters(["dictData"])
215 }, 217 },
216 created () { 218 created () {
219 this.ableOperation = this.$parent.currentSelectTab.ableOperation
217 this.clmlInitList() 220 this.clmlInitList()
218 }, 221 },
219 methods: { 222 methods: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-21 16:29:37 4 * @LastEditTime: 2023-07-04 16:08:03
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
22 </div> 22 </div>
23 </div> 23 </div>
24 </div> 24 </div>
25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button> 25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()"
26 v-if="!this.$route.query.viewtype && ableOperation">新增</el-button>
26 </div> 27 </div>
27 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 28 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" :ableOperation="ableOperation" @updateList="updateList"
29 @nextPriview="nextPriview"
28 @prevPriview="prevPriview" /> 30 @prevPriview="prevPriview" />
29 </div> 31 </div>
30 </div> 32 </div>
...@@ -42,6 +44,8 @@ ...@@ -42,6 +44,8 @@
42 components: { clxxAddDialog, imagePreview, clxxDetailDialog }, 44 components: { clxxAddDialog, imagePreview, clxxDetailDialog },
43 data () { 45 data () {
44 return { 46 return {
47 //表单是否可操作
48 ableOperation: true,
45 isDialog: false, 49 isDialog: false,
46 iclass: "", 50 iclass: "",
47 // 材料目录选中 51 // 材料目录选中
...@@ -63,6 +67,7 @@ ...@@ -63,6 +67,7 @@
63 ...mapGetters(["dictData"]) 67 ...mapGetters(["dictData"])
64 }, 68 },
65 created () { 69 created () {
70 this.ableOperation = this.$parent.currentSelectTab.ableOperation
66 this.clmlInitList(1) 71 this.clmlInitList(1)
67 }, 72 },
68 methods: { 73 methods: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-30 14:32:40 4 * @LastEditTime: 2023-07-04 15:04:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 <script> 20 <script>
21 import { datas } from "../../javascript/zsyl.js"; 21 import { datas } from "../../javascript/zsyl.js";
22 import { getSlsqBdcqzList } from "@/api/bdcqz.js" 22 import { getSlsqBdcqzList } from "@/api/bdcqz.js"
23 import { log } from 'bpmn-js-token-simulation';
23 export default { 24 export default {
24 name: "zsyl", 25 name: "zsyl",
25 props: { 26 props: {
...@@ -57,7 +58,6 @@ ...@@ -57,7 +58,6 @@
57 } 58 }
58 }, 59 },
59 mounted () { 60 mounted () {
60 debugger
61 this.columns = datas.columns(); 61 this.columns = datas.columns();
62 if (this.formData.bdcqz) { 62 if (this.formData.bdcqz) {
63 //从缮证进入 63 //从缮证进入
......
...@@ -65,9 +65,10 @@ ...@@ -65,9 +65,10 @@
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="创建时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
69 <el-table-column label="办结时间" prop="endTime" width="160" align="center" /> 69 <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
70 <el-table-column label="操作方式" prop="businessName" align="center"/> 70 <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
71 <el-table-column label="操作方式" prop="controls" align="center"/>
71 <el-table-column label="意见" prop="idea" align="center"/> 72 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 73 </el-table>
73 </div> 74 </div>
...@@ -118,6 +119,14 @@ ...@@ -118,6 +119,14 @@
118 this.clearViewer() 119 this.clearViewer()
119 }, 120 },
120 methods: { 121 methods: {
122 formatDate(row, column) {
123 let data = row[column.property]
124 if(data == null) {
125 return null
126 }
127 let dt = new Date(data)
128 return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
129 },
121 processReZoom () { 130 processReZoom () {
122 this.defaultZoom = 1 131 this.defaultZoom = 1
123 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto') 132 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
...@@ -240,6 +249,7 @@ ...@@ -240,6 +249,7 @@
240 item.comments.forEach(element => { 249 item.comments.forEach(element => {
241 if(element.type=="COMPLETE"){ 250 if(element.type=="COMPLETE"){
242 this.formData.allCommentList[index].idea=element.message 251 this.formData.allCommentList[index].idea=element.message
252 this.formData.allCommentList[index].controls="完成"
243 } 253 }
244 }); 254 });
245 this.formData.allCommentList[index].agent=item.assignee.name 255 this.formData.allCommentList[index].agent=item.assignee.name
......
...@@ -131,6 +131,14 @@ ...@@ -131,6 +131,14 @@
131 </el-col> 131 </el-col>
132 </el-row> 132 </el-row>
133 <div class="slxx_title title-block"> 133 <div class="slxx_title title-block">
134 土地用途
135 <div class="triangle"></div>
136 </div>
137 <tdytTable
138 :tableData="ruleForm.tdytqxList"
139 @upDateTdytxxList="upDateTdytxxList"
140 />
141 <div class="slxx_title title-block">
134 权利人信息 142 权利人信息
135 <div class="triangle"></div> 143 <div class="triangle"></div>
136 </div> 144 </div>
...@@ -207,6 +215,7 @@ ...@@ -207,6 +215,7 @@
207 </template> 215 </template>
208 <script> 216 <script>
209 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 217 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
218 import tdytTable from "@/views/workflow/components/tdytTable";
210 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js"; 219 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
211 import { mapGetters } from "vuex"; 220 import { mapGetters } from "vuex";
212 export default { 221 export default {
...@@ -228,7 +237,7 @@ ...@@ -228,7 +237,7 @@
228 } 237 }
229 }); 238 });
230 }, 239 },
231 components: { qlrCommonTable }, 240 components: { qlrCommonTable,tdytTable },
232 computed: { 241 computed: {
233 ...mapGetters(["dictData", "flag"]), 242 ...mapGetters(["dictData", "flag"]),
234 }, 243 },
...@@ -246,6 +255,12 @@ ...@@ -246,6 +255,12 @@
246 } 255 }
247 }, 256 },
248 methods: { 257 methods: {
258 // 更新土地用途信息
259 upDateTdytxxList(val) {
260 console.log("VAL", val);
261 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
262 this.key++;
263 },
249 // 更新权利人信息 264 // 更新权利人信息
250 upDateQlrxxList (val) { 265 upDateQlrxxList (val) {
251 this.ruleForm.qlrList = _.cloneDeep(val); 266 this.ruleForm.qlrList = _.cloneDeep(val);
...@@ -258,6 +273,7 @@ ...@@ -258,6 +273,7 @@
258 this.ruleForm.ywrList = _.cloneDeep(val); 273 this.ruleForm.ywrList = _.cloneDeep(val);
259 }, 274 },
260 onSubmit () { 275 onSubmit () {
276 console.log("this.ruleForm",);
261 saveData(this.ruleForm).then((res) => { 277 saveData(this.ruleForm).then((res) => {
262 if (res.code === 200) { 278 if (res.code === 200) {
263 this.$message({ 279 this.$message({
......
...@@ -134,6 +134,14 @@ ...@@ -134,6 +134,14 @@
134 </el-col> 134 </el-col>
135 </el-row> 135 </el-row>
136 <div class="slxx_title title-block"> 136 <div class="slxx_title title-block">
137 土地用途
138 <div class="triangle"></div>
139 </div>
140 <tdytTable
141 :tableData="ruleForm.tdytqxList"
142 @upDateTdytxxList="upDateTdytxxList"
143 />
144 <div class="slxx_title title-block">
137 权利人信息 145 权利人信息
138 <div class="triangle"></div> 146 <div class="triangle"></div>
139 </div> 147 </div>
...@@ -191,6 +199,7 @@ ...@@ -191,6 +199,7 @@
191 </template> 199 </template>
192 <script> 200 <script>
193 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 201 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
202 import tdytTable from "@/views/workflow/components/tdytTable";
194 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js"; 203 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
195 import { mapGetters } from "vuex"; 204 import { mapGetters } from "vuex";
196 export default { 205 export default {
...@@ -214,7 +223,7 @@ ...@@ -214,7 +223,7 @@
214 } 223 }
215 }); 224 });
216 }, 225 },
217 components: { qlrCommonTable }, 226 components: { qlrCommonTable,tdytTable },
218 computed: { 227 computed: {
219 ...mapGetters(["dictData", "flag"]), 228 ...mapGetters(["dictData", "flag"]),
220 }, 229 },
...@@ -272,6 +281,12 @@ ...@@ -272,6 +281,12 @@
272 } 281 }
273 }); 282 });
274 }, 283 },
284 // 更新土地用途信息
285 upDateTdytxxList(val) {
286 console.log("VAL", val);
287 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
288 this.key++;
289 },
275 // 更新权利人信息 290 // 更新权利人信息
276 upDateQlrxxList (val) { 291 upDateQlrxxList (val) {
277 this.ruleForm.qlrList = _.cloneDeep(val); 292 this.ruleForm.qlrList = _.cloneDeep(val);
......
...@@ -125,6 +125,14 @@ ...@@ -125,6 +125,14 @@
125 </el-col> 125 </el-col>
126 </el-row> 126 </el-row>
127 <div class="slxx_title title-block"> 127 <div class="slxx_title title-block">
128 土地用途
129 <div class="triangle"></div>
130 </div>
131 <tdytTable
132 :tableData="ruleForm.tdytqxList"
133 @upDateTdytxxList="upDateTdytxxList"
134 />
135 <div class="slxx_title title-block">
128 权利人信息 136 权利人信息
129 <div class="triangle"></div> 137 <div class="triangle"></div>
130 </div> 138 </div>
...@@ -179,6 +187,7 @@ ...@@ -179,6 +187,7 @@
179 </template> 187 </template>
180 <script> 188 <script>
181 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 189 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
190 import tdytTable from "@/views/workflow/components/tdytTable";
182 import { Init } from "@/api/workflow/fwsyqFlow.js"; 191 import { Init } from "@/api/workflow/fwsyqFlow.js";
183 import { mapGetters } from "vuex"; 192 import { mapGetters } from "vuex";
184 export default { 193 export default {
...@@ -198,7 +207,7 @@ ...@@ -198,7 +207,7 @@
198 } 207 }
199 }); 208 });
200 }, 209 },
201 components: { qlrCommonTable }, 210 components: { qlrCommonTable,tdytTable },
202 computed: { 211 computed: {
203 ...mapGetters(["dictData", "flag"]), 212 ...mapGetters(["dictData", "flag"]),
204 }, 213 },
...@@ -247,6 +256,12 @@ ...@@ -247,6 +256,12 @@
247 }; 256 };
248 }, 257 },
249 methods: { 258 methods: {
259 // 更新土地用途信息
260 upDateTdytxxList(val) {
261 console.log("VAL", val);
262 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
263 this.key++;
264 },
250 list (bsmSldy) { 265 list (bsmSldy) {
251 var formdata = new FormData(); 266 var formdata = new FormData();
252 formdata.append("bsmSldy", bsmSldy); 267 formdata.append("bsmSldy", bsmSldy);
......
...@@ -126,6 +126,14 @@ ...@@ -126,6 +126,14 @@
126 </el-col> 126 </el-col>
127 </el-row> 127 </el-row>
128 <div class="slxx_title title-block"> 128 <div class="slxx_title title-block">
129 土地用途
130 <div class="triangle"></div>
131 </div>
132 <tdytTable
133 :tableData="ruleForm.tdytqxList"
134 @upDateTdytxxList="upDateTdytxxList"
135 />
136 <div class="slxx_title title-block">
129 权利人信息 137 权利人信息
130 <div class="triangle"></div> 138 <div class="triangle"></div>
131 </div> 139 </div>
...@@ -194,6 +202,7 @@ ...@@ -194,6 +202,7 @@
194 <script> 202 <script>
195 import { mapGetters } from "vuex" 203 import { mapGetters } from "vuex"
196 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js" 204 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"
205 import tdytTable from "@/views/workflow/components/tdytTable";
197 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable" 206 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
198 export default { 207 export default {
199 mounted () { 208 mounted () {
...@@ -214,7 +223,7 @@ ...@@ -214,7 +223,7 @@
214 }) 223 })
215 }) 224 })
216 }, 225 },
217 components: { qlrCommonTable }, 226 components: { qlrCommonTable,tdytTable },
218 computed: { 227 computed: {
219 ...mapGetters(["dictData", "flag"]) 228 ...mapGetters(["dictData", "flag"])
220 }, 229 },
...@@ -233,6 +242,12 @@ ...@@ -233,6 +242,12 @@
233 } 242 }
234 }, 243 },
235 methods: { 244 methods: {
245 // 更新土地用途信息
246 upDateTdytxxList(val) {
247 console.log("VAL", val);
248 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
249 this.key++;
250 },
236 // 更新权利人信息 251 // 更新权利人信息
237 upDateQlrxxList (val) { 252 upDateQlrxxList (val) {
238 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)) 253 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
...@@ -281,6 +296,7 @@ ...@@ -281,6 +296,7 @@
281 }) 296 })
282 } 297 }
283 } 298 }
299 console.log("this.ruleFormmmmmmmmm",this.ruleForm);
284 saveData(this.ruleForm).then((res) => { 300 saveData(this.ruleForm).then((res) => {
285 if (res.code === 200) { 301 if (res.code === 200) {
286 this.$message({ 302 this.$message({
......
...@@ -128,6 +128,14 @@ ...@@ -128,6 +128,14 @@
128 </el-col> 128 </el-col>
129 </el-row> 129 </el-row>
130 <div class="slxx_title title-block"> 130 <div class="slxx_title title-block">
131 土地用途
132 <div class="triangle"></div>
133 </div>
134 <tdytTable
135 :tableData="ruleForm.tdytqxList"
136 @upDateTdytxxList="upDateTdytxxList"
137 />
138 <div class="slxx_title title-block">
131 权利人信息 139 权利人信息
132 <div class="triangle"></div> 140 <div class="triangle"></div>
133 </div> 141 </div>
...@@ -189,6 +197,7 @@ ...@@ -189,6 +197,7 @@
189 <script> 197 <script>
190 import { mapGetters } from "vuex"; 198 import { mapGetters } from "vuex";
191 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 199 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
200 import tdytTable from "@/views/workflow/components/tdytTable";
192 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"; 201 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
193 export default { 202 export default {
194 mounted () { 203 mounted () {
...@@ -206,7 +215,7 @@ ...@@ -206,7 +215,7 @@
206 this.$endLoading(); 215 this.$endLoading();
207 }); 216 });
208 }, 217 },
209 components: { qlrCommonTable }, 218 components: { qlrCommonTable,tdytTable },
210 computed: { 219 computed: {
211 ...mapGetters(["dictData", "flag"]) 220 ...mapGetters(["dictData", "flag"])
212 }, 221 },
...@@ -228,6 +237,12 @@ ...@@ -228,6 +237,12 @@
228 }; 237 };
229 }, 238 },
230 methods: { 239 methods: {
240 // 更新土地用途信息
241 upDateTdytxxList(val) {
242 console.log("VAL", val);
243 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
244 this.key++;
245 },
231 // 更新权利人信息 246 // 更新权利人信息
232 upDateQlrxxList (val) { 247 upDateQlrxxList (val) {
233 this.ruleForm.qlrList = _.cloneDeep(val); 248 this.ruleForm.qlrList = _.cloneDeep(val);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-29 11:13:35 4 * @LastEditTime: 2023-07-04 16:23:54
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -88,41 +88,41 @@ ...@@ -88,41 +88,41 @@
88 <el-row :gutter="10"> 88 <el-row :gutter="10">
89 <el-col :span="8"> 89 <el-col :span="8">
90 <el-form-item label="农用地面积："> 90 <el-form-item label="农用地面积：">
91 <el-input v-model="ruleForm.tdsyq.nydmj"></el-input> 91 <el-input v-model="ruleForm.tdsyq.nydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 <el-col :span="8"> 94 <el-col :span="8">
95 <el-form-item label="耕地面积："> 95 <el-form-item label="耕地面积：">
96 <el-input v-model="ruleForm.tdsyq.gdmj"></el-input> 96 <el-input v-model="ruleForm.tdsyq.gdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
97 </el-form-item> 97 </el-form-item>
98 </el-col> 98 </el-col>
99 <el-col :span="8"> 99 <el-col :span="8">
100 <el-form-item label="林地面积："> 100 <el-form-item label="林地面积：">
101 <el-input v-model="ruleForm.tdsyq.ldmj"></el-input> 101 <el-input v-model="ruleForm.tdsyq.ldmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
102 </el-form-item> 102 </el-form-item>
103 </el-col> 103 </el-col>
104 </el-row> 104 </el-row>
105 <el-row :gutter="10"> 105 <el-row :gutter="10">
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="草地面积："> 107 <el-form-item label="草地面积：">
108 <el-input v-model="ruleForm.tdsyq.cdmj"></el-input> 108 <el-input v-model="ruleForm.tdsyq.cdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
109 </el-form-item> 109 </el-form-item>
110 </el-col> 110 </el-col>
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="其他农用地面积："> 112 <el-form-item label="其他农用地面积：">
113 <el-input v-model="ruleForm.tdsyq.qtnydmj"></el-input> 113 <el-input v-model="ruleForm.tdsyq.qtnydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
114 </el-form-item> 114 </el-form-item>
115 </el-col> 115 </el-col>
116 <el-col :span="8"> 116 <el-col :span="8">
117 <el-form-item label="建筑使用面积："> 117 <el-form-item label="建筑使用面积：">
118 <el-input v-model="ruleForm.tdsyq.jsydmj"></el-input> 118 <el-input v-model="ruleForm.tdsyq.jsydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
119 </el-form-item> 119 </el-form-item>
120 </el-col> 120 </el-col>
121 </el-row> 121 </el-row>
122 <el-row :gutter="10"> 122 <el-row :gutter="10">
123 <el-col :span="8"> 123 <el-col :span="8">
124 <el-form-item label="未利用地面积："> 124 <el-form-item label="未利用地面积：">
125 <el-input v-model="ruleForm.tdsyq.wlydmj"></el-input> 125 <el-input v-model="ruleForm.tdsyq.wlydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
126 </el-form-item> 126 </el-form-item>
127 </el-col> 127 </el-col>
128 <el-col :span="8"> 128 <el-col :span="8">
......
...@@ -256,12 +256,12 @@ ...@@ -256,12 +256,12 @@
256 type: 'success' 256 type: 'success'
257 }) 257 })
258 store.dispatch('user/refreshPage', true); 258 store.dispatch('user/refreshPage', true);
259 this.$popupCacel()
259 } else { 260 } else {
260 this.$message.error(res.message); 261 this.$message.error(res.message);
261 } 262 }
262 }) 263 })
263 } 264 }
264 this.$popupCacel()
265 }, 265 },
266 handleSelectionChange (val) { 266 handleSelectionChange (val) {
267 this.bdcdysz = val 267 this.bdcdysz = val
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 </div> 91 </div>
92 </template> 92 </template>
93 <script> 93 <script>
94 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz,getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl" 94 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
95 export default { 95 export default {
96 data () { 96 data () {
97 return { 97 return {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 }, 24 },
25 mounted () { 25 mounted () {
26 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) { 26 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
27 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm,this.formData?.sqywInfo?.nodecode || this.formData?.nodecode); 27 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
28 this.router = this.loadView(view); 28 this.router = this.loadView(view);
29 } else { 29 } else {
30 let view = queueDjywmc(this.$route.query?.sqywbm); 30 let view = queueDjywmc(this.$route.query?.sqywbm);
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
33 }, 33 },
34 methods: { 34 methods: {
35 loadView (view) { 35 loadView (view) {
36 console.log(view, 'view');
36 return (r) => 37 return (r) =>
37 require.ensure([], () => r(require(`./components/${view}.vue`))); 38 require.ensure([], () => r(require(`./components/${view}.vue`)));
38 }, 39 },
......