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-08-24 17:38:26 +08:00
parent 7f8c5737bc ac2c00ba4f
commit 3bdafc9d3d
9 changed files with 204 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/languages/cn.js
+1
View File
@@ -407,6 +407,7 @@ export const m = {
PleaseSelectYourFieldOfExpertise: '请选择所属专业领域',
pleaseEnterComments: '请输入备注',
standardNo: '标准号',
enterpriseStandardNumber: '企标号',
nameStandard: '标准名称',
theImportFile: '导入文件',
specialEffectiveDate: '特殊生效日期',
src/assets/languages/en.js
+1
View File
@@ -236,6 +236,7 @@ export const m = {
pleaseSelectApplicableArea: 'PleaseSelectApplicableArea',
country: 'Country',
itemNumber: 'ItemNumber',
enterpriseStandardNumber: 'enterpriseStandardNumber',
entryName: 'EntryName',
clauseRequirements: 'ClauseRequirements',
keyPointsOfimplementation: 'KeyPointsOfimplementation',
src/pages/config/pages/attributeCustom/components/stand.vue
+1 -1
View File
@@ -135,7 +135,7 @@
</el-select>
</el-form-item>
<el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
<el-select v-model="attributeEO.selVal" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
<el-select v-model="attributeEO.selVal" placeholder="请选择" filterable>
<el-option
v-for="item in relateDicIdOptions"
:label="item.label"
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+6
View File
@@ -261,6 +261,7 @@ export default {
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
fileIds: '',
listType: "", //区分是哪个清单
listName: "", //清单名称
descriptionList: "", //清单说明
@@ -358,6 +359,11 @@ export default {
this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId;
let filesId = []
item.fileName.forEach(itemIds =>{
filesId.push(itemIds.id)
})
this.listForm.fileId = filesId.join(',')
item.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.getFileInfo();
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+1 -1
View File
@@ -543,8 +543,8 @@
})
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善人员信息')
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+13 -9
View File
@@ -204,7 +204,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
height="150%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectedChange"
@@ -233,7 +233,7 @@
</el-table>
<pagination
style="position: relative;"
:page="pageNo"
:page="queryUnqualidiedData.pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"/>
@@ -283,13 +283,10 @@ export default {
standModel: false,
// 总数
total: 0,
// 当前页数
pageNo: 1,
// 查询未符合项整改数据库数据
queryUnqualidiedData: {
pageNo: 1,
pageSize: 10,
total: 0,
current: 1,
size: this.$store.getters.userInfo.configContent,
closeState: '1',
standId: '',
standSerialNumber: '', // 标准号/名称
@@ -344,6 +341,12 @@ export default {
//点击新增事件
addList() {
dicTypeData().then(res => {
if (this.pageNo !== undefined) {
this.queryUnqualidiedData.current = this.pageNo
}
if (this.size !== undefined) {
this.queryUnqualidiedData.size = this.size
}
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
standUnqualified(this.queryUnqualidiedData).then(res => {
this.unqualidiedData = res.data.records
@@ -553,8 +556,9 @@ export default {
this.pageNo = page
this.getTableByPage()
},
pageSizeChange () {
this.getTableByPage()
pageSizeChange (pageSize) {
this.size = pageSize
this.getTableByPage(pageSize)
},
}
}
src/pages/regulatoryRepository/partCodeApply/index.vue
+2 -2
View File
@@ -42,8 +42,8 @@
</el-button>
<el-button type="primary" size="mini" v-btn-permission="'9caea8a46be62a0ae0600de35bad6539'"
class="common-button-primary" @click="deletePartCode('demore',null)">
<i class="iconfont">&#xe611;</i>
删除
<i class="iconfont">&#xe61b;</i>
批量删除
</el-button>
</div>
<!--表格区域-->
src/pages/searchCenter/pages/advancedSearch.vue
+172 -109
View File
@@ -599,178 +599,232 @@
<el-form :model="standForm" ref="standForm" label-position="right" label-width="150px">
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="企标类别" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据企标类别查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="企标类别" prop="standSort">
<el-select v-model="standForm.standSort" filterable>
<el-option
v-for="item in standSortOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企标编号" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据企标编号查找"
<el-form-item label="企标编号" prop="standCode">
<el-input v-model="standForm.standCode" clearable
placeholder="请输入企标编号"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="标准年份" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据标准年份查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="标准年份" prop="standYear">
<el-input v-model.number="standForm.standYear" clearable placeholder="请输入标准年份"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企标名称" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据企标名称查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="企标名称" prop="standName">
<el-input v-model="standForm.standName" clearable
placeholder="请输入企标名称"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="企标英文名称" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据企标英文名称查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="企标英文名称" prop="standEnName">
<el-input v-model="standForm.standEnName" clearable placeholder="请输入企标英文名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="文本状态" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据文本状态查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="文本状态" prop="textStatusBuss">
<el-select v-model="standForm.textStatusBuss"
placeholder="请选择文本状态"
clearable>
<el-option
v-for="opt in textStatusOptions"
:key="opt.value"
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
>
{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="废止日期" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据废止日期查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="发布日期" class="add-form-item form-item-disabled">
<el-datePicker v-model="standForm.issueTime"
:editable="false"
placeholder="请选择发布日期"
value-format="yyyy-MM-dd"
clearable></el-datePicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企标实施日期" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据企标实施日期查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="实施日期" title="标准实施日期" class="add-form-item form-item-disabled">
<el-datePicker v-model="standForm.putTime"
:editable="false"
placeholder="请选择实施日期"
value-format="yyyy-MM-dd"
clearable
></el-datePicker>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="企标发布日期" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据企标发布日期查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="废止日期" prop="FZRQBUSS">
<el-datePicker v-model="standForm.FZRQBUSS"
:editable="false"
placeholder="请选择废止日期"
value-format="yyyy-MM-dd"
clearable
></el-datePicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复审日期" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据复审日期查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="复审日期" prop="FSRQBUSS">
<el-datePicker v-model="standForm.FSRQBUSS"
:editable="false"
placeholder="请选择复审日期"
value-format="yyyy-MM-dd"
clearable
></el-datePicker>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="起草部门" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据起草部门查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="起草部门" prop="QCDW">
<el-select v-model="standForm.QCDW" filterable clearable>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据起草人查找"
@keyup.enter.native="btnSearch"></el-input>
<el-select v-model="standForm.QCRBUSS" filterable clearable>
<el-option
v-for="item in qcrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="文件上传人员" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据文件上传人员查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="文件上传人员" prop="nameShow">-->
<!-- <el-input v-model="standForm.nameShow" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="适用车型" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据适用车型查找"
@keyup.enter.native="btnSearch"></el-input>
<el-select v-model="standForm.SYCXCLASS" filterable clearable>
<el-option
v-for="item in applyArcticOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="能源类型" prop="NYLXCLASS">
<el-select v-model="standForm.NYLXCLASS" filterable clearable>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="适用产品线" prop="SYCPXCLASS">
<el-select v-model="standForm.SYCPXCLASS" filterable clearable>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="体系类别" prop="TXLBBUSS">
<el-input v-model="standForm.TXLBBUSS" clearable placeholder="请输入体系类别"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="关联模块-VPPS编码" prop="VPPSBMBUSS">
<el-input v-model="standForm.VPPSBMBUSS" clearable
placeholder="请输入关联模块-VPPS编码查找"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联模块-中文名称" prop="VPPSCNBUSS">
<el-input v-model="standForm.VPPSCNBUSS" clearable
placeholder="请输入关联模块-中文名称查找"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="能源类型" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据能源类型查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="代替企标编号" prop="DTQBBHBUSS">
<el-input v-model="standForm.DTQBBHBUSS" clearable placeholder="请输入代替企标编号查找"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据适用产品线查找"
@keyup.enter.native="btnSearch"></el-input>
<el-form-item label="被代替企标编号" prop="BDTQBBHBUSS">
<el-input v-model="standForm.BDTQBBHBUSS" clearable placeholder="请输入被代替企标编号查找"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="体系类别" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据体系类别查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联模块-VPPS编码" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据关联模块-VPPS编码查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="代替企标编号" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据代替企标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联模块-中文名称" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据关联模块-中文名称查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="被代替企标编号" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据被代替企标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宣贯记录" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据宣贯记录查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="上传时间" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="宣贯记录" prop="standNumber">-->
<!-- <el-input v-model="standForm.standNumber" clearable-->
<!-- placeholder="根据宣贯记录查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row type="flex" justify="space-around" class="code-row-bg">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="上传时间" prop="nameShow">-->
<!-- <el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- </el-col>-->
</el-row>
</el-form>
</div>
@@ -1259,6 +1313,11 @@ export default {
txlbOptions: [], // 体系类别
// 标准类别
standSortOptions: [],
textStatusOptions: [],
qcdwOptions:[],//起草单位下拉框
qcrOptions:[],//起草人下拉框
nylxOptions:[],//能源类型下拉框
syrzOptions:[],//适用认证下拉框
// 我司署名人
wssmrOptions: [],
// 体系类别
@@ -2377,6 +2436,10 @@ export default {
this.bussBigClassOptions = res.data.BUSSBIGCLASS;
this.bussStandClassOptions = res.data.BUSSSTANDCLASS;
this.regionOptions = res.data.REGION; // 区域
this.textStatusOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.qcdwOptions = res.data.QCDW // 起草单位
this.qcrOptions = res.data.QCRBUSS // 起草人
this.syrzOptions = res.data.SYRZCLASS // 适用认证
}, e => {
});
// 根据资源类型过滤表头
src/pages/searchCenter/pages/standardSearch.vue
+7 -7
View File
@@ -877,9 +877,9 @@
} else if (this.selectIndex === 'laws' && seniortype[i] === 'CYSD') {
renameType = 'WSSFCY'
} else if (this.selectIndex === 'enterprise' && seniortype[i] === 'ORGLIST'){
renameType = 'ZQCBM'
renameType = 'QCDW'
} else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){
renameType = 'statecode'
renameType = 'textStatusBuss'
}
else {
renameType = seniortype[i]
@@ -1136,11 +1136,11 @@
// 企业标准
case 'enterprise':
//标准状态
filterOptions.BUSSSTATE = originOptions.BUSSSTATE
filterOptions.BUSSSTATE.title = '标准状态'
filterOptions.BUSSSTATE = originOptions.TEXTSTATUSBUSS
filterOptions.BUSSSTATE.title = '文本状态'
filterOptions.BUSSSTATE.index = 1
//主起草部门
filterOptions.ORGLIST = originOptions.ORGLIST
filterOptions.ORGLIST = originOptions.QCDW
filterOptions.ORGLIST.title = '主起草部门'
filterOptions.ORGLIST.index = 2
break
@@ -1264,8 +1264,8 @@
}
if(condition.selectIndex === 'enterprise'){
condition.selectIndex='bussstand'
condition.standState = condition.BUSSSTATE
condition.ZQCBM = condition.ORGLIST
condition.textStatusBuss = condition.BUSSSTATE
condition.QCDW = condition.ORGLIST
}
// 查询为国内外政策时，改变查询参数名
if (condition.selectIndex === 'laws') {