Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
12b21b0a by yuanbo
Options

Merge remote-tracking branch 'origin/dev' into dev

2 parents 2cadb5b1 80fa1fe7
Inline Side-by-side
Showing 2 changed files with 34 additions and 12 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-18 13:53:23 4 * @LastEditTime: 2023-09-07 16:09:13
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg"> 28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg">
29 <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button> 29 <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button>
30 </el-upload> 30 </el-upload>
31 <!-- 左移右移 -->
32 <el-button type="primary" @click="handleMove('left')" v-if="ableOperation">左移</el-button>
33 <el-button type="primary" @click="handleMove('right')" v-if="ableOperation">右移</el-button>
31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete" 34 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
32 v-if="thumbnailImages.length>0 && ableOperation">删除</el-button> 35 v-if="thumbnailImages.length>0 && ableOperation">删除</el-button>
33 <div v-if="ableOperation" class="pl-5"> 36 <div v-if="ableOperation" class="pl-5">
...@@ -133,6 +136,10 @@ ...@@ -133,6 +136,10 @@
133 this.scanTitle = '打开高拍仪' 136 this.scanTitle = '打开高拍仪'
134 } 137 }
135 }, 138 },
139 // 左右移动
140 handleMove(direction) {
141
142 },
136 /** 143 /**
137 * @description: 拍照 144 * @description: 拍照
138 * @author: renchao 145 * @author: renchao
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-15 09:43:46 4 * @LastEditTime: 2023-09-07 16:01:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -31,9 +31,23 @@ ...@@ -31,9 +31,23 @@
31 loading: false, 31 loading: false,
32 column: [ 32 column: [
33 { 33 {
34 width: "50", 34 width: '50',
35 label: '序号', 35 renderHeader: (h, scope) => {
36 type: 'index' 36 return <div> {
37 !this.formData.ableOperation ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
38 }
39 </div>
40 },
41 render: (h, scope) => {
42 return (
43 <div>
44 {
45 !this.formData.ableOperation ? <span>{scope.$index + 1}</span> :
46 <i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i>
47 }
48 </div>
49 )
50 }
37 }, 51 },
38 { 52 {
39 prop: "isrequired", 53 prop: "isrequired",
...@@ -90,12 +104,11 @@ ...@@ -90,12 +104,11 @@
90 width: "50", 104 width: "50",
91 render: (h, scope) => { 105 render: (h, scope) => {
92 return ( 106 return (
93 <div> 107 (this.formData.ableOperation && scope.row.isrequired != '1') ?
94 { 108 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
95 scope.row.sjsl ? 109 scope.row.sjsl ?
96 <span>{scope.row.sjsl}</span> : 1 110 <span>{scope.row.sjsl}</span> : 1
97 } 111 }</span>
98 </div>
99 ) 112 )
100 } 113 }
101 }, 114 },
...@@ -162,9 +175,7 @@ ...@@ -162,9 +175,7 @@
162 > 175 >
163 下移 176 下移
164 </el-button> 177 </el-button>
165 <i v-show={scope.row.isrequired != '1' && this.formData.ableOperation} onClick={() => { 178
166 this.handleDelete(scope.$index, scope.row);
167 }} class="el-icon-delete pointer" style="color:#409EFF;margin-left:5px;position: relative;top: 1px;"></i>
168 </div > 179 </div >
169 ) 180 )
170 } 181 }
...@@ -291,6 +302,10 @@ ...@@ -291,6 +302,10 @@
291 * @author: renchao 302 * @author: renchao
292 */ 303 */
293 handleDelete (index, row) { 304 handleDelete (index, row) {
305 if (row.children.length > 0) {
306 this.$message.error('页数存在不可删除');
307 return
308 }
294 let that = this 309 let that = this
295 this.$confirm('此操作将永久删除该 是否继续?', '提示', { 310 this.$confirm('此操作将永久删除该 是否继续?', '提示', {
296 confirmButtonText: '确定', 311 confirmButtonText: '确定',
......