客户需求对比

src/views/dayPlan/PngAppro/components/createForm.vue

@@ -25,7 +25,7 @@
         <Card :title="titleNew" :bordered="false" v-if="currentRoute.query.type=='compare'&&titleNew">
           <basicForm ref="basicFormRef" :formObj="formStateNew" :changeList="diffResultList" :list="dataListNew" :disable="currentRoute.query.type"></basicForm>
         </Card>
-        <Card :title="title" :bordered="false" >
+        <Card :title="title" :bordered="false" v-if="title">
           <basicForm ref="basicFormRef" :formObj="formState" :list="dataList" :disable="currentRoute.query.type"></basicForm>
         </Card>
       </a-form>
@@ -56,33 +56,20 @@
     const userStore = useUserStore();
     const userInfo = userStore.getUserInfo;
 
-    const formType = ref('2'); // 0 新建 1 修改 2 查看
-    const formRef = ref();
-    const props = defineProps({
-      disabled: false,
-      id: ''
-    
-    });
     const { bus, FORM_LIST_MODIFIED } = useEventBus();
 
     const router = useRouter();
     const { currentRoute } = router;
-    const isDisable = ref(false);
     const { formPath } = currentRoute.value.query;
     const pathArr = [];
 
     const tabStore = useMultipleTabStore();
-    const formProps = ref(null);
-    const formId = ref(currentRoute.value?.params?.id);
-    const pageType = ref(currentRoute.value.query?.type);
+  
     const pageId = ref(currentRoute.value.query?.id)
     
-    const contractQty = ref()
     const spinning = ref(false);
-    const curIdx = ref(null)
     const { notification } = useMessage();
     const { t } = useI18n();
-    const hasDel = ref(false)
     const formState = reactive({
 
     });
@@ -103,11 +90,7 @@
     const dataListNew = ref([])
     const basicFormRef = ref()
     const diffResultList = ref([])
-    let optionSelect= reactive({
-      approCodeList: [],
-    });
     onMounted(() => {
-      getOption()
       if (pageId.value) {
         if (currentRoute.value.query.type=='compare') {
           getCompareInfo(pageId.value)
@@ -120,17 +103,17 @@
     async function getCompareInfo(id) {
        spinning.value = true
       try {
-      let data = await getLngPngApproCompare(id) || []
+      let data = await getLngPngApproCompare(id) || {}
       spinning.value = false
       diffResultList.value = data.diffResultList || []
         let obj = changeData(data.oldBean)
         Object.assign(formState, {...obj.params})
-        Object.assign(dataList.value, obj.list || [{}])
-        title.value = '版本V'+ formState.verNo
+        Object.assign(dataList.value, obj.list || [])
+        title.value = formState.verNo? ('版本V'+ formState.verNo) : ''
 
         let obj1 = changeData(data.newBean || {})
         Object.assign(formStateNew, {...obj1.params})
-        Object.assign(dataListNew.value, obj1.list || [{}])
+        Object.assign(dataListNew.value, obj1.list || [])
         titleNew.value = formStateNew.verNo ? ('版本V'+ formStateNew.verNo) : ''
         
         
@@ -147,26 +130,13 @@
       spinning.value = false
       let obj = changeData(data)
       Object.assign(formState, {...obj.params})
-      Object.assign(dataList.value, obj.list || [{}])
+      Object.assign(dataList.value, obj.list || [])
       } catch (error) {
         spinning.value = false
       }
     }
     const changeData = (obj) => {
-      console.log(obj.lngPngApproPurList, 9999)
-      let arr = obj.lngPngApproPurList || [{}]
-      // const startDate = dayjs(obj.datePlan);
-      // const endDate = dayjs(new Date());
-      // const diffInDays = endDate.diff(startDate, 'day');
-      // if (diffInDays == 0) {
-      //   obj.dayDesc = '当日'
-      // } else if (diffInDays == 1) {
-      //   obj.dayDesc = '次日'
-      // } else if (diffInDays > 1) {
-      //   obj.dayDesc = diffInDays + '日后'
-      // } else {
-      //   obj.dayDesc = ''
-      // }
+      let arr = obj.lngPngApproPurList || []
       obj.qtyContractM3 = Number(obj.qtyContractM3)/10000
       obj.qtyPlanM3 = Number(obj.qtyPlanM3)/10000
       obj.qtyDemandM3 = Number(obj.qtyDemandM3)/10000
@@ -186,10 +156,6 @@
         params: obj
       }
     } 
-    async function getOption() {
-      optionSelect.approCodeList = await getDictionary('LNG_APPRO')
-
-    }
     function close() {
       tabStore.closeTab(currentRoute.value, router);
     }
@@ -213,7 +179,7 @@
         remark: formState.reply,
         data: [obj]
       }
-      spinning.value = true;
+      
       try {
         if (type == 'reject') {
           if (!formState.reply) {
@@ -231,6 +197,7 @@
         if (formPath.includes('dayPlan/pngReceiveStationAppro/index')) {
           request = approveLngPngApproSZ
         }
+        spinning.value = true;
         await request(params);
         spinning.value = false;
         notification.success({