Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue

@@ -1,6 +1,6 @@
 <template>
   <transition name="slide-right">
-    <div class="warn" v-if="showWarning" :draggable="true" @dragstart="onDragStart" @dragend="onDragEnd" @mousedown.prevent.stop="onMouseDown" @mousemove="onMouseMove" @mouseup="onMouseUp">
+    <div class="warn"  :class="{ 'no-data': !warnings.length }" v-if="showWarning" :style="{ display: warnings.length ? 'block' : 'none' }" :draggable="true" @dragstart="onDragStart" @dragend="onDragEnd" @mousedown.prevent.stop="onMouseDown" @mousemove="onMouseMove" @mouseup="onMouseUp">
       <div class="warntitle">
         <span class="titleText">设计预警通知</span>
         <div>

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue

@@ -303,7 +303,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="equipId" align="center" min-width="120">
-                    <template #header> 设备信息 </template>
+                    <template #header> 设备型号 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.equipId`"  class="mb-0px!">
                         <el-select disabled v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">

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

@@ -307,7 +307,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="equipId" align="center" min-width="120">
-                    <template #header> 设备信息 </template>
+                    <template #header> 设备型号 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.equipId`" class="mb-0px!">
                         <el-select v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">

mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue

@@ -6,8 +6,8 @@
     <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
-      <el-form-item label="工序编号" prop="code">
-        <el-input v-model="queryParams.code" placeholder="工序编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      <el-form-item label="工序编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="工序编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item label="工序名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="工序名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
@@ -45,7 +45,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
       <!-- <el-table-column label="自增字段，唯一" align="center" prop="id" /> -->
       <el-table-column type="index" width="100" label="序号" align="center" />
-      <el-table-column label="工序编号" align="center" prop="code" />
+      <el-table-column label="工序编码" align="center" prop="code" />
       <el-table-column label="工序名称" align="center" prop="name" />
       <el-table-column label="所属车间" align="center" prop="wname" />
       <el-table-column label="是否需要报工" align="center" prop="isReport">