Merge branch 'fix_foton_20240619' into 'master'

Fix foton 20240619

See merge request laws-foton-slrs/foton-laws-system-front!203
This commit is contained in:
王晓勇
2024-07-01 09:54:19 +00:00
4 changed files with 29 additions and 11 deletions
+6 -1
View File
@@ -463,5 +463,10 @@
bottom: 20px; bottom: 20px;
z-index: 1000; z-index: 1000;
} }
sup{
vertical-align: super!important;
}
sub{
vertical-align: sub!important;
}
</style> </style>
@@ -473,7 +473,7 @@
type="textarea" type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="1000" maxlength="3000"
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -483,7 +483,7 @@
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500" maxlength="3000"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<custom-date-pick-group <custom-date-pick-group
@@ -319,7 +319,7 @@
type="textarea" type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="500" maxlength="3000"
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -329,7 +329,7 @@
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500" maxlength="3000"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<custom-date-pick-group <custom-date-pick-group
@@ -413,7 +413,7 @@
type="textarea" type="textarea"
v-model="editForm.changePoint" v-model="editForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="1000" maxlength="3000"
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -423,7 +423,7 @@
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
v-model="editForm.changePoint" v-model="editForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500" maxlength="3000"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<custom-date-pick-group <custom-date-pick-group
@@ -66,13 +66,14 @@
<el-form-item <el-form-item
label="政策名称" label="政策名称"
:prop="!disabledXX ? 'lawsName':''" :prop="!disabledXX ? 'lawsName':''"
class="add-form-item form-item-disabled" class="add-form-item form-item-disabled cursor-poin"
> >
<el-input <el-input
v-model="dataForm.lawsName" v-model="dataForm.lawsName"
:disabled="true" readonly
placeholder="请输入政策名称" placeholder="请输入政策名称"
clearable clearable
@click.native="goDeatil"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -166,7 +167,7 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('templateFileList','templateFileId','.zip,.docx,.doc,.xls,.xlsx',200)" @click="fileUpload('templateFileList','templateFileId','.zip,.docx,.doc,.xls,.xlsx,.pdf',200)"
> >
点击上传 点击上传
</el-button> </el-button>
@@ -369,7 +370,7 @@ export default {
nodeList: [], nodeList: [],
formRules: { formRules: {
lawsNo: [ lawsNo: [
{ required: true, message: '请输入政策文号', trigger: 'change' }, // { required: true, message: '请输入政策文号', trigger: 'change' },
], ],
lawsName: [ lawsName: [
{ required: true, message: '请输入政策名称', trigger: 'change' }, { required: true, message: '请输入政策名称', trigger: 'change' },
@@ -548,6 +549,11 @@ export default {
} }
}, },
methods: { methods: {
//跳转到政策详情
goDeatil(){
if(this.dataForm.linkUrl)
window.open(this.dataForm.linkUrl,'_blank')
},
handlePreview (file) { handlePreview (file) {
let attId = '' let attId = ''
if (file && file.id) { if (file && file.id) {
@@ -566,6 +572,7 @@ export default {
this.dataForm.lawsNo = row.lawsNo this.dataForm.lawsNo = row.lawsNo
this.dataForm.lawsName = row.lawsName this.dataForm.lawsName = row.lawsName
this.dataForm.lawsId = row.id this.dataForm.lawsId = row.id
this.dataForm.linkUrl=row.lawsDetailLink
this.dataForm = { ...this.dataForm } this.dataForm = { ...this.dataForm }
}, },
handleSearchStandard () { handleSearchStandard () {
@@ -1067,4 +1074,10 @@ export default {
.addButton { .addButton {
display: inline-block; display: inline-block;
} }
.cursor-poin {
/deep/ .el-input .el-input__inner{
cursor: pointer !important;
color: #0c91e5 !important;
}
}
</style> </style>