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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!168
This commit is contained in:
王夏晖
2021-09-30 09:02:07 +08:00
parent 3e29e1c354 16d2a9ab9e
commit 2a4a1acc46
10 changed files with 249 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
+3 -3
View File
@@ -101,7 +101,7 @@
<el-popover trigger="hover" placement="top">
{{scope.row.institutionName}}
<div slot="reference" class="name-wrapper">
<p v-if="scope.row.institutionName.length<15">
<p v-if="!scope.row.institutionName || scope.row.institutionName.length<15">
{{scope.row.institutionName}}
</p>
<p v-else> {{scope.row.institutionName.substring(0,15)}}...</p>
@@ -116,7 +116,7 @@
<el-popover trigger="hover" placement="top">
{{scope.row.NameList}}
<div slot="reference" class="name-wrapper">
<p v-if="scope.row.NameList.length<15">
<p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
{{scope.row.NameList}}
</p>
<p v-else> {{scope.row.NameList.substring(0,15)}}...</p>
@@ -334,7 +334,7 @@ export default {
}, res => {
console.log(res.data)
res.data.records.forEach((item) => {
var NameList = ''
let NameList = ''
item.positions.forEach((items) => {
if (NameList.length > 0) {
NameList += ','
src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
+21 -13
View File
@@ -210,20 +210,28 @@ export default {
handleSubmit(callback) {
const selection = this.$refs['selection'].selection
console.log(selection)
return new Promise((resolve, reject) => {
this.postListToServer(selection).then(res => {
// 关闭当前区域
this.handleCancel()
callback && callback()
resolve(res)
}).catch((err) => {
// 关闭当前区域
this.handleCancel()
callback && callback()
reject(err)
if (selection.length>0){
return new Promise((resolve, reject) => {
this.postListToServer(selection).then(res => {
// 关闭当前区域
this.handleCancel()
callback && callback()
resolve(res)
}).catch((err) => {
// 关闭当前区域
this.handleCancel()
callback && callback()
reject(err)
})
})
})
}else {
return new Promise(() => {
// 关闭当前区域
this.handleCancel()
callback && callback()
})
}
},
handleCancel() {
src/pages/localTool/standAutoSplit/index.vue
+4
View File
@@ -982,8 +982,12 @@ export default {
}, res => {
res.data.list.map((item, index) => {
if (item.collectId != null && item.collectId !== '') {
item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
item.collectBtn = false
} else {
item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
item.collectBtn = true
}
})
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+5 -3
View File
@@ -1036,7 +1036,8 @@ export default {
return
}
const query = this.infoForm
this.editForm.id = query.infoId
this.editForm.id = this.infoId
console.log("hello",this.editForm.id);
this.editForm.standNumSplit = query.standNumSplit
this.editForm.standNameSplit = query.standNameSplit
this.editForm.fileType = query.fileType
@@ -1046,6 +1047,7 @@ export default {
editFormSave () {
this.$refs['editForm'].validate(valid => {
if (valid) {
this.isSubmit = true
this.$http.postData('lawss/sarFileSplitInfo/updateSarFileSplitInfo', this.editForm, {
_this: this
@@ -2223,8 +2225,8 @@ export default {
const query = info[0]
this.infoForm = {
id: this.infoId,
standNumSplit: query.splitStatus!=='0' ? query.showNumber : query.standNumSplit,
standNameSplit: query.splitStatus!=='0' ? query.standName : query.standNameSplit,
standNumSplit: query.splitStatus=='0' ? query.showNumber : query.standNumSplit,
standNameSplit: query.splitStatus=='0' ? query.standName : query.standNameSplit,
fileType: query.fileType
}
if (query.splitStatus === '0') {
src/pages/localTool/standardWarning.vue
+2 -2
View File
@@ -261,8 +261,8 @@
:pageSize="pageConfig.newStandPageSize"
:total="pageConfig.count3"
autoSize
@pageChange="page => handlePageChange('newItems', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
@pageChange="page => handlePageChange('newStand', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>
<el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>
<el-table
:data="oldStand"
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+21 -1
View File
@@ -29,21 +29,37 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standNumber && listForm.standNumber.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standName && listForm.standName.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
@@ -779,11 +795,15 @@ export default {
if (this.dataList.length < 1) {
this.satisfyFlag = false
this.$message.warning("请添加产品线信息");
}else{
this.satisfyFlag = true
}
this.dataList.forEach(item => {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
if (!item.distributePerson) {
this.satisfyFlag = false
this.$message.warning("请选择分发责任人");
}else{
this.satisfyFlag = true
}
});
if(this.satisfyFlag){
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+27 -1
View File
@@ -29,21 +29,37 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standNumber && listForm.standNumber.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standName && listForm.standName.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
@@ -87,6 +103,12 @@
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
@@ -752,11 +774,15 @@ export default {
if (this.dataList.length < 1) {
this.satisfyFlag = false
this.$message.warning("请添加产品线信息");
}else {
this.satisfyFlag = true
}
this.dataList.forEach(item => {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
if (!item.distributePerson) {
this.satisfyFlag = false
this.$message.warning("请选择分发责任人");
}else {
this.satisfyFlag = true
}
});
if(this.satisfyFlag){
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+81 -4
View File
@@ -220,10 +220,20 @@
label="合规">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
|| dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
|| dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null"
disabled
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -238,10 +248,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -251,22 +269,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -282,10 +318,20 @@
label="合规(具体情况)">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].zcNoCompliance && dataList[scope.$index].zcNoCompliance.length>0
|| dataList[scope.$index].zcCountermeasures && dataList[scope.$index].zcCountermeasures>0
|| dataList[scope.$index].zcCompletionTime && dataList[scope.$index].zcCompletionTime !== null"
disabled
v-model="dataList[scope.$index].zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -299,10 +345,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
disabled
v-model="dataList[scope.$index].zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -312,22 +366,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
disabled
v-model="dataList[scope.$index].zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="productionCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
disabled
v-model="dataList[scope.$index].zcCompletionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="dataList[scope.$index].zcCompletionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -810,6 +882,11 @@ export default {
height: 100%;
}
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+82 -4
View File
@@ -132,10 +132,20 @@
label="合规">
<template slot-scope="scope">
<el-input
v-if="scope.row.noCompliance && scope.row.noCompliance.length>0
|| scope.row.countermeasures && scope.row.countermeasures.length>0
|| scope.row.completionTime && scope.row.completionTime !== null"
disabled
v-model="scope.row.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="scope.row.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -150,10 +160,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
disabled
v-model="scope.row.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="scope.row.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -163,22 +181,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
disabled
v-model="scope.row.countermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="scope.row.countermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
disabled
v-model="scope.row.completionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="scope.row.completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -194,10 +230,20 @@
label="合规(具体情况)">
<template slot-scope="scope">
<el-input
v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0
|| scope.row.zcCountermeasures && scope.row.zcCountermeasures>0
|| scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"
disabled
v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -211,10 +257,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
disabled
v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -224,22 +278,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
disabled
v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="productionCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
disabled
v-model="scope.row.zcCompletionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="scope.row.zcCompletionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -896,6 +968,12 @@ export default {
.accessStandardsAndRegulations {
height: 100%;
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
}
.demo-drawer-content {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+3 -1
View File
@@ -2872,12 +2872,14 @@ export default {
this.$set(data, 'showDel', false)
},
treeClick(treeNode) {
console.log("hello")
this.selectSarMenu = treeNode
this.standCommonlySearch.menuId = treeNode.id
this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
this.sarStandardsSearch.page = 1
this.standCommonlySearch.page = 1
this.getDomesticStandardTable(this.tableFlag)
//搜索后点击属性菜单依然显示搜索条件的数据
this.getDomesticStandardTable(this.standCommonlySearch)
},
// 点击搜索按钮
searchBtnClick(standCommonlySearch) {