Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2021-09-24 14:38:00 +08:00
32 changed files with 2880 additions and 2606 deletions
+1 -2
View File
@@ -44,8 +44,7 @@
</el-table-column>
<el-table-column
prop="name"
label="链接名称"
width="220px">
label="链接名称">
</el-table-column>
<el-table-column
label="链接">
File diff suppressed because it is too large Load Diff
@@ -49,24 +49,21 @@
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div>
<p>
{{ listForm.fileName }}
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
<el-button class="common-button-default" size="mini">
点击上传
</el-button>
</el-upload>
</p>
<div class="file-box">
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
<el-button class="common-button-default" size="mini">
点击上传
</el-button>
</el-upload>
</div>
</el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
@@ -129,6 +126,9 @@
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
@@ -209,22 +209,8 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
<el-card>
<el-form-item prop="dockUserName2" style="margin-bottom: 0">
<h4>会签人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''">
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>标准/政策法规工程师</h4>
@@ -305,7 +291,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -313,7 +299,7 @@
align="center">
</el-table-column>
<el-table-column
prop="countryArea"
prop="countryAreaShow"
label="国家/地区"
align="center">
</el-table-column>
@@ -376,7 +362,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -462,7 +448,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -815,6 +801,7 @@ export default {
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
fileIds: [], // 上传的附件
fileList: [],
fileListName: [], //上传的附件名称
standardData: [], //添加标准数据
standardData1: [], //添加标准数据
@@ -885,12 +872,38 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes);
mes.form.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.fileInfoList.push(itemId)
this.getFileInfo();
});
this.listForm = mes.form;
this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
});
},
// 请求上传的文件信息
getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds
}, {
_this: this
}, res => {
this.$nextTick(() => {
res.data.map(item => {
// 赋值要回显的上传文件内容
this.fileList.push({
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
});
});
});
}, e => {
});
},
checkedRole(data) {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
@@ -998,7 +1011,22 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
let arr = res.data.records;
//国家地区字段转换
arr.map(item => {
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) {
k[m] = this.countryOptions[i].label
}
item.countryAreaShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr;
this.total = res.data.total;
}, e => {
});
@@ -1256,6 +1284,17 @@ export default {
cancelStand() {
this.standModel = false;
},
// 点击清单名称跳转事件
showTable(item) {
sessionStorage.setItem("accessRow", JSON.stringify(item));
this.$store.commit("setDetailMap", this.$route.path);
this.$router.push({
name: "AccessStandardDetails",
params: {
id: item.id
}
});
},
//添加标准确定事件
okStand() {
if (this.standList.length < 1) {
@@ -1344,6 +1383,7 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
this.$refs.detailedSelection.clearSelection()
} else {
this.$message.warning("请选择一条数据进行带入");
}
@@ -1413,7 +1453,6 @@ export default {
});
},
pageChange(page) {
console.log(page);
this.page = page;
this.selectionList();
},
@@ -209,20 +209,6 @@
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
<!-- :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
<!-- <h4>会签人</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
<!-- <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
<!-- @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card>
@@ -305,7 +291,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -376,7 +362,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -447,7 +433,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -959,7 +945,7 @@ export default {
}, res => {
let arr = res.data.records;
//国家地区字段转换
arr.forEach(item => {
arr.map(item => {
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
@@ -1235,6 +1221,17 @@ export default {
cancelStand() {
this.standModel = false;
},
// 点击清单名称跳转事件
showTable(item) {
sessionStorage.setItem("accessRow", JSON.stringify(item));
this.$store.commit("setDetailMap", this.$route.path);
this.$router.push({
name: "AccessStandardDetails",
params: {
id: item.id
}
});
},
//添加标准确定事件
okStand() {
this.getStandData();
@@ -1324,6 +1321,7 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
this.$refs.detailedSelection.clearSelection()
} else {
this.$message.warning("请选择一条数据进行带入");
}
@@ -78,35 +78,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">-->
<!-- <el-option-->
<!-- v-for="item in countryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData=='1'"label="国家/地区" prop="" label-width="150px" class="add-form-item">
<el-select v-model="form.country" multiple filterable clearable>
<el-form-item v-show="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
>
</el-option>
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.standSort" placeholder="请选择标准类别">
<el-option
@@ -151,7 +133,7 @@
<el-radio label="2"></el-radio>
</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-form-item v-show="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key"
@@ -164,7 +146,7 @@
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
</el-form-item>
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-form-item v-show="verifySarStandard && form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
v-model="form.gxhbq"
placeholder="请输入标签"
@@ -239,7 +221,7 @@
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -299,7 +281,7 @@
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -359,7 +341,7 @@
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -391,7 +373,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -421,7 +403,7 @@
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -451,7 +433,7 @@
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -481,7 +463,7 @@
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -601,12 +583,12 @@
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option
v-for="item in qcdwOption"
@@ -617,7 +599,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '1'" label="体系类别" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option
v-for="item in txlbOptions"
@@ -684,7 +666,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option
v-for="item in wssmrOptions"
@@ -695,7 +677,7 @@
></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-form-item v-show="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
<el-option
v-for="item in cysdOptions"
@@ -729,7 +711,7 @@
@click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -788,7 +770,7 @@
@click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-input
v-model="form.cbbh"
placeholder="请输入采标编号"
@@ -1375,6 +1357,7 @@
countryArr:'',
form: {
// 基础信息
country:[],
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: '0', // 标准类型
@@ -1530,7 +1513,7 @@
watch:{
'form.country': {
handler (val) {
console.log("val")
console.log(val)
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.countryArr = val.join(",");
@@ -1546,9 +1529,84 @@
this.$refs.tree.filter(val);
},
'form.standInData': {
handler: function() {
handler: function(val) {
this.verifySarStandard = false
this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
//切换清空表单
this.form= {
// 基础信息
country:[],
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: val, // 标准类型
standSort: '', // 标准类别
standNumber: '', // 标准编号
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
signFlag: '1', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系
standSystemName: '',// 标准体系名称
gxhbq: '', // 标签
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
zccssrq: '', // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
FBGBJBD: '', // 发布稿
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
kwj: '', // 勘 误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
zqyjgName: '', // 征求意见稿
jdwjName: '', // 解读文件
zbjbdName: '', // 增补件
kwjName: '', // 勘误件
glwjName: '', // 关联文件
// 适用范围
txlb: '', // 体系类别
gkdw: '', // 归口管理部门
qcdw: [], // 起草单位
wssmr: [], // 我司署名人
cysd: '', // 我司参与深度
cllx: [], // 适用车型
nylx: [],// 能源类型
sycpx: [],// 适用产品线
syrz: [], // 适用认证
zrbm: [], // 责任部门
zrgcs: [], // 责任工程师
cycvppsbm: '', // 关联模块--乘用车VPPS编码
cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码
kccvppscn: '', // 关联模块--卡车vpps中文名称
dybxh: '', // 模块结构单元变型号
dymc: '', // 模块结构单元名称
// 关联信息
dtbjh: '', // 代替标准号
cbbh: '', // 采标编号
cbcd: '', // 采标程度
yybj: '', // 引用标准
bfbdtbzh: '', // 部分代替标准号
byybj: '', // 被引用标准
glwj: '', // 关联文件
xglc: '', // 相关流程
chjl: '', // 参会记录
}
},
},
'standardSearchForm.standType': {
@@ -2322,12 +2380,13 @@
})
},
handleSubmit() {
this.form.country=this.countryArr;
// this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.$refs['userForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
@@ -2395,7 +2454,7 @@
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.countryOptions=res.data.COUNTRY//国家地区
this.countryOptions=res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
@@ -2417,6 +2476,7 @@
this.busVsFunc()
this.modelFunc()
}
}
</script>
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -266,6 +267,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -306,6 +307,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -290,6 +291,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
@@ -15,7 +15,7 @@
<template slot="title">基础信息</template>
</process-title>
<el-form
v-if="foldFormFlag === false"
v-if="foldFormFlag === false"
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
@@ -58,42 +58,42 @@
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-form
v-if="foldFormFlag === true"
style="display: none"
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
v-if="foldFormFlag === true"
style="display: none"
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
></el-input>
</el-form-item>
</el-col>
@@ -111,9 +111,9 @@
style="width: 100%"
border
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -353,6 +353,27 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- <ProcessFooter-->
<!-- show-submit-->
<!-- show-transfer-->
<!-- :submitLoading="isSubmit"-->
<!-- :transfer-loading="isTransfer"-->
<!-- :saveLoading="saveLoading"-->
<!-- :approval="true"-->
<!-- @back="beforeBack"-->
<!-- @transfer="handleTransfer"-->
<!-- @submit="handleSubmit"-->
<!-- >-->
<!-- </ProcessFooter>-->
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
@@ -360,7 +381,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep1-7",
@@ -373,6 +394,11 @@ export default {
return {
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
nodeList:[],
drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -451,6 +477,47 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
@@ -517,35 +584,31 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
});
}
});
},
//标准表格选择框改变
selectStandChange(data) {
@@ -580,7 +643,6 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg-step7 {
/deep/ .el-drawer__container {
.prc-content-border {
@@ -651,6 +713,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -113,7 +113,7 @@
@selection-change="selectStandChange"
height="56%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -781,9 +781,14 @@ export default {
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -113,7 +113,7 @@
@selection-change="selectStandChange"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -727,5 +727,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>>
@@ -113,7 +113,7 @@
@selection-change="selectStandChange"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -717,5 +717,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -111,9 +111,9 @@
style="width: 100%"
border
@selection-change="selectStandChange"
height="55%"
height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -713,6 +713,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -529,5 +529,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -598,5 +598,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -574,5 +574,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -597,5 +597,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -56,7 +56,7 @@
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -874,6 +874,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -598,5 +598,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -595,5 +595,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -597,5 +597,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -272,7 +272,7 @@ export default {
this.countryOptions.forEach(item => {
map.set(item.value, item.label);
});
arr.forEach(item => {
arr.map(item => {
//
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(",");
@@ -202,7 +202,6 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
width="300"
>
<template slot-scope="scope">
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -306,7 +306,6 @@
show-overflow-tooltip
prop="standName"
label="中文名称"
width="300"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -318,7 +317,6 @@
show-overflow-tooltip
prop="standEnName"
label="英文名称"
width="300"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -199,7 +199,6 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
width="300"
>
<template slot-scope="scope">
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -87,8 +87,9 @@
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%;height: calc(100% - 150px)"
style="width: 100%;height: inherit"
border
:max-height="400"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
@@ -191,7 +192,7 @@
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<el-dropdown trigger="click" @command="handleCommand(scope.$index, localProTableList)">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">
@@ -882,7 +883,7 @@ export default {
});
},
//
handleCommand(command) {
handleCommand(command,index, rows) {
switch (command[1]) {
case "删除":
this.handleDelete(command[0]);
@@ -1676,7 +1677,7 @@ export default {
.local-products-or-project-library {
//position: relative;
height: 100%;
height: calc(100% - 100px);
.container {
height: calc(~'100% - 55px');
@@ -1701,6 +1702,9 @@ export default {
}
}
/deep/.el-table .el-table__body-wrapper {
height: 86%;
}
::v-deep .el-drawer__header {
& > span:first-child {
outline: none !important;
@@ -28,14 +28,17 @@
<p class="transition-box-p">
<label class="transition-box-label">附件</label>
<span class="file-box" v-if="fileInfoList.length > 0">
<span v-for="(file,item) in fileInfoList"
target="_blank"
class="transition-box-span table-jump"
@click="handleQueryPdf(file)"
:key="item">
{{ file.name }}
</span>
</span>
<div style="display: flex;">
<div v-for="(file,item) in fileInfoList"
target="_blank"
class="transition-box-span table-jump"
@click="handleQueryPdf(file)"
:key="item">
{{ file.name }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
</div>
</div>
</span>
<span class="transition-box-span" v-else>-</span>
</p>
<p class="transition-box-p">
@@ -222,6 +225,9 @@ export default {
}
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
//
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -1751,6 +1751,7 @@ export default {
this.searchSarBykey();
},
judgeRolePermiOnSar(item, type) {
debugger
let pagetype;
if (type !== 5 && item.type === "msgdyinfo") {
if (type === 2) {
@@ -1986,6 +1987,7 @@ export default {
},
//
detailsStandardLaws(item) {
debugger
let routername = "";
let pagetype = "";
if (item.type === "stand") {
@@ -1993,7 +1995,7 @@ export default {
routername = "OtherStandardDetails";
pagetype = "INLAND_STAND";
} else {
routername = "OtherForeignDetails";
routername = "OtherStandardDetails";
pagetype = "FOREIGN_STAND";
}
} else if (item.type === "laws") {