ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 修改流程中驳回光标在备注文本框的时候，可以操作成功的bug；企标更改流程增加replaceFileId字段传的是在线编辑本身就可以用的文件

Browse Source
This commit is contained in:
lideqin
2024-01-26 10:41:15 +08:00
parent 6d1b150b3d
commit 401afb567b
11 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+1 -1
View File
@@ -648,7 +648,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+1 -1
View File
@@ -542,7 +542,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+1 -1
View File
@@ -467,7 +467,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
+2 -1
View File
@@ -398,6 +398,7 @@ export default {
param.data = Object.assign({}, data.formInline) param.data = Object.assign({}, data.formInline)
param.data.list = data.dataSource param.data.list = data.dataSource
param.data.onEditFile = data.onEditFile param.data.onEditFile = data.onEditFile
param.data.replaceFileId = data.replaceFileId
let func let func
if (this.$route.query.taskId) { if (this.$route.query.taskId) {
// 有taskId说明是驳回的提交 // 有taskId说明是驳回的提交
@@ -481,7 +482,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue
+20 -17
View File
@@ -492,23 +492,24 @@ export default {
await getEnterpriseStandardInfoById({ id: standardId, type: '2' }).then(res => { await getEnterpriseStandardInfoById({ id: standardId, type: '2' }).then(res => {
if (res.success) { if (res.success) {
// 过程稿件id 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 // 过程稿件id 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿
const fieldArr = ['publish_of_original', 'modification_list', 'draft_for_review', 'draft_for_comment', 'draft'] // const fieldArr = ['publish_of_original', 'modification_list', 'draft_for_review', 'draft_for_comment', 'draft']
const needSuffixArr = ['doc', 'docx'] // const needSuffixArr = ['doc', 'docx']
let fileId = '' // let fileId = ''
for (const item of fieldArr) { // for (const item of fieldArr) {
if (!fileId) { // if (!fileId) {
const fileNameArr = res.result[item + '_dictText'].split(',') // const fileNameArr = res.result[item + '_dictText'].split(',')
for (let i = 0; i < fileNameArr.length; i++) { // for (let i = 0; i < fileNameArr.length; i++) {
// 截取文件后缀名 // // 截取文件后缀名
const fileSuffix = (fileNameArr[i] ? fileNameArr[i].split('.')[fileNameArr[i].split('.').length - 1] : '').toLowerCase() // const fileSuffix = (fileNameArr[i] ? fileNameArr[i].split('.')[fileNameArr[i].split('.').length - 1] : '').toLowerCase()
if (needSuffixArr.includes(fileSuffix)) { // if (needSuffixArr.includes(fileSuffix)) {
// 说明是支持在线编辑的文件格式 // // 说明是支持在线编辑的文件格式
console.log('支持在线编辑的文件', res.result[item].split(',')[i], res.result[item + '_dictText'].split(',')[i]) // console.log('支持在线编辑的文件', res.result[item].split(',')[i], res.result[item + '_dictText'].split(',')[i])
fileId = res.result[item].split(',')[i] // fileId = res.result[item].split(',')[i]
} // }
} // }
} // }
} // }
const fileId = res.result.publish_of_original_standardSplit
this.standardCanOnlineEditFile = fileId this.standardCanOnlineEditFile = fileId
} }
}) })
@@ -529,6 +530,7 @@ export default {
} }
data.dataSource = this.dataSource data.dataSource = this.dataSource
data.onEditFile = this.onEditFile data.onEditFile = this.onEditFile
data.replaceFileId = this.standardCanOnlineEditFile
return data return data
}, },
// 外层获取数据要过校验,返回false表示没有通过校验 // 外层获取数据要过校验,返回false表示没有通过校验
@@ -542,6 +544,7 @@ export default {
data.formInline = { ...formInline, ...this.formInline } data.formInline = { ...formInline, ...this.formInline }
data.dataSource = this.dataSource data.dataSource = this.dataSource
data.onEditFile = this.onEditFile data.onEditFile = this.onEditFile
data.replaceFileId = this.standardCanOnlineEditFile
} else { } else {
this.$message.warning(this.$t('addAtLeastOneRowOfData')) this.$message.warning(this.$t('addAtLeastOneRowOfData'))
data = false data = false
src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+1 -1
View File
@@ -1070,7 +1070,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+1 -1
View File
@@ -548,7 +548,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
+1 -1
View File
@@ -686,7 +686,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
+1 -1
View File
@@ -469,7 +469,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
+1 -1
View File
@@ -467,7 +467,7 @@ export default {
this.switchValue = 'base' this.switchValue = 'base'
} }
this.$nextTick(() => { this.$nextTick(() => {
this.approvalInfoForm.validateFields((err, values) => { this.approvalInfoForm.validateFields({ force: true }, (err, values) => {
if (!err) { if (!err) {
this.loading = true this.loading = true
const param = {} const param = {}
src/views/workCenter/processCenter/table/DraftList.vue
+23
View File
@@ -109,6 +109,29 @@ export default {
} }
} }
}, },
created () {
// const messageHeader = {
// Requests: {
// partCategoryNum: '123',
// partCategoryName: '123',
// standardNumber: 'GB/T 20234.5-2023',
// standardName: 'FCC测试-电动汽车传导充电用连接装置 第2部分：交流充电接口'
// }
// }
const messageHeader = {
Rows: [
{ id: 1, standardNumber: 'GB 11563.0-', queryLabels: '条文号' },
{ id: 2, standardNumber: 'GB/T 20234.3-', queryLabels: '条文标题' },
{ id: 3, standardNumber: 'Q/ZZ 11357-', queryLabels: '条文解读' },
{ id: 4, standardNumber: 'Q/ZZ 12554-', queryLabels: '适用零部件' }
]
}
// const param = {
// standardNumber: 'GB/T 20234.5-2023',
// standardName: 'FCC测试-电动汽车传导充电用连接装置 第2部分：交流充电接口'
// }
console.log(JSON.stringify(messageHeader))
},
methods: { methods: {
loadData (arg) { loadData (arg) {
if (!this.url.list) { if (!this.url.list) {