全局字段

yudao-ui-admin-vue3/src/views/pressure/equipmentAppointment/index.vue

@@ -52,7 +52,7 @@
 
         <!-- 部门 -->
         <el-form-item label="部门">
-          <el-input v-model="searchFormDataTable.deptName" placeholder="请输入部门" clearable />
+          <DeptSelect v-model="searchFormDataTable.deptId" placeholder="请选择部门" clearable />
         </el-form-item>
 
         <!-- 区域 -->
@@ -350,6 +350,7 @@ import EquipBoilerForm from '@/components/EquipBoilerForm/index.vue'
 import EquipPipeForm from '@/components/EquipPipeForm/index.vue'
 import BatchEditForm from './components/batchEditForm.vue'
 import AreaSelect from '@/views/system/equipcontainer/components/AreaSelect.vue'
+import DeptSelect from '@/views/pressure2/pipescheduling/components/DeptSelect.vue'
 import { getStrDictOptions, getDictLabel, DICT_TYPE } from '@/utils/dict'
 import FetchApis from './index.api'
 import { cloneDeep } from 'lodash-es'
@@ -387,7 +388,7 @@ const searchFormDataTable = ref({
   equipCode: '',
   equipDistrict: '',
   contactPhone: '',
-  deptName: '',
+  deptId: '',
   useRegisterNo: ''
 })
 
@@ -665,7 +666,7 @@ const handleReset = () => {
     equipCode: '',
     equipDistrict: '',
     contactPhone: '',
-    deptName: '',
+    deptId: '',
     useRegisterNo: ''
   }
   getListPageFn()

yudao-ui-admin-vue3/src/views/pressure2/dynamictbcol/DynamicTbColForm.vue

@@ -14,7 +14,8 @@
         <el-input v-model="formData.colName" placeholder="请输入字段名称" />
       </el-form-item>
       <el-form-item label="字段范围" prop="colRound">
-        <el-select v-model="formData.colRound" :disabled="!isChange" placeholder="请选择字段范围">
+        <!-- <el-select v-model="formData.colRound" :disabled="!isChange" placeholder="请选择字段范围"> -->
+        <el-select v-model="formData.colRound"  placeholder="请选择字段范围">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.PRESSURE2_COL_ROUND)"
             :key="dict.value"
@@ -39,8 +40,8 @@
       <el-form-item label="是否可编辑" prop="isEdit">
         <el-switch v-model="formData.isEdit" />
       </el-form-item>
-      <el-form-item label="备注" prop="note">
-        <el-input v-model="formData.note" type="textarea" placeholder="请输入备注" />
+      <el-form-item :label="formData.colRound == 2 ? '值' : '备注'" prop="note">
+        <el-input v-model="formData.note" type="textarea" :placeholder="formData.colRound == 2 ? '请输入值' : '请输入备注'" />
       </el-form-item>
       <el-form-item label="附加值" prop="creatorName">
         <el-input v-model="formData.creatorName" placeholder="请输入附加值" />