Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-01-23 79702b005a055df600ad61b19c2e7a4a01cc3d40

 applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue

@@ -47,7 +47,7 @@
         :model="formData"
         :rules="rules"
         :disabled="dialogReadonly"
         label-width="100px"
         label-width="140px"
      >
         <el-row>
            <el-col :span="12">
@@ -95,17 +95,31 @@
         </el-row>
      </el-form>
      <template #footer>
         <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
         <el-button
            class="save-btn"
            color="#4C34FF"
            v-if="!dialogReadonly"
            :loading="submitting"
            :disabled="submitting"
            @click="handleSubmit"
         >
            保存
         </el-button>
         <template v-if="!dialogReadonly">
            <el-button color="#F2F3F5" @click="visible = false">取消</el-button>
            <el-button
               class="save-btn"
               color="#4C34FF"

               :loading="submitting"
               :disabled="submitting"
               @click="handleSubmit"
            >
               提交
            </el-button>
         </template>
         <template v-if="dialogReadonly && innovationDetailsStatus ==='0'">
            <el-button color="#F2F3F5" @click="handleReject">不通过</el-button>
            <el-button
               class="save-btn"
               color="#4C34FF"
               :loading="submitting"
               :disabled="submitting"
               @click="handleApprove"
            >
               通过
            </el-button>
         </template>
      </template>
   </el-dialog>
</template>
@@ -130,7 +144,7 @@
   caseDesc: '',
   innovationStatus: '',
})

const innovationDetailsStatus = inject('innovationDetailsStatus')
const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
const formData = ref(initForm()) // 表单数据
@@ -156,8 +170,37 @@
   if (!isValid) return
   submitting.value = true
   try {
      formData.value.innovationStatus = dialogMode.value === 'add' ? '0' : formData.value.innovationStatus
      await gdApplicationInnovationSubmitApi(formData.value)
      ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
      visible.value = false
      emit('success')
   } finally {
      submitting.value = false
   }
}

// 处理通过
async function handleApprove() {
   submitting.value = true
   try {
      formData.value.innovationStatus = '1'
      await gdApplicationInnovationSubmitApi(formData.value)
      ElMessage.success('审批通过成功')
      visible.value = false
      emit('success')
   } finally {
      submitting.value = false
   }
}

// 处理不通过
async function handleReject() {
   submitting.value = true
   try {
      formData.value.innovationStatus = '2'
      await gdApplicationInnovationSubmitApi(formData.value)
      ElMessage.success('审批不通过成功')
      visible.value = false
      emit('success')
   } finally {
@@ -183,3 +226,6 @@

defineExpose({ open })
</script>
<style scoped lang="scss">

</style>