[Fix 0000] 瓦斯日报小票功能修复及地点历史曲线问题修复

src/views/vent/gas/gasInspectNonfc/gasInspectNonfc.api.ts

@@ -84,4 +84,4 @@ export const taskSubmit = (params) => defHttp.post({ url: Api.taskSubmit, params
 export const addGasReportAddressNew = (params) => defHttp.post({ url: Api.addGasReportAddressNew, params });
 export const clearCardInfoNew = (params) => defHttp.delete({ url: Api.clearCardInfoNew, params }, { joinParamsToUrl: true });
 export const editNew = (params) => defHttp.post({ url: Api.editNew, params });
-export const queryHisCurve = (params) => defHttp.get({ url: Api.queryHisCurve, params });
+export const queryHisCurve = (params) => defHttp.post({ url: Api.queryHisCurve, params });

src/views/vent/gas/gasReport/gas-report.api.ts

@@ -39,4 +39,4 @@ export const getIsReviewPass = (params) => defHttp.post({ url: Api.getIsReviewPa
 
 export const getAllUserInfo = (params) => defHttp.get({ url: Api.getAllUserInfo, params });
 
-export const exportReportByPoi = (params) => defHttp.post({ url: Api.exportReportByPoi, params });
+export const exportReportByPoi = (params) => defHttp.post({ url: Api.exportReportByPoi, params, responseType: 'blob' });

src/views/vent/gas/gasReport/index.vue

@@ -266,7 +266,7 @@
   // }
   //导出瓦斯检查小票
   async function getExport2() {
-    if (searchData.reportTime && searchData.sbr) {
+    if (searchData.reportTime) {
       openModal();
     } else if (!searchData.reportTime) {
       message.warning('请选择需要导出数据的填报日期!');
@@ -405,8 +405,15 @@
   }
 
   const [registerModal, { openModal }] = useModal();
-  const [registerForm, { validate }] = useForm({
+  const [registerForm, { validate, setFieldsValue }] = useForm({
     schemas: [
+      {
+        label: '检查工',
+        field: 'checkName',
+        component: 'ApiSelect',
+        required: true,
+        show: false,
+      },
       {
         label: '交班瓦检员',
         field: 'agoCheckPerson',
@@ -414,8 +421,8 @@
         required: true,
         componentProps: {
           api: getAllUserInfo,
-          labelField: 'username',
-          valueField: 'id',
+          labelField: 'realname',
+          valueField: 'username',
           showSearch: true,
         },
       },
@@ -426,9 +433,14 @@
         required: true,
         componentProps: {
           api: getAllUserInfo,
-          labelField: 'username',
-          valueField: 'id',
+          labelField: 'realname',
+          valueField: 'username',
           showSearch: true,
+          onChange(__, { label }) {
+            setFieldsValue({
+              checkName: label,
+            });
+          },
         },
       },
       {
@@ -438,8 +450,8 @@
         required: true,
         componentProps: {
           api: getAllUserInfo,
-          labelField: 'username',
-          valueField: 'id',
+          labelField: 'realname',
+          valueField: 'username',
           showSearch: true,
         },
       },
@@ -451,7 +463,7 @@
   /** 导出瓦斯检查小票 */
   async function submitHandler() {
     const params = await validate();
-    const res = await exportReportByPoi({ tempName: 'wsjcxp', reportTime: searchData.reportTime, checkName: searchData.sbr, ...params });
+    const res = await exportReportByPoi({ tempName: 'wsjcxp', reportTime: searchData.reportTime, ...params });
     const filename = searchData.reportTime + '.xlsx';
     downFilePublic(res, filename);
   }