Merge remote-tracking branch 'origin/master'

src/views/pms/iotopeationfill/index.vue

@@ -76,7 +76,7 @@
 
     <!-- 列表 -->
     <ContentWrap>
-      <el-table v-loading="loading" :data="list" :stripe="true"  :show-overflow-tooltip="true">
+      <el-table v-loading="loading" :data="list" :stripe="true"  >
         <el-table-column :label="t('common.index')" min-width="60" align="center">
           <template #default="scope">
             {{ scope.$index + 1 }}
@@ -84,10 +84,22 @@
         </el-table-column>
         <el-table-column :label="t('bomList.name')" align="center" prop="orderName" min-width="220"/>
         <el-table-column :label="t('operationFill.duty')" align="center" prop="userName" min-width="100"/>
-        <el-table-column :label="t('operationFill.orderDevice')" align="center" prop="fillList" min-width="150"/>
+        <el-table-column :label="t('operationFill.orderDevice')" align="center" prop="fillList" min-width="150" :show-overflow-tooltip="true"/>
         <el-table-column :label="t('operationFill.status')" align="center" prop="orderStatus" min-width="120">
           <template #default="scope">
-            <dict-tag :type="DICT_TYPE.OPERATION_FILL_ORDER_STATUS" :value="scope.row.orderStatus" />
+            <el-tooltip
+              v-if="scope.row.orderStatus === 3"
+              effect="dark"
+              :content="scope.row.reason"
+              placement="top"
+            >
+              <dict-tag :type="DICT_TYPE.OPERATION_FILL_ORDER_STATUS" :value="scope.row.orderStatus" />
+            </el-tooltip>
+            <dict-tag
+              v-else
+              :type="DICT_TYPE.OPERATION_FILL_ORDER_STATUS"
+              :value="scope.row.orderStatus"
+            />
           </template>
         </el-table-column>
         <el-table-column :label="t('operationFill.deviceCount')" align="center" prop="allDev" min-width="120">
@@ -222,6 +234,8 @@
 </template>
 
 <script setup lang="ts">
+
+
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotInspectOrderApi, IotInspectOrderVO } from '@/api/pms/inspect/order'

src/views/pms/iotopeationfill/index1.vue

@@ -230,7 +230,7 @@ const throttle = (fn: Function, delay: number) => {
 };
 
 const showComponent = () => {
-  if(JSON.parse(fillStatus)=== 1){
+  if(JSON.parse(fillStatus)=== 1||JSON.parse(fillStatus)===3){
     showStatus = false;
   }
 };