fix:完成时间添加，列表样式修改

src/api/business/production/onceWorkOrder.js

@@ -98,4 +98,12 @@ export function entrustSourceApi(query) {
     method: 'get',
     params: query
   })
-}
+}
+export function selectRecordByOrderIdApi(query){
+  request.defaults.baseURL = '/ezhizao-yzbh-production'
+  return request({
+    url: '/business/onceWorkOrder/selectRecordByOrderId',
+    method: 'get',
+    params: query
+  })
+}

src/views/business/production/onceWork/index.vue

@@ -16,32 +16,32 @@
     </div>
     <!-- v-hasPermi="['business:entrust:workOrder:current:export']"> -->
     <!-- 搜索区 -->
-    <el-form  class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+    <el-form  class="list-search-container"  :model="queryParams" ref="queryRef" :inline="true"
       label-width="78px">
       <el-form-item label="客户名称：" prop="companyName">
-        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+        <el-input v-model="queryParams.companyName" size="small" style="width: 150px" placeholder="请输入客户名称" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="工单状态：" prop="recordStatus">
-        <el-select v-model="queryParams.recordStatus" placeholder="请选择工单状态" clearable @change="handleQuery">
+        <el-select size="small" v-model="queryParams.recordStatus" placeholder="请选择工单状态" clearable @change="handleQuery">
           <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="领取人：" prop="handlerName">
-        <el-input v-model="queryParams.handlerName" style="width: 150px" placeholder="请输入领取人" clearable
+        <el-input size="small" v-model="queryParams.handlerName" style="width: 150px" placeholder="请输入领取人" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="项目：" prop="taskTypeName">
-        <el-input v-model="queryParams.taskTypeName" style="width: 150px" placeholder="请输入项目" clearable
+        <el-input size="small" v-model="queryParams.taskTypeName" style="width: 150px" placeholder="请输入项目" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="交接单状态：" prop="resultStatus">
-        <el-select v-model="queryParams.resultStatus" placeholder="请选择交接单状态" clearable @change="handleQuery">
+        <el-select size="small" v-model="queryParams.resultStatus" placeholder="请选择交接单状态" clearable @change="handleQuery">
           <el-option v-for="item in resultStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="来源：" prop="formTenantId">
-        <el-select v-model="queryParams.formTenantId" placeholder="请选择来源" clearable @change="handleQuery">
+        <el-select size="small" v-model="queryParams.formTenantId" placeholder="请选择来源" clearable @change="handleQuery">
           <el-option v-for="(value,key) in entrustSource" :key="key" :label="value == null?'数据缺失':value" :value="key" />
         </el-select>
       </el-form-item>
@@ -68,6 +68,7 @@
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+
     <div v-if="flag && flag2 && tenant.versionId !== '4'">
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
         <el-tab-pane label="全部" name="first">
@@ -88,7 +89,7 @@
         prop="socialCreditCode"
         min-width="150"
       /> -->
-      <el-table-column label="来源" align="center" prop="accountName" min-width="150" v-if="tenant.versionId == '4'" />
+      <el-table-column label="来源" align="center" prop="accountName" min-width="150" />
       <!-- <el-table-column label="工单类型" align="center" prop="amount" width="80">
         <template #default="scope">
           {{ scope.row.type === 1 ? "循环工单" : "代办工单" }}
@@ -219,7 +220,7 @@
             >{{resultLable(scope.row)}}</el-button>
             <el-button v-if="(scope.row.record !== null || scope.row.record.status!==3) && scope.row.record.handlerId  ===  useUserStore().user.userId"  link type="primary" icon="Edit" size="small" style="margin: 0"
                        @click="viewResult(scope.row,false)" />
-            <el-button v-if="scope.row.record !== null || scope.row.record.status === 3" v-hasPermi="['business:production:onceWork:perEdit']"  link type="primary" icon="Edit" size="small" style="margin: 0"
+            <el-button v-if="scope.row.record !== null && scope.row.record.status === 3" v-hasPermi="['business:production:onceWork:perEdit']"  link type="primary" icon="Edit" size="small" style="margin: 0"
                        @click="viewResult(scope.row,false)" />
           </div>
 

src/views/business/production/onceWork/resultDialog.vue

@@ -6,6 +6,9 @@
         <el-form-item>
           &nbsp;&nbsp;  &nbsp;任务结果:{{sumbitForm.resultStatus === 2?'暂停办理':sumbitForm.resultStatus === 0?'终止任务':'完成任务'}}
         </el-form-item>
+        <el-form-item v-if="sumbitForm.resultStatus === 0 ||sumbitForm.resultStatus === 1">
+          &nbsp;&nbsp;  &nbsp;完成时间:{{finishTime}}
+        </el-form-item>
       </div>
       <div v-else>
         <el-form-item v-if="handlerId === useUserStore().user.userId" prop="resultStatus" label="任务结果:">
@@ -28,13 +31,13 @@
       </div>
       <div class="imgClass" v-if="falg">
         <div style="white-space: nowrap;">上传交接单：</div>
-        <el-col :span="24">
+        <el-col :span="20">
           <el-row :gutter="10">
             <el-col v-for="(o, index) in filesTable" :key="o.id" :span="8"
                     style="margin-bottom: 10px; position: relative">
               <el-card :body-style="{ padding: '0px' }">
                 <!-- <img :src="`${baseUrl}${o.fileUrl}`" class="image" style="max-width: 100%; height: 200px" @click="handleImageView(o.fileUrl)" /> -->
-                <el-image :src="`${baseUrl}${o.fileUrl}`" class="image" style="max-width: 100%; height: 200px"
+                <el-image :src="`${baseUrl}${o.fileUrl}`" class="image" style="max-width: 100%; height: 150px"
                           :preview-teleported="true" fit="contain" :preview-src-list="preList" :initial-index="index"
                 />
               </el-card>
@@ -51,11 +54,11 @@
                       style="margin-bottom: 10px; position: relative">
                 <el-card :body-style="{ padding: '0px' }">
                   <!-- <img :src="`${baseUrl}${o.fileUrl}`" class="image" style="max-width: 100%; height: 200px" @click="handleImageView(o.fileUrl)" /> -->
-                  <el-image :src="`${baseUrl}${o.fileUrl}`" class="image" style="     background-color: black;max-width: 100%; height: 200px"
+                  <el-image :src="`${baseUrl}${o.fileUrl}`" class="image" style="     background-color: black;max-width: 100%; height: 150px"
                             :preview-teleported="true" fit="contain" :preview-src-list="viewList" :initial-index="index"
                   />
 
-                  <Delete @click="deleteCol(o.id,o.fileUrl)" style="width: 130px; height: 20px;" />
+                  <Delete @click="deleteCol(o.id,o.fileUrl)" style="width: 110px; height: 20px;" />
                 </el-card>
               </el-col>
             </el-row>
@@ -104,6 +107,7 @@ import { uploadFile } from "@/api/tool/file";
 import {computed, defineProps, getCurrentInstance, reactive, toRefs} from "vue";
 import useUserStore from "@/store/modules/user";
 import {
+  selectRecordByOrderIdApi,
   updateRecordStatus,
   FileList,uploadFiles,delFile
 } from "@/api/business/production/onceWorkOrder";
@@ -137,7 +141,7 @@ const viewList = ref([]);
 const falg = ref(false);
 let refile = null;
 let fileEntity:Ifile = {};
-
+const finishTime = ref();
 interface Ifile{
   id?:number;
   fileName?:string;
@@ -214,7 +218,11 @@ function openView(id,status,userId,resultStatus,view){
   }else{
     sumbitForm.resultStatus = null;
   }
-
+  if(resultStatus === 0 ||resultStatus === 1){
+    selectRecordByOrderIdApi({"workOrderId":id}).then((res:any)=>{
+      finishTime.value = res.data[0].finishTime;
+    })
+  }
   sumbitForm.file = null;
   formHidden.value = status;
   falg.value = view;