|
|
@@ -729,6 +729,7 @@
|
|
|
Vue.createApp({
|
|
|
data() {
|
|
|
return {
|
|
|
+ dictList: [],
|
|
|
loading: false,
|
|
|
isFlag: false,
|
|
|
isEdit: true,
|
|
|
@@ -938,35 +939,35 @@
|
|
|
businessEditMode: 'add',
|
|
|
businessEditScope: null,
|
|
|
businessEditIndex: null,
|
|
|
- businessTransportPopVisible: false,
|
|
|
- // 产品规格
|
|
|
- specEditVisible: false,
|
|
|
- specEditTitle: '添加产品规格',
|
|
|
- specEditForm: { specification: '', num: '', batchNo: '' },
|
|
|
- specEditMode: 'add',
|
|
|
- specEditScope: null,
|
|
|
- specEditIndex: null,
|
|
|
- // 事件
|
|
|
- eventEditVisible: false,
|
|
|
- eventEditTitle: '添加事件',
|
|
|
- eventEditForm: { eventTime: '', eventHospital: '', eventDesc: '', files: [], eventOpinion: '' },
|
|
|
- eventEditMode: 'add',
|
|
|
- eventEditScope: null,
|
|
|
- eventEditIndex: null,
|
|
|
- // 补发
|
|
|
- reissueEditVisible: false,
|
|
|
- reissueEditTitle: '添加补发',
|
|
|
- reissueEditForm: { reissueType: '', reissueOtherType: '', reissueContact: '', reissueOtherReq: '' },
|
|
|
- reissueEditMode: 'add',
|
|
|
- reissueEditScope: null,
|
|
|
- reissueEditIndex: null,
|
|
|
- reissueTypeList: [
|
|
|
- { value: '同规格型号', text: '同规格型号' },
|
|
|
- { value: '其他规格型号', text: '其他规格型号' },
|
|
|
- { value: '无', text: '无' },
|
|
|
- ],
|
|
|
- reissueTypePopVisible: false,
|
|
|
- }
|
|
|
+ businessTransportPopVisible: false,
|
|
|
+ // 产品规格
|
|
|
+ specEditVisible: false,
|
|
|
+ specEditTitle: '添加产品规格',
|
|
|
+ specEditForm: { specification: '', num: '', batchNo: '' },
|
|
|
+ specEditMode: 'add',
|
|
|
+ specEditScope: null,
|
|
|
+ specEditIndex: null,
|
|
|
+ // 事件
|
|
|
+ eventEditVisible: false,
|
|
|
+ eventEditTitle: '添加事件',
|
|
|
+ eventEditForm: { eventTime: '', eventHospital: '', eventDesc: '', files: [], eventOpinion: '' },
|
|
|
+ eventEditMode: 'add',
|
|
|
+ eventEditScope: null,
|
|
|
+ eventEditIndex: null,
|
|
|
+ // 补发
|
|
|
+ reissueEditVisible: false,
|
|
|
+ reissueEditTitle: '添加补发',
|
|
|
+ reissueEditForm: { reissueType: '', reissueOtherType: '', reissueContact: '', reissueOtherReq: '' },
|
|
|
+ reissueEditMode: 'add',
|
|
|
+ reissueEditScope: null,
|
|
|
+ reissueEditIndex: null,
|
|
|
+ reissueTypeList: [
|
|
|
+ { value: '同规格型号', text: '同规格型号' },
|
|
|
+ { value: '其他规格型号', text: '其他规格型号' },
|
|
|
+ { value: '无', text: '无' },
|
|
|
+ ],
|
|
|
+ reissueTypePopVisible: false,
|
|
|
+ }
|
|
|
},
|
|
|
created() {
|
|
|
let _this = this
|
|
|
@@ -980,15 +981,22 @@
|
|
|
console.log('收到选中的文件:', data)
|
|
|
if (_this.$refs.generateForm) {
|
|
|
if (_this.selectFilesRowIndex != null && _this.selectFilesField) {
|
|
|
- // 数组行附件：更新 blank_adopzrdd[index].files
|
|
|
+ // 数组行附件：更新 data[field][index].files
|
|
|
let formData = await _this.$refs.generateForm.getData(false);
|
|
|
var arr = formData[_this.selectFilesField] || []
|
|
|
var row = arr[_this.selectFilesRowIndex]
|
|
|
if (row) {
|
|
|
row.files = data.files || []
|
|
|
- _this.$refs.generateForm.setData({
|
|
|
- [_this.selectFilesField]: arr
|
|
|
- })
|
|
|
+ } else {
|
|
|
+ // 行不存在时创建临时行（新增未保存时的上传）
|
|
|
+ arr[_this.selectFilesRowIndex] = { files: data.files || [] }
|
|
|
+ }
|
|
|
+ _this.$refs.generateForm.setData({
|
|
|
+ [_this.selectFilesField]: arr
|
|
|
+ })
|
|
|
+ // 同步到事件编辑表单
|
|
|
+ if (_this.selectFilesField === 'blank_event_component' && _this.eventEditVisible) {
|
|
|
+ _this.eventEditForm.files = data.files || []
|
|
|
}
|
|
|
_this.selectFilesRowIndex = null
|
|
|
} else {
|
|
|
@@ -1078,10 +1086,21 @@
|
|
|
|
|
|
// }
|
|
|
// });
|
|
|
-
|
|
|
-
|
|
|
+ this.getDictList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ getDictList() {
|
|
|
+ axios({
|
|
|
+ method: 'get',
|
|
|
+ url: this.APIUrl + `/system/dict/getByCode/collaborative_type`,
|
|
|
+ headers: this.headers,
|
|
|
+ }).then((res) => {
|
|
|
+ console.log('getDictList~~~', res.data.data)
|
|
|
+ if (res.data.code != '-1') {
|
|
|
+ this.dictList = res.data.data
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
// ===== 印章编辑弹窗 =====
|
|
|
openSealEditDialog(scope, mode, index) {
|
|
|
this.sealEditVisible = true
|
|
|
@@ -1528,7 +1547,12 @@
|
|
|
this.loading = false;
|
|
|
return;
|
|
|
}
|
|
|
- console.log(this.form.valueJson)
|
|
|
+ console.log('dictList~~~~', this.dictList, this.form.dictType)
|
|
|
+ // 从 dictList 中查找匹配的字典名称
|
|
|
+ var _this = this
|
|
|
+ var dictItem = this.dictList.find(function(d) { return d[_this.form.dictType] }) || {}
|
|
|
+ var dictName = dictItem[_this.form.dictType] || _this.form.dictType
|
|
|
+
|
|
|
this.form.processType = '1';
|
|
|
let API = this.APIUrl + '/bpm/process-instance/create'
|
|
|
axios({
|
|
|
@@ -1537,6 +1561,12 @@
|
|
|
headers: this.headers,
|
|
|
data: {
|
|
|
...this.form,
|
|
|
+ variables: {
|
|
|
+ ...this.form.valueJson,
|
|
|
+ businessCode: this.form.code,
|
|
|
+ businessName: this.form.name,
|
|
|
+ businessType: dictName
|
|
|
+ }
|
|
|
}
|
|
|
}).then((res) => {
|
|
|
this.loading = false;
|
