Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3b4b0bc7 by xiaomiao
Options

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

2 parents 6e1da098 7b5895c0
Inline Side-by-side
Showing 8 changed files with 44 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 //从缮证进入
......
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
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 </div> 30 </div>
31 <!-- 一并申请 --> 31 <!-- 一并申请 -->
32 <div v-if="selectType == 'together'" class="right-situation el-card"> 32 <div v-if="selectType == 'together'" class="right-situation el-card">
33 <div class="right-title">一并申请</div> 33 <div class="right-title">一并申请</div>
34 <ul> 34 <ul>
35 <li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index" 35 <li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
36 @dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)"> 36 @dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)">
37 <dt>{{ item.nodename }}</dt> 37 <dt>{{ item.nodename }}</dt>
...@@ -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 {
...@@ -147,13 +147,13 @@ ...@@ -147,13 +147,13 @@
147 if (this.selectType == 'amend') { 147 if (this.selectType == 'amend') {
148 this.getRepairBiz(); 148 this.getRepairBiz();
149 } 149 }
150 if (this.selectType == 'together') { 150 if (this.selectType == 'together') {
151 getTogetherBiz().then(res => { 151 getTogetherBiz().then(res => {
152 if (res) { 152 if (res) {
153 console.log("res", res); 153 console.log("res", res);
154 this.djqxList = res.result; 154 this.djqxList = res.result;
155 } 155 }
156 }) 156 })
157 } 157 }
158 }, 158 },
159 //权利类型菜单事件 159 //权利类型菜单事件
......
...@@ -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 },
......