Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
fanlin
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
}))
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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", "", {
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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']),
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user