任务单岗位改成字典

mes-ui/mes-ui-admin-vue3/src/utils/dict.ts

@@ -268,7 +268,7 @@ export enum DICT_TYPE {
 	PICKCAR='pickcar',//审核类型
   HELI_BORROW_TYPE='heli_borrow_type',//员工借用物料类型
   HELI_USE='heli_use',//员工借用物料用途
-
+  HELI_POST='heli_post',//任务单人员配置岗位
 	PICKMODE='pickmode',//领料模式
 	DB_LEVEL='db_level',//代办级别
 	DB_TYPE='db_type',//代办类型

mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue

@@ -63,7 +63,7 @@
                             <el-table-column type="index" label="序号" align="center" min-width="60" fixed />
                             <el-table-column prop="description" min-width="200" label="业务人员" align="center">
                               <template #default="scope">
-                                <el-select   v-model="scope.row.busyId"  element-loading-background="rgb(255, 255, 255)" placeholder="请选择" >
+                                <el-select   v-model="scope.row.busyId"  filterable element-loading-background="rgb(255, 255, 255)" placeholder="请选择" >
                                   <el-option v-for="item in userSelectList" :key="item.id" :label="item.username + ' ' + item.nickname" :value="item.id" />
                                 </el-select>
                               </template>
@@ -71,7 +71,7 @@
                             <el-table-column prop="postId" min-width="150" label="岗位" align="center">
                               <template #default="scope">
                                 <el-select   v-model="scope.row.postId"  element-loading-background="rgb(255, 255, 255)" placeholder="请选择" >
-                                  <el-option v-for="item in postSelectList" :key="item.id" :label="item.name" :value="item.id" />
+                                  <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_POST)" :key="dict.value" :label="dict.label" :value="dict.value" />
                                 </el-select>
                               </template>
                             </el-table-column>
@@ -113,6 +113,7 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
 
 import router from "@/router";
 import {handleTree} from "@/utils/tree";
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -142,7 +143,8 @@ const isResList = ref([
 const postSelectList = ref([
   { id: 0, name: '0' },
   { id: 1, name: '1' },
-  { id: 2, name: '2' }
+  { id: 2, name: '2' },
+  { id: 3, name: '3' }
 ]);
 const typeList = ref([
   { id: 1, name: '任务单'},

mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue

@@ -156,7 +156,7 @@
                   </el-table-column>
                   <el-table-column label="规格型号" prop="spec" min-width="140">
                     <template #default="{ row, $index }">
-                      <span v-if="row.type == '1'" v-html="row.spec"></span>
+                      <span v-if="row.type == '2'" v-html="row.spec"></span>
                       <el-form-item v-else :prop="`${$index}.spec`" :rules="subFormRules.spec" class="mb-0px!">
                         <el-input :disabled="getDisable(row.bomEditStatus)" v-model="row.spec" />
                       </el-form-item>

mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue

@@ -67,6 +67,7 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await ShenheApi.getShenhe(id)
+      formData.value.shenheName=Number(formData.value.shenheName)
     } finally {
       formLoading.value = false
     }