修改pp样品确认意见选择

boyang
1 parent e8ccb97c
Showing 2 changed files with 47 additions and 29 deletions
src/views/project/order/FormDetail/TrackFormPanel.vue
src/views/project/order/tableData.tsx
@@ -26,16 +26,34 @@
       let fields = ref({});
  
       const schemas = computed(() => {
+        // return FIELDS_TRACK_STAGE_INFO.map((item) => ({
+        //   ...item,
+        //   componentProps: {
+        //     ...item.componentProps,
+        //     ...(item.component === 'Select' && { showSearch: true }),
+        //     disabled: getDisable(
+        //       get(fields.value, `${item.field}`),
+        //       props.id,
+        //       get(props.trackFormData, `${item.field}`),
+        //     ),
+        //   },
+        //   colProps: {
+        //     span: 24,
+        //   },
+        // }));
         return FIELDS_TRACK_STAGE_INFO.map((item) => ({
           ...item,
           componentProps: {
             ...item.componentProps,
             ...(item.component === 'Select' && { showSearch: true }),
-            disabled: getDisable(
-              get(fields.value, `${item.field}`),
-              props.id,
-              get(props.trackFormData, `${item.field}`),
-            ),
+            disabled:
+              item.field === 'ppConfirmResult'
+                ? false
+                : getDisable(
+                    get(fields.value, `${item.field}`),
+                    props.id,
+                    get(props.trackFormData, `${item.field}`),
+                  ),
           },
           colProps: {
             span: 24,
@@ -920,28 +920,28 @@ export const FIELDS_TRACK_STAGE_INFO = [
     componentProps: {
       options: [
         {
-          label: '1+1st+ok',
-          value: '1+1st+ok',
+          label: '1.1st ok',
+          value: '1.1st ok',
         },
         {
-          label: '1+1st+Fail',
-          value: '1+1st+Fail',
+          label: '1.1st Fail',
+          value: '1.1st Fail',
         },
         {
-          label: '1+1st+ok',
-          value: '1+1st+ok',
+          label: '2.2st ok',
+          value: '2.2st ok',
         },
         {
-          label: '2+2st+Fail',
-          value: '2+2st+Fail',
+          label: '2.2st Fail',
+          value: '2.2st Fail',
         },
         {
-          label: '3+3st+ok',
-          value: '3+3st+ok',
+          label: '3.3st ok',
+          value: '3.3st ok',
         },
         {
-          label: '3+3st+Fail',
-          value: '3+3st+Fail',
+          label: '3.3st Fail',
+          value: '3.3st Fail',
         },
       ],
     },
@@ -1550,28 +1550,28 @@ export function getFormConfig(businessUsers: any[]): Partial&lt;FormProps&gt; {
           mode: 'multiple',
           options: [
             {
-              label: '1+1st+ok',
-              value: '1+1st+ok',
+              label: '1.1st ok',
+              value: '1.1st ok',
             },
             {
-              label: '1+1st+Fail',
-              value: '1+1st+Fail',
+              label: '1.1st Fail',
+              value: '1.1st Fail',
             },
             {
-              label: '1+1st+ok',
-              value: '1+1st+ok',
+              label: '2.2st ok',
+              value: '2.2st ok',
             },
             {
-              label: '2+2st+Fail',
-              value: '2+2st+Fail',
+              label: '2.2st Fail',
+              value: '2.2st Fail',
             },
             {
-              label: '3+3st+ok',
-              value: '3+3st+ok',
+              label: '3.3st ok',
+              value: '3.3st ok',
             },
             {
-              label: '3+3st+Fail',
-              value: '3+3st+Fail',
+              label: '3.3st Fail',
+              value: '3.3st Fail',
             },
           ],
         },