lng计量业务

src/views/dayPlan/LngMeasurePur/components/config.ts

@@ -63,7 +63,7 @@ export const columns: BasicColumn[] = [
     title: '计划日期',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -72,7 +72,7 @@ export const columns: BasicColumn[] = [
     title: '客户简称',
     componentType: 'input',
     align: 'left',
-
+    width: 150,
     sorter: true,
   },
 
@@ -81,7 +81,7 @@ export const columns: BasicColumn[] = [
     title: '气源地',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -90,7 +90,7 @@ export const columns: BasicColumn[] = [
     title: '车头号',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -99,7 +99,7 @@ export const columns: BasicColumn[] = [
     title: '挂车号',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -108,7 +108,7 @@ export const columns: BasicColumn[] = [
     title: '装车量(吨)',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -117,7 +117,7 @@ export const columns: BasicColumn[] = [
     title: '装车量(吉焦)',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -126,7 +126,7 @@ export const columns: BasicColumn[] = [
     title: '装车量(方)',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -135,7 +135,7 @@ export const columns: BasicColumn[] = [
     title: '进厂皮重时间',
     componentType: 'input',
     align: 'left',
-
+    width: 180,
     sorter: true,
   },
 
@@ -144,7 +144,7 @@ export const columns: BasicColumn[] = [
     title: '出厂毛重时间',
     componentType: 'input',
     align: 'left',
-
+    width: 180,
     sorter: true,
   },
 
@@ -153,7 +153,7 @@ export const columns: BasicColumn[] = [
     title: '客户确认人',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -162,7 +162,7 @@ export const columns: BasicColumn[] = [
     title: '客户确认时间',
     componentType: 'input',
     align: 'left',
-
+    width: 180,
     sorter: true,
   },
 
@@ -171,7 +171,7 @@ export const columns: BasicColumn[] = [
     title: '内部确认人',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -180,7 +180,7 @@ export const columns: BasicColumn[] = [
     title: '内部确认时间',
     componentType: 'input',
     align: 'left',
-
+    width: 180,
     sorter: true,
   },
 
@@ -189,7 +189,7 @@ export const columns: BasicColumn[] = [
     title: '销售合同',
     componentType: 'input',
     align: 'left',
-
+    width: 180,
     sorter: true,
   },
 
@@ -198,7 +198,7 @@ export const columns: BasicColumn[] = [
     title: '供应商',
     componentType: 'input',
     align: 'left',
-
+    width: 180,
     sorter: true,
   },
 
@@ -207,7 +207,7 @@ export const columns: BasicColumn[] = [
     title: '附件',
     componentType: 'input',
     align: 'left',
-
+    width: 200,
     sorter: true,
   },
 
@@ -216,7 +216,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
@@ -225,7 +225,7 @@ export const columns: BasicColumn[] = [
     title: '驳回意见',
     componentType: 'input',
     align: 'left',
-
+    width: 130,
     sorter: true,
   },
 ];

src/views/dayPlan/LngMeasurePur/index.vue

@@ -27,7 +27,7 @@
       </BasicTable>
     <LngMeasurePurModal @register="registerModal" @success="handleSuccess" />
     <DataLog :logId="logId" :logPath="logPath" v-model:visible="modalVisible"/>
-    <rejectReplyModal :visible="isOpen" @success="handleRejectReply" />
+    <rejectReplyModal :visible="isOpen" @success="handleRejectReply" @cancel="handleRejectCancel"/>
   </PageWrapper>
 </template>
 <script lang="ts" setup>
@@ -38,7 +38,7 @@
   import { ref, computed, onMounted, onUnmounted, watch} from 'vue';
   
   import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table';
-  import { getLngLngMeasurePage, deleteLngLngMeasure} from '/@/api/dayPlan/LngMeasurePur';
+  import { getLngLngMeasurePage, deleteLngLngMeasure,submitLngLngMeasurePur,rejectlLngLngMeasurePur,cancelLngLngMeasurePur} from '/@/api/dayPlan/LngMeasurePur';
   import { PageWrapper } from '/@/components/Page';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -112,7 +112,7 @@
       },
       schemas: customSearchFormSchema,
       fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD']],
-      showResetButton: false,
+      showResetButton: true,
     },
     beforeFetch: (params) => {
       return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
@@ -189,7 +189,7 @@
     } else {
       selectedKeys.value= [val?.id]
     }
-    await submitLngPngMeasurePur(selectedKeys.value)
+    await submitLngLngMeasurePur(selectedKeys.value)
     handleSuccess();
     notification.success({
       message: '提示',
@@ -209,7 +209,7 @@
     } else {
       selectedKeys.value= [val?.id]
     }
-    await cancelLngPngMeasurePur(selectedKeys.value)
+    await cancelLngLngMeasurePur(selectedKeys.value)
     handleSuccess();
     notification.success({
       message: '提示',
@@ -231,18 +231,25 @@
     }
     isOpen.value = true
   }
+  const handleRejectCancel = ()=> {
+    isOpen.value = false
+  }
   const handleRejectReply = async (val) => {
     let obj = {
       "ids": selectedKeys.value,
       "rejNote": val.reply,
     }
-    await rejectLngPngMeasurePur(obj)
-    isOpen.value = false
-    handleSuccess();
-    notification.success({
-      message: '提示',
-      description: t('已驳回！'),
-    });
+    try {
+      await rejectlLngLngMeasurePur(obj)
+       isOpen.value = false
+       handleSuccess();
+       notification.success({
+         message: '提示',
+         description: t('已驳回！'),
+       });
+    } catch (error) {
+      // isOpen.value = false
+    }
   }
   function handleDatalog (record: Recordable) {
     modalVisible.value = true