FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_20240123_UAT' into 'master'

Browse Source 
Fix 20240123 uat

See merge request laws-foton-slrs/foton-laws-system-front!150
This commit is contained in:
高嵩
2024-01-24 09:56:01 +00:00
parent a131f9bb7a f541cbce00
commit 4172ad2664
10 changed files with 2004 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/hzwlComponents/UploadFormItem.vue
+98 -1
View File
@@ -60,13 +60,59 @@
:on-success="onSuccess"
:on-preview="onPreview"
:on-remove="removeOneFile"
:show-file-list="true"
:show-file-list="false"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff" />
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
<ul class="el-upload-list el-upload-list--text">
<li
v-for="(file, index) in FileList"
:key="index"
class="el-upload-list__item is-success"
:title="file.name"
@click="onPreview(file)"
>
<a class="el-upload-list__item-name">
<i class="el-icon-document" />
{{ file.name }}
</a>
<label class="el-upload-list__item-status-label">
<i class="el-icon-upload-success el-icon-circle-check" />
</label>
<i class="el-icon-edit" @click.stop="handleModifyName(file)" />
<i class="el-icon-close" @click.stop="handleRemoveFile(file)" />
</li>
</ul>
</el-dialog>
<el-dialog
title="修改文件名称"
:visible.sync="openModifyFileNameDialog"
append-to-body
>
<el-input v-model="modifyFile.fileName" />
<div class="demo-drawer-footer" style="text-align: right;margin-top:30px">
<el-button
class="common-button-primary"
size="mini"
icon="el-icon-check"
type="primary"
:loading="modifyFileNameLoading"
@click="handleModifyNameSubmite"
>
提交
</el-button>
<el-button
class="common-button-default"
size="mini"
icon="el-icon-close"
@click="openModifyFileNameDialog = false"
>
取消
</el-button>
</div>
</el-dialog>
</el-form-item>
</template>
@@ -120,6 +166,13 @@ export default {
fileMadel: false,
fileList: [], // 用于el-upload
FileList: [], // 用于回显
openModifyFileNameDialog: false,
modifyFile: {
fileName: '',
fileId: ''
},
modifyFileNameLoading: false
}
},
created () {
@@ -234,6 +287,42 @@ export default {
this.$preview(attId)
}
},
handleRemoveFile (file) {
const fileList = []
this.FileList.forEach(item => {
if (item.id !== file.id) {
fileList.push(item)
}
})
this.removeOneFile(file, fileList)
},
handleModifyName (file) {
this.modifyFile.fileName = file.name
this.modifyFile.fileId = file.id
this.openModifyFileNameDialog = true
},
handleModifyNameSubmite () {
this.modifyFileNameLoading = true
this.$http.get('att/attFile/updateFileName', this.modifyFile, {
_this: this
}, res => {
if(res.ok) {
this.modifyFileNameLoading = false
this.openModifyFileNameDialog = false
this.FileList.forEach(item => {
if(item.id === this.modifyFile.fileId) {
item.name = this.modifyFile.fileName
}
})
const ids = this.FileList.map(item => item.id).join(',')
const names = this.FileList.map(item => item.name).join(',')
this.$emit('update:ids', ids)
this.$emit('update:names', names)
}
}, e => {
this.modifyFileNameLoading = false
})
},
}
}
</script>
@@ -250,4 +339,12 @@ export default {
background: #fff3f3;
z-index: 9;
}
.el-upload-list__item .el-icon-edit{
position: absolute;
top: 5px;
right: 25px;
cursor: pointer;
opacity: .75;
color: #606266;
}
</style>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+98 -2
View File
@@ -1426,13 +1426,58 @@
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-remove="removeOneFile"
:show-file-list="true"
:show-file-list="false"
>
<div>
<i class="el-icon-upload" style="color: #3399ff" />
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
<ul class="el-upload-list el-upload-list--text">
<li
v-for="(file, index) in fileList"
:key="index"
class="el-upload-list__item is-success"
:title="file.name"
>
<a class="el-upload-list__item-name">
<i class="el-icon-document" />
{{ file.name }}
</a>
<label class="el-upload-list__item-status-label">
<i class="el-icon-upload-success el-icon-circle-check" />
</label>
<i class="el-icon-edit" @click.stop="handleModifyName(file)" />
<i class="el-icon-close" @click.stop="handleRemoveFile(file)" />
</li>
</ul>
</el-dialog>
<el-dialog
title="修改文件名称"
:visible.sync="openModifyFileNameDialog"
append-to-body
>
<el-input v-model="modifyFile.fileName" />
<div class="demo-drawer-footer" style="text-align: right;margin-top:30px">
<el-button
class="common-button-primary"
size="mini"
icon="el-icon-check"
type="primary"
:loading="modifyFileNameLoading"
@click="handleModifyNameSubmite"
>
提交
</el-button>
<el-button
class="common-button-default"
size="mini"
icon="el-icon-close"
@click="openModifyFileNameDialog = false"
>
取消
</el-button>
</div>
</el-dialog>
<!-- 新建抽屉 -->
<el-drawer
@@ -1961,6 +2006,12 @@ export default {
})
}
return {
openModifyFileNameDialog: false,
modifyFile: {
fileName: '',
fileId: ''
},
modifyFileNameLoading: false,
disabledXX: !!this.$route.query.disabledXX,
ccc: false,
productTitle: '', // 模态框标题
@@ -2505,6 +2556,43 @@ export default {
this.modelFunc()
},
methods: {
handleRemoveFile (file) {
const fileList = []
this.fileList.forEach(item => {
const fileId = file.id || file.response.data.id
const itemId = item.id || item.response.data.id
if (fileId !== itemId) {
fileList.push(item)
}
})
this.fileList = fileList
this.removeOneFile(file, fileList)
},
handleModifyName (file) {
this.modifyFile.fileName = file.name
this.modifyFile.fileId = file.id || file.response.data.id
this.openModifyFileNameDialog = true
},
handleModifyNameSubmite () {
this.modifyFileNameLoading = true
this.$http.get('att/attFile/updateFileName', this.modifyFile, {
_this: this
}, res => {
if(res.ok) {
this.modifyFileNameLoading = false
this.openModifyFileNameDialog = false
this.fileList.forEach(item => {
const id = item.id || item.response.data.id
if(id === this.modifyFile.fileId) {
item.name = this.modifyFile.fileName
}
})
this.removeOneFile('_', this.fileList)
}
}, e => {
this.modifyFileNameLoading = false
})
},
// 新增
productAdd () {
this.productModal = true
@@ -3609,7 +3697,7 @@ export default {
// }
// this.form.zbjbdName += response.data.name+',';
// }
this.fileList = fileList
switch (this.fileType) {
case 'fbgbjbd':
this.FBGBJBDFileList = fileList;
@@ -4419,4 +4507,12 @@ export default {
height: 8%;
}
}
.el-upload-list__item .el-icon-edit{
position: absolute;
top: 5px;
right: 25px;
cursor: pointer;
opacity: .75;
color: #606266;
}
</style>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+798 -568
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+3 -3
View File
@@ -436,12 +436,12 @@
prop="CYCVPPSCNBUSS"
class="add-form-item form-item-disabled"
>
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable disabled />
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="关联模块--乘用车vpps中文名称" clearable disabled />
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-form-item label="关联模块--卡车VPPS中文名称" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.KCVPPSCNBUSS"
placeholder="关联模块--卡车VPPS编码"
placeholder="关联模块--卡车VPPS中文名称"
clearable
disabled
/>
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+3 -3
View File
@@ -401,10 +401,10 @@
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable disabled />
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="关联模块--乘用车vpps中文名称" clearable disabled />
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled />
<el-form-item label="关联模块--卡车VPPS中文名称" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS中文名称" clearable disabled />
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+898 -800
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+3 -3
View File
@@ -405,20 +405,20 @@
<el-input
v-model="form.CYCVPPSCNBUSS"
:disabled="disabledXX"
placeholder="请输入模块中文名称"
placeholder="关联模块--乘用车vpps中文名称"
clearable
disabled
/>
</el-form-item>
<el-form-item
label="关联模块--卡车VPPS编码"
label="关联模块--卡车vpps中文名称"
prop="KCVPPSCNBUSS"
class="add-form-item form-item-disabled"
>
<el-input
v-model="form.KCVPPSCNBUSS"
:disabled="disabledXX"
placeholder="关联模块--卡车VPPS编码"
placeholder="关联模块--卡车vpps中文名称"
clearable
disabled
/>
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+3 -3
View File
@@ -488,20 +488,20 @@
<el-input
v-model="form.CYCVPPSCNBUSS"
:disabled="disabledXX"
placeholder="请输入模块中文名称"
placeholder="关联模块--乘用车vpps中文名称"
clearable
disabled
/>
</el-form-item>
<el-form-item
label="关联模块--卡车VPPS编码"
label="关联模块--卡车VPPS中文名称"
prop="KCVPPSCNBUSS"
class="add-form-item form-item-disabled"
>
<el-input
v-model="form.KCVPPSCNBUSS"
:disabled="disabledXX"
placeholder="关联模块--卡车VPPS编码"
placeholder="关联模块--卡车VPPS中文名称"
clearable
disabled
/>
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+98 -1
View File
@@ -187,13 +187,58 @@
:on-success="importFileSuccess"
:on-preview="handleFilePreview"
:on-remove="removeOneFile"
:show-file-list="true"
:show-file-list="false"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff" />
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
<ul class="el-upload-list el-upload-list--text">
<li
v-for="(file, index) in fileList"
:key="index"
class="el-upload-list__item is-success"
:title="file.name"
>
<a class="el-upload-list__item-name">
<i class="el-icon-document" />
{{ file.name }}
</a>
<label class="el-upload-list__item-status-label">
<i class="el-icon-upload-success el-icon-circle-check" />
</label>
<i class="el-icon-edit" @click.stop="handleModifyName(file)" />
<i class="el-icon-close" @click.stop="handleRemoveFile(file)" />
</li>
</ul>
</el-dialog>
<el-dialog
title="修改文件名称"
:visible.sync="openModifyFileNameDialog"
append-to-body
>
<el-input v-model="modifyFile.fileName" />
<div class="demo-drawer-footer" style="text-align: right;margin-top:30px">
<el-button
class="common-button-primary"
size="mini"
icon="el-icon-check"
type="primary"
:loading="modifyFileNameLoading"
@click="handleModifyNameSubmite"
>
提交
</el-button>
<el-button
class="common-button-default"
size="mini"
icon="el-icon-close"
@click="openModifyFileNameDialog = false"
>
取消
</el-button>
</div>
</el-dialog>
<el-dialog
:title="config.attrName"
@@ -692,6 +737,12 @@ export default {
callback()
};
return {
openModifyFileNameDialog: false,
modifyFile: {
fileName: '',
fileId: ''
},
modifyFileNameLoading: false,
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -1211,6 +1262,43 @@ export default {
// this.getMaxStandnSn();
},
methods: {
handleRemoveFile (file) {
const fileList = []
this.fileList.forEach(item => {
const fileId = file.id || file.response.data.id
const itemId = item.id || item.response.data.id
if (fileId !== itemId) {
fileList.push(item)
}
})
this.fileList = fileList
this.removeOneFile(file, fileList)
},
handleModifyName (file) {
this.modifyFile.fileName = file.name
this.modifyFile.fileId = file.id || file.response.data.id
this.openModifyFileNameDialog = true
},
handleModifyNameSubmite () {
this.modifyFileNameLoading = true
this.$http.get('att/attFile/updateFileName', this.modifyFile, {
_this: this
}, res => {
if(res.ok) {
this.modifyFileNameLoading = false
this.openModifyFileNameDialog = false
this.fileList.forEach(item => {
const id = item.id || item.response.data.id
if(id === this.modifyFile.fileId) {
item.name = this.modifyFile.fileName
}
})
this.removeOneFile('_', this.fileList)
}
}, e => {
this.modifyFileNameLoading = false
})
},
reveseStatusChange (val) {
if(this.form.reviseStatus === '1') {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus', { reviseStatus: 'buss1_' + this.form.reviseStatus, standSort: this.form.standSort, taskId: this.taskIds }, {
@@ -2285,6 +2373,7 @@ export default {
const fileObj = {}
fileObj.id = file.response.data.id
fileObj.name = file.response.data.name
this.fileList = fileList
switch (this.fileType) {
case 'FBGBUSS':
this.FBGBUSSFileList = this.FBGBUSSFileList.filter( item => item.response === undefined);
@@ -3240,4 +3329,12 @@ export default {
}
}
}
.el-upload-list__item .el-icon-edit{
position: absolute;
top: 5px;
right: 25px;
cursor: pointer;
opacity: .75;
color: #606266;
}
</style>
src/utils/login.js
+2 -2
View File
@@ -35,7 +35,8 @@ function loginAgain () {
if (isMobile()) {
loginInPhone().then(() => {
Message.success('登录成功')
router.go(0)
// router.go(0)
window.location.reload(false)
})
} else {
window.location.href = ssoLogout + encodeURIComponent(window.location.href)
@@ -99,7 +100,6 @@ function loginInPhone () {
})
hwh5.getAuthCode().then(data => {
console.log('获取到了welinkCode', data)
Message.success('获取到了welinkCode')
if (data) {
const code = data.code
getTokenToWeLink({