canrd-outside / order-erp-front · Commits

Commit 3c821a98cd5840256fc33085f76dd7109724af1b

Authored by boyang
1 parent e8ccb97c
build: skipped

修改pp样品确认意见选择

Inline Side-by-side
Showing 2 changed files with 47 additions and 29 deletions
src/views/project/order/FormDetail/TrackFormPanel.vue
  View file @3c821a9
@@ -26,16 +26,34 @@ @@ -26,16 +26,34 @@
26 let fields = ref({}); 26 let fields = ref({});
27 27
28 const schemas = computed(() => { 28 const schemas = computed(() => {
  29 + // return FIELDS_TRACK_STAGE_INFO.map((item) => ({
  30 + // ...item,
  31 + // componentProps: {
  32 + // ...item.componentProps,
  33 + // ...(item.component === 'Select' && { showSearch: true }),
  34 + // disabled: getDisable(
  35 + // get(fields.value, `${item.field}`),
  36 + // props.id,
  37 + // get(props.trackFormData, `${item.field}`),
  38 + // ),
  39 + // },
  40 + // colProps: {
  41 + // span: 24,
  42 + // },
  43 + // }));
29 return FIELDS_TRACK_STAGE_INFO.map((item) => ({ 44 return FIELDS_TRACK_STAGE_INFO.map((item) => ({
30 ...item, 45 ...item,
31 componentProps: { 46 componentProps: {
32 ...item.componentProps, 47 ...item.componentProps,
33 ...(item.component === 'Select' && { showSearch: true }), 48 ...(item.component === 'Select' && { showSearch: true }),
34 - disabled: getDisable(  
35 - get(fields.value, `${item.field}`),  
36 - props.id,  
37 - get(props.trackFormData, `${item.field}`),  
38 - ), 49 + disabled:
  50 + item.field === 'ppConfirmResult'
  51 + ? false
  52 + : getDisable(
  53 + get(fields.value, `${item.field}`),
  54 + props.id,
  55 + get(props.trackFormData, `${item.field}`),
  56 + ),
39 }, 57 },
40 colProps: { 58 colProps: {
41 span: 24, 59 span: 24,
src/views/project/order/tableData.tsx
  View file @3c821a9
@@ -920,28 +920,28 @@ export const FIELDS_TRACK_STAGE_INFO = [ @@ -920,28 +920,28 @@ export const FIELDS_TRACK_STAGE_INFO = [
920 componentProps: { 920 componentProps: {
921 options: [ 921 options: [
922 { 922 {
923 - label: '1+1st+ok',  
924 - value: '1+1st+ok', 923 + label: '1.1st ok',
  924 + value: '1.1st ok',
925 }, 925 },
926 { 926 {
927 - label: '1+1st+Fail',  
928 - value: '1+1st+Fail', 927 + label: '1.1st Fail',
  928 + value: '1.1st Fail',
929 }, 929 },
930 { 930 {
931 - label: '1+1st+ok',  
932 - value: '1+1st+ok', 931 + label: '2.2st ok',
  932 + value: '2.2st ok',
933 }, 933 },
934 { 934 {
935 - label: '2+2st+Fail',  
936 - value: '2+2st+Fail', 935 + label: '2.2st Fail',
  936 + value: '2.2st Fail',
937 }, 937 },
938 { 938 {
939 - label: '3+3st+ok',  
940 - value: '3+3st+ok', 939 + label: '3.3st ok',
  940 + value: '3.3st ok',
941 }, 941 },
942 { 942 {
943 - label: '3+3st+Fail',  
944 - value: '3+3st+Fail', 943 + label: '3.3st Fail',
  944 + value: '3.3st Fail',
945 }, 945 },
946 ], 946 ],
947 }, 947 },
@@ -1550,28 +1550,28 @@ export function getFormConfig(businessUsers: any[]): Partial<FormProps> { @@ -1550,28 +1550,28 @@ export function getFormConfig(businessUsers: any[]): Partial<FormProps> {
1550 mode: 'multiple', 1550 mode: 'multiple',
1551 options: [ 1551 options: [
1552 { 1552 {
1553 - label: '1+1st+ok',  
1554 - value: '1+1st+ok', 1553 + label: '1.1st ok',
  1554 + value: '1.1st ok',
1555 }, 1555 },
1556 { 1556 {
1557 - label: '1+1st+Fail',  
1558 - value: '1+1st+Fail', 1557 + label: '1.1st Fail',
  1558 + value: '1.1st Fail',
1559 }, 1559 },
1560 { 1560 {
1561 - label: '1+1st+ok',  
1562 - value: '1+1st+ok', 1561 + label: '2.2st ok',
  1562 + value: '2.2st ok',
1563 }, 1563 },
1564 { 1564 {
1565 - label: '2+2st+Fail',  
1566 - value: '2+2st+Fail', 1565 + label: '2.2st Fail',
  1566 + value: '2.2st Fail',
1567 }, 1567 },
1568 { 1568 {
1569 - label: '3+3st+ok',  
1570 - value: '3+3st+ok', 1569 + label: '3.3st ok',
  1570 + value: '3.3st ok',
1571 }, 1571 },
1572 { 1572 {
1573 - label: '3+3st+Fail',  
1574 - value: '3+3st+Fail', 1573 + label: '3.3st Fail',
  1574 + value: '3.3st Fail',
1575 }, 1575 },
1576 ], 1576 ],
1577 }, 1577 },