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:
fanlin
2021-07-20 16:45:33 +08:00
parent 55ed51632e 6b2edd514e
commit 48db1ea810
18 changed files with 453 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+28 -2
View File
@@ -71,6 +71,9 @@
prop="useFlag"
label="角色状态"
width="170px">
<template slot-scope="scope">
<span>{{ scope.row.useFlag===0?'禁用':'启用' }}</span>
</template>
</el-table-column>
<el-table-column
prop="operator"
@@ -184,9 +187,20 @@
</el-form-item>
<el-form-item label="角色描述" prop="remarks" label-width="80px" class="add-form-item">
<el-input v-model="addForm.remarks"
placeholder="请输入上级描述"
placeholder="请输入角色描述"
clearable></el-input>
</el-form-item>
<el-form-item label="角色状态" prop="useFlag" label-width="145px">
<el-select class="bead-input" v-model="addForm.useFlag">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div slot="footer">
@@ -243,7 +257,8 @@ export default {
SuperiorRoleModel: false,
addFormRules: {
name: [
{ required: true, message: '请输入角色名称', trigger: 'blur' }
{ required: true, message: '请输入角色名称', trigger: 'blur' },
{type: 'string', max: 100, message: '角色名称不能超过100个字符', trigger: 'blur'}
]
},
addForm: {
@@ -251,8 +266,19 @@ export default {
parentId: '', // 上级ID
remarks: '', // 角色描述
parent: '',
useFlag: '',
id: ''
},
options: [
{
value: "0",
label: "禁用",
},
{
value: "1",
label: "启用",
}
],
addModel: false,
treeData3: [],
defaultProps3: {
src/pages/localTool/standardRecognition/index.vue
+4 -3
View File
@@ -259,10 +259,10 @@ export default {
},
],
fileType: [
{ required: true, message: "文本状态称不能为空", trigger: "blur" },
{ required: true, message: "文本状态称不能为空", trigger: "change" },
],
fileName: [
{ required: true, message: '文件不能为空', trigger: 'blur' }
{ required: true, message: '文件不能为空', trigger: 'change' }
]
},
options: [
@@ -515,7 +515,8 @@ export default {
message: "文件上传成功",
type: "success",
});
// this.$refs['uploadFilesdfEo'].resetFields()
this.$refs['uploadFilesdfEo'].clearValidate('fileName')
this.$refs['uploadFilesdfEo'].clearValidate('standName')
} else {
this.defaultFileList = [];
this.uploadFilesdfEo.attId = "";
src/pages/processCenter/pages/components/ProcessMixin.vue
+1 -1
View File
@@ -26,7 +26,7 @@ export default {
},
{
label: '项目合规评估流程',
value: '7'
value: '5'
},
{
label: '未符合项整改流程',
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+79 -39
View File
@@ -67,48 +67,48 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="listForm.modelName"
clearable
></el-input>
<div v-if="listForm.modelName" @click="fileUpload" class="fileClass">
{{ listForm.modelName }}
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="mini">
点击上传
</el-button>
</div>
</el-form-item>
<!-- <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">-->
<!-- <el-upload-->
<!-- v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "-->
<!-- :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-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- style="display: none;"-->
<!-- v-model="listForm.modelName"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <div v-if="listForm.modelName" @click="fileUpload" class="fileClass">-->
<!-- {{ listForm.modelName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- @click="fileUpload"-->
<!-- size="mini">-->
<!-- 点击上传-->
<!-- </el-button>-->
<!-- </el-upload>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="listForm.fileId"-->
<!-- placeholder=""-->
<!-- ></el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
<el-upload
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
: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>
<el-input
v-else
v-model="listForm.fileId"
placeholder=""
></el-input>
</el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
<el-radio-group v-model="signFlag" @change="selectSign">
<el-radio label="1">是</el-radio>
@@ -1111,6 +1111,46 @@ export default {
fileUpload () {
this.fileMadel = true
},
// 上传文件成功回调
uploadBackSuccess (res, file, fileList) {
console.log(file);
console.log(fileList)
if (res.ok) {
this.fileInfoList = fileList
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
this.$message.success('上传成功')
} else {
this.$message.error(res.message)
fileList.pop()
}
},
// 相关附件 上传之前钩子
beforeUpload (file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
//把后缀转大写
if(fileSuffix !== undefined && fileSuffix !== null){
fileSuffix = fileSuffix.toUpperCase()
}
// 判断上传文件格式
if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
|| fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
return true
} else {
this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
return false
}
// 判断文件上传大小
if (file.size / 1024 / 1024 > 300) {
this.$message.warning('文件' + file.name + '大小不能超过300M')
return false
}
return true
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+32 -26
View File
@@ -629,42 +629,49 @@ export default {
},
//提交事件
handleSubmit() {
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account;
json.standId = this.listForm.standId;
json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj
json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj
this.$refs['listForm'].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
this.dataList.forEach(item => {
if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){
this.$message.warning('请选择分发责任人')
} else {
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account;
json.standId = this.listForm.standId;
json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj
json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj
this.$refs['listForm'].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善人员信息");
return this.$message.warning("请完善基础信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
})
},
//选择拆分标准取消事件
closeDrawer() {
@@ -683,7 +690,6 @@ export default {
}, {
_this: this
}, res => {
console.log(res)
this.listForm.breakdownList = res.data;
this.ListModel = false;
}, e => {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
-2
View File
@@ -303,7 +303,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -317,7 +316,6 @@ export default {
*/
getFormFieldList (item) {
this.$nextTick(() => {
console.log(item.dataList)
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+41 -29
View File
@@ -364,7 +364,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -386,6 +385,7 @@ export default {
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
this.listForm.breakdownList.push({
itemId: new Date().getTime(),
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
@@ -406,14 +406,23 @@ export default {
zCCSSRQ: item.pepdtos[i].zCCSSRQ,
});
}
console.log(item.pepdtos);
}
},
saveUserInfo() {
if (this.type === "implementer") {
// 如果有勾选的项
if (this.selectList.length) {
this.listForm.breakdownList.forEach((item, index) => {
if (this.selectList.includes(item.itemId)) {
this.listForm.breakdownList[index].implementerId = this.roleRow.id;
this.listForm.breakdownList[index].implementer = this.roleRow.name;
}
})
} else {
this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
}
this.listForm.implementer = this.roleRow.name;
this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
this.showColumn = false;
this.$nextTick(() => {
this.showColumn = true;
@@ -443,28 +452,34 @@ export default {
},
//提交事件
handleSubmit() {
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 => {
this.listForm.breakdownList.forEach(item => {
if(item.implementer === null || item.implementer === '' || item.implementer === undefined){
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.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 => {
});
});
}
})
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -477,10 +492,7 @@ export default {
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
}
this.selectList = data.map(item => item.itemId)
},
selectThree() {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
-1
View File
@@ -477,7 +477,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
-4
View File
@@ -419,7 +419,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -432,7 +431,6 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
@@ -461,7 +459,6 @@ export default {
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -504,7 +501,6 @@ export default {
mounted() {
this.processTable()
this.getData()
// console.log(this.$store.getters.getHandleInfo);
}
};
</script>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+1 -4
View File
@@ -419,7 +419,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -432,13 +431,12 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.step3DTOS
this.dataList = item.dataList
this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber
this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
@@ -503,7 +501,6 @@ export default {
mounted() {
this.processTable()
this.getData()
// console.log(this.$store.getters.getHandleInfo);
}
};
</script>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
-3
View File
@@ -419,7 +419,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -432,7 +431,6 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
console.log(item.dataList);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
@@ -501,7 +499,6 @@ export default {
mounted() {
this.processTable()
this.getData()
// console.log(this.$store.getters.getHandleInfo);
}
};
</script>
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+16 -1
View File
@@ -86,6 +86,12 @@
prop="countryArea"
label="国家/地区"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.countryArea.indexOf(',') >= 0">
<span>{{ scope.row.countryArea }}</span>
</span>
<span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
</template>
</el-table-column>
<el-table-column
prop="detailedListName"
@@ -170,6 +176,7 @@ export default {
name: "listOfCountries",
data() {
return {
countryAreaMap: {},
searching: false,
total: 0,
page: 1,
@@ -345,9 +352,16 @@ export default {
this.$router.push({
name: "ListOfStandardsAndRegulationsDetails",
query: {
id: item.id
id: item.id,
fileIds: item.fileIds
}
});
},
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.countryAreaMap, item.value, item.label)
})
}
},
mounted() {
@@ -358,6 +372,7 @@ export default {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.setMap(this.countryOptions)
}, e => {
});
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+2 -1
View File
@@ -352,7 +352,8 @@ export default {
this.$router.push({
name: "OtherAddEit",
query: {
id: item.id
id: item.id,
fileIds: item.fileIds
}
});
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+2 -1
View File
@@ -355,7 +355,8 @@ export default {
this.$router.push({
name: "ProjectAddEit",
query: {
id: item.id
id: item.id,
fileIds: item.fileIds
}
});
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+63 -24
View File
@@ -242,6 +242,9 @@
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
<el-table
@@ -336,25 +339,31 @@
>
</el-table-column>
<el-table-column
prop="issueTime"
prop="standEnName"
align="center"
width="180px"
label="英文名称">
</el-table-column>
<el-table-column
prop="issueTime"
prop="typeApplicable"
align="center"
width="180px"
label="适用车型">
<template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="nylx"
align="center"
width="180px"
label="能源类型">
<template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="putTime"
sortable
align="center"
width="210px"
@@ -362,14 +371,14 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zccssrqgj"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="XCXSSRQ"
prop="xcxssrqgj"
sortable
align="center"
width="210px"
@@ -377,40 +386,53 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zrbm"
width="210px"
align="center"
label="责任部门">
<template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="sycpx"
width="180px"
align="center"
label="适用产品线">
<template slot-scope="scope">
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="cycvppsbm"
width="210px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppsbm"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppscn"
align="center"
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column>
<el-table-column width="150">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -421,6 +443,7 @@
<el-button
class="common-button-default"
type="danger"
style="margin-left: 0px"
size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag"
>下移</el-button>
@@ -526,12 +549,18 @@ export default {
// }
// }
return {
textStatusMap: {},
typeApplicableMap: {},
nylxMap: {},
zrbmMap: {},
sycpxMap: {},
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 1,
countryArea: '',
fileIds: '',
detailedListName: '',
energyKind: '',
type: '',
@@ -552,9 +581,6 @@ export default {
detailedListName: [
{required: true, message: '清单名称不能为空', trigger: 'blur'},
{type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
],
remark: [
{required: true,type: 'string', max: 500, message: '表单名称不能超过500个字符', trigger: 'blur'}
]
},
disabledFlag: false,
@@ -846,7 +872,6 @@ export default {
uploadBackSuccess (res, file, fileList) {
if (res.ok) {
this.fileInfoList = fileList
console.log(this.fileInfoList)
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
this.$message.success('上传成功')
} else {
@@ -1186,8 +1211,7 @@ export default {
this.fileInfoList.map(item => {
relateFile.push(item.id)
})
sarAccessEO.relateFile = relateFile.join(',')
console.log(sarAccessEO.relateFile)
sarAccessEO.fileIds = relateFile.join(',')
}
if (!sarAccessEO.id) {
// 新增
@@ -1201,12 +1225,8 @@ export default {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations',
query: {
relateFile: sarAccessEO.relateFile
}
name: 'AccessStandardsAndRegulations'
})
console.log(sarAccessEO)
}
}, e => {
})
@@ -1604,7 +1624,7 @@ export default {
// 请求上传的文件信息
getFileInfo () {
this.$http.get('att/attFile/getMultiFileInfos', {
fileIds: this.sarAccessEO.relateFile
fileIds: this.$route.query.fileIds
}, {
_this: this
}, res => {
@@ -1696,6 +1716,16 @@ export default {
this.sarAccessInfoList = res.data
}, e => {
})
},
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label)
this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label)
})
}
},
watch: {
@@ -1732,6 +1762,15 @@ export default {
this.ROLELIST = res.data.ROLELIST
this.GXHBQOptions = res.data.GXHBQXX
this.askNatureOptions = res.data.ACCESSTYPE
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.getGzzOption()
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+64 -18
View File
@@ -11,7 +11,10 @@
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p">
<label class="transition-box-label">国家/地区：</label>
<span class="transition-box-span">{{ sarAccessEO.countryArea }}</span>
<span class="transition-box-span" v-if="sarAccessEO.countryArea.indexOf(',') >= 0">
<span>{{ sarAccessEO.countryArea }}</span>
</span>
<span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">清单说明：</label>
@@ -21,7 +24,7 @@
<label class="transition-box-label">附件：</label>
<div class="file-box" v-if="fileInfoList.length > 0">
<p v-for="item in fileInfoList"
:key="item.id">
:key="item.id"> {{ item.name }}
<i
title="下载"
@click="downloadFile(item.id)"
@@ -124,31 +127,35 @@
<el-table-column
prop="standName"
label="中文名称"
align="center"
fixed="left"
width="180px"
>
</el-table-column>
<el-table-column
prop="issueTime"
prop="standEnName"
align="center"
width="180px"
label="英文名称">
</el-table-column>
<el-table-column
prop="issueTime"
prop="typeApplicable"
align="center"
width="180px"
label="适用车型">
<template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="nylx"
align="center"
width="180px"
label="能源类型">
<template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="putTime"
sortable
align="center"
width="210px"
@@ -156,14 +163,14 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zccssrqgj"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="xcxssrqgj"
sortable
align="center"
width="210px"
@@ -171,35 +178,48 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zrbm"
width="210px"
align="center"
label="责任部门">
<template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="sycpx"
width="180px"
align="center"
label="适用产品线">
<template slot-scope="scope">
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="cycvppsbm"
width="210px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppsbm"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppscn"
align="center"
width="210px"
label="卡车VPPS中文名称">
@@ -256,6 +276,12 @@ export default {
name: "AccessStandardDetails",
data() {
return {
textStatusMap: {},
typeApplicableMap: {},
nylxMap: {},
zrbmMap: {},
sycpxMap: {},
countryAreaMap: {},
standinfoList: [],
standardFormTotal: 0,
relateDialog: false,
@@ -452,9 +478,8 @@ export default {
},
// 请求上传的文件信息
getFileInfo() {
console.log(this.sarAccessEO)
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.sarAccessEO.relateFile
fileIds: this.sarAccessEO.fileIds
}, {
_this: this
}, res => {
@@ -474,7 +499,7 @@ export default {
},
// 附件下载事件
fileDownLoad(attId) {
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId;
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
},
// 点击查看
handlePreview(item) {
@@ -560,6 +585,17 @@ export default {
doLayout() {
this.$refs.adminTable && this.$refs.adminTable.doLayout();
this.$refs.skillTable && this.$refs.skillTable.doLayout();
},
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label)
this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label)
this.$set(this.countryAreaMap, item.value, item.label)
})
}
},
mounted() {
@@ -589,6 +625,16 @@ export default {
this.ROLELIST = res.data.ROLELIST;
this.GXHBQOptions = res.data.GXHBQXX;
this.askNatureOptions = res.data.ACCESSTYPE;
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.setMap(this.drawerCountryOptions)
this.getGzzOption();
}, e => {
});
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+60 -13
View File
@@ -227,6 +227,9 @@
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
<el-table
@@ -321,25 +324,31 @@
>
</el-table-column>
<el-table-column
prop="issueTime"
prop="standEnName"
align="center"
width="180px"
label="英文名称">
</el-table-column>
<el-table-column
prop="issueTime"
prop="typeApplicable"
align="center"
width="180px"
label="适用车型">
<template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="nylx"
align="center"
width="180px"
label="能源类型">
<template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="putTime"
sortable
align="center"
width="210px"
@@ -347,14 +356,14 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zccssrqgj"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="XCXSSRQ"
prop="xcxssrqgj"
sortable
align="center"
width="210px"
@@ -362,35 +371,48 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zrbm"
width="210px"
align="center"
label="责任部门">
<template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="sycpx"
width="180px"
align="center"
label="适用产品线">
<template slot-scope="scope">
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="cycvppsbm"
width="210px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppsbm"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppscn"
align="center"
width="210px"
label="卡车VPPS中文名称">
@@ -511,11 +533,17 @@ export default {
// }
// }
return {
textStatusMap: {},
typeApplicableMap: {},
nylxMap: {},
zrbmMap: {},
sycpxMap: {},
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 4,
fileIds: '',
detailedList: '',
detailedListName: '',
energyKind: '',
@@ -1167,7 +1195,7 @@ export default {
this.fileInfoList.map(item => {
relateFile.push(item.id)
})
sarAccessEO.relateFile = relateFile.join(',')
sarAccessEO.fileIds = relateFile.join(',')
}
if (!sarAccessEO.id) {
// 新增
@@ -1584,7 +1612,7 @@ export default {
// 请求上传的文件信息
getFileInfo () {
this.$http.get('att/attFile/getMultiFileInfos', {
fileIds: this.sarAccessEO.relateFile
fileIds: this.$route.query.fileIds
}, {
_this: this
}, res => {
@@ -1678,6 +1706,16 @@ export default {
}, e => {
})
},
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label)
this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label)
})
}
},
watch: {
@@ -1714,6 +1752,15 @@ export default {
this.ROLELIST = res.data.ROLELIST
this.GXHBQOptions = res.data.GXHBQXX
this.askNatureOptions = res.data.ACCESSTYPE
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.getGzzOption()
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+60 -13
View File
@@ -227,6 +227,9 @@
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
<el-table
@@ -321,25 +324,31 @@
>
</el-table-column>
<el-table-column
prop="issueTime"
prop="standEnName"
align="center"
width="180px"
label="英文名称">
</el-table-column>
<el-table-column
prop="issueTime"
prop="typeApplicable"
align="center"
width="180px"
label="适用车型">
<template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="nylx"
align="center"
width="180px"
label="能源类型">
<template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
prop="putTime"
sortable
align="center"
width="210px"
@@ -347,14 +356,14 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zccssrqgj"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="XCXSSRQ"
prop="xcxssrqgj"
sortable
align="center"
width="210px"
@@ -362,35 +371,48 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zrbm"
width="210px"
align="center"
label="责任部门">
<template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="sycpx"
width="180px"
align="center"
label="适用产品线">
<template slot-scope="scope">
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="cycvppsbm"
width="210px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppsbm"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
prop="kccvppscn"
align="center"
width="210px"
label="卡车VPPS中文名称">
@@ -511,11 +533,17 @@ export default {
// }
// }
return {
textStatusMap: {},
typeApplicableMap: {},
nylxMap: {},
zrbmMap: {},
sycpxMap: {},
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 2,
fileIds: '',
projectName: '',
detailedListName: '',
energyKind: '',
@@ -1168,7 +1196,7 @@ export default {
this.fileInfoList.map(item => {
relateFile.push(item.id)
})
sarAccessEO.relateFile = relateFile.join(',')
sarAccessEO.fileIds = relateFile.join(',')
}
if (!sarAccessEO.id) {
// 新增
@@ -1585,7 +1613,7 @@ export default {
// 请求上传的文件信息
getFileInfo () {
this.$http.get('att/attFile/getMultiFileInfos', {
fileIds: this.sarAccessEO.relateFile
fileIds: this.$route.query.fileIds
}, {
_this: this
}, res => {
@@ -1679,6 +1707,16 @@ export default {
}, e => {
})
},
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label)
this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label)
})
}
},
watch: {
@@ -1715,6 +1753,15 @@ export default {
this.ROLELIST = res.data.ROLELIST
this.GXHBQOptions = res.data.GXHBQXX
this.askNatureOptions = res.data.ACCESSTYPE
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.getGzzOption()
}, e => {
})