Merge branch 'fix_foton_20240408' into 'master'
Fix foton 20240408 See merge request laws-foton-slrs/foton-laws-system-front!172
This commit is contained in:
@@ -1144,7 +1144,7 @@
|
||||
<el-upload
|
||||
multiple
|
||||
drag
|
||||
:limit="8"
|
||||
:limit="30"
|
||||
:on-exceed="handleExceed"
|
||||
:file-list="fileList"
|
||||
:action="fileUrl"
|
||||
@@ -2187,7 +2187,7 @@
|
||||
},
|
||||
//限制上传文件个数
|
||||
handleExceed (files, fileList) {
|
||||
this.$message.warning(`当前限制选择 8 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
|
||||
this.$message.warning(`当前限制选择 30 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
|
||||
},
|
||||
// 标准来源改变事件
|
||||
standInChange(val) {
|
||||
|
||||
@@ -1417,7 +1417,7 @@
|
||||
ref="importfile"
|
||||
multiple
|
||||
drag
|
||||
:limit="8"
|
||||
:limit="30"
|
||||
:on-exceed="handleExceed"
|
||||
:file-list="fileList"
|
||||
:action="fileUrl"
|
||||
@@ -2649,7 +2649,7 @@ export default {
|
||||
},
|
||||
// 限制上传文件个数
|
||||
handleExceed (files, fileList) {
|
||||
this.$message.warning(`当前限制选择 8 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
|
||||
this.$message.warning(`当前限制选择 30 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
|
||||
},
|
||||
// 标准来源改变事件
|
||||
standInChange (val) {
|
||||
|
||||
@@ -1552,7 +1552,7 @@
|
||||
ref="importfile"
|
||||
multiple
|
||||
drag
|
||||
:limit="8"
|
||||
:limit="30"
|
||||
:on-exceed="handleExceed"
|
||||
:file-list="fileList"
|
||||
:action="fileUrl"
|
||||
@@ -2186,7 +2186,7 @@ export default {
|
||||
},
|
||||
// 限制上传文件个数
|
||||
handleExceed (files, fileList) {
|
||||
this.$message.warning(`当前限制选择 8 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
|
||||
this.$message.warning(`当前限制选择 30 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
|
||||
},
|
||||
// 标准来源改变事件
|
||||
standInChange (val) {
|
||||
|
||||
@@ -804,14 +804,14 @@
|
||||
>
|
||||
<el-card>
|
||||
<el-form-item prop="fzrUserName" style="margin-bottom: 0">
|
||||
<h4>起草单位中心主任</h4>
|
||||
<h4>标委会主任</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input
|
||||
v-model="roleForm.fzrUserName"
|
||||
:disabled="disabledXX"
|
||||
readonly="readonly"
|
||||
placeholder="选择起草单位中心主任"
|
||||
@click.native="choiceZRR('fzrUserId', '选择起草单位中心主任', roleForm.fzrUserId)"
|
||||
placeholder="选择标委会主任"
|
||||
@click.native="choiceZRR('fzrUserId', '选择标委会主任', roleForm.fzrUserId)"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -1914,7 +1914,7 @@ export default {
|
||||
{ required: true, message: '选择标准法规部高级经理', trigger: 'blur' },
|
||||
],
|
||||
fzrUserName: [
|
||||
{ required: true, message: '选择起草单位中心主任', trigger: 'blur' },
|
||||
{ required: true, message: '选择标委会主任', trigger: 'blur' },
|
||||
],
|
||||
zhrUserName: [
|
||||
{
|
||||
|
||||
@@ -967,14 +967,14 @@
|
||||
>
|
||||
<el-card>
|
||||
<el-form-item prop="fzrUserName" style="margin-bottom: 0">
|
||||
<h4>起草单位中心主任</h4>
|
||||
<h4>标委会主任</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input
|
||||
v-model="roleForm.fzrUserName"
|
||||
:disabled="disabledXX"
|
||||
readonly="readonly"
|
||||
placeholder="选择起草单位中心主任"
|
||||
@click.native="choiceZRR('fzrUserId', '选择起草单位中心主任', roleForm.fzrUserId)"
|
||||
placeholder="选择标委会主任"
|
||||
@click.native="choiceZRR('fzrUserId', '选择标委会主任', roleForm.fzrUserId)"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -2157,7 +2157,7 @@ export default {
|
||||
{ required: true, message: '选择标准法规部高级经理', trigger: 'blur' },
|
||||
],
|
||||
fzrUserName: [
|
||||
{ required: true, message: '选择起草单位中心主任', trigger: 'blur' },
|
||||
{ required: true, message: '选择标委会主任', trigger: 'blur' },
|
||||
],
|
||||
zhrUserName: [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user