Browse Source

fix:解除合同的判断

ly 11 months ago
parent
commit
c4667a3e5e
1 changed files with 7 additions and 6 deletions
  1. 7 6
      src/views/business/production/onceWork/index.vue

+ 7 - 6
src/views/business/production/onceWork/index.vue

@@ -126,7 +126,7 @@
         </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="140">
         <template #default="scope">
           {{scope.row.onWorkDetail}}
           <el-button link type="primary" icon="Edit" size="small" style="padding: 0"
@@ -164,10 +164,11 @@
         <template #default="scope">
           <div :style="getStatusStyle(scope.row)">
             {{ getStatusLabel(scope.row) }}
-            <el-popover placement="top-start" width="250" trigger="hover">
-              <div style="display: flex; flex-direction: row">
+
+            <el-popover placement="top-start" width="150" trigger="hover">
+              <div style="display: flex; flex-direction: column;align-items:flex-start;">
                 <div v-for="item in selectStatus" :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px">
+                     style="display: flex; flex-direction: row; margin-right: 10px">
                   <div :style="{
                       backgroundColor: item.color,
                       width: '14px',
@@ -470,7 +471,7 @@
   const viewOnWorkDetail = (row) =>{
     const id = row.id || ids.value;
 
-    if(row.record == null){
+    if(row.record == null ||row.record.status === 0){
       proxy.$alert(
           "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
           "请领取任务" +
@@ -488,7 +489,7 @@
   }
   const viewResult = (row) =>{
     const id = row.id || ids.value;
-    if(row.record == null){
+    if(row.record == null||row.record.status === 0 ){
       proxy.$alert(
           "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
           "请领取任务" +