Merge branch 'fix_foton_20230613' into 'master'

Fix foton 20230613

See merge request laws-foton-slrs/foton-laws-system-front!111
This commit is contained in:
高嵩
2023-08-29 02:24:40 +00:00
21 changed files with 403 additions and 63 deletions
+14 -10
View File
@@ -1,18 +1,20 @@
<template> <template>
<div id="app"> <div id="app">
<!-- 596843564600706080--> <!-- 596843564600706080-->
<iframe <!-- <iframe-->
src="https://iftappwelink.foton.com.cn/ke_fu_ui/?groupId=596843564600706080" <!-- src="https://iftappwelink.foton.com.cn/ke_fu_ui/?groupId=596843564600706080"-->
style="position: absolute; bottom: 1%;right: 10px;z-index: 10000" <!-- style="position: absolute; bottom: 1%;right: 10px;z-index: 10000"-->
height="490" <!-- height="490"-->
width="510" <!-- width="510"-->
frameborder="0" <!-- frameborder="0"-->
scrolling="0" <!-- scrolling="0"-->
></iframe> <!-- ></iframe>-->
<!-- 数小福 -->
<customerService></customerService>
<!-- <router-view v-if="!isBoolean"/>--> <!-- <router-view v-if="!isBoolean"/>-->
<span v-if="this.$route.name === 'Login'|| !isBoolean"> <span v-if="this.$route.name === 'Login'|| !isBoolean">
<router-view/> <router-view/>
</span> </span>
<span v-else> <span v-else>
<div class="content-box" v-if="isCollapse"> <div class="content-box" v-if="isCollapse">
<el-container> <el-container>
@@ -93,9 +95,11 @@
<script> <script>
import {mapGetters, mapState} from 'vuex' import {mapGetters, mapState} from 'vuex'
import {webLoginType, ssoLogoutUrlDev} from '@/sysConfig' import {webLoginType, ssoLogoutUrlDev} from '@/sysConfig'
import customerService from "@/components/customerService";
export default { export default {
name: 'App', name: 'App',
components: { customerService },
data() { data() {
return { return {
isBoolean: false, isBoolean: false,
+236
View File
@@ -0,0 +1,236 @@
<template>
<!-- 数小福 -->
<span id="drag" draggable>
<iframe
src="https://iftappwelink.foton.com.cn/ke_fu_ui/?groupId=596843564600706080"
style="position: absolute; bottom: 10px; right: 0%"
:height="height"
:width="width"
id="child"
frameborder="0"
scrolling="0">
</iframe>
</span>
</template>
<script>
export default {
name: "customerService",
data() {
return {
clientOffset: {},
drag: null,
flag: null,
height: 100,
width: 100,
l: 0,
t: 0,
x: 0,
y: 0,
};
},
mounted(){
this.drag = document.getElementById('drag');
var iframe = document.getElementById('child');
iframe.style.pointerEvents = 'none';
this.drag.addEventListener('mousedown', this.dragDiv, false);
window.onload = () => {
let that = this;
// 弹框显示
that.drag.onmousedown = function (e) {
// 获取鼠标点击位置与拖拽元素左上角的偏移
var disx = e.pageX - that.drag.offsetLeft;
var disy = e.pageY - that.drag.offsetTop;
that.clientOffset.clientX = e.clientX;
that.clientOffset.clientY = e.clientY;
// 设置 document.onmousemove 事件处理函数来实现拖拽效果
document.onmousemove = function (e) {
that.drag.style.left = e.pageX - disx + 'px';
that.drag.style.top = e.pageY - disy + 'px';
};
// 设置 document.onmouseup 事件处理函数来结束拖拽
document.onmouseup = function () {
document.onmousemove = null;
document.onmouseup = null;
};
};
that.drag.addEventListener('mouseup', (event) => {
//鼠标抬起后的事件,判断是拖拽还是点击
let clientX = event.clientX;
let clientY = event.clientY;
if (clientX === that.clientOffset.clientX && clientY === that.clientOffset.clientY) {
//这里触发点击事件,将click方法移入这里
document.getElementById('child').contentWindow.postMessage('open', '*');
window.addEventListener(
'message',
function (e) {
if (e.data === 'open') {
that.height = 470;
that.width = 510;
iframe.style.pointerEvents = 'auto';
} else if (e.data == 'close') {
that.height = 100;
that.width = 100;
iframe.style.pointerEvents = 'none';
}
},
false
);
return;
} else {
return;
}
});
};
},
Method:{
dragDiv(e) {
e.preventDefault(); //阻止发生自身事件
this.flag = true;
this.x = e.layerX || e.offsetX;
this.y = e.layerY || e.offsetY;
document.addEventListener('mousemove', this.docMove, false);
document.addEventListener('mouseup', this.mouseup, false);
},
docMove(e) {
if (this.flag) {
e.preventDefault();
this.l = parseInt(drag.style.left);
this.t = parseInt(drag.style.top);
drag.style.left = -this.x + e.pageX + 'px';
drag.style.top = -this.y + e.pageY + 'px';
}
},
mouseup() {
this.flag = false;
window.removeEventListener('mouseup', this.mouseup);
},
}
// mounted() {
// this.kefu()
// },
// methods: {
// kefu () {
// let clientOffset = {};
// var drag = document.getElementById("drag"),
// flag;
// drag.addEventListener("mousedown", dragDiv, false);
// function dragDiv(e) {
// e.preventDefault(); //阻止发生自身事件
// flag = true;
// var x = e.layerX || e.offsetX;
// var y = e.layerY || e.offsetY;
// document.addEventListener("mousemove", docMove, false);
// document.addEventListener("mouseup", mouseup, false);
// function docMove(e) {
// if (flag) {
// e.preventDefault;
// var l = parseInt(drag.style.left);
// var t = parseInt(drag.style.top);
// drag.style.left = -x + e.pageX + "px";
// drag.style.top = -y + e.pageY + "px";
// }
// }
// }
//
// function mouseup() {
// flag = false;
// window.removeEventListener("mouseup", mouseup);
// }
//
// // 弹框显示
// drag.onmousedown = function (e) {
// var disx = e.pageX - drag.offsetLeft;
// var disy = e.pageY - drag.offsetTop;
// clientOffset.clientX = event.clientX;
// clientOffset.clientY = event.clientY;
// // 解决点击后图标偏移 start (1/3)
// drag.style.left = e.pageX - disx + "px";
// drag.style.top = e.pageY - disy + "px";
// // 解决点击后图标偏移 end
// document.onmousemove = function (e) {
// drag.style.left = e.pageX - disx + "px";
// drag.style.top = e.pageY - disy + "px";
// };
// document.onmouseup = function () {
// document.onmousemove = document.onmouseup = null;
// };
// };
// drag.addEventListener("mouseup", (event) => {
// //鼠标抬起后的事件,判断是拖拽还是点击
// let clientX = event.clientX;
// let clientY = event.clientY;
// if (
// clientX === clientOffset.clientX &&
// clientY === clientOffset.clientY
// ) {
// //这里触发点击事件,将click方法移入这里
// console.log(1212);
// document
// .getElementById("child")
// .contentWindow.postMessage("open", "*");
// return;
// } else {
// return;
// }
// });
// var iframe = document.getElementById("child");
//
// var styles = drag.style;
// window.onload = () => {
// // 父级页面接收消息
// var _this = this;
// window.addEventListener(
// "message",
// function (e) {
// console.log("父级页面接收消息", e);
// if (e.data === "open") {
// iframe.setAttribute("height", "470");
// iframe.setAttribute("width", "510");
//
// styles.height = "470px";
// styles.width = "580px";
//
// // 解决点击后图标偏移 start (2/3)
// styles.left = (styles.left.slice(0,styles.left.indexOf('px')) - 509) + 'px'
// styles.top = (styles.top.slice(0,styles.top.indexOf('px')) - 470 + 99) + 'px'
// // 解决点击后图标偏移 end
//
// iframe.style.pointerEvents = "";
// } else if (e.data == "close") {
// iframe.setAttribute("height", "100");
// iframe.setAttribute("width", "100");
//
// styles.height = "99px";
// styles.width = "71px";
//
// // 解决点击后图标偏移 start (3/3)
// styles.left = (styles.left.slice(0,styles.left.indexOf('px')) / 1 + 509) + 'px'
// styles.top = (styles.top.slice(0,styles.top.indexOf('px')) / 1 + 470 - 99) + 'px'
// // 解决点击后图标偏移 end
//
// iframe.style.pointerEvents = "none";
// }
// },
// false
// );
// };
// },
// }
}
</script>
<style scoped>
#drag {
display: block;
position: absolute;
width: 71px;
text-align: center;
height: 117px;
bottom: 36px;
right: 14px;
}
</style>
@@ -2544,9 +2544,9 @@
}) })
} }
}, },
ifStandCodebyStandName(standCode,standName){ ifStandCodebyStandName(standCode,standName,taskIds,standNum){
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName}) this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum})
.then(res => resolve(res)) .then(res => resolve(res))
.catch(e => { .catch(e => {
throw new Error(e) throw new Error(e)
@@ -2615,7 +2615,7 @@
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
if(this.form.standStatus === '1' || this.form.standStatus === '2'){ if(this.form.standStatus === '1' || this.form.standStatus === '2'){
this.ifStandCodebyStandName(this.form.standCode,this.form.standName) this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum)
.then((res)=>{ .then((res)=>{
if(res.ok){ if(res.ok){
this.completeTask() this.completeTask()
@@ -813,6 +813,7 @@
name="file" name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:before-remove="beforeRemove"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:on-preview="handleFilePreview" :on-preview="handleFilePreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
@@ -1757,7 +1758,7 @@
// ], // ],
standEnName: [ standEnName: [
{required: false, message: '请输入企标英文名称', trigger: 'blur'}, {required: false, message: '请输入企标英文名称', trigger: 'blur'},
{min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}, {min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur'},
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -3048,6 +3049,16 @@
this.fileMadel = true; this.fileMadel = true;
}, },
beforeRemove (file, fileList) {
return new Promise((resolve, reject) => {
if(file.id && !file.id.startsWith('ATT')) {
return reject(false)
} else if (file.response.data.id && !file.response.data.id.startsWith('ATT')){
return reject(false)
}
return resolve(true)
})
},
removeOneFile(file, fileLists) { removeOneFile(file, fileLists) {
const fileList = fileLists.map(item => { const fileList = fileLists.map(item => {
return { return {
@@ -3056,23 +3067,23 @@
} }
}) })
switch (this.fileType) { switch (this.fileType) {
case 'FBGBUSS': case 'FBGBUSS':
this.FBGBUSSFileList = fileList this.FBGBUSSFileList = fileList
break; break;
case 'BZSMBUSS' : case 'BZSMBUSS' :
this.BZSMBUSSFileList = fileList this.BZSMBUSSFileList = fileList
break; break;
case 'LSBBBUSS': case 'LSBBBUSS':
this.LSBBBUSSFileList = fileList this.LSBBBUSSFileList = fileList
break; break;
case 'QTWJBUSS': case 'QTWJBUSS':
this.QTWJBUSSFileList = fileList this.QTWJBUSSFileList = fileList
break; break;
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
default : default :
; ;
} }
}, },
drawerCheckZRBM(data) { drawerCheckZRBM(data) {
@@ -814,6 +814,7 @@
name="file" name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:before-remove="beforeRemove"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:on-preview="handleFilePreview" :on-preview="handleFilePreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
@@ -1743,7 +1744,7 @@
], ],
standEnName: [ standEnName: [
{required: false, message: '请输入企标英文名称', trigger: 'blur'}, {required: false, message: '请输入企标英文名称', trigger: 'blur'},
{min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}, {min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur'},
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -3063,6 +3064,16 @@
this.fileMadel = true; this.fileMadel = true;
}, },
beforeRemove (file, fileList) {
return new Promise((resolve, reject) => {
if(file.id && !file.id.startsWith('ATT')) {
return reject(false)
} else if (file.response.data.id && !file.response.data.id.startsWith('ATT')){
return reject(false)
}
return resolve(true)
})
},
removeOneFile(file, fileLists) { removeOneFile(file, fileLists) {
const fileList = fileLists.map(item => { const fileList = fileLists.map(item => {
return { return {
@@ -950,7 +950,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -880,7 +880,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -949,7 +949,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -242,6 +242,7 @@
name="file" name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:before-remove="beforeRemove"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:on-preview="handleFilePreview" :on-preview="handleFilePreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
@@ -1028,7 +1029,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -2211,6 +2212,16 @@
this.fileMadel = true; this.fileMadel = true;
}, },
beforeRemove (file, fileList) {
return new Promise((resolve, reject) => {
if(file.id && !file.id.startsWith('ATT')) {
return reject(false)
} else if (file.response.data.id && !file.response.data.id.startsWith('ATT')){
return reject(false)
}
return resolve(true)
})
},
removeOneFile(file, fileLists) { removeOneFile(file, fileLists) {
const fileList = fileLists.map(item => { const fileList = fileLists.map(item => {
return { return {
@@ -247,6 +247,7 @@
name="file" name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:before-remove="beforeRemove"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:on-preview="handleFilePreview" :on-preview="handleFilePreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
@@ -1068,7 +1069,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -2350,6 +2351,16 @@
} }
this.fileMadel = true; this.fileMadel = true;
}, },
beforeRemove (file, fileList) {
return new Promise((resolve, reject) => {
if(file.id && !file.id.startsWith('ATT')) {
return reject(false)
} else if (file.response.data.id && !file.response.data.id.startsWith('ATT')){
return reject(false)
}
return resolve(true)
})
},
removeOneFile(file, fileLists) { removeOneFile(file, fileLists) {
const fileList = fileLists.map(item => { const fileList = fileLists.map(item => {
return { return {
@@ -2646,9 +2657,9 @@
this.rules.commentText[0].required = true; this.rules.commentText[0].required = true;
} }
}, },
ifStandCodebyStandName(standCode,standName){ ifStandCodebyStandName(standCode,standName,taskIds,standNum){
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName}) this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum})
.then(res => resolve(res)) .then(res => resolve(res))
.catch(e => { .catch(e => {
throw new Error(e) throw new Error(e)
@@ -2710,7 +2721,7 @@
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
if(this.form.reviseStatus === '1' || this.form.reviseStatus === '2'){ if(this.form.reviseStatus === '1' || this.form.reviseStatus === '2'){
this.ifStandCodebyStandName(this.form.standCode,this.form.standName) this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum)
.then((res)=>{ .then((res)=>{
if(res.ok){ if(res.ok){
this.completeTask() this.completeTask()
@@ -3010,16 +3021,32 @@
// }else { // }else {
// this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) // this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// } // }
this.form.standNum = this.form.standNum.replace(/^0+/,"") console.log(this.form.standNum)
this.form.standNum = this.form.standNum.padStart(3,'0') if (this.form.standNum.includes(',')) {
// 多个代替企标编号 调接口获取企标顺序号
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
_this: this
}, res => {
this.form.standNum = res.data + ''
this.form.standNum = this.form.standNum.replace(/^0+/,"")
this.form.standNum = this.form.standNum.padStart(3,'0')
this.standNum = this.form.standNum // 保存初始顺序号
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.standCode = this.form.standCode
this.formKey++
}, e => {
})
} else {
this.form.standNum = this.form.standNum.replace(/^0+/,"")
this.form.standNum = this.form.standNum.padStart(3,'0')
this.standNum = this.form.standNum // 保存初始顺序号 this.standNum = this.form.standNum // 保存初始顺序号
this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.standCode = this.form.standCode
// this.standSort = this.form.standSort
this.formKey++
this.standCode = this.form.standCode
// this.standSort = this.form.standSort
this.formKey++
}
} else if (this.form.reviseStatus === '3'){ } else if (this.form.reviseStatus === '3'){
this.form.standCode = this.form.standCode this.form.standCode = this.form.standCode
@@ -288,6 +288,7 @@
name="file" name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:before-remove="beforeRemove"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:on-preview="handleFilePreview" :on-preview="handleFilePreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
@@ -1062,7 +1063,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -2246,6 +2247,16 @@
this.fileMadel = true; this.fileMadel = true;
}, },
beforeRemove (file, fileList) {
return new Promise((resolve, reject) => {
if(file.id && !file.id.startsWith('ATT')) {
return reject(false)
} else if (file.response.data.id && !file.response.data.id.startsWith('ATT')){
return reject(false)
}
return resolve(true)
})
},
removeOneFile(file, fileLists) { removeOneFile(file, fileLists) {
const fileList = fileLists.map(item => { const fileList = fileLists.map(item => {
return { return {
@@ -1346,7 +1346,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -491,6 +491,7 @@
name="file" name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:before-remove="beforeRemove"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:on-preview="handleFilePreview" :on-preview="handleFilePreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
@@ -1311,7 +1312,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -2590,6 +2591,16 @@
this.fileMadel = true; this.fileMadel = true;
}, },
beforeRemove (file, fileList) {
return new Promise((resolve, reject) => {
if(file.id && !file.id.startsWith('ATT')) {
return reject(false)
} else if (file.response.data.id && !file.response.data.id.startsWith('ATT')){
return reject(false)
}
return resolve(true)
})
},
removeOneFile(file, fileLists) { removeOneFile(file, fileLists) {
const fileList = fileLists.map(item => { const fileList = fileLists.map(item => {
return { return {
@@ -334,6 +334,7 @@
name="file" name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:before-remove="beforeRemove"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:on-preview="handleFilePreview" :on-preview="handleFilePreview"
:on-remove="removeOneFile" :on-remove="removeOneFile"
@@ -1104,7 +1105,7 @@
], ],
standEnName: [ standEnName: [
{required: false, message: '请输入企标英文名称', trigger: 'blur'}, {required: false, message: '请输入企标英文名称', trigger: 'blur'},
{min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}, {min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur'},
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -2218,6 +2219,16 @@
this.fileMadel = true; this.fileMadel = true;
}, },
beforeRemove (file, fileList) {
return new Promise((resolve, reject) => {
if(file.id && !file.id.startsWith('ATT')) {
return reject(false)
} else if (file.response.data.id && !file.response.data.id.startsWith('ATT')){
return reject(false)
}
return resolve(true)
})
},
removeOneFile(file, fileLists) { removeOneFile(file, fileLists) {
const fileList = fileLists.map(item => { const fileList = fileLists.map(item => {
return { return {
@@ -900,7 +900,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -1093,7 +1093,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -1151,7 +1151,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -1061,7 +1061,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -1311,7 +1311,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
@@ -2834,6 +2834,12 @@
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
// this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") // this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
this.LSBBBUSSFileList = this.LSBBBUSSFileList.reduce((init,item)=>{
if(item.id || (item.response && item.response.data &&item.response.data.id)){
init.push(item)
}
return init
},[])
this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
@@ -929,7 +929,7 @@
], ],
standEnName: [ standEnName: [
{ required: false, message: '请输入企标英文名称', trigger: 'blur' }, { required: false, message: '请输入企标英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' },
{validator: this.verify.valiateEnName, trigger: 'change'} {validator: this.verify.valiateEnName, trigger: 'change'}
], ],
textStatusBuss: [ textStatusBuss: [
+6 -5
View File
@@ -1,7 +1,8 @@
/*** @description: /***
* @author: chenxiaoxi @description: 通用配置
* @date: 2018-09-04 17:47:46 * @author: chenxiaoxi
*/ * @date: 2018-09-04 17:47:46
*/
// 服务器地址 // 服务器地址
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '4202' // const devInterfacePORT = '4202'
@@ -77,4 +78,4 @@ module.exports = {
enterprise: enterprise, // GQ广汽 SJZX数据中心 enterprise: enterprise, // GQ广汽 SJZX数据中心
theme: theme, // 主题 theme: theme, // 主题
processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
} }