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:
11528
2022-03-25 00:51:32 +08:00
parent 282e6990d7 9f1e1f5ef9
commit da4974199e
10 changed files with 126 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+6 -1
View File
@@ -311,7 +311,7 @@
title="查看人员"
:visible.sync="RoleModel"
@close="RoleCancle"
size="1100px"
size="900px"
class="not-footer-drawer"
>
<div class="demo-drawer-content">
@@ -358,6 +358,11 @@
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
align="center"
prop="institutionName"
label="所属部门">
</el-table-column>
<el-table-column
align="center"
prop="uname"
src/pages/details/otherBussStandardDetails/index.vue
+15 -2
View File
@@ -414,7 +414,7 @@
</div>
</template>
<p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p v-if="activeState"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p v-if="activeState" style="border-bottom: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p class="half">
<label style=" margin-right: 156px;"
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
@@ -521,7 +521,7 @@
>
{{ child.value || '-' }}
</span>
<div v-else class="modular-content-p-flies">
<div v-else :class="(child.value === null || child.value.length === 0) ? 'file2' : 'modular-content-p-flies'">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
@@ -532,6 +532,7 @@
<i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</p>
<template v-if="child.value === null || child.value.length === 0" >-</template>
<!-- <el-button-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
@@ -3235,6 +3236,18 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/ .file2 {
display: inline-block;
width: calc(100% - 225px);
min-height: 50px;
line-height: 50px;
font-size: 16px;
color: #333333;
word-break: break-all;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
/deep/ .el-collapse{
border: none;
}
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+1
View File
@@ -1259,6 +1259,7 @@ export default {
this.form.zrgcs = "";
}
this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+13 -16
View File
@@ -143,19 +143,19 @@
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="审批意见">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
</div>
</div>
<div class="content" v-show="active === '3'">
@@ -277,9 +277,6 @@ export default {
nextStatus: ""
},
formRules: {
nextStatus: [
{ required: true, message: "", trigger: "change" }
]
},
associationOptions: [{
value: "修订",
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
-7
View File
@@ -216,13 +216,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
-7
View File
@@ -232,13 +232,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+10 -2
View File
@@ -206,7 +206,7 @@
type="primary"
size="mini"
class="common-button-primary"
@click="QYBZget">查询
@click="QYBZgetBtn">查询
</el-button>
<el-button
class="common-button-default"
@@ -223,7 +223,7 @@
:data="QYBZList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
class="table-height"
border
@selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -753,6 +753,10 @@ export default {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
QYBZgetBtn(){
this.QYBZform.page = 1
this.QYBZget()
},
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
@@ -958,5 +962,9 @@ export default {
}
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+12 -16
View File
@@ -228,19 +228,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -372,7 +359,7 @@
type="primary"
size="mini"
class="common-button-primary"
@click="QYBZget">查询
@click="QYBZgetBtn">查询
</el-button>
<el-button
class="common-button-default"
@@ -389,7 +376,7 @@
:data="QYBZList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
class="table-height"
border
@selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -858,7 +845,7 @@ export default {
},
QYBZenterDrawer () {
if (this.QYBZformSelect.length > 1) {
this.$message.warning('请选择一条标准')
this.$message.warning('您只能选择一条标准进行带入')
} else if (this.QYBZformSelect.length < 1){
this.$message.warning('请选择要带入的标准')
} else {
@@ -879,6 +866,11 @@ export default {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
//企业标准查询
QYBZgetBtn(){
this.QYBZform.page = 1
this.QYBZget()
},
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
@@ -1170,5 +1162,9 @@ export default {
}
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
-7
View File
@@ -223,13 +223,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+69 -71
View File
@@ -1225,8 +1225,26 @@
<el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCVPPSBMBUSS"
placeholder="选择关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
placeholder="请输入关联模块--乘用车VPPS编码"
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.KCVPPSBMBUSS"
placeholder="请输入关联模块--卡车VPPS编码"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.DYBXHBUSS"
placeholder="请输入模块结构单元变型号(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYBXHBUSS"
placeholder="请输入模块结构单元变型号(乘用车)"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -1240,18 +1258,6 @@
@click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])">
</el-input>
</el-form-item>
<!-- <el-form-item label="起草人" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarBussionessSearch.QCRBUSS" clearable placeholder="请输入起草人"></el-input>-->
<!--&lt;!&ndash; <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>&ndash;&gt;-->
<!--&lt;!&ndash; <el-option&ndash;&gt;-->
<!--&lt;!&ndash; v-for="item in qcrOptions"&ndash;&gt;-->
<!--&lt;!&ndash; placeholder="请选择"&ndash;&gt;-->
<!--&lt;!&ndash; :key="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :value="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :label="item.label"&ndash;&gt;-->
<!--&lt;!&ndash; ></el-option>&ndash;&gt;-->
<!--&lt;!&ndash; </el-select>&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- 能源类型-->
<template>
<custom-select-array
@@ -1260,18 +1266,6 @@
v-model="sarBussionessSearch['NYLXCLASS']"
></custom-select-array>
</template>
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarBussionessSearch.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>-->
<!-- 适用产品线（新增字段）-->
<template>
<custom-select-array
:config="sycpxOptions"
@@ -1279,20 +1273,30 @@
v-model="sarBussionessSearch['SYCPXCLASS']"
></custom-select-array>
</template>
<!-- <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarBussionessSearch.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-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCVPPSCNBUSS"
placeholder="请输入关联模块--乘用车vpps中文名称"
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" title="关联模块--卡车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.KCVPPSCNBUSS"
placeholder="请输入关联模块--卡车vpps中文名称"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.DYMCBUSS"
placeholder="请输入模块结构单元名称(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYMCBUSS"
placeholder="请输入关联模块--乘用车vpps中文名称"
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -2581,17 +2585,17 @@ export default {
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
if (this.drawerTitle2 === 'VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}
} else {
if (this.drawerTitle2 === 'VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
} else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
@@ -3637,8 +3641,8 @@ export default {
nowstandinfo.putTime = this.$dateFormat(this.sarBussionessStandEO.putTime, 'yyyy-MM-dd hh:mm:ss')
}
// 代替标准号
if (nowstandinfo.replaceStandNum != null) {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
if (this.sarBussionessStandEO["DTQBBHBUSS"] != null) {
nowstandinfo.replaceStandNum = this.sarBussionessStandEO["DTQBBHBUSS"].replace(/，/ig, ',')
}
if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
@@ -4336,37 +4340,29 @@ export default {
formFieldList.forEach((item) => {
const value = this.sarBussionessSearch[item.attrField]
// 时间格式处理
if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') {
advanceSearchVOList.push({
connect: "and",
field: 'CYCVPPSBM',
type: 'like',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') {
advanceSearchVOList.push({
connect: "and",
field: 'CYCVPPSCN',
type: 'like',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'EQUALS',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
advanceSearchVOList.push({
connect: advanceSearchVOList.length > 0 ? "and" : "",
field: item.attrField || "",
type: "between",
value: (value ? value[0]+','+value[1] : "") || "",
});
}else if (value !== undefined && value !== null && value !== "") {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'like',
value: value
});
}
})
if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') {
advanceSearchVOList.push({
connect: "and",
field: 'BARQ',
type: 'EQUALS',
value: formData.BARQ
});
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData;
@@ -4757,6 +4753,8 @@ export default {
}
if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') {
rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'})
}else if(item.attrLen && item.attrType === 'INPUT_STR'){
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
}
if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'INPUT_STR') {
rule.push({