fix:页面文字修改

src/views/business/collect/detail/collectDetail.vue

@@ -22,7 +22,7 @@
       <el-form-item  label="确认所属时间：" label-width="95px" prop="bizArchiveInput.map.receiptDateFilter">
         <el-date-picker v-model="queryParams.bizArchiveInput.map.receiptDateFilter" size="small" type="daterange" clearable
                         format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
-                        end-placeholder="业务日期" style="width: 100%;"></el-date-picker>
+                        end-placeholder="所属时间" style="width: 100%;"></el-date-picker>
       </el-form-item>
       <el-form-item label="甲方：" prop="bizArchiveInput.boss">
         <el-input v-model="queryParams.bizArchiveInput.boss" size="small" placeholder="请输入甲方" style="width: 150px"
@@ -50,33 +50,32 @@
                        :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="合同类型：" prop="bizArchiveInput.contractType">
+        <el-form-item label="合同签单类型：" prop="bizArchiveInput.contractType" label-width="auto">
           <el-select size="small" v-model="queryParams.bizArchiveInput.contractType" placeholder="新签/续签" clearable
                      style="width: 150px">
             <el-option v-for="item in contractTypes" :key="item.value" :label="item.label"
                        :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="项目名称：" prop="bizCollection.projectName">
+        <el-form-item label="项目名称：" prop="bizCollection.projectName" label-width="auto">
           <el-input v-model="queryParams.bizCollection.projectName" size="small" placeholder="请输入审核人名称" style="width: 150px"
                     clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="项目主体名称：" prop="bizCollection.projectMainName">
+        <el-form-item  label="项目主体名称：" prop="bizCollection.projectMainName" label-width="auto">
           <el-input v-model="queryParams.bizCollection.projectMainName" size="small" placeholder="请输入审核人名称" style="width: 150px"
                     clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="请选择到账时间：" prop="bizArchiveInput.map.actuallyDateFilter">
+        <el-form-item label="请选择到账时间：" prop="bizArchiveInput.map.actuallyDateFilter" label-width="auto">
           <el-date-picker v-model="queryParams.bizArchiveInput.map.actuallyDateFilter" type="daterange" clearable size="small"
                           format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
-                          end-placeholder="业务日期" style="width: 100%;"></el-date-picker>
+                          end-placeholder="到账时间" style="width: 100%;"></el-date-picker>
         </el-form-item>
 
-        <el-form-item style="margin-left: 40px;">
+        <div style="display: flex; margin-right: 46px; justify-content: flex-end">
           <el-button type="primary" icon="Search" @click="handleQuery" size="small">搜索</el-button>
           <el-button icon="Refresh" @click="resetQuery" size="small">重置</el-button>
-        </el-form-item>
+        </div>
       </div>
-
     </el-form>
     <!-- 列表区 -->
     <el-table v-loading="loading" :data="DataList" size="small" border height="100%">
@@ -98,7 +97,7 @@
       </el-table-column>
       <el-table-column label="本次收款金额" align="center" prop="arriveAmount">
       </el-table-column>
-      <el-table-column label="合同类型" align="center" prop="bizArchiveInput.contractType">
+      <el-table-column label="合同签单类型" align="center" prop="bizArchiveInput.contractType">
         <template #default="scope">
           {{scope.row.bizArchiveInput.contractType == null?'':scope.row.bizArchiveInput.contractType === 0?'新签':'续签'}}
         </template>
@@ -126,6 +125,8 @@
       </el-table-column>
       <el-table-column label="到账日期" align="center" prop="bizCollection.arriveDate" >
       </el-table-column>
+      <el-table-column label="收款备注" align="center" prop="remark" >
+      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.params.pageNum"

src/views/business/production/onWorkDetail/onWorkDetailDialog.vue

@@ -28,7 +28,7 @@
         @current-change="handleCurrentChange"
     >
       <el-table-column type="index" label="序号" width="50" />
-      <el-table-column property="recordDate" label="工作日期" width="120" >
+      <el-table-column property="recordDate" label="记录日期" width="120" >
         <template #default="scope">
           <el-date-picker v-if="recordStatu === 1 &&handlerId === useUserStore().user.userId" v-model="scope.row.recordDate" type="date" clearable size="small"
                           format="YYYY-MM-DD " value-format="YYYY-MM-DD"
@@ -38,7 +38,7 @@
           <div v-else>{{dateFormat(scope.row.recordDate)}}</div>
         </template>
       </el-table-column>
-      <el-table-column property="recordDetail" label="工作详情" width="300" >
+      <el-table-column property="recordDetail" label="进度描述" width="300" >
         <template #default="scope">
 
           <el-input type="textarea" v-if="recordStatu === 1 &&handlerId === useUserStore().user.userId"  class="no-scrollbar" v-model="scope.row.recordDetail" :disabled="scope.row.inputdisabled"/>

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

@@ -83,7 +83,7 @@
         </template>
       </el-table-column>
       <el-table-column label="说明" align="center" prop="explain" min-width="180" />
-      <el-table-column label="合同" align="center" min-width="180" >
+      <el-table-column label="合同" align="center" min-width="50" >
         <template #default="scope">
           <el-button link type="primary" size="small" @click="viewContract(scope.row)">查看</el-button>
         </template>
@@ -124,13 +124,13 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="已收款" prop="arriveAmount" align="center" min-width="140">
+      <el-table-column label="已收款" prop="arriveAmount" align="center" min-width="60">
         <template #default="scope">
           {{rowNum(scope.row.arriveAmount)}}
         </template>
       </el-table-column>
 
-      <el-table-column label="任务进度" align="center" prop="onWorkDetail" min-width="140">
+      <el-table-column label="任务进度" align="center" prop="onWorkDetail" min-width="250">
         <template #default="scope">
           <el-button link type="primary" size="small" @click="viewOnWorkDetail(scope.row)"
                      >{{textFormat(scope.row.onWorkDetail)}}</el-button>
@@ -440,7 +440,7 @@
 
   function finishedHandle(row) {
     const id = row.id || ids.value;
-    resultDialogView.value.openView(id,row.record.status,row.record.handlerId,row.tenantId);
+    resultDialogView.value.openView(id, row.record.status, row.record.handlerId,row.record.resultStatus);
   }
   function finishedHandle2(row) {
     proxy.$modal
@@ -508,7 +508,7 @@
   }
   const textFormat = (text)=>{
     if(text){
-      return  text.slice(0,10)+'....'
+      return  text.slice(0,20)+'....'
     }
     return '';
   }

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :close-on-click-modal = "false"
-             v-model="outerVisible" title="任务进度" width="600">
+             v-model="outerVisible" title="结果情况" width="600">
     <el-form :model="sumbitForm" label-width="auto" ref="workDetailForm" style="max-width: 600px">
       <el-form-item v-if="handlerId === useUserStore().user.userId" label="任务结果">
         <div v-if="sumbitForm.recordStatus === 3 || sumbitForm.recordStatus === 4 ">