12b21b0a by yuanbo

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

2 parents 2cadb5b1 80fa1fe7
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-18 13:53:23
* @LastEditTime: 2023-09-07 16:09:13
-->
<template>
<div class="rlPopup">
......@@ -28,6 +28,9 @@
accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg">
<el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button>
</el-upload>
<!-- 左移右移 -->
<el-button type="primary" @click="handleMove('left')" v-if="ableOperation">左移</el-button>
<el-button type="primary" @click="handleMove('right')" v-if="ableOperation">右移</el-button>
<el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
v-if="thumbnailImages.length>0 && ableOperation">删除</el-button>
<div v-if="ableOperation" class="pl-5">
......@@ -133,6 +136,10 @@
this.scanTitle = '打开高拍仪'
}
},
// 左右移动
handleMove(direction) {
},
/**
* @description: 拍照
* @author: renchao
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-15 09:43:46
* @LastEditTime: 2023-09-07 16:01:19
-->
<template>
<div class="clmlmx-box">
......@@ -31,9 +31,23 @@
loading: false,
column: [
{
width: "50",
label: '序号',
type: 'index'
width: '50',
renderHeader: (h, scope) => {
return <div> {
!this.formData.ableOperation ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
}
</div>
},
render: (h, scope) => {
return (
<div>
{
!this.formData.ableOperation ? <span>{scope.$index + 1}</span> :
<i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i>
}
</div>
)
}
},
{
prop: "isrequired",
......@@ -90,12 +104,11 @@
width: "50",
render: (h, scope) => {
return (
<div>
{
(this.formData.ableOperation && scope.row.isrequired != '1') ?
<el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
scope.row.sjsl ?
<span>{scope.row.sjsl}</span> : 1
}
</div>
}</span>
)
}
},
......@@ -162,9 +175,7 @@
>
下移
</el-button>
<i v-show={scope.row.isrequired != '1' && this.formData.ableOperation} onClick={() => {
this.handleDelete(scope.$index, scope.row);
}} class="el-icon-delete pointer" style="color:#409EFF;margin-left:5px;position: relative;top: 1px;"></i>
</div >
)
}
......@@ -291,6 +302,10 @@
* @author: renchao
*/
handleDelete (index, row) {
if (row.children.length > 0) {
this.$message.error('页数存在不可删除');
return
}
let that = this
this.$confirm('此操作将永久删除该 是否继续?', '提示', {
confirmButtonText: '确定',
......