FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-14 06:34:48 +08:00
parent b776a37f21 11becd2401
commit 2f588ca217
15 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
-1
View File
@@ -30,7 +30,6 @@
node-key="id"
:filter-node-method="filterNode"
highlight-current
default-expand-all
ref="tree"
:expand-on-click-node="false"
@node-click="handleNodeClick">
src/pages/details/otherStandardDetails/index.vue
+4 -4
View File
@@ -89,8 +89,8 @@
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
<!-- 多个文件时-->
<span v-else-if="child.value && child.value.length > 0">
<div style="margin-left: 19%;margin-top: -60px;line-height: 90px">
<div v-else-if="child.value && child.value.length > 0">
<span style="margin-left: 19%">
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -106,9 +106,9 @@
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
</div>
</span>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
</div>
<el-button
v-if="child.attrField === itemNam "
v-for="(itemNam,index) in itemExistList"
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+2 -2
View File
@@ -44,7 +44,7 @@
/>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -948,7 +948,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+3 -3
View File
@@ -30,7 +30,7 @@
:verifySarStandard = "verifySarStandard"></formList>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -906,7 +906,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2225,7 +2225,7 @@
}
},
handleSubmit() {
this.getRule()
// this.getRule()
// const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+3 -3
View File
@@ -86,7 +86,7 @@
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -969,7 +969,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2375,7 +2375,7 @@
}
},
handleSubmit() {
this.getRule()
// this.getRule()
// const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+2 -2
View File
@@ -31,7 +31,7 @@
:verifySarStandard = "verifySarStandard"></formList>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 0;">
<el-form
ref="formTongGuo"
@@ -1025,7 +1025,7 @@
],
reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
reasonNot:[],
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+3 -3
View File
@@ -164,7 +164,7 @@
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -1040,7 +1040,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2465,7 +2465,7 @@
}
},
handleSubmit() {
this.getRule()
// this.getRule()
// const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+3 -3
View File
@@ -86,7 +86,7 @@
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -970,7 +970,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2376,7 +2376,7 @@
}
},
handleSubmit() {
this.getRule()
// this.getRule()
// const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+3 -3
View File
@@ -164,7 +164,7 @@
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -1040,7 +1040,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -2464,7 +2464,7 @@
}
},
handleSubmit() {
this.getRule()
// this.getRule()
// const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+2 -2
View File
@@ -44,7 +44,7 @@
/>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -941,7 +941,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+2 -2
View File
@@ -45,7 +45,7 @@
/>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -942,7 +942,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+2 -2
View File
@@ -29,7 +29,7 @@
:verifySarStandard = "verifySarStandard"></formList>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -917,7 +917,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+2 -2
View File
@@ -89,7 +89,7 @@
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -983,7 +983,7 @@
],
},
rules:{
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+2 -2
View File
@@ -115,7 +115,7 @@
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 0;">
<el-form
ref="formTongGuo"
@@ -1195,7 +1195,7 @@
],
reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
reasonNot:[],
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+2 -2
View File
@@ -115,7 +115,7 @@
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="回执说明" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -1229,7 +1229,7 @@
],
reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
reasonNot:[],
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
// commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },