Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
d32e5582 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 0e768cf8 e98c6adb
Expand all
Inline Side-by-side
Showing 32 changed files with 662 additions and 168 deletions
1 /* 1 /*
2 * @Description: 材料信息 2 * @Description: 材料信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 15:56:03 4 * @LastEditTime: 2023-09-18 16:03:16
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -157,3 +157,17 @@ export function getClmxList (bsmSj) { ...@@ -157,3 +157,17 @@ export function getClmxList (bsmSj) {
157 } 157 }
158 }) 158 })
159 } 159 }
160 /**
161 * @description: 补录材料目录
162 * @param {*} data
163 * @author: renchao
164 */
165 export function repairInitClml (data) {
166 return request({
167 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/repairInitClml',
168 method: 'post',
169 params: {
170 repair: data.bsmRepair
171 }
172 })
173 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -28,7 +28,7 @@ export function getXtParamsByYwh (ywh) { ...@@ -28,7 +28,7 @@ export function getXtParamsByYwh (ywh) {
28 */ 28 */
29 export function getBlParamsByYwh (ywh, bsmQlxx) { 29 export function getBlParamsByYwh (ywh, bsmQlxx) {
30 return request({ 30 return request({
31 url: SERVER.SERVERAPI + '​/rest​/ywbl​/djyw​/getBlParamsByYwh', 31 url: SERVER.SERVERAPI + '/rest/ywbl/djyw/getBlParamsByYwh',
32 method: 'get', 32 method: 'get',
33 params: { 33 params: {
34 ywh: ywh, 34 ywh: ywh,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-14 17:11:15 4 * @LastEditTime: 2023-09-19 10:19:52
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
...@@ -160,7 +160,6 @@ ...@@ -160,7 +160,6 @@
160 .mask-content { 160 .mask-content {
161 padding: 5px 20px 30px 20px; 161 padding: 5px 20px 30px 20px;
162 width: 100%; 162 width: 100%;
163 min-height: 253px;
164 max-height: 90vh; 163 max-height: 90vh;
165 overflow-y: scroll; 164 overflow-y: scroll;
166 } 165 }
......
1 <!-- 这是补录的业务流程模块 -->
...\ No newline at end of file ...\ No newline at end of file
1 这是登记薄材料明细
2 补录数据和临时数据
...\ No newline at end of file ...\ No newline at end of file
1 <!-- 这是补录信息的材料文件 -->
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-07 15:04:46 4 * @LastEditTime: 2023-09-19 10:17:02
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit" 7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
40 ruleForm: { 40 ruleForm: {
41 cllx: "", 41 cllx: "",
42 clmc: "", 42 clmc: "",
43 sfggcl: "0"
43 }, 44 },
44 rules: { 45 rules: {
45 cllx: [ 46 cllx: [
...@@ -47,14 +48,17 @@ ...@@ -47,14 +48,17 @@
47 ], 48 ],
48 clmc: [ 49 clmc: [
49 { required: true, message: '请输入材料名称', trigger: 'blur' } 50 { required: true, message: '请输入材料名称', trigger: 'blur' }
51 ],
52 clbm: [
53 { required: true, message: '请输入材料编码', trigger: 'blur' }
50 ] 54 ]
51 } 55 }
52 } 56 }
53 }, 57 },
54 watch: { 58 watch: {
55 value (val) { 59 value (val) {
56 this.myValue = val; 60 this.myValue = val
57 }, 61 }
58 }, 62 },
59 methods: { 63 methods: {
60 /** 64 /**
...@@ -66,6 +70,7 @@ ...@@ -66,6 +70,7 @@
66 this.ruleForm = { 70 this.ruleForm = {
67 cllx: "", 71 cllx: "",
68 clmc: "", 72 clmc: "",
73 sfggcl: "0"
69 } 74 }
70 }, 75 },
71 /** 76 /**
...@@ -79,6 +84,7 @@ ...@@ -79,6 +84,7 @@
79 this.ruleForm = { 84 this.ruleForm = {
80 cllx: "", 85 cllx: "",
81 clmc: "", 86 clmc: "",
87 sfggcl: "0"
82 } 88 }
83 this.$emit("input", false); 89 this.$emit("input", false);
84 } else { 90 } else {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-14 11:14:54 4 * @LastEditTime: 2023-09-19 10:17:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
8 <lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false" 8 <lb-table :column="column" :key="key" row-key="bsmSj" ref="listTable" :heightNumSetting="true" :calcHeight="600"
9 :data="tableData"> 9 :pagination="false" :data="tableData">
10 </lb-table> 10 </lb-table>
11 <div class="text-center"> 11 <div class="text-center">
12 <el-button @click="handleCancel">取消</el-button> 12 <el-button @click="$popupCacel">取消</el-button>
13 <el-button type="primary" @click="handleSubmit" :loading="loading">保存</el-button> 13 <el-button type="primary" @click="handleSubmit" v-if="formData.ableOperation && tableData.length>0" :loading="loading">保存</el-button>
14 </div> 14 </div>
15 </div> 15 </div>
16 </template> 16 </template>
17 <script> 17 <script>
18 import store from '@/store/index.js' 18 import Vue from 'vue'
19 import Sortable from 'sortablejs' 19 import Sortable from 'sortablejs'
20 import store from '@/store/index.js'
20 import { ywPopupCacel } from "@/utils/popup.js"; 21 import { ywPopupCacel } from "@/utils/popup.js";
21 import { editCompanyMaterialList } from "@/api/company.js"; 22 import { InitClml, updateClml } from "@/api/clxx.js";
22 export default { 23 export default {
23 props: { 24 props: {
24 formData: { 25 formData: {
...@@ -34,11 +35,32 @@ ...@@ -34,11 +35,32 @@
34 sortable: null, 35 sortable: null,
35 column: [ 36 column: [
36 { 37 {
38 prop: "isrequired",
39 label: "是否必选",
40 width: "80",
41 render: (h, scope) => {
42 if (scope.row.isrequired === "1") {
43 return (
44 <div>
45 <span>必选</span>
46 </div>
47 );
48 }
49 else {
50 return (
51 <div>
52 <span>可选</span>
53 </div>
54 )
55 }
56 }
57 },
58 {
37 label: "材料名称", 59 label: "材料名称",
38 render: (h, scope) => { 60 render: (h, scope) => {
39 return ( 61 return (
40 (scope.row.sfxjcl == '1') ? 62 (this.formData.ableOperation && scope.row.sfxjcl == '1') ?
41 <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> : <span>{scope.row.clmc}</span> 63 <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
42 ) 64 )
43 } 65 }
44 }, 66 },
...@@ -47,27 +69,50 @@ ...@@ -47,27 +69,50 @@
47 width: "110", 69 width: "110",
48 render: (h, scope) => { 70 render: (h, scope) => {
49 return ( 71 return (
50 <el-select value={scope.row.cllx} 72 this.formData.ableOperation ?
51 onChange={(val) => { scope.row.cllx = val }}> 73 <el-select value={scope.row.sjlx}
52 { 74 onChange={(val) => { scope.row.sjlx = val }}>
53 store.getters.dictData['A40'].map(option => { 75 {
54 return ( 76 store.getters.dictData['A40'].map(option => {
55 <el-option label={option.dname} value={option.dcode}></el-option> 77 return (
56 ) 78 <el-option label={option.dname} value={option.dcode}></el-option>
57 }) 79 )
58 } 80 })
59 </el-select> 81 }
82 </el-select> : <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
60 ) 83 )
61 } 84 }
62 }, 85 },
63 { 86 {
64 label: "页数", 87 prop: "sjsl",
88 label: "收件数量",
65 width: "80", 89 width: "80",
66 render: (h, scope) => { 90 render: (h, scope) => {
67 if (scope.row.count && scope.row.count > 0) { 91 return (
92 (this.formData.ableOperation) ?
93 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
94 scope.row.sjsl
95 }</span>
96 )
97 }
98 },
99 {
100 label: "扫描时间",
101 width: "140",
102 render: (h, scope) => {
103 return (
104 <span>{scope.row.sjsj}</span>
105 )
106 }
107 },
108 {
109 label: "页数",
110 width: "60",
111 render: (h, scope) => {
112 if (scope.row.ys && scope.row.ys > 0) {
68 return ( 113 return (
69 <div> 114 <div>
70 <span>{scope.row.count}</span> 115 <span>{scope.row.ys}</span>
71 </div> 116 </div>
72 ); 117 );
73 } else { 118 } else {
...@@ -80,6 +125,21 @@ ...@@ -80,6 +125,21 @@
80 }, 125 },
81 }, 126 },
82 { 127 {
128 label: "是否新建材料",
129 width: "80",
130 render: (h, scope) => {
131 if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
132 return (
133 <span>是</span>
134 );
135 } else {
136 return (
137 <span>否</span>
138 );
139 }
140 },
141 },
142 {
83 label: "操作", 143 label: "操作",
84 width: "100", 144 width: "100",
85 render: (h, scope) => { 145 render: (h, scope) => {
...@@ -87,7 +147,7 @@ ...@@ -87,7 +147,7 @@
87 <el-button 147 <el-button
88 type="text" 148 type="text"
89 icon="el-icon-delete" 149 icon="el-icon-delete"
90 disabled={scope.row.count != 0} 150 disabled={!(scope.row.ys == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
91 onClick={() => { 151 onClick={() => {
92 this.handleDelete(scope.$index, scope.row); 152 this.handleDelete(scope.$index, scope.row);
93 }} 153 }}
...@@ -102,15 +162,6 @@ ...@@ -102,15 +162,6 @@
102 tableData: [] 162 tableData: []
103 } 163 }
104 }, 164 },
105 mounted () {
106 this.initSort()
107 this.tableData = _.cloneDeep(this.formData.data)
108 },
109 beforeDestroy () {
110 if (this.sortable) {
111 this.sortable.destroy();
112 }
113 },
114 watch: { 165 watch: {
115 'formData.data': { 166 'formData.data': {
116 handler: function (val, oldVal) { 167 handler: function (val, oldVal) {
...@@ -120,32 +171,61 @@ ...@@ -120,32 +171,61 @@
120 deep: true 171 deep: true
121 } 172 }
122 }, 173 },
174 mounted () {
175 this.initSort()
176 },
177 beforeDestroy () {
178 if (this.sortable) {
179 this.sortable.destroy();
180 }
181 },
123 methods: { 182 methods: {
124 handleCancel () {
125 ywPopupCacel()
126 },
127 handleSubmit () { 183 handleSubmit () {
128 this.loading = true 184 this.loading = true
129 store.dispatch('user/reWorkFresh', false) 185 store.dispatch('user/reWorkFresh', false)
130 editCompanyMaterialList(this.tableData, this.formData.bsmCompany).then(res => { 186 updateClml(this.tableData, this.formData.bsmSldy, Vue.prototype.$currentRoute.query.bsmSlsq).then(res => {
131 this.loading = false 187 this.loading = false
132 if (res.code == 200) { 188 if (res.code == 200) {
133 this.$message({ 189 this.$message({
134 message: '保存成功', 190 message: '保存成功',
135 type: 'success' 191 type: 'success'
136 }) 192 })
137 store.dispatch('user/reWorkFresh', true)
138 ywPopupCacel() 193 ywPopupCacel()
194 store.dispatch('user/reWorkFresh', true)
139 } 195 }
140 }).catch(() => { 196 }).catch(() => {
141 this.loading = false 197 this.loading = false
142 }) 198 })
143 }, 199 },
144 /** 200 /**
201 * @description: 材料目录明细初始化
202 * @author: renchao
203 */
204 clmlInitList () {
205 return new Promise(resolve => {
206 this.unitData = this.$parent.unitData;
207 var formdata = new FormData();
208 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
209 formdata.append("bsmSldy", this.formData.bsmRepair);
210 formdata.append("clfl", 3);
211 InitClml(formdata).then((res) => {
212 if (res.code == 200) {
213 resolve(res.code)
214 if (res.result && res.result.length > 0) {
215 this.tableData = res.result;
216 } else {
217 this.tableData = []
218 }
219 } else {
220 this.$message.error(res.message)
221 }
222 })
223 })
224 },
225 /**
145 * @description: 材料目录删除 226 * @description: 材料目录删除
146 * @param {*} index 227 * @param {*} index
147 * @param {*} row 228 * @param {*} row
148 * @author: renchao
149 */ 229 */
150 handleDelete (index, row) { 230 handleDelete (index, row) {
151 this.$confirm('此操作将永久删除该 是否继续?', '提示', { 231 this.$confirm('此操作将永久删除该 是否继续?', '提示', {
...@@ -173,7 +253,19 @@ ...@@ -173,7 +253,19 @@
173 this.tableData.splice(evt.newIndex, 0, targetRow); 253 this.tableData.splice(evt.newIndex, 0, targetRow);
174 } 254 }
175 }) 255 })
176 } 256 },
257 dicStatus (val, code) {
258 let data = store.getters.dictData[code],
259 name = '暂无'
260 if (data) {
261 data.map((item) => {
262 if (item.dcode == val) {
263 name = item.dname
264 }
265 })
266 return name
267 }
268 },
177 } 269 }
178 } 270 }
179 </script> 271 </script>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-14 16:24:07 4 * @LastEditTime: 2023-09-18 17:11:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <div class="img-list-wrap" v-Loading="loading"> 14 <div class="img-list-wrap" v-Loading="loading">
15 <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪"> 15 <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪">
16 <div v-for="(img, i) in previewImg.imgList" :key="i" v-else> 16 <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
17 <photo-zoom :url="img.fileurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2" 17 <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
18 overlayStyle="width: 100%;height:100%"> 18 overlayStyle="width: 100%;height:100%">
19 </photo-zoom> 19 </photo-zoom>
20 </div> 20 </div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 <ul> 41 <ul>
42 <li v-for="(img, index) in thumbnailImages" :key="index" :class="{ active: previewImg.index === index }" 42 <li v-for="(img, index) in thumbnailImages" :key="index" :class="{ active: previewImg.index === index }"
43 @click="showCurrent(index)"> 43 @click="showCurrent(index)">
44 <img :src="img.fileurl"> 44 <img :src="img.fjurl">
45 </li> 45 </li>
46 </ul> 46 </ul>
47 </div> 47 </div>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <script> 53 <script>
54 import PhotoZoom from '@/components/PhotoZoom' 54 import PhotoZoom from '@/components/PhotoZoom'
55 import { getAltimeterInfo, getUuid } from '@/utils/operation.js' 55 import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
56 import { uploadBatch, deleteFile, move } from "@/api/company.js" 56 import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
57 import publicPicture from '@/components/publicPicture/index.vue' 57 import publicPicture from '@/components/publicPicture/index.vue'
58 export default { 58 export default {
59 name: 'PreviewImage', 59 name: 'PreviewImage',
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 // 缩略图 86 // 缩略图
87 thumbnailImages: [], 87 thumbnailImages: [],
88 showViewer: false, 88 showViewer: false,
89 initialIndex: 0, 89 initialIndex: undefined,
90 allLi: [], 90 allLi: [],
91 } 91 }
92 }, 92 },
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 previewImg: { 94 previewImg: {
95 handler (newValue, oldValue) { 95 handler (newValue, oldValue) {
96 if (newValue.imgList && newValue.imgList.length > 0) { 96 if (newValue.imgList && newValue.imgList.length > 0) {
97 this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fileurl) 97 this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl)
98 this.thumbnailImages = newValue.imgList 98 this.thumbnailImages = newValue.imgList
99 } else { 99 } else {
100 this.allLi = [] 100 this.allLi = []
...@@ -134,18 +134,14 @@ ...@@ -134,18 +134,14 @@
134 setTimeout(() => { 134 setTimeout(() => {
135 this.scanTitle = '关闭高拍仪' 135 this.scanTitle = '关闭高拍仪'
136 this.loading = false 136 this.loading = false
137 }, 3000) 137 }, 4000)
138 } else { 138 } else {
139 this.scanTitle = '打开高拍仪' 139 this.scanTitle = '打开高拍仪'
140 } 140 }
141 }, 141 },
142 /** 142 // 左右移动
143 * @description: 左右移动
144 * @param {*} direction
145 * @author: renchao
146 */
147 handleMove (direction) { 143 handleMove (direction) {
148 move(this.previewImg.imgList[this.previewImg.index].bsmFile, direction).then(res => { 144 move(direction, this.previewImg.imgList[this.previewImg.index].bsmClmx).then(res => {
149 if (res.code == 200) { 145 if (res.code == 200) {
150 if (direction == 'left') { 146 if (direction == 'left') {
151 this.previewImg.index = this.previewImg.index - 1 147 this.previewImg.index = this.previewImg.index - 1
...@@ -153,7 +149,7 @@ ...@@ -153,7 +149,7 @@
153 this.previewImg.index = this.previewImg.index + 1 149 this.previewImg.index = this.previewImg.index + 1
154 } 150 }
155 this.initialIndex = this.previewImg.index 151 this.initialIndex = this.previewImg.index
156 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial }) 152 this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
157 this.$message({ 153 this.$message({
158 message: '移动成功!', 154 message: '移动成功!',
159 type: 'success' 155 type: 'success'
...@@ -195,7 +191,7 @@ ...@@ -195,7 +191,7 @@
195 let file = blobToFile(blob); 191 let file = blobToFile(blob);
196 var formData = new FormData(); 192 var formData = new FormData();
197 formData.append('file', file) 193 formData.append('file', file)
198 formData.append("bsmMaterial ", this.previewImg.bsmMaterial); 194 formData.append("bsmSj", this.previewImg.bsmSj);
199 formData.append("bsmSlsq", this.previewImg.bsmSlsq); 195 formData.append("bsmSlsq", this.previewImg.bsmSlsq);
200 uploadSjClmx(formData).then((res) => { 196 uploadSjClmx(formData).then((res) => {
201 if (res.code == 200) { 197 if (res.code == 200) {
...@@ -292,13 +288,14 @@ ...@@ -292,13 +288,14 @@
292 this.key++ 288 this.key++
293 return; 289 return;
294 } 290 }
295 formData.append("bsmMaterial", this.previewImg.bsmMaterial); 291 formData.append("bsmSj", this.previewImg.bsmSj);
292 formData.append("bsmSlsq", this.previewImg.bsmSlsq);
296 if (this.previewImg.imgList.length > 0) { 293 if (this.previewImg.imgList.length > 0) {
297 formData.append("index", this.previewImg.imgList[this.previewImg.index].sxh); 294 formData.append("index", this.previewImg.imgList[this.previewImg.index].sxh);
298 } 295 }
299 uploadBatch(formData).then((res) => { 296 uploadBatch(formData).then((res) => {
300 if (res.code == 200) { 297 if (res.code == 200) {
301 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial }) 298 this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
302 this.$message({ 299 this.$message({
303 message: '上传成功!', 300 message: '上传成功!',
304 type: 'success' 301 type: 'success'
...@@ -320,12 +317,12 @@ ...@@ -320,12 +317,12 @@
320 cancelButtonText: '取消', 317 cancelButtonText: '取消',
321 type: 'warning' 318 type: 'warning'
322 }).then(async () => { 319 }).then(async () => {
323 let bsmFile = this.previewImg.imgList[this.previewImg.index].bsmFile 320 let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
324 let bsmMaterial = this.previewImg.imgList[this.previewImg.index].bsmMaterial 321 let bsmSj = this.previewImg.imgList[this.previewImg.index].bsmSj
325 this.previewImg.imgList = this.previewImg.imgList.filter(item => item.bsmFile != bsmFile) 322 this.previewImg.imgList = this.previewImg.imgList.filter(item => item.bsmClmx != bsmClmx)
326 deleteFile(bsmFile).then(res => { 323 deleteClmx(bsmClmx).then(res => {
327 if (res.code == 200) { 324 if (res.code == 200) {
328 that.$emit('updateList', { children: this.previewImg.imgList, bsmMaterial: bsmMaterial }) 325 that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
329 that.$message({ 326 that.$message({
330 message: '删除成功!', 327 message: '删除成功!',
331 type: 'success' 328 type: 'success'
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 10:09:10 4 * @LastEditTime: 2023-09-19 09:28:13
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
29 </div> 29 </div>
30 <div 30 <div
31 v-for="(item, index) in tableData" 31 v-for="(item, index) in tableData"
32 :key="item.bsmMaterial" 32 :key="item.bsmSj"
33 :class="['child', treeCheckId == item.bsmMaterial ? 'checked' : '']" 33 :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']"
34 @click="treeClick(item, index)"> 34 @click="treeClick(item, index)">
35 {{ item.clmc }} 35 <span v-if="item.isrequired == 1" class="required">必选</span>
36 <span class="cl_number" :key="key" v-if="item.count">({{ item.count }})</span> 36 {{ item.sjmc }}
37 <span class="cl_number" :key="key" v-else>(0)</span> 37 <span class="cl_number" :key="key">({{ item.ys ? item.ys : 0 }})</span>
38 </div> 38 </div>
39 </div> 39 </div>
40 </div> 40 </div>
...@@ -62,9 +62,7 @@ ...@@ -62,9 +62,7 @@
62 import imagePreview from "./dialog/imagePreview.vue"; 62 import imagePreview from "./dialog/imagePreview.vue";
63 import clxxAddDialog from "./dialog/clxxAddDialog.vue"; 63 import clxxAddDialog from "./dialog/clxxAddDialog.vue";
64 import clxxDetailDialog from "./dialog/clxxDetailDialog.vue"; 64 import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
65 import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js"; 65 import { repairInitClml, saveClml, getClmxList } from "@/api/clxx.js";
66 import { saveClml, getClmxList } from "@/api/clxx.js";
67 import { repairInitClml } from "@/api/djbRepair.js";
68 export default { 66 export default {
69 components: { clxxAddDialog, imagePreview, clxxDetailDialog }, 67 components: { clxxAddDialog, imagePreview, clxxDetailDialog },
70 props: { 68 props: {
...@@ -85,7 +83,7 @@ ...@@ -85,7 +83,7 @@
85 key: 0, 83 key: 0,
86 tableData: [], 84 tableData: [],
87 previewImg: { 85 previewImg: {
88 bsmMaterial: "", 86 bsmSj: "",
89 index: 0, 87 index: 0,
90 selectedIndex: 0, 88 selectedIndex: 0,
91 imgList: [] 89 imgList: []
...@@ -100,7 +98,7 @@ ...@@ -100,7 +98,7 @@
100 watch: { 98 watch: {
101 workFresh: { 99 workFresh: {
102 handler (newValue, oldValue) { 100 handler (newValue, oldValue) {
103 this.clmlInitList() 101 if (newValue) this.clmlInitList()
104 }, 102 },
105 deep: true, 103 deep: true,
106 immediate: true 104 immediate: true
...@@ -118,19 +116,19 @@ ...@@ -118,19 +116,19 @@
118 if (this.treeCheckIndex < this.tableData.length) { 116 if (this.treeCheckIndex < this.tableData.length) {
119 this.treeCheckIndex++; 117 this.treeCheckIndex++;
120 if (this.tableData[this.treeCheckIndex]) { 118 if (this.tableData[this.treeCheckIndex]) {
121 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmMaterial; 119 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
122 // 判断页数 120 // 判断页数
123 let ys = this.tableData[this.treeCheckIndex].ys 121 let ys = this.tableData[this.treeCheckIndex].ys
124 this.previewImg.index = 0; 122 this.previewImg.index = 0;
125 // 获取材料明细 123 // 获取材料明细
126 if (ys > 0) { 124 if (ys > 0) {
127 getFileListByBsmMaterial(this.treeCheckId).then(res => { 125 getClmxList(this.treeCheckId).then(res => {
128 this.previewImg.imgList = res.result ? res.result : [] 126 this.previewImg.imgList = res.result ? res.result : []
129 }) 127 })
130 } else { 128 } else {
131 this.previewImg.imgList = [] 129 this.previewImg.imgList = []
132 } 130 }
133 this.previewImg.bsmMaterial = this.tableData[this.treeCheckIndex].bsmMaterial; 131 this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
134 } else { 132 } else {
135 this.$message.error('没有最后一张了'); 133 this.$message.error('没有最后一张了');
136 } 134 }
...@@ -143,11 +141,11 @@ ...@@ -143,11 +141,11 @@
143 prevPriview () { 141 prevPriview () {
144 if (this.treeCheckIndex >= 1) { 142 if (this.treeCheckIndex >= 1) {
145 this.treeCheckIndex--; 143 this.treeCheckIndex--;
146 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmMaterial; 144 this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
147 // 判断页数 145 // 判断页数
148 let ys = this.tableData[this.treeCheckIndex].ys 146 let ys = this.tableData[this.treeCheckIndex].ys
149 if (ys > 0) { 147 if (ys > 0) {
150 getFileListByBsmMaterial(this.treeCheckId).then(res => { 148 getClmxList(this.treeCheckId).then(res => {
151 this.previewImg.imgList = res.result ? res.result : [] 149 this.previewImg.imgList = res.result ? res.result : []
152 this.previewImg.index = this.previewImg.imgList.length - 1; 150 this.previewImg.index = this.previewImg.imgList.length - 1;
153 }) 151 })
...@@ -155,7 +153,7 @@ ...@@ -155,7 +153,7 @@
155 this.previewImg.imgList = []; 153 this.previewImg.imgList = [];
156 this.previewImg.index = 0 154 this.previewImg.index = 0
157 } 155 }
158 this.previewImg.bsmMaterial = this.tableData[this.treeCheckIndex].bsmMaterial; 156 this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
159 } else { 157 } else {
160 this.$message.error('没有第一张了'); 158 this.$message.error('没有第一张了');
161 } 159 }
...@@ -168,7 +166,7 @@ ...@@ -168,7 +166,7 @@
168 clmlInitList (type) { 166 clmlInitList (type) {
169 // 1：列表初始化 2：新增材料 167 // 1：列表初始化 2：新增材料
170 return new Promise((resolve) => { 168 return new Promise((resolve) => {
171 getCompanyMaterialList(this.formData.bsmCompany).then((res) => { 169 repairInitClml(this.$parent).then((res) => {
172 if (res.code == 200) { 170 if (res.code == 200) {
173 resolve(res.code); 171 resolve(res.code);
174 if (res.result && res.result.length > 0) { 172 if (res.result && res.result.length > 0) {
...@@ -195,12 +193,12 @@ ...@@ -195,12 +193,12 @@
195 * @author: renchao 193 * @author: renchao
196 */ 194 */
197 setChecked (item) { 195 setChecked (item) {
198 this.treeCheckId = item.bsmMaterial; 196 this.treeCheckId = item.bsmSj;
199 this.title = item.sjmc; 197 this.title = item.sjmc;
200 this.titleYs = 1; 198 this.titleYs = 1;
201 this.titleNum = item.children.length; 199 this.titleNum = item.children.length;
202 this.previewImg.imgList = item.children; 200 this.previewImg.imgList = item.children;
203 this.previewImg.bsmMaterial = item.bsmMaterial; 201 this.previewImg.bsmSj = item.bsmSj;
204 }, 202 },
205 /** 203 /**
206 * @description: updateList 204 * @description: updateList
...@@ -212,7 +210,7 @@ ...@@ -212,7 +210,7 @@
212 if (val.children.length != 0) { 210 if (val.children.length != 0) {
213 //删除最后一张图片时 val=null 211 //删除最后一张图片时 val=null
214 this.tableData.forEach((item) => { 212 this.tableData.forEach((item) => {
215 if (item.bsmMaterial == val.bsmMaterial) { 213 if (item.bsmSj == val.bsmSj) {
216 item.count = val.children.length 214 item.count = val.children.length
217 } 215 }
218 }); 216 });
...@@ -224,7 +222,7 @@ ...@@ -224,7 +222,7 @@
224 } else { 222 } else {
225 this.previewImg.imgList = []; 223 this.previewImg.imgList = [];
226 this.tableData.forEach((item, index) => { 224 this.tableData.forEach((item, index) => {
227 if (this.treeCheckId == item.bsmMaterial) { 225 if (this.treeCheckId == item.bsmSj) {
228 item.count = 0; 226 item.count = 0;
229 that.treeCheckIndex = index; 227 that.treeCheckIndex = index;
230 } 228 }
...@@ -245,20 +243,34 @@ ...@@ -245,20 +243,34 @@
245 */ 243 */
246 addSave (data) { 244 addSave (data) {
247 let obj = { 245 let obj = {
248 bsmCompany: this.formData.bsmCompany, 246 bsmSlsq: this.$parent.bsmSlsq,
249 clmc: data.clmc, 247 isrequired: "1",
250 cllx: data.cllx 248 sjmc: data.clmc,
249 sjsl: 0,
250 smzt: "",
251 ys: 0,
252 sjlx: data.cllx,
253 sjbm: data.clbm,
254 sfxjcl: "1", // 是否必选
255 sfggcl: data.sfggcl,
251 }; 256 };
252 addCompanyMaterial(obj).then(async (res) => { 257 //是否公共材料
258 if (data.sfggcl == "0") {
259 obj["bsmSldy"] = this.$parent.currentSelectProps.bsmSldy;
260 }
261 if (this.$route.query.sqywbm == "DJBBL") {
262 obj.bsmSldy = this.$parent.bsmRepair
263 }
264 saveClml(obj).then(async (res) => {
253 if (res.code == 200) { 265 if (res.code == 200) {
254 let res = await this.clmlInitList(2); 266 let res = await this.clmlInitList(2);
255 if (res == 200) 267 if (res == 200)
256 this.$message({ 268 this.$message({
257 message: "新增成功", 269 message: "新增成功",
258 type: "success" 270 type: "success",
259 }) 271 });
260 } 272 }
261 }) 273 });
262 }, 274 },
263 /** 275 /**
264 * @description: 材料目录点击选中 276 * @description: 材料目录点击选中
...@@ -268,12 +280,12 @@ ...@@ -268,12 +280,12 @@
268 */ 280 */
269 treeClick (item, index) { 281 treeClick (item, index) {
270 this.previewImg.index = 0; 282 this.previewImg.index = 0;
271 this.treeCheckId = item?.bsmMaterial; 283 this.treeCheckId = item?.bsmSj;
272 this.treeCheckIndex = index; 284 this.treeCheckIndex = index;
273 getFileListByBsmMaterial(item.bsmMaterial).then(res => { 285 getClmxList(item.bsmSj).then(res => {
274 this.previewImg.imgList = res.result ? res.result : [] 286 this.previewImg.imgList = res.result ? res.result : []
275 }) 287 })
276 this.previewImg.bsmMaterial = item?.bsmMaterial; 288 this.previewImg.bsmSj = item?.bsmSj;
277 }, 289 },
278 /** 290 /**
279 * @description: 小图片点击 291 * @description: 小图片点击
...@@ -288,9 +300,8 @@ ...@@ -288,9 +300,8 @@
288 //查看明细 300 //查看明细
289 viewDetail () { 301 viewDetail () {
290 store.dispatch("user/reWorkFresh", false); 302 store.dispatch("user/reWorkFresh", false);
291 ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", { 303 ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", {
292 data: this.tableData, 304 data: this.tableData,
293 bsmCompany: this.formData.bsmCompany
294 }, "60%", true, false) 305 }, "60%", true, false)
295 }, 306 },
296 //设置tableData 307 //设置tableData
...@@ -401,6 +412,7 @@ ...@@ -401,6 +412,7 @@
401 line-height: 20px; 412 line-height: 20px;
402 transition: all 0.3s; 413 transition: all 0.3s;
403 padding: 8px 0; 414 padding: 8px 0;
415 overflow: hidden;
404 } 416 }
405 417
406 .child:hover { 418 .child:hover {
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 09:31:37 4 * @LastEditTime: 2023-09-18 16:32:42
5 */ 5 */
6 //流程环节操作按钮 6 //流程环节操作按钮
7 export function getForm (tabName) { 7 export function getForm (tabName) {
...@@ -82,7 +82,7 @@ export function getForm (tabName) { ...@@ -82,7 +82,7 @@ export function getForm (tabName) {
82 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue"); 82 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue");
83 break; 83 break;
84 case "clxx": 84 case "clxx":
85 form = require("@/views/djbworkflow/djbBook/components/clxx/index.vue"); 85 form = require("@/views/djbworkflow/components/clxx/index.vue");
86 break; 86 break;
87 case "spyj": 87 case "spyj":
88 form = require("@/views/djbworkflow/djbBook/spyj.vue"); 88 form = require("@/views/djbworkflow/djbBook/spyj.vue");
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 09:55:41
5 -->
6 <template>
7 <div class="rlPopup">
8 <div class="prev handle-btn" v-if="!isScan" @click="prev()">
9 <i class="el-icon-arrow-left"></i>
10 </div>
11 <div class="next handle-btn" v-if="!isScan" @click="next()">
12 <i class="el-icon-arrow-right"></i>
13 </div>
14 <div class="img-list-wrap" v-Loading="loading">
15 <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="">
16 <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
17 <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
18 overlayStyle="width: 100%;height:100%">
19 </photo-zoom>
20 </div>
21 </div>
22 <!--缩略图-->
23 <div class="thumb-wrap">
24 <div class="thumb-wrap-button">
25 <el-button type="primary" @click="clickImage" v-if="previewImg.imgList.length>0">（放大） 显示（缩小）</el-button>
26 <!-- <el-upload class="fileUpdate" ref="upload" :key="key" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
27 :on-change="handleChange"
28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg">
29 <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button>
30 </el-upload> -->
31 <!-- <el-button type="primary" @click="handleMove('left')" v-if="ableOperation">左移</el-button>
32 <el-button type="primary" @click="handleMove('right')" v-if="ableOperation">右移</el-button> -->
33 <!-- <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
34 v-if="thumbnailImages.length>0 && ableOperation">删除</el-button>
35 <div v-if="ableOperation" class="pl-5">
36 <el-button type="primary" @click="handleOpenScan" v-if="ableOperation" :loading="loading">{{scanTitle}}</el-button>
37 <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
38 </div> -->
39 </div>
40 <ul>
41 <li v-for="(img, index) in thumbnailImages" :key="index" :class="{ active: previewImg.index === index }"
42 @click="showCurrent(index)">
43 <img :src="img.fjurl">
44 </li>
45 </ul>
46 </div>
47 <!-- 点开后的视图 -->
48 <publicPicture v-if="showViewer" :url-list="allLi" :initialIndex="initialIndex" @close-viewer="closeViewer">
49 </publicPicture>
50 </div>
51 </template>
52 <script>
53 import PhotoZoom from '@/components/PhotoZoom'
54 import publicPicture from '@/components/publicPicture/index.vue'
55 export default {
56 name: 'PreviewImage',
57 props: {
58 previewImg: {
59 type: Object,
60 default: () => { }
61 },
62 ableOperation: {
63 type: Boolean,
64 default: true
65 }
66 },
67 components: {
68 PhotoZoom,
69 publicPicture
70 },
71 data () {
72 return {
73 loading: false,
74 key: 0,
75 isScan: false,
76 // 打开高拍仪
77 scanTitle: '打开高拍仪',
78 transform: {
79 scale: 1,
80 degree: 0
81 },
82 maxFileLength: 0,
83 // 缩略图
84 thumbnailImages: [],
85 showViewer: false,
86 initialIndex: 0,
87 allLi: [],
88 }
89 },
90 watch: {
91 previewImg: {
92 handler (newValue, oldValue) {
93 if (newValue.imgList && newValue.imgList.length > 0) {
94 this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl)
95 this.thumbnailImages = newValue.imgList
96 } else {
97 this.allLi = []
98 this.thumbnailImages = []
99 }
100 },
101 deep: true,
102 immediate: true
103 }
104 },
105 created () {
106 this.maxLength = 0;
107 this.allLi = _.cloneDeep(this.previewImg.imgList).map(item => item.fjurl)
108 this.thumbnailImages = this.previewImg.imgList
109 },
110 computed: {
111 isFirst () {
112 return this.previewImg.index === 0
113 },
114 isLast () {
115 return this.previewImg.index === this.previewImg.imgList.length - 1
116 }
117 },
118 methods: {
119 prev () {
120 let len = this.previewImg.imgList.length
121 if (this.isFirst || len == 0) {
122 this.$emit('prevPriview')
123 } else {
124 this.$parent.previewImg.index = (this.$parent.previewImg.index - 1 + len) % len
125 }
126 },
127 /**
128 * @description: next
129 * @author: renchao
130 */
131 next () {
132 let len = this.previewImg.imgList.length
133 if (this.isLast || len == 0) {
134 this.$emit('nextPriview')
135 } else {
136 this.$parent.previewImg.index = (this.$parent.previewImg.index + 1) % len
137 }
138 },
139 /**
140 * @description: showCurrent
141 * @param {*} index
142 * @author: renchao
143 */
144 showCurrent (index) {
145 this.previewImg.index = index
146 this.initialIndex = index
147 },
148 /**
149 * @description: closeViewer
150 * @author: renchao
151 */
152 closeViewer () {
153 this.showViewer = false
154 },
155 /**
156 * @description: clickImage
157 * @author: renchao
158 */
159 clickImage () {
160 this.showViewer = true
161 }
162 }
163 }
164 </script>
165 <style lang="scss" scoped>
166 // 查看大图
167 .rlPopup {
168 position: relative;
169 width: 100%;
170 text-align: center;
171 height: 100%;
172
173 .handle-btn {
174 position: absolute;
175 top: 50%;
176 transform: translateY(-100%);
177 width: 66px;
178 height: 66px;
179 line-height: 75px;
180 color: #fff;
181 background-color: rgb(239, 239, 239);
182 border-radius: 50%;
183 cursor: pointer;
184 text-align: center;
185 transition: all 0.3s;
186
187 i {
188 font-size: 24px;
189 }
190 }
191
192 .handle-btn:hover {
193 background-color: rgb(185, 183, 183);
194 }
195
196 .prev {
197 left: 1%;
198 }
199
200 .next {
201 right: 5%;
202 }
203
204 .img-list-wrap {
205 width: calc(100% - 30px);
206 display: flex;
207 justify-content: center;
208 height: calc(100% - 150px);
209 align-items: center;
210 background: rgba(194, 190, 190, 0.1);
211 overflow: scroll;
212
213 img {
214 display: block;
215 object-fit: scale-down;
216 transition: all 0.3s;
217 max-width: 100%;
218 }
219 }
220
221 .thumb-wrap {
222 &-button {
223 display: flex;
224 justify-content: center;
225
226 .fileUpdate {
227 margin: 0 10px;
228 }
229 }
230
231 li {
232 float: left;
233 width: 60px;
234 height: 45px;
235 border: solid 1px #ececec;
236 position: relative;
237 margin-right: 5px;
238 cursor: pointer;
239
240 &:last-child {
241 margin-right: 0;
242 }
243
244 img {
245 max-width: 57px;
246 max-height: 42px;
247 display: block;
248 object-fit: scale-down;
249 position: absolute;
250 top: 50%;
251 left: 50%;
252 transform: translate(-50%, -50%);
253 }
254 }
255
256 .active {
257 border-color: #409eff;
258 }
259 }
260 }
261 </style>
262 <style>
263 .zoom-on-hover {
264 position: relative;
265 overflow: hidden;
266 }
267
268 .zoom-on-hover .normal {
269 width: 100%;
270 }
271
272 .zoom-on-hover .zoom {
273 position: absolute;
274 opacity: 0;
275 transform-origin: top left;
276 }
277
278 .zoom-on-hover.zoomed .zoom {
279 opacity: 1;
280 }
281
282 .zoom-on-hover.zoomed .normal {
283 opacity: 0;
284 }
285 </style>
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 14:42:14 4 * @LastEditTime: 2023-09-19 09:12:32
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
97 <script> 97 <script>
98 import Router from '@/router' 98 import Router from '@/router'
99 import { datas } from "../qlxxFormData.js"; 99 import { datas } from "../qlxxFormData.js";
100 import { ywPopupDialog } from "@/utils/popup.js";
100 import printTemplate from "../components/printTemplate.vue"; 101 import printTemplate from "../components/printTemplate.vue";
101 import { getXtParamsByYwh, getBlParamsByYwh } from '@/api/djyw' 102 import { getXtParamsByYwh, getBlParamsByYwh } from '@/api/djyw'
102 export default { 103 export default {
...@@ -234,8 +235,7 @@ ...@@ -234,8 +235,7 @@
234 } else { 235 } else {
235 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 236 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
236 let data = res.result 237 let data = res.result
237 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx') 238 ywPopupDialog("材料信息", "registerBook/components/clxx/index", data, "60%", true, false)
238 window.open(href, `urlname${data.bsmSlsq}`)
239 }) 239 })
240 } 240 }
241 } 241 }
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 10:52:40 4 * @LastEditTime: 2023-09-15 10:52:40
5 */ 5 */
...@@ -89,12 +89,12 @@ export function getNode (qllx, qlxx, bdcdylx, bdcdyid) { ...@@ -89,12 +89,12 @@ export function getNode (qllx, qlxx, bdcdylx, bdcdyid) {
89 if (qlxxPage[i].qllx == qllx) { 89 if (qlxxPage[i].qllx == qllx) {
90 if (qllx == "A04" || qllx == "A06" || qllx == "A08") { 90 if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
91 if (bdcdylx == "4") { 91 if (bdcdylx == "4") {
92 node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" }; 92 node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
93 } else { 93 } else {
94 node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" }; 94 node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
95 } 95 }
96 } else { 96 } else {
97 node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" }; 97 node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
98 } 98 }
99 break; 99 break;
100 } 100 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 10:02:12 4 * @LastEditTime: 2023-09-19 10:15:00
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -167,7 +167,6 @@ ...@@ -167,7 +167,6 @@
167 //type 1：列表初始化 2：新增材料 167 //type 1：列表初始化 2：新增材料
168 return new Promise((resolve) => { 168 return new Promise((resolve) => {
169 this.unitData = this.$parent.unitData; 169 this.unitData = this.$parent.unitData;
170 console.log(this.$parent.unitData, 'this.$parent.unitData;');
171 var formdata = new FormData(); 170 var formdata = new FormData();
172 formdata.append("bsmSlsq", this.$parent.bsmSlsq); 171 formdata.append("bsmSlsq", this.$parent.bsmSlsq);
173 if (this.$route.query.sqywbm == "DJBBL") { 172 if (this.$route.query.sqywbm == "DJBBL") {
...@@ -333,7 +332,7 @@ ...@@ -333,7 +332,7 @@
333 }) 332 })
334 } 333 }
335 } 334 }
336 }; 335 }
337 </script> 336 </script>
338 <style scoped lang="scss"> 337 <style scoped lang="scss">
339 @import "~@/styles/mixin.scss"; 338 @import "~@/styles/mixin.scss";
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-18 08:55:31 4 * @LastEditTime: 2023-09-19 10:15:07
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit" 7 <dialogBox title="新建材料信息" width="25%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
8 :isFullscreen="false"> 8 :isFullscreen="false">
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> 9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
10 <el-row> 10 <el-row>
...@@ -24,19 +24,17 @@ ...@@ -24,19 +24,17 @@
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 </el-row> 26 </el-row>
27 <el-row :gutter="20"> 27 <el-row :gutter="20">
28 <el-col :span="24"> 28 <el-col :span="24">
29 <el-form-item 29 <el-form-item
30 label="是否公共材料" 30 label="是否公共材料">
31 > 31 <el-radio-group
32 <el-radio-group 32 v-model="ruleForm.sfggcl">
33 v-model="ruleForm.sfggcl" 33 <el-radio label="1">是</el-radio>
34 > 34 <el-radio label="0">否</el-radio>
35 <el-radio label="1">是</el-radio> 35 </el-radio-group>
36 <el-radio label="0">否</el-radio> 36 </el-form-item>
37 </el-radio-group> 37 </el-col>
38 </el-form-item>
39 </el-col>
40 </el-row> 38 </el-row>
41 </el-form> 39 </el-form>
42 </dialogBox> 40 </dialogBox>
...@@ -54,7 +52,7 @@ ...@@ -54,7 +52,7 @@
54 ruleForm: { 52 ruleForm: {
55 cllx: "", 53 cllx: "",
56 clmc: "", 54 clmc: "",
57 sfggcl:"0" 55 sfggcl: "0"
58 }, 56 },
59 rules: { 57 rules: {
60 cllx: [ 58 cllx: [
...@@ -62,6 +60,9 @@ ...@@ -62,6 +60,9 @@
62 ], 60 ],
63 clmc: [ 61 clmc: [
64 { required: true, message: '请输入材料名称', trigger: 'blur' } 62 { required: true, message: '请输入材料名称', trigger: 'blur' }
63 ],
64 clbm: [
65 { required: true, message: '请输入材料编码', trigger: 'blur' }
65 ] 66 ]
66 } 67 }
67 } 68 }
...@@ -84,6 +85,7 @@ ...@@ -84,6 +85,7 @@
84 this.ruleForm = { 85 this.ruleForm = {
85 cllx: "", 86 cllx: "",
86 clmc: "", 87 clmc: "",
88 sfggcl: "0"
87 } 89 }
88 }, 90 },
89 /** 91 /**
...@@ -97,7 +99,7 @@ ...@@ -97,7 +99,7 @@
97 this.ruleForm = { 99 this.ruleForm = {
98 cllx: "", 100 cllx: "",
99 clmc: "", 101 clmc: "",
100 sfggcl:"0" 102 sfggcl: "0"
101 } 103 }
102 this.$emit("input", false); 104 this.$emit("input", false);
103 } else { 105 } else {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 10:04:28 4 * @LastEditTime: 2023-09-19 10:14:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -257,6 +257,18 @@ ...@@ -257,6 +257,18 @@
257 this.tableData.splice(evt.newIndex, 0, targetRow); 257 this.tableData.splice(evt.newIndex, 0, targetRow);
258 } 258 }
259 }) 259 })
260 },
261 dicStatus (val, code) {
262 let data = store.getters.dictData[code],
263 name = '暂无'
264 if (data) {
265 data.map((item) => {
266 if (item.dcode == val) {
267 name = item.dname
268 }
269 })
270 return name
271 }
260 } 272 }
261 } 273 }
262 } 274 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-08 16:38:43 4 * @LastEditTime: 2023-09-18 15:24:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -235,7 +235,7 @@ export default { ...@@ -235,7 +235,7 @@ export default {
235 color: #8b4534; 235 color: #8b4534;
236 } 236 }
237 .szxx_body { 237 .szxx_body {
238 height: 280px; 238 min-height: 280px;
239 } 239 }
240 } 240 }
241 .zs-card { 241 .zs-card {
......
...@@ -127,8 +127,16 @@ ...@@ -127,8 +127,16 @@
127 </el-row> 127 </el-row>
128 <el-row :gutter="10"> 128 <el-row :gutter="10">
129 <el-col :span="8"> 129 <el-col :span="8">
130 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质："> 130 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质">
131 <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input> 131 <treeselect
132 disabled
133 v-model="ruleForm.ztQlxx.qlxzmc"
134 noOptionsText="暂无数据"
135 :default-expand-level="1"
136 placeholder=""
137 :normalizer="normalizer"
138 :show-count="true"
139 :options="dictData['A9']" />
132 </el-form-item> 140 </el-form-item>
133 </el-col> 141 </el-col>
134 <el-col :span="8"> 142 <el-col :span="8">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-14 17:19:58 4 * @LastEditTime: 2023-09-19 10:44:12
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -100,7 +100,15 @@ ...@@ -100,7 +100,15 @@
100 </el-col> 100 </el-col>
101 <el-col :span="8"> 101 <el-col :span="8">
102 <el-form-item label="权利性质："> 102 <el-form-item label="权利性质：">
103 <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input> 103 <treeselect
104 disabled
105 v-model="ruleForm.ztQlxx.qlxzmc"
106 noOptionsText="暂无数据"
107 :default-expand-level="1"
108 placeholder=""
109 :normalizer="normalizer"
110 :show-count="true"
111 :options="dictData['A9']" />
104 </el-form-item> 112 </el-form-item>
105 </el-col> 113 </el-col>
106 <el-col :span="8"> 114 <el-col :span="8">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 14:53:24 4 * @LastEditTime: 2023-09-19 10:44:26
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -94,7 +94,15 @@ ...@@ -94,7 +94,15 @@
94 </el-col> 94 </el-col>
95 <el-col :span="8"> 95 <el-col :span="8">
96 <el-form-item label="权利性质：" prop="qlxzmc"> 96 <el-form-item label="权利性质：" prop="qlxzmc">
97 <el-input disabled v-model="ruleForm.qlxzmc"></el-input> 97 <treeselect
98 disabled
99 v-model="ruleForm.qlxzmc"
100 noOptionsText="暂无数据"
101 :default-expand-level="1"
102 placeholder=""
103 :normalizer="normalizer"
104 :show-count="true"
105 :options="dictData['A9']" />
98 </el-form-item> 106 </el-form-item>
99 </el-col> 107 </el-col>
100 </el-row> 108 </el-row>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:06:17 4 * @LastEditTime: 2023-09-19 10:28:39
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -70,8 +70,16 @@ ...@@ -70,8 +70,16 @@
70 </el-form-item> 70 </el-form-item>
71 </el-col> 71 </el-col>
72 <el-col :span="8"> 72 <el-col :span="8">
73 <el-form-item label="权利性质1："> 73 <el-form-item label="权利性质">
74 <el-input maxlength="25" v-model="ruleForm.zdjbxx.qlxzmc"></el-input> 74 <treeselect
75 disabled
76 v-model="ruleForm.zdjbxx.qlxzmc"
77 noOptionsText="暂无数据"
78 :default-expand-level="1"
79 placeholder=""
80 :normalizer="normalizer"
81 :show-count="true"
82 :options="dictData['A9']" />
75 </el-form-item> 83 </el-form-item>
76 </el-col> 84 </el-col>
77 </el-row> 85 </el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-09-14 17:21:19 5 * @LastEditTime: 2023-09-19 10:44:45
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -72,7 +72,15 @@ ...@@ -72,7 +72,15 @@
72 </el-col> 72 </el-col>
73 <el-col :span="8"> 73 <el-col :span="8">
74 <el-form-item label="权利性质："> 74 <el-form-item label="权利性质：">
75 <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> 75 <treeselect
76 disabled
77 v-model="ruleForm.zdjbxx.qlxzmc"
78 noOptionsText="暂无数据"
79 :default-expand-level="1"
80 placeholder=""
81 :normalizer="normalizer"
82 :show-count="true"
83 :options="dictData['A9']" />
76 </el-form-item> 84 </el-form-item>
77 </el-col> 85 </el-col>
78 </el-row> 86 </el-row>
......
...@@ -65,7 +65,15 @@ ...@@ -65,7 +65,15 @@
65 </el-col> 65 </el-col>
66 <el-col :span="8"> 66 <el-col :span="8">
67 <el-form-item label="权利性质："> 67 <el-form-item label="权利性质：">
68 <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> 68 <treeselect
69 disabled
70 v-model="ruleForm.zdjbxx.qlxzmc"
71 noOptionsText="暂无数据"
72 :default-expand-level="1"
73 placeholder=""
74 :normalizer="normalizer"
75 :show-count="true"
76 :options="dictData['A9']" />
69 </el-form-item> 77 </el-form-item>
70 </el-col> 78 </el-col>
71 </el-row> 79 </el-row>
......
...@@ -65,7 +65,15 @@ ...@@ -65,7 +65,15 @@
65 </el-col> 65 </el-col>
66 <el-col :span="8"> 66 <el-col :span="8">
67 <el-form-item label="权利性质："> 67 <el-form-item label="权利性质：">
68 <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> 68 <treeselect
69 disabled
70 v-model="ruleForm.zdjbxx.qlxzmc"
71 noOptionsText="暂无数据"
72 :default-expand-level="1"
73 placeholder=""
74 :normalizer="normalizer"
75 :show-count="true"
76 :options="dictData['A9']" />
69 </el-form-item> 77 </el-form-item>
70 </el-col> 78 </el-col>
71 </el-row> 79 </el-row>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-01 13:47:11 4 * @LastEditTime: 2023-09-19 10:45:32
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -70,7 +70,15 @@ ...@@ -70,7 +70,15 @@
70 </el-col> 70 </el-col>
71 <el-col :span="8"> 71 <el-col :span="8">
72 <el-form-item label="权利性质："> 72 <el-form-item label="权利性质：">
73 <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> 73 <treeselect
74 disabled
75 v-model="ruleForm.zdjbxx.qlxzmc"
76 noOptionsText="暂无数据"
77 :default-expand-level="1"
78 placeholder=""
79 :normalizer="normalizer"
80 :show-count="true"
81 :options="dictData['A9']" />
74 </el-form-item> 82 </el-form-item>
75 </el-col> 83 </el-col>
76 </el-row> 84 </el-row>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 11:15:30 4 * @LastEditTime: 2023-09-19 10:04:58
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 class="loadingtext" 159 class="loadingtext"
160 @sort-change="handleSort" 160 @sort-change="handleSort"
161 :current-page.sync="pageData.currentPage" 161 :current-page.sync="pageData.currentPage"
162 :heightNum="305" 162 :heightNum="350"
163 :total="tableData.total" 163 :total="tableData.total"
164 @size-change="handleSizeChange" 164 @size-change="handleSizeChange"
165 @p-current-change="handleCurrentChange" 165 @p-current-change="handleCurrentChange"
...@@ -256,12 +256,11 @@ ...@@ -256,12 +256,11 @@
256 this.queryClick(); 256 this.queryClick();
257 }, 257 },
258 /** 258 /**
259 * @description: ywhClick 259 * @description: 有任务权限
260 * @param {*} item 260 * @param {*} item
261 * @author: renchao 261 * @author: renchao
262 */ 262 */
263 ywhClick (item) { 263 ywhClick (item) {
264 //有任务权限
265 if (item.sjlx == "3") { 264 if (item.sjlx == "3") {
266 item.djywbm = "DJBBL"; 265 item.djywbm = "DJBBL";
267 const { href } = this.$router.resolve( 266 const { href } = this.$router.resolve(
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:00:51 4 * @LastEditTime: 2023-09-19 10:47:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
8 <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick" v-if="!isJump"> 8 <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
9 <el-tab-pane label="自然幢" name="zrz"></el-tab-pane> 9 <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
10 <el-tab-pane label="多幢" name="dz"></el-tab-pane> 10 <el-tab-pane label="多幢" name="dz" v-if="sqywInfo.djywbm !== 'B37100'"></el-tab-pane>
11 </el-tabs> 11 </el-tabs>
12 <div v-show="activeName == 'zrz'"> 12 <div v-show="activeName == 'zrz'">
13 <div class="from-clues-header"> 13 <div class="from-clues-header">
...@@ -336,8 +336,8 @@ ...@@ -336,8 +336,8 @@
336 let refs = 'table1'; 336 let refs = 'table1';
337 if (this.activeName == 'dz') { 337 if (this.activeName == 'dz') {
338 refs = 'table'; 338 refs = 'table';
339 this.$refs[refs].clearSelection() 339 }else{
340 } else { 340 this.sqywInfo.djywbm !== 'B37100' && this.$refs[refs].clearSelection()
341 } 341 }
342 const bdcdysz = this.bdcdysz 342 const bdcdysz = this.bdcdysz
343 if (bdcdysz.length > 0) { 343 if (bdcdysz.length > 0) {
......
...@@ -40,7 +40,7 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -40,7 +40,7 @@ export function queueDjywmc (djywbm, djqxbm) {
40 case "A04100"://国有建设用地使用权/房屋所有权(首次登记) 40 case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
41 case "A06100": // 宅基地使用权/房屋所有权 || 首次登记 41 case "A06100": // 宅基地使用权/房屋所有权 || 首次登记
42 case "A08100": // 集体建设用地使用权/房屋所有权 || 首次登记 42 case "A08100": // 集体建设用地使用权/房屋所有权 || 首次登记
43 case "B37100": 43 case "B37100": // 在建工程抵押权 || 首次登记
44 vm = "fwsyq"; 44 vm = "fwsyq";
45 break; 45 break;
46 case "A04200": //国有建设用地使用权/房屋所有权 || 转移登记 46 case "A04200": //国有建设用地使用权/房屋所有权 || 转移登记
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 11:19:07 4 * @LastEditTime: 2023-09-19 10:04:04
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 <el-col :span="4" class="btnColRight"> 43 <el-col :span="4" class="btnColRight">
44 <el-form-item> 44 <el-form-item>
45 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> 45 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
46 <el-button @click="moreQueryClick">高级查询</el-button> 46 <!-- <el-button @click="moreQueryClick">高级查询</el-button> -->
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 </el-row> 49 </el-row>
...@@ -140,18 +140,31 @@ ...@@ -140,18 +140,31 @@
140 console.log(name, sort); 140 console.log(name, sort);
141 }, 141 },
142 /** 142 /**
143 * @description: 高级查询
144 * @author: renchao
145 */
146 moreQueryClick () { },
147 /**
148 * @description: openDialog 143 * @description: openDialog
149 * @param {*} item 144 * @param {*} item
150 * @author: renchao 145 * @author: renchao
151 */ 146 */
152 openDialog (item) { 147 openDialog (item) {
153 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&type=jdcx') 148 if (item.sjlx == "3") {
154 window.open(href, `urlname${item.bsmSlsq}`) 149 item.djywbm = "DJBBL";
150 const { href } = this.$router.resolve(
151 "/djbworkFrameview?bsmSlsq=" +
152 item.bsmSlsq +
153 "&bestepid=" +
154 item.bestepid +
155 "&sqywbm=" +
156 item.djywbm
157 );
158 window.open(href, `djbworkFrameview${item.bsmSlsq}`);
159 } else {
160 const { href } = this.$router.resolve(
161 "/workFrameView?bsmSlsq=" +
162 item.bsmSlsq +
163 "&bestepid=" +
164 item.bestepid
165 );
166 window.open(href, `workFrameView${item.bsmSlsq}`);
167 }
155 } 168 }
156 } 169 }
157 } 170 }
......