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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-24 13:37:03 +08:00
parent 4dbb216542 0bb06fbdc5
commit a09dd2a796
11 changed files with 2005 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+1456
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1 -1
View File
@@ -1012,7 +1012,7 @@ export default {
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '4')
_formData.append('json', JSON.stringify({
form: this.form,
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
}))
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+2 -21
View File
@@ -39,11 +39,13 @@
</el-form-item>
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
<el-input
disabled
v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
placeholder="暂无数据"
>
</el-input>
<el-input
disabled
v-else
v-model="listForm.modelName"
placeholder=""
@@ -68,13 +70,6 @@
prop="code"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
@@ -320,20 +315,6 @@ export default {
//保存事件
handleSave() {
},
handlePreview(item) {
if (item.id) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.standId,
pageType: item.standType + "_STAND"
}
});
window.open(routeUrl.href, "_blank");
} else {
this.$message.warning("暂无关联的标准");
}
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+11
View File
@@ -383,6 +383,17 @@ export default {
handleTabs(name) {
this.active = name;
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
//点击添加事件
addList() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+28 -29
View File
@@ -37,14 +37,14 @@
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="listForm.applyRegion"-->
<!-- placeholder="请输入适用区域"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="listForm.applyRegion"-->
<!-- placeholder="请输入适用区域"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -55,12 +55,14 @@
</el-form-item>
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
<el-input
disabled
v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
v-model="listForm.modelName"
placeholder="暂无数据"
>
</el-input>
<el-input
disabled
v-else
v-model="listForm.modelName"
placeholder=""
@@ -85,10 +87,6 @@
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
@@ -120,10 +118,10 @@
</el-table-column>
</el-table>
</div>
<div >
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;" >
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
@@ -218,12 +216,12 @@
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail } from "api/process";
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {inboundLiaisonDetail} from "api/process";
export default {
export default {
name: "bzqdfbStep4",
components: {
ProcessHeader,
@@ -272,7 +270,7 @@ export default {
},
choiceForm: {}, //选择标准清单列表
// countryOptions: [], //适用区域下拉框数据
userId:this.$store.getters.userInfo.userId,
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
signFlag: "1", //是否会签 1为会签 2为不会签
@@ -285,7 +283,7 @@ export default {
};
},
methods: {
processTable () {
processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '',
@@ -295,7 +293,8 @@ export default {
_this: this
}, res => {
this.detailData = res
}, e => {})
}, e => {
})
},
//tab发生变化
handleTabs(name) {
@@ -325,7 +324,7 @@ export default {
/**
* @description: 动态表单读取
*/
getFormFieldList (item) {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
@@ -339,7 +338,7 @@ export default {
})
},
//驳回事件
beforeBack () {
beforeBack() {
this.listForm.approvalOpinion = '1'
this.handleSubmit()
},
@@ -391,7 +390,7 @@ export default {
}
},
computed: {
listNoDataText () {
listNoDataText() {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
}
},
@@ -399,13 +398,13 @@ export default {
this.getData()
this.processTable()
},
};
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
@import '~@/assets/styles/style';
.bzqdfb-step4 {
.bzqdfb-step4 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
@@ -475,6 +474,6 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+18 -16
View File
@@ -58,7 +58,7 @@
></el-input>
</el-form-item>
<el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select v-model="form.textStatus" placeholder="请选择文本状态">
<el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
<el-option
v-for="item in standStateOptions"
placeholder="请选择"
@@ -79,7 +79,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别">
<el-select :popper-append-to-body="false" v-model="form.standSort" placeholder="请选择标准类别">
<el-option
v-for="item in standSortOptions"
placeholder="请选择"
@@ -90,7 +90,7 @@
</el-select>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质">
<el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
@@ -122,7 +122,7 @@
</el-radio-group>
</el-form-item>
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key"
:multiple=false
@@ -473,7 +473,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-option
v-for="item in zrbmOptions"
placeholder="请选择"
@@ -484,7 +484,7 @@
</el-select>
</el-form-item>
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>
<el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
<el-option
v-for="item in applyArcticOptions"
placeholder="请选择"
@@ -495,7 +495,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-select :popper-append-to-body="false" v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -555,7 +555,7 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option
v-for="item in qcdwOption"
placeholder="请选择"
@@ -566,7 +566,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option
v-for="item in txlbOptions"
placeholder="请选择"
@@ -579,7 +579,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-select :popper-append-to-body="false" v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -590,7 +590,7 @@
</el-select>
</el-form-item>
<el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
<el-select v-model="form.syrz" placeholder="请选择适用认证" multiple>
<el-select :popper-append-to-body="false" v-model="form.syrz" placeholder="请选择适用认证" multiple>
<el-option
v-for="item in applyAuthOptions"
placeholder="请选择"
@@ -601,7 +601,7 @@
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-option
v-for="item in zrgcsOptions"
placeholder="请选择"
@@ -633,13 +633,13 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option label="署名人1" value="1"></el-option>
<el-option label="署名人2" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度">
<el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
<el-option
v-for="item in cysdOptions"
placeholder="请选择"
@@ -673,7 +673,7 @@
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度">
<el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
<el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option>
</el-select>
@@ -859,6 +859,7 @@
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
<el-form-item label="标准来源" class="search-item" v-if="dataSource">
<el-select
:popper-append-to-body="false"
v-model="replaceLawsNumForm.standType"
placeholder="请选择标准来源"
@change="dataSourceChange">
@@ -984,6 +985,7 @@
<el-form :model="standardSearchForm" inline class="label-input-form search-area">
<el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
<el-select
:popper-append-to-body="false"
v-model="standardSearchForm.standType"
placeholder="请选择标准来源">
<el-option value="INLAND" label="国内标准库"></el-option>
@@ -991,7 +993,7 @@
</el-select>
</el-formItem>
<el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
<el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
<el-select :popper-append-to-body="false" v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
<el-option
v-for="item in standSortOptions"
:key="item.value"
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+10
View File
@@ -226,6 +226,16 @@ export default {
}
})
break
case '4':
this.$router.push({
name: 'bzqdfbStep1-1',
query: {
type: '4',
processName: '标准清单发布更新流程',
bpnId: id
}
})
break
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+16 -2
View File
@@ -449,7 +449,7 @@
label-width="150px"
class="add-form-item"
>
<template slot="label">乘用车VPPS编码</template>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item>
</template>
@@ -459,7 +459,7 @@
label-width="150px"
class="add-form-item"
>
<template slot="label">卡车VPPS编码</template>
<template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
@@ -1295,6 +1295,8 @@ export default {
children: 'children',
label: 'menuName'
},
id: '', // 收藏数据的id
collectId: '', // 收藏id
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
@@ -2262,6 +2264,8 @@ export default {
},
// 编辑标准属性
selectStandardPro (item, state) {
this.id = item.id
this.collectId = item.collectId
this.addOrUPdateFlag = 2
this.modalshowtitle = '编辑国内标准'
this.modalshowflag = true
@@ -3116,6 +3120,16 @@ export default {
}, res => {
this.isSubmit = false
if (res.ok) {
this.personCollect.collectType = 'INLAND_STAND'
this.personCollect.id = this.id
this.personCollect.collectResId = this.collectId
this.personCollect.collectTitle = this.sarStandardsInfoEO.standName
this.personCollect.userId = this.$store.getters.userInfo.userId
this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
_this: this,
loading: 'loading'
}, res => {
}, e => {})
this.getDomesticStandardTable(this.tableFlag)
this.resetForm()
if (this.addOrUPdateFlag === 1) {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+3 -3
View File
@@ -510,7 +510,7 @@
label-width="150px"
class="add-form-item"
>
<template slot="label">乘用车VPPS编码</template>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item>
</template>
@@ -520,7 +520,7 @@
label-width="150px"
class="add-form-item"
>
<template slot="label">卡车VPPS编码</template>
<template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
@@ -2048,7 +2048,7 @@ export default {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
const formFieldList = this.formFieldList
console.log(formFieldList)
console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
this.sarStandardsInfoEO.standSort = item.standSort
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+19 -6
View File
@@ -25,7 +25,7 @@
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-input v-model="historySearch.responseUnit" v-show="false" />
<el-input v-model="historySearch.responseUnitShow" v-show="false" />
<el-popover
placement="bottom"
popper-class="user-dept-popper"
@@ -495,8 +495,19 @@ export default {
})
},
detailsStandard (item) {
this.$http.post('lawss/sarTestItem/validateStandNumber', {
standnumber: item.standNum
console.log(item);
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: 'INLAND_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
// 接口调用无返回值与后台商量后先行封存 使用未符合整改数据库中方法直接跳转
/*this.$http.post('lawss/sarTestItem/validateStandNumber', {
standNumber: item.standId
}, {
_this: this
}, res => {
@@ -510,7 +521,7 @@ export default {
})
window.open(routeUrl.href, '_blank')
}, e => {
})
})*/
},
getOrgTreeSource () {
this.$http.get('sys/org/getTree', {}, {_this: this},
@@ -612,8 +623,9 @@ export default {
// })
// },
treeClickSearch (treeId, treeNode) {
this.historySearch.responseUnit = treeNode.id
this.historySearch.responsibleUnit = treeNode.id
this.historySearch.responseUnitShow = treeNode.name
this.$forceUpdate()
},
// 点击清空按钮事件
clearAllSearch () {
@@ -621,7 +633,8 @@ export default {
standNumOrName: '',
quesType: '',
productName: '',
responseUnit: ''
responsibleUnit: '',
responseUnitShow:''
}
this.getTableBtn()
},
src/router/index.js
+9
View File
@@ -249,6 +249,15 @@ const routes = [
title: '标准清单发布/更新流程'
}
},
{
path: '/bzqdfbStep1-1',
name: 'bzqdfbStep1-1',
component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue'),
meta: {
requireAuth: true,
title: '标准清单发布/更新流程'
}
},
{
path: '/bzqdfbStep2',
name: 'bzqdfbStep2',