|
|
@@ -417,9 +417,9 @@ export default {
|
|
|
'form.xuan_ze_feng_xian': {
|
|
|
handler (data) {
|
|
|
this.loading = true
|
|
|
- data = data.split(',')
|
|
|
- data = "'" + data.join("','") + "'"
|
|
|
- const sql = `select * from t_fxkzb where id_ in (${data}) ORDER BY FIELD(id_, ${data})`
|
|
|
+ const dataArr = data.split(',')
|
|
|
+ const dataStr = "'" + dataArr.join("','") + "'"
|
|
|
+ const sql = `select * from t_fxkzb where id_ in (${dataStr}) ORDER BY FIELD(id_, ${dataStr})`
|
|
|
this.$common.request('sql', sql).then(response => {
|
|
|
let data1 = []
|
|
|
if (response.variables != null && response.variables.data != null && response.variables.data.length > 0) {
|
|
|
@@ -444,7 +444,8 @@ export default {
|
|
|
xian_xing_kong_zh: item.gong_zuo_miao_shu,
|
|
|
ni_cai_qu_cuo_shi: '',
|
|
|
zhi_ding_ren_: '',
|
|
|
- qian_zai_yuan_yin: ''
|
|
|
+ qian_zai_yuan_yin: '',
|
|
|
+ xuan_ze_feng_xian: data
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
@@ -483,7 +484,7 @@ export default {
|
|
|
this.position = data[0].bian_zhi_bu_men_
|
|
|
this.userId = data[0].bian_zhi_ren_
|
|
|
this.time = data[0].bian_zhi_shi_jian
|
|
|
- this.form.xuan_ze_feng_xian = data[0].xuan_ze_feng_xian
|
|
|
+ this.form.xuan_ze_feng_xian = data[0].xuan_ze_feng_xian || ''
|
|
|
this.tableList = data
|
|
|
this.tableList.forEach(i => {
|
|
|
if (!Object.hasOwn(i, 'qian_zai_yuan_yin')) i.qian_zai_yuan_yin = ''
|
|
|
@@ -771,7 +772,7 @@ export default {
|
|
|
type: 'warning'
|
|
|
}).then(async () => {
|
|
|
// 提交时自动保存
|
|
|
- await this.save()
|
|
|
+ await this.save('submit')
|
|
|
const params = {
|
|
|
tableName: 't_fxsbpgb2',
|
|
|
updList: this.Ids.map(item => ({
|
|
|
@@ -834,9 +835,11 @@ export default {
|
|
|
throw new Error('已结束,不可再次提交!')
|
|
|
}
|
|
|
},
|
|
|
- async save () {
|
|
|
+ async save (type = 'save') {
|
|
|
try {
|
|
|
- this.check()
|
|
|
+ if (type === 'submit') {
|
|
|
+ this.check()
|
|
|
+ }
|
|
|
await this.getIsFinish()
|
|
|
const curIds = this.tableList.map(item => item.shi_bie_xiang_)
|
|
|
|
|
|
@@ -860,6 +863,12 @@ export default {
|
|
|
}
|
|
|
// 更新
|
|
|
if (updatedIds.length > 0) {
|
|
|
+ updatedIds.forEach(u => {
|
|
|
+ delete u.create_time_
|
|
|
+ delete u.create_by_
|
|
|
+ delete u.update_by_
|
|
|
+ delete u.update_time_
|
|
|
+ })
|
|
|
const params = {
|
|
|
tableName: 't_fxsbpgb2',
|
|
|
updList: updatedIds.map(item => ({
|