修改清单相关的bug

This commit is contained in:
宋伟佳
2021-12-27 10:52:42 +08:00
parent bbd14fc5cb
commit 95badff27b
5 changed files with 53 additions and 29 deletions
@@ -1057,7 +1057,7 @@ export default {
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList this.listForm.fileName = this.fileInfoList
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
var json = Object.assign(this.listForm, this.roleForm); let json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
this.$refs["Form"].validate((valid) => { this.$refs["Form"].validate((valid) => {
@@ -1237,7 +1237,7 @@ export default {
this.standList.map(item => { this.standList.map(item => {
let newStand = false; let newStand = false;
for (let itemKey of this.dataList) { for (let itemKey of this.dataList) {
if (item.id == itemKey.id) { if (item.id === itemKey.id) {
newStand = true; newStand = true;
break; break;
} }
@@ -1246,6 +1246,14 @@ export default {
this.$message.warning("请勿重复添加数据"); this.$message.warning("请勿重复添加数据");
} else { } else {
this.dataList.push(item); this.dataList.push(item);
this.dataList.forEach(item => {
if(item.XCXSSRQ === null){
item.XCXSSRQ = ''
}
if(item.ZCCSSRQ === null){
item.ZCCSSRQ = ''
}
})
exits.push(item.id); exits.push(item.id);
} }
}); });
@@ -616,6 +616,14 @@ export default {
_this.$message.warning("请勿重复添加数据"); _this.$message.warning("请勿重复添加数据");
} else { } else {
_this.dataList.push(item); _this.dataList.push(item);
_this.dataList.forEach(item => {
if(item.XCXSSRQ === null){
item.XCXSSRQ = ''
}
if(item.ZCCSSRQ === null){
item.ZCCSSRQ = ''
}
})
} }
}); });
this.standardData = [] this.standardData = []
@@ -445,6 +445,7 @@
</el-form-item> </el-form-item>
<el-form-item label="标准实施日期" prop="putTime"> <el-form-item label="标准实施日期" prop="putTime">
<el-date-picker <el-date-picker
clearable
v-model.trim="editRowData.ssrq" v-model.trim="editRowData.ssrq"
type="dates" type="dates"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@@ -172,12 +172,6 @@
align="center" align="center"
width="210px" width="210px"
label="标准实施日期"> label="标准实施日期">
<template slot-scope="scope">
<span v-if="scope.row.ssrq === null">
{{ scope.row.ssrq }}
</span>
<span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -610,18 +604,34 @@ export default {
// 导出确定功能 // 导出确定功能
//确认导出 //确认导出
exportTestItem() { exportTestItem() {
if (this.saveExportType === "apart") { if(this.sarAccessEO.sortKey === '1'){
if (this.selectedList != null && this.selectedList != "") { if (this.saveExportType === "apart") {
if (this.selectedList != null && this.selectedList != "") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
"exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
} else if (this.saveExportType === "all") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
"exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
}else{
if (this.saveExportType === "apart") {
if (this.selectedList != null && this.selectedList != "") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
}
} else if (this.saveExportType === "all") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName; "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
window.open(exportURL); window.open(exportURL);
this.$message.success("导出信息成功"); this.$message.success("导出信息成功");
} }
} else if (this.saveExportType === "all") {
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
"exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
window.open(exportURL);
this.$message.success("导出信息成功");
} }
this.exportModelFlag = false; this.exportModelFlag = false;
this.selectedList = []; this.selectedList = [];
+10 -13
View File
@@ -7,22 +7,20 @@
// 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 devInterfacePORT = '9999'
const devIp = '192.168.10.70'
const devInterfacePORT = '4202'
// const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '8033' // const devInterfacePORT = '8038'
const devIp = '10.19.11.243'
const devInterfacePORT = '4304'
// 配置 idm 认证 // 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
// 配置 前端服务 // 配置 前端服务
const devWebUrl = 'https://srms.foton.com.cn/#/' const devWebUrl = 'http://62.234.136.153:8038/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'dev' const webLoginType = 'dev'
// 配置onlyOffice 前端服务 // 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://10.100.5.116:8088' const onlyOfficeUrl = 'http://127.0.0.1:8080'
// 配置 kkFileView 前端服务
const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -46,10 +44,10 @@ const processPort = '17210'
*****************************************************************/ *****************************************************************/
// 生产环境配置 // 生产环境配置
// const prodIp = '62.234.136.153' const prodIp = '62.234.136.153'
// const prodInterfacePORT = '8033' const prodInterfacePORT = '8033'
const prodIp = 'srms.foton.com.cn' // const prodIp = 'slrs.foton.com.cn'
const prodInterfacePORT = '' // const prodInterfacePORT = ''
// 判断环境 // 判断环境
const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -62,7 +60,6 @@ module.exports = {
ssoLoginUrlDev: ssoLogin + devWebUrl, ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLoginUrl: ssoLogin, ssoLoginUrl: ssoLogin,
onlyOfficeUrl: onlyOfficeUrl, onlyOfficeUrl: onlyOfficeUrl,
kkFileViewUrl: kkFileViewUrl,
devWebUrl: devWebUrl, devWebUrl: devWebUrl,
serverUrl: 'http://' + serverIP, // 服务器IP地址 serverUrl: 'http://' + serverIP, // 服务器IP地址
interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,