Merge remote-tracking branch 'origin/master'

张含笑

2026-01-21 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e

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

@@ -7,7 +7,7 @@
      destroy-on-close
   >
      <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 +60,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 +172,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
                  />
@@ -261,7 +259,7 @@
function getDeptNameById(deptId, deptList) {
   // 处理类型转换，确保比较的是相同类型
   const targetId = String(deptId)
	

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

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

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