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:
zhaokaiyao@91isoft.com
2021-08-08 15:09:09 +08:00
parent ec7699a115 597b26d01f
commit f6d8f5299e
15 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standAutoSplit/index.vue
+19
View File
@@ -186,12 +186,20 @@
prop="standNumber" prop="standNumber"
label="标准号/政策号" label="标准号/政策号"
align="center"> align="center">
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview1(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称/政策名称" label="标准名称/政策名称"
align="center" align="center"
> >
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview1(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standFileClassifyShow" prop="standFileClassifyShow"
@@ -819,6 +827,17 @@ export default {
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
//拆分页点击查看详情
handlePreview1(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: item.sarType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 查询政策和标准 // 查询政策和标准
getSearch () { getSearch () {
if (this.conditionForm.standType === 'FOREIGN2') { if (this.conditionForm.standType === 'FOREIGN2') {
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -103,13 +103,13 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="170" width="230"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itermsConditions" prop="itermsConditions"
label="条款内容" label="条款内容"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -104,13 +104,13 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="170" width="230"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itermsConditions" prop="itermsConditions"
label="条款内容" label="条款内容"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+2 -2
View File
@@ -98,13 +98,13 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="170" width="230"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itermsConditions" prop="itermsConditions"
label="条款内容" label="条款内容"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+7 -7
View File
@@ -99,15 +99,15 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="100" width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
align="center"> align="center">
</el-table-column> </el-table-column>
<!-- <el-table-column-->
<!-- prop="itemsTitle"-->
<!-- label="条款内容"-->
<!-- show-overflow-tooltip-->
<!-- align="center">-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
prop="technicalRequir" prop="technicalRequir"
width="150" width="150"
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2 -2
View File
@@ -94,13 +94,13 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="100" width="230"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsTitle" prop="itemsTitle"
label="条款内容" label="条款内容"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+2 -2
View File
@@ -94,13 +94,13 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="100" width="230"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsTitle" prop="itemsTitle"
label="条款内容" label="条款内容"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+2 -2
View File
@@ -95,13 +95,13 @@
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="100" width="230"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsTitle" prop="itemsTitle"
label="条款内容" label="条款内容"
show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+28 -24
View File
@@ -397,7 +397,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveinboundTask } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "bzqdfbStep3", name: "bzqdfbStep3",
@@ -693,16 +693,24 @@ export default {
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum if(item.form === undefined){
this.listForm.prcName = this.prcName this.listForm.prcNum = this.prcNum
this.listForm['id'] = item.id this.listForm.prcName = this.prcName
this.listForm.dataList = item.dataList this.listForm['id'] = item.id
this.dataList = item.dataList this.listForm.dataList = item.dataList
this.listForm.applyUpdUserId = item.applyUpdUserId this.dataList = item.dataList
this.listForm.jlUserId = item.jlUserId this.listForm.applyUpdUserId = item.applyUpdUserId
this.listForm.zrUserId = item.zrUserId this.listForm.jlUserId = item.jlUserId
this.fileIds = item.fileId; this.listForm.zrUserId = item.zrUserId
this.getFileInfo(); this.fileIds = item.fileId;
this.getFileInfo();
} else {
this.listForm = item.form
this.dataList = item.form.dataList
this.listForm.dataList = item.form.dataList
this.fileIds = item.form.fileId;
this.getFileInfo();
}
}) })
}, },
//保存事件 //保存事件
@@ -713,23 +721,19 @@ export default {
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4"); _formData.append("prcType", "4");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
taskInfo: '根据会签意见修订',
form: this.listForm, form: this.listForm,
roleForm: this.roleForm,
prcNum: this.$route.query.prcNum,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: this.commentText commentText: this.commentText
})); }));
saveinboundTask(_formData).then(res => {
this.saveLoading = false; // saveTaskForPub(_formData).then(res => {
this.$message.success("保存成功"); // this.saveLoading = false;
this.$router.push('/processCenter') // this.$message.success("保存成功");
this.bpnId = res.result; // this.bpnId = res.result;
}).catch(e => { // }).catch(e => {
this.saveLoading = false; // this.saveLoading = false;
}); // });
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+4 -2
View File
@@ -537,7 +537,7 @@ export default {
this.commentText = mes.commentText; this.commentText = mes.commentText;
this.dataList = mes.form.dataList; this.dataList = mes.form.dataList;
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(!item.projectLine){ if(!item.productLine){
this.dataList = null this.dataList = null
} }
}) })
@@ -760,8 +760,10 @@ export default {
//选择拆分标准确定事件 //选择拆分标准确定事件
OkDrawer() { OkDrawer() {
if (this.selectedList.length == 1) { if (this.selectedList.length == 1) {
this.listForm.standNumber = this.selectedList[0].standNumber; this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName; this.listForm.standName = this.selectedList[0].standName;
this.listForm.standType = this.selectedList[0].standType;
this.listForm.standId = this.selectedList[0].id;
this.listForm.id = this.selectedList[0].id; this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", { this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id, ids: this.listForm.id,
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+4 -1
View File
@@ -470,6 +470,7 @@ export default {
listForm: { listForm: {
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
standType: "", //标准类型
XCXSSRQ: "", //新车型实施日期 XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期 ZCCSSRQ: "", //在产车实施日期
certifiedEngineer: "", //认证工程师 certifiedEngineer: "", //认证工程师
@@ -732,8 +733,10 @@ export default {
//选择拆分标准确定事件 //选择拆分标准确定事件
OkDrawer() { OkDrawer() {
if (this.selectedList.length === 1) { if (this.selectedList.length === 1) {
this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName; this.listForm.standName = this.selectedList[0].standName;
this.listForm.standType = this.selectedList[0].standType;
this.listForm.standId = this.selectedList[0].id;
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
this.listForm.id = this.selectedList[0].id; this.listForm.id = this.selectedList[0].id;
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
:height="sarProStateTableHeight" height="56%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
:height="sarProStateTableHeight" height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
:height="sarProStateTableHeight" height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
:height="sarProStateTableHeight" height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column <el-table-column