Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-26 beb95fb5fc166804056abafd70fc01ac27de7621

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

@@ -5,9 +5,10 @@
      :title="titleEnum[dialogMode]"
      @closed="visible = false"
      destroy-on-close
      :close-on-click-modal="false"
   >
      <div class="detail-container" v-if="dialogReadonly">
         <el-row>
         <el-row class="detail-row-view">
            <el-col :span="12">
               <div class="label">需求名称</div>
               <div class="val">{{ formData.demandName }}</div>
@@ -60,13 +61,13 @@
      </div>

      <el-form
         class="dialog-form"
         class="gd-dialog-form"
         v-else
         ref="formRef"
         :model="formData"
         :rules="rules"
         :disabled="dialogReadonly"
         label-width="120px"
         label-width="160px"
      >
         <el-row>
            <el-col :span="12">
@@ -172,13 +173,11 @@
                  <el-input class="gd-input" v-model="formData.dataSource" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="24">
            <el-col :span="12">
               <el-form-item label="需求信息项" prop="demandInfo">
                  <el-input
                     class="gd-input"
                     v-model="formData.demandInfo"
                     type="textarea"
                     :rows="4"
                     placeholder="请输入"
                     clearable
                  />
@@ -186,18 +185,16 @@
            </el-col>
         </el-row>
      </el-form>
      <template #footer>
      <template #footer v-if="!dialogReadonly">
         <el-button
            class="save-btn"
            color="#4C34FF"
            v-if="!dialogReadonly"
            color="#F2F3F5"
            :loading="submitting"
            :disabled="submitting"
            @click="handleSubmit"
         >
            保存
         </el-button>
         <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
         <el-button class="save-btn" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>

      </template>
   </el-dialog>
@@ -261,7 +258,7 @@
function getDeptNameById(deptId, deptList) {
   // 处理类型转换，确保比较的是相同类型
   const targetId = String(deptId)
	

   // 递归遍历部门树
   function findDept(deptList) {
      for (const dept of deptList) {
@@ -275,11 +272,11 @@
      }
      return ''
   }
	

   if (!targetId || !Array.isArray(deptList) || deptList.length === 0) {
      return ''
   }
	

   return findDept(deptList)
}
// 提交新增/编辑