Merge remote-tracking branch 'origin/master'

罗广辉

2026-03-05 aef9afcbfceec4c9220992dcd651c86e6fbdefd0

 applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue

@@ -12,7 +12,7 @@
         ref="formRef"
         :model="formData"
         :rules="rules"
         label-width="68px"
         label-width="98px"
         v-loading="loading"
      >
         <el-row>
@@ -47,6 +47,20 @@
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="24">
               <el-form-item label="结果送达方式" prop="resultConfig">
                  <el-select
                     class="gd-select"
                     popper-class="gd-select-popper"
                     v-model="formData.resultConfig"
                     placeholder="请选择"
                     clearable

                  >
                     <el-option v-for="item in dictObj.resultConfig" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
                  </el-select>
               </el-form-item>
            </el-col>
         </el-row>
      </el-form>
      <template #footer>
@@ -72,6 +86,7 @@
   processDefinitionId: '',
   processInstanceId: '',
   materialIds: [],
   resultConfig:''
})

const emit = defineEmits(['success'])
@@ -83,6 +98,7 @@
const flowList = ref([]) // 流程列表
const materialsList = ref([]) // 材料列表
const currentRow = ref(null) // 当前操作的行
const dictObj = inject('dictObj')

// 表单校验规则
const rules = {
@@ -120,7 +136,7 @@
      // 设置流程定义ID
      formData.value.processDefinitionId = data.processDefinitionId || ''
      formData.value.processInstanceId = data.processInstanceId || ''

      formData.value.resultConfig = data.resultConfig || ''
      // 从关联材料中提取材料ID列表
      if (data.thingListMaterialRels && data.thingListMaterialRels.length > 0) {
         formData.value.materialIds = data.thingListMaterialRels.map(item => item.materialId)
@@ -145,6 +161,7 @@
         processDefinitionId: formData.value.processDefinitionId,
         processInstanceId: formData.value.processInstanceId || '',
         materialIds: formData.value.materialIds || [],
         resultConfig: formData.value.resultConfig || '',
      }
      await saveConfigApi(submitData)
      ElMessage.success('配置保存成功')