first

src/views/plan/drawingWorkOrder/index.vue

@@ -256,7 +256,7 @@ const columns: Ref<DataTableColumns<drawingWorkOrder.tabelList>> = ref([
     align: 'center',
     key: 'degreeOfCompletion',
     render: row => {
-      const percentage = row.degreeOfCompletion
+      const percentage = row.status == '2' ? 100 :row.degreeOfCompletion
         ? `${(row.degreeOfCompletion * 100 > 100 ? 100 : row.degreeOfCompletion * 100).toFixed(0)}`
         : 0;
       return <n-progress type="line" percentage={percentage} processing indicator-placement="inside" />;
@@ -266,7 +266,10 @@ const columns: Ref<DataTableColumns<drawingWorkOrder.tabelList>> = ref([
     title: '已完成数量',
     width: 100,
     align: 'center',
-    key: 'wightCompletion'
+    key: 'wightCompletion',
+		render: row => {
+			return row.status == '2' ? row.weight : row.wightCompletion;
+		}
   },
   {
     title: '客户',

src/views/plan/paintJobOrder/index.vue

@@ -572,24 +572,27 @@ const columns: Ref<DataTableColumns<paintJobOrder.tabelList>> = ref([
   //   }
   // },
 
-  {
+	{
-    title: '完成度',
+		title: '完成度',
-    width: 200,
+		width: 200,
-    align: 'center',
+		align: 'center',
-    key: 'degreeOfCompletion',
+		key: 'degreeOfCompletion',
-    render: row => {
+		render: row => {
-      const percentage = row.degreeOfCompletion
+			const percentage = row.status == '2' ? 100 :row.degreeOfCompletion
-        ? `${(row.degreeOfCompletion * 100 > 100 ? 100 : row.degreeOfCompletion * 100).toFixed(0)}`
+				? `${(row.degreeOfCompletion * 100 > 100 ? 100 : row.degreeOfCompletion * 100).toFixed(0)}`
-        : 0;
+				: 0;
-      return <n-progress type="line" percentage={percentage} processing indicator-placement="inside" />;
+			return <n-progress type="line" percentage={percentage} processing indicator-placement="inside" />;
-    }
+		}
-  },
+	},
-  {
+	{
-    title: '已完成数量',
+		title: '已完成数量',
-    width: 100,
+		width: 100,
-    align: 'center',
+		align: 'center',
-    key: 'wightCompletion'
+		key: 'wightCompletion',
-  },
+		render: row => {
+			return row.status == '2' ? row.weight : row.wightCompletion;
+		}
+	},
   // {
   //   title: '盘数',
   //   width: 100,