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-07-14 18:00:41 +08:00
parent 61f7f1342b 4c338c36f9
commit de627ca1db
13 changed files with 168 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home1/components/searchGroup/index.vue
+38 -23
View File
@@ -2,26 +2,27 @@
<template>
<div class="search-group">
<el-select
v-model="selectKey"
v-model="checkState"
class="search-group-item"
placeholder="请选择"
>
<el-option
v-for="item in jumpPage"
:key="item.selectKey"
:key="item.value"
:label="item.label"
:value="item.selectKey"
:value="item.value"
></el-option>
</el-select>
<div class="search-condition">
<el-input
v-model="keywords"
@keyup.native.enter="search"
v-model="checkContent">
type="text"
placeholder="请输入关键词"
clearable
></el-input>
<el-button class="primary_button" type="primary">搜索</el-button>
<el-button class="primary_button" type="primary" @click="search">搜索</el-button>
</div>
</div>
</template>
@@ -33,36 +34,50 @@ export default {
mixins: [],
data() {
return {
selectKey: '',
keywords: '',
// 当前查询状态
checkState: 'All',
// 查询内容
checkContent: '',
jumpPage: [
{
selectKey: '选项1',
label: '国内外标准法规',
label: '全部',
value: 'All'
},
{
selectKey: '选项2',
label: '研究报告',
label: '国内标准法规',
value: 'stand'
},
{
label: '海外标准法规', // value没改
value: 'bussstand'
},
{
label: '国内外政策',
value: 'laws'
},
{
selectKey: '选项3',
label: '企业标准',
},
{
selectKey: '选项4',
label: '动态&通知',
},
{
selectKey: '选项5',
label: '流程中心',
},
value: 'enterprise'
}
],
}
},
computed: {},
watch: {},
mounted() {},
methods: {},
methods: {
search() {
this.$router.push({
name: 'StandardSearch',
params: {
selectKey: this.checkState,
searchValue: this.checkContent || undefined
}
})
},
},
mounted(){
},
}
</script>
src/pages/home1/components/solicitopinions/index.vue
+7 -6
View File
@@ -43,12 +43,13 @@ export default {
} )
},
standForComments (item) {
this.$router.push({
name:'standardForComments',
params: {
id: item.id
}
},)
this.$store.commit('setDetailMap',this.$router.path)
this.$router.push({
name: 'consultationDetails',
query: {
item: item
}
})
},
},
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show ="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+59 -60
View File
@@ -12,23 +12,23 @@
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-form :modal="dataList" inline class="label-input-form">
<el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input v-model="dataList.standId"
<el-input v-model="nonSearch.standId"
size="small"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item">
<el-input v-model="dataList.productName"
<el-input v-model="nonSearch.productName"
size="small"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-input v-model="dataList.responsibleUnit" v-show="false"/>
<el-input v-model="nonSearch.responsibleUnit" v-show="false"/>
<el-popover
placement="bottom"
popper-class="user-dept-popper"
@@ -38,7 +38,7 @@
<el-input
size="small"
slot="reference"
v-model="dataList.responseUnitShow"
v-model="nonSearch.responseUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
@@ -62,7 +62,7 @@
class="common-button-primary"
size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage">
@click="getTableByPage(nonSearch)">
查询
</el-button>
</el-form-item>
@@ -105,15 +105,15 @@
<el-table-column prop="dutyEngineer" label="责任工程师"/>
<el-table-column label="选择分发责任人" prop="dutyPeopleInfo">
<template slot-scope="scope">
<span v-if="scope.row.show">
<el-input
style="display: none"
v-model="scope.row.dutyPeopleInfo"
size="mini"
placeholder="请输入内容"
@click.native="choiceDuty"
/>
</span>
<span v-else>{{scope.row.dutyPeopleInfo}}</span>
/>
<div v-if="scope.row.dutyPeopleInfo" class="fileClass">
{{ scope.row.dutyPeopleInfo || '-'}}
</div>
</template>
</el-table-column>
</el-table>
@@ -187,7 +187,7 @@ export default {
ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
nonConformitySearch: {
nonSearch: {
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
@@ -206,15 +206,6 @@ export default {
myLoading: false,
// 责任部门
zNodesSItem: [],
unqualidiedData: [{
standId: '',
productName: '',
itemsNum: '',
itemsName: '',
planCloseTime: '',
responsibleUnit: '',
dutyEngineer: ''
}],
clearSelection: false,
nodeList: [],
drawerTitle: '', //drawer标题
@@ -244,11 +235,19 @@ export default {
this.getData()
this.getTree()
},
methods: {
watch: {
nonSearch(val) {
this.nonSearch = val
}
},
methods: {
getData() {
const params = {
taskIds: this.taskIds,
pId: this.pId,
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
@@ -261,30 +260,19 @@ export default {
})
},
// 批量选择分发责任人
dutyEngineerList() {
dutyEngineerList(id) {
if (this.multipleSelection.length === 0) {
this.$message.warning("请选择至少一条数据进行分发责任人");
} else {
this.multipleSelection.map((i, index)=> {
i.show = true
this.$set(this.dataList, i, index)
})
this.nodeList = []
this.nodeList.push(id)
this.modalshowflag = true
}
},
// 选择勾选项的集合
handleSelectionChange(value) {
this.multipleSelection = value
},
// 选择分发责任人时
choiceDuty(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.modalshowflag = true
},
selectPeople(row) {
this.modalshowflag = true
console.log(value)
},
handleTabs(name) {
this.active = name
@@ -313,10 +301,7 @@ export default {
}
let json = {
dockUserList: list,
// engineer: this.$store.getters.userInfo.userId,
// standardInfoList: list[0].standardInfoList,
}
console.log(json)
let flag=false
this.dataList.forEach(item => {
if (item.dutyPeopleInfo === '') {
@@ -364,19 +349,13 @@ export default {
// 流程节点负责人抽屉保存按钮
saveUserInfo () {
// 选取负责人时的操作
for (let i = 0; i < this.multipleSelection.length; i++ ) {
this.multipleSelection[i].dutyPeopleInfo = this.roleRow[0].name
this.multipleSelection[i].dutyPeopleInfoId = this.roleRow[0].id
for (let b = 0; b < this.multipleSelection.length; b++) {
this.dataList[b].dutyPeopleInfo = this.multipleSelection[i].dutyPeopleInfo
this.dataList[b].dutyPeopleInfoId = this.multipleSelection[i].dutyPeopleInfoId
this.dataList.forEach(val=> {
val.show = false
})
}
this.lastDataList = this.dataList
this.$refs.multipleTable.clearSelection();
}
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow[0].name
item.dutyPeopleInfoId = this.roleRow[0].id
})
this.lastDataList = this.dataList
this.$refs.multipleTable.clearSelection();
// 选取流程信息完成
this.roleForm.dutyUserInfoName = this.roleRow.name
this.modalshowflag = false
},
@@ -385,17 +364,37 @@ export default {
this.modalshowflag = false
},
//查询按钮
getTableByPage() {
this.getData()
},
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
let matchUnit = true; // 部门 筛选
if (standId) {
const keysId = standId
.toUpperCase() // 转大写
.replace(' ', '') // 删掉空格
.split('') // 切割成 单个字
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
}
if (productName) {
matchName = item.productName === productName;
}
if (responsibleUnit) {
matchUnit = item.responsibleUnit === responsibleUnit;
}
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
},
// 清空 查询条件
clearAllSearch (search = true) {
this.nonConformitySearch = {
clearAllSearch () {
this.nonSearch = {
standId: '',
productName: '',
responsibleUnit: ''
}
this.getTableByPage()
this.getData()
},
// 分页事件
pageChange (page) {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+7 -9
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -17,7 +17,7 @@
<el-form
:model="listForm"
:rules="formRules"
ref="xmpgForm"
ref="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
@@ -109,7 +109,7 @@
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-form
ref="Form"
ref="roleForm"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
@@ -536,16 +536,15 @@ export default {
},
//提交事件
handleSubmit() {
console.log(this.roleForm)
console.log(this.listForm);
// var json = this.listForm
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account;
json.standId = this.listForm.standId;
this.$refs["xmpgForm"].validate((valid) => {
json.XCXSSRQ = this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ
json.ZCCSSRQ = this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
this.$refs['listForm'].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
@@ -652,7 +651,6 @@ export default {
}, {
_this: this
}, res => {
console.log(res.data);
this.productData = res.data;
this.totalNo = res.data.total;
}, e => {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -2
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -110,7 +110,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+6 -4
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -98,12 +98,12 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="newTime"
prop="xCXSSRQ"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="oldTime"
prop="zCCSSRQ"
align="center"
label="在产车实施日期">
</el-table-column>
@@ -155,7 +155,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
@@ -397,6 +397,8 @@ export default {
qualityEngineer: item.pepdtos[i].qualityEngineer,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ,
zCCSSRQ: item.pepdtos[i].zCCSSRQ,
});
}
}
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+8 -8
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -103,13 +103,13 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="newTime"
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="oldTime"
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
@@ -264,7 +264,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
@@ -492,10 +492,10 @@ export default {
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.step3DTOS
this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber
this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
// this.listForm.standName = item.step3DTOS[0].standName
// this.listForm.standNumber = item.step3DTOS[0].standNumber
// this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
// this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
})
},
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+14 -2
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -102,6 +102,18 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="XCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="productType"
align="center"
@@ -203,7 +215,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+10 -10
View File
@@ -295,19 +295,18 @@ export default {
},
// 批量删除
deleteSarAccess(flag, id) {
if (flag === "delOne") {
if (flag === 'delOne') {
this.selectedList = [];
this.selectedList[0] = id;
}
if (!this.selectedList.length) {
this.$message.warning("请选择要删除的数据");
if (this.selectedList.length === 0) {
this.$message.warning('请选择要删除的数据')
} else {
this.$confirm("确认删除选中数据？", "确认删除", {
confirmButtonText: "确定",
cancelButtonText: "取消",
confirmButtonClass: "common-button-primary",
roundButton: false,
type: "warning"
this.$confirm('确定删除这些数据？', '提示', {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
this.$http.postDelete(URL, {}, res => {
@@ -317,7 +316,8 @@ export default {
}, e => {
});
}).catch(() => {
});
})
}
},
// 表格选择框
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+11 -11
View File
@@ -300,31 +300,31 @@ export default {
name: "OtherAddEit"
});
},
// 删除
//批量删除
deleteSarAccess(flag, id) {
if (flag === "delOne") {
if (flag === 'delOne') {
this.selectedList = [];
this.selectedList[0] = id;
}
if (this.selectedList.length === 0) {
this.$message.warning("请选择要删除的数据");
this.$message.warning('请选择要删除的数据')
} else {
this.$confirm("确认删除这些数据？", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
this.$confirm('确定删除这些数据？', '提示', {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
this.$http.postDelete(URL, {}, res => {
this.searchSarAccess();
this.selectedList = [];
this.$message.success("删除成功");
this.$message.success('删除成功')
}, e => {
});
}).catch(() => {
});
})
}
},
// 表格选择框
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+1 -2
View File
@@ -309,7 +309,7 @@ export default {
this.selectedList = [];
this.selectedList[0] = id;
}
if (this.selectedList === 0) {
if (this.selectedList.length === 0) {
this.$message.warning('请选择要删除的数据')
} else {
this.$confirm('确定删除这些数据？', '提示', {
@@ -329,7 +329,6 @@ export default {
})
}
},
// 表格选择框
selectOne(data) {
src/pages/searchCenter/pages/standardSearch.vue
+4
View File
@@ -363,6 +363,10 @@ export default {
mounted() {
//查询所有选项
this.queryOptions();
let globalInputSearch = this.$route.params.searchValue
if (globalInputSearch !== 'allvalue') {
this.keywords = globalInputSearch
}
},
unmounted() {