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-21 11:21:41 +08:00
parent fc5070ac81 58c00b6c72
commit 5f91f150a2
9 changed files with 203 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+1 -1
View File
@@ -190,7 +190,7 @@
placeholder="请输入角色描述" placeholder="请输入角色描述"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="角色状态" prop="useFlag" label-width="145px"> <el-form-item label="角色状态" prop="useFlag" style="margin-left: 10px">
<el-select class="bead-input" v-model="addForm.useFlag"> <el-select class="bead-input" v-model="addForm.useFlag">
<el-option <el-option
v-for="item in options" v-for="item in options"
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+38 -32
View File
@@ -102,7 +102,7 @@
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -110,7 +110,7 @@
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -121,7 +121,8 @@
<template slot-scope="scope,text" v-if="showColumn"> <template slot-scope="scope,text" v-if="showColumn">
<div> <div>
<div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)"> <div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)">
{{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer }} {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer
}}
</div> </div>
</div> </div>
</template> </template>
@@ -269,6 +270,7 @@ export default {
sarProStateTableHeight: null, // 项目列表高度 sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
processType: 1, processType: 1,
sarFlag: true,
loading: false, loading: false,
// dataList: [],//清单里的标准数据 // dataList: [],//清单里的标准数据
active: "1", active: "1",
@@ -402,8 +404,8 @@ export default {
qualityEngineerName: item.pepdtos[i].qualityEngineerName, qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber, standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName, standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ, xCXSSRQ: item.pepdtos[i].xCXSSRQ,
zCCSSRQ: item.pepdtos[i].zCCSSRQ, zCCSSRQ: item.pepdtos[i].zCCSSRQ
}); });
} }
} }
@@ -417,7 +419,7 @@ export default {
this.listForm.breakdownList[index].implementerId = this.roleRow.id; this.listForm.breakdownList[index].implementerId = this.roleRow.id;
this.listForm.breakdownList[index].implementer = this.roleRow.name; this.listForm.breakdownList[index].implementer = this.roleRow.name;
} }
}) });
} else { } else {
this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
@@ -453,33 +455,37 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.breakdownList.forEach(item => { this.listForm.breakdownList.forEach(item => {
if(item.implementer === null || item.implementer === '' || item.implementer === undefined){ if (item.implementer === null || item.implementer === "" || item.implementer === undefined) {
this.$message.warning('请选择落实人') this.sarFlag = false;
} else { } else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.sarFlag = true;
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.approvalOpinion = "";
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm.breakdownList);
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");
}
}, e => {
});
} }
}) });
if (this.sarFlag === true) {
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.approvalOpinion = "";
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm.breakdownList);
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");
}
}, e => {
});
} else {
this.$message.warning("请选择落实人");
}
}, },
drawerCheck(data) { drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -492,7 +498,7 @@ export default {
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
this.selectList = data.map(item => item.itemId) this.selectList = data.map(item => item.itemId);
}, },
selectThree() { selectThree() {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+71 -66
View File
@@ -108,7 +108,7 @@
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -117,7 +117,7 @@
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -273,7 +273,7 @@
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list">
<el-table <el-table
height="100%" height="800px"
ref="selection" ref="selection"
:data="detailData" :data="detailData"
tooltip-effect="dark" tooltip-effect="dark"
@@ -306,7 +306,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -314,7 +314,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -322,7 +322,7 @@
label="审批意见" label="审批意见"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.commentText}}</span> <span>{{ scope.row.commentText }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -330,7 +330,7 @@
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -365,7 +365,6 @@ export default {
}, },
data() { data() {
return { return {
detailData: [], detailData: [],
sarProStateTableHeight: null, // 项目列表高度 sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
@@ -373,7 +372,7 @@ export default {
loading: false, loading: false,
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
active: "1", active: "1",
userId:this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
listType: "country", //选择的清单类型 listType: "country", //选择的清单类型
@@ -388,30 +387,30 @@ export default {
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
listForm: { listForm: {
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
certifiedEngineerName: "", //认证工程师 certifiedEngineerName: "", //认证工程师
qualityEngineerName: "", //质量工程师 qualityEngineerName: "", //质量工程师
dataList: [{ dataList: [{
projectManager: '', projectManager: "",
itemsName: '', itemsName: "",
uname: '', uname: "",
projectNumber: '', projectNumber: "",
implementer: '', implementer: "",
implementerId: '', implementerId: "",
productLine: '', productLine: "",
itemNum:'', itemNum: "",
distributePerson:'', distributePerson: "",
projectName:'', projectName: "",
distributePersonId:'', distributePersonId: "",
complianceReasons:'', //在研合规原因 complianceReasons: "", //在研合规原因
noCompliance:'', //在研不合规项目 noCompliance: "", //在研不合规项目
countermeasures:'', //在研应对措施 countermeasures: "", //在研应对措施
completionTime:'', //在研完成时间 completionTime: "", //在研完成时间
zcComplianceReasons: '', //在产的合规原因 zcComplianceReasons: "", //在产的合规原因
zcNoCompliance:'', //在产不合规项目 zcNoCompliance: "", //在产不合规项目
zcCountermeasures:'', //在产的应对措施 zcCountermeasures: "", //在产的应对措施
zcCompletionTime:'', //在产的完成时间 zcCompletionTime: "" //在产的完成时间
}] }]
}, },
// listForm: { // listForm: {
@@ -455,17 +454,18 @@ export default {
}; };
}, },
methods: { methods: {
processTable () { processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '', sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu shunxu: this.shunxu
}, { }, {
loading: 'loading', loading: "loading",
_this: this _this: this
}, res => { }, res => {
this.detailData = res this.detailData = res;
}, e => {}) }, e => {
});
}, },
//tab发生变化 //tab发生变化
handleTabs(name) { handleTabs(name) {
@@ -479,37 +479,42 @@ export default {
}).then(res => { }).then(res => {
console.log(res.mesg); console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm) this.getFormFieldList(processForm);
} }
}).catch(e => { }).catch(e => {
}) });
}) });
}, },
/** /**
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
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 console.log(item.fenFlag);
this.listForm.prcName = this.prcName if (item.fenFlag === undefined ) {
this.listForm['id'] = item.id this.dataList = item.step3DTOS;
this.dataList = item.step3DTOS } else {
this.listForm.standName = item.step3DTOS[0].standName this.dataList = item.dataList;
this.listForm.standNumber = item.step3DTOS[0].standNumber }
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName this.listForm.prcNum = this.prcNum;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName this.listForm.prcName = this.prcName;
this.listForm.itemsName = item.step3DTOS[0].itemsName this.listForm["id"] = item.id;
this.listForm.itemNum = item.step3DTOS[0].itemNum this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit this.listForm.standNumber = item.step3DTOS[0].standNumber;
this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
}) this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName;
this.listForm.itemNum = item.step3DTOS[0].itemNum;
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
});
}, },
//保存事件 //保存事件
handleSave () { handleSave() {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -517,18 +522,18 @@ export default {
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = ""; this.listForm.approvalOpinion = "";
this.listForm.signFlag = ""; this.listForm.signFlag = "";
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
json: json, json: json
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message);
this.$router.push('/processCenter') this.$router.push("/processCenter");
} }
}, e => { }, e => {
@@ -554,13 +559,13 @@ export default {
} }
}, },
computed: { computed: {
listNoDataText () { listNoDataText() {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}, }
}, },
mounted() { mounted() {
this.processTable() this.processTable();
this.getData() this.getData();
// console.log(this.$store.getters.getHandleInfo); // console.log(this.$store.getters.getHandleInfo);
} }
}; };
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+24 -7
View File
@@ -345,7 +345,7 @@ export default {
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
listForm: { listForm: {
fenFlag: '1', //1为通过 其他为驳回 fenFlag: " ", //1为驳回 2为通过
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
certifiedEngineerName: "", //认证工程师 certifiedEngineerName: "", //认证工程师
@@ -419,6 +419,7 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
@@ -447,14 +448,31 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack () { beforeBack () {
this.listForm.fenFlag = '2'
this.handleSubmit()
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
this.listForm.fenFlag = '1'
const json = JSON.stringify(this.listForm);
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')
}
}, e => {
});
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '2'
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
@@ -468,7 +486,6 @@ export default {
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
}, e => { }, e => {
}); });
}, },
//标准表格选择框改变 //标准表格选择框改变
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+2 -2
View File
@@ -87,7 +87,7 @@
label="国家/地区" label="国家/地区"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.countryArea.indexOf(',') >= 0"> <span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',') > 0">
<span>{{ scope.row.countryArea }}</span> <span>{{ scope.row.countryArea }}</span>
</span> </span>
<span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span> <span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
@@ -138,7 +138,7 @@
label="更新时间" label="更新时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss') : scope.row.updateTime }}</div> <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+41 -2
View File
@@ -70,6 +70,7 @@
:on-remove="delFileInfo" :on-remove="delFileInfo"
:on-success="uploadBackSuccess" :on-success="uploadBackSuccess"
:before-upload="beforeUpload" :before-upload="beforeUpload"
:on-preview="handleOnPreview"
> >
<el-button class="common-button-default" size="mini"> <el-button class="common-button-default" size="mini">
点击上传 点击上传
@@ -225,17 +226,26 @@
prop="issueTime" prop="issueTime"
sortable sortable
label="发布日期"> 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>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
sortable sortable
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
sortable sortable
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -376,6 +386,9 @@
width="210px" width="210px"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrqgj"
@@ -383,6 +396,9 @@
align="center" align="center"
width="210px" width="210px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -554,6 +570,7 @@ export default {
nylxMap: {}, nylxMap: {},
zrbmMap: {}, zrbmMap: {},
sycpxMap: {}, sycpxMap: {},
zrbmOptions: [],
selectSearch : [], selectSearch : [],
// 新增、编辑 基础信息字段 // 新增、编辑 基础信息字段
sarAccessEO: { sarAccessEO: {
@@ -879,6 +896,14 @@ export default {
fileList.pop() fileList.pop()
} }
}, },
// 点击上传的文件进行下载
handleOnPreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
// 相关附件 上传之前钩子 // 相关附件 上传之前钩子
beforeUpload (file) { beforeUpload (file) {
var filename = file.name var filename = file.name
@@ -1257,6 +1282,19 @@ export default {
_this: this _this: this
}, res =>{ }, res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
console.log(this.sarAccessInfoSearchList)
}, e => { }, e => {
}) })
}, },
@@ -1714,6 +1752,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarAccessInfoList = res.data this.sarAccessInfoList = res.data
console.log(res.data)
}, e => { }, e => {
}) })
}, },
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+11 -2
View File
@@ -55,6 +55,7 @@
:on-remove="delFileInfo" :on-remove="delFileInfo"
:on-success="uploadBackSuccess" :on-success="uploadBackSuccess"
:before-upload="beforeUpload" :before-upload="beforeUpload"
:on-preview="handleOnPreview"
> >
<el-button class="common-button-default" size="mini"> <el-button class="common-button-default" size="mini">
点击上传 点击上传
@@ -1716,7 +1717,14 @@ export default {
this.$set(this.zrbmMap, item.value, item.label) this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label) this.$set(this.sycpxMap, item.value, item.label)
}) })
} },
// 点击上传的文件进行下载
handleOnPreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}, },
watch: { watch: {
// 监听 清单类型 // 监听 清单类型
@@ -1770,9 +1778,10 @@ export default {
const accessRow = this.getAccessStandardRegRow const accessRow = this.getAccessStandardRegRow
this.$nextTick(() => { this.$nextTick(() => {
this.sarAccessEO.type = accessRow.type this.sarAccessEO.type = accessRow.type
this.sarAccessEO.countryArea = accessRow.countryArea.split(',') //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
// this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
this.sarAccessEO.detailedListName = accessRow.detailedListName this.sarAccessEO.detailedListName = accessRow.detailedListName
this.sarAccessEO.detailedList = accessRow.detailedList
this.sarAccessEO.id = accessRow.id this.sarAccessEO.id = accessRow.id
this.sarAccessEO.remark = accessRow.remark || '' this.sarAccessEO.remark = accessRow.remark || ''
this.sarAccessEO.relateFile = accessRow.relateFile this.sarAccessEO.relateFile = accessRow.relateFile
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+14 -6
View File
@@ -55,6 +55,7 @@
:on-remove="delFileInfo" :on-remove="delFileInfo"
:on-success="uploadBackSuccess" :on-success="uploadBackSuccess"
:before-upload="beforeUpload" :before-upload="beforeUpload"
:on-preview="handleOnPreview"
> >
<el-button class="common-button-default" size="mini"> <el-button class="common-button-default" size="mini">
点击上传 点击上传
@@ -417,7 +418,7 @@
width="210px" width="210px"
label="卡车VPPS中文名称"> label="卡车VPPS中文名称">
</el-table-column> </el-table-column>
<el-table-column> <el-table-column width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -428,6 +429,7 @@
<el-button <el-button
class="common-button-default" class="common-button-default"
type="danger" type="danger"
style="margin-left: 0px"
size="small" @click="moveDown(scope.$index, scope.row)" size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag" v-if="!disabledFlag"
>下移</el-button> >下移</el-button>
@@ -1242,8 +1244,6 @@ export default {
_this: this _this: this
}, res =>{ }, res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.$nextTick(() => {
})
}, e => { }, e => {
}) })
@@ -1717,7 +1717,14 @@ export default {
this.$set(this.zrbmMap, item.value, item.label) this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label) this.$set(this.sycpxMap, item.value, item.label)
}) })
} },
// 点击上传的文件进行下载
handleOnPreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}, },
watch: { watch: {
// 监听 清单类型 // 监听 清单类型
@@ -1734,7 +1741,7 @@ export default {
}, },
mounted () { mounted () {
this.zqaId =this.$route.query.id; this.zqaId =this.$route.query.id;
// this.getData() //this.getData()
this.getDept() this.getDept()
// 从数据库中查询各下拉框数据 // 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -1771,9 +1778,10 @@ export default {
const accessRow = this.getAccessStandardRegRow const accessRow = this.getAccessStandardRegRow
this.$nextTick(() => { this.$nextTick(() => {
this.sarAccessEO.type = accessRow.type this.sarAccessEO.type = accessRow.type
this.sarAccessEO.countryArea = accessRow.countryArea.split(',') //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
// this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
this.sarAccessEO.detailedListName = accessRow.detailedListName this.sarAccessEO.detailedListName = accessRow.detailedListName
this.sarAccessEO.projectName = accessRow.projectName
this.sarAccessEO.id = accessRow.id this.sarAccessEO.id = accessRow.id
this.sarAccessEO.remark = accessRow.remark || '' this.sarAccessEO.remark = accessRow.remark || ''
this.sarAccessEO.relateFile = accessRow.relateFile this.sarAccessEO.relateFile = accessRow.relateFile
src/sysConfig/index.js
+1 -1
View File
@@ -7,7 +7,7 @@
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '10005' // const devInterfacePORT = '10005'
// const devIp = '192.168.10.248' // const devIp = '192.168.10.248'
const devIp = '192.168.1.108' const devIp = '192.168.1.102'
const devInterfacePORT = '9999' const devInterfacePORT = '9999'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'