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 
Develop

See merge request LAWS/laws-system-front-FOTON!331
This commit is contained in:
王夏晖
2022-03-01 15:25:47 +08:00
parent ba7f325f95 710b7820e7
commit 826088c0ab
11 changed files with 255 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+33
View File
@@ -213,6 +213,11 @@
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' "
class="table-jump" style="color: #98E165"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
@@ -233,6 +238,10 @@
@click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{
scope.row.standName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
@click="handlePreview(scope.row)" class="table-jump" style="color: #98E165">{{
scope.row.standName
}}</a>
<a v-else @click="handlePreview(scope.row)" style="color: #333333"
class="table-jump">{{ scope.row.standName }}</a>
</template>
@@ -246,6 +255,9 @@
<span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.issueTime }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.issueTime }}</span>
<span v-else>{{ scope.row.issueTime }}</span>
</template>
</el-table-column>
@@ -258,6 +270,9 @@
<span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.SSRQ }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.SSRQ }}</span>
<span v-else>{{ scope.row.SSRQ }}</span>
</template>
@@ -271,6 +286,9 @@
<span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.XCXSSRQ }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.XCXSSRQ }}</span>
<span v-else>{{ scope.row.XCXSSRQ }}</span>
</template>
</el-table-column>
@@ -282,6 +300,9 @@
<span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.ZCCSSRQ }}</span>
<span v-else>{{ scope.row.ZCCSSRQ }}</span>
</template>
</el-table-column>
@@ -289,6 +310,15 @@
prop="dtbzh"
width="200"
label="代替标准号">
<template slot-scope="scope">
<span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.dtbzh }}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ scope.row.dtbzh }}</span>
<span v-else>{{ scope.row.dtbzh }}</span>
</template>
</el-table-column>
<el-table-column
prop="textStatus"
@@ -304,6 +334,9 @@
style="color: #F56C6C">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #98E165">{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+2 -2
View File
@@ -4338,7 +4338,7 @@ export default {
type: 'like',
value: value
});
}else if (value !== undefined && value !== null && value !== "") {
}else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
advanceSearchVOList.push({
connect: advanceSearchVOList.length > 0 ? "and" : "",
field: item.attrField || "",
@@ -4351,7 +4351,7 @@ export default {
advanceSearchVOList.push({
connect: "and",
field: 'BARQ',
type: 'equals',
type: 'EQUALS',
value: formData.BARQ
});
}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+8 -8
View File
@@ -2385,14 +2385,14 @@ export default {
{validator: this.verify.testItemCode, trigger: 'change'},
{type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'}
],
standName: [
{required: true, message: '标准名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
],
standEnName: [
{type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
{validator: this.verify.valiateEnName, trigger: 'blur'}
],
// standName: [
// {required: true, message: '标准名称不能为空', trigger: 'change'},
// {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
// ],
// standEnName: [
// {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
// {validator: this.verify.valiateEnName, trigger: 'blur'}
// ],
synopsis: [
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
],