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

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

Browse Source
This commit is contained in:
zhutianqi
2021-11-18 17:18:49 +08:00
parent 3d2d0e7112 c42d27109a
commit 82bb9589c2
9 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
+5 -5
View File
@@ -46,7 +46,7 @@
</el-table-column>
<el-table-column
label="标准编号/政策编号"
prop="lawId"
prop="lawCode"
align="center"
width="300"
>
@@ -221,7 +221,7 @@
<el-form :model="standardSearchForm" inline class="label-input-form search-area">
<el-form-item label="标准编号/政策编号" style="margin-right:10px" prop="lawsNumber" class="search-item">
<el-input
v-model="standardSearchForm.lawId"
v-model="standardSearchForm.lawCode"
clearable placeholder="根据编号查找"
:maxlength="100"
@keyup.enter.native="getDomesticStandardTable"/>
@@ -278,7 +278,7 @@
align="center">
</el-table-column>
<el-table-column
prop="lawId"
prop="lawCode"
width="200"
label="标准编号/政策编号"
align="center">
@@ -382,7 +382,7 @@ export default {
taskTableData: []
},
standardSearchForm: {
lawId: '',
lawCode: '',
lawName: '',
productType: '',
page: 1,
@@ -583,7 +583,7 @@ export default {
},
//清空搜索条件
handleResetSearch() {
this.standardSearchForm.lawId = ''
this.standardSearchForm.lawCode = ''
this.standardSearchForm.lawName = ''
this.standardSearchForm.productType = ''
this.standardSearchForm.standType = 'INLAND'
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step2.vue
+1 -1
View File
@@ -40,7 +40,7 @@
<el-table-column
label="标准编号/政策编号"
align="center"
prop="lawId"
prop="lawCode"
width="300"
>
</el-table-column>
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step3.vue
+1 -1
View File
@@ -39,7 +39,7 @@
</el-table-column>
<el-table-column
label="标准编号/政策编号"
prop="lawId"
prop="lawCode"
align="center"
width="300"
>
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
+1 -1
View File
@@ -53,7 +53,7 @@
</el-table-column>
<el-table-column
label="标准编号/政策编号"
prop="lawId"
prop="lawCode"
align="center"
width="300"
>
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
+2 -2
View File
@@ -37,13 +37,13 @@
align="center">
</el-table-column>
<el-table-column
prop="lawId"
prop="lawCode"
label="标准编号/政策编号"
align="center"
width="150"
>
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.lawId"></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.lawCode"></el-input>
</template>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
+1 -1
View File
@@ -37,7 +37,7 @@
align="center">
</el-table-column>
<el-table-column
prop="lawId"
prop="lawCode"
label="标准编号/政策编号"
align="center"
width="150"
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
+1 -1
View File
@@ -37,7 +37,7 @@
align="center">
</el-table-column>
<el-table-column
prop="lawId"
prop="lawCode"
label="标准编号/政策编号"
align="center"
width="150"
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
+1 -1
View File
@@ -37,7 +37,7 @@
align="center">
</el-table-column>
<el-table-column
prop="lawId"
prop="lawCode"
label="标准编号/政策编号"
align="center"
width="150"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+15 -15
View File
@@ -4809,21 +4809,21 @@ export default {
const rules = {...this.defaultAddFormFieldRules}
formFieldList.forEach((item) => {
const rule = []
if (item.isMust === '0' && isEdit !== '0') {
if (item.attrType === 'DATE_PICKER') {
rule.push({required: true, type: 'date', message: `${item.attrName}不能为空`, trigger: 'blur'})
} else if (item.attrType === 'SEL_OPTION') {
rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
} else if (item.attrType === 'DATE_PIC_OPTS') {
rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
} else if (item.attrType === 'INPUT_NUM') {
rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'blur'})
} else if (item.attrType === 'SEL_OPTS') {
rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
} else if (item.attrType === 'INPUT_STR') {
rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
}
}
// if (item.isMust === '0' && isEdit !== '0') {
// if (item.attrType === 'DATE_PICKER') {
// rule.push({required: true, type: 'date', message: `${item.attrName}不能为空`, trigger: 'blur'})
// } else if (item.attrType === 'SEL_OPTION') {
// rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
// } else if (item.attrType === 'DATE_PIC_OPTS') {
// rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
// } else if (item.attrType === 'INPUT_NUM') {
// rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'blur'})
// } else if (item.attrType === 'SEL_OPTS') {
// rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
// } else if (item.attrType === 'INPUT_STR') {
// rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
// }
// }
// isEdit 为0 标准状态不是必填
if (isEdit === '0') {
rules.standState = [{required: false, message: '文本状态不能为空', trigger: 'change'}]