修复部分bug

src/api/reportforms/ConsigneeReport.js

@@ -1,10 +1,10 @@
 import request from '@/axios';
 /** 报表列表 */
-export const postDeptIncomingPage = params => {
+export const postDeptIncomingPage = data => {
   return request({
     url: '/api/logpm-report/reportIncoming/consigineeIncomingPage',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
   });
 };
 

src/api/reportforms/SalesDepartmentIncomeReport.js

@@ -1,10 +1,10 @@
 import request from '@/axios';
 /** 报表列表 */
-export const postDeptIncomingPage = params => {
+export const postDeptIncomingPage = data => {
   return request({
     url: '/api/logpm-report/reportIncoming/deptIncomingPage',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
   });
 };
 

src/api/waybill/WaybillOrderList.js

@@ -81,3 +81,14 @@ export const postExport = data => {
     responseType: 'blob',
   });
 };
+
+/**
+ * 修改服务类型
+ */
+export const postUpdateWaybillTypeService = data => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseWaybill/updateWaybillTypeService',
+    method: 'post',
+    data,
+  });
+};

src/page/index/top/index.vue

@@ -31,7 +31,7 @@
       </div>
       <!-- 仓库名称  -->
 
-      <div class="top-bar__item" @click="showcl(true)">
+      <div class="top-bar__item" style="text-decoration: underline" @click="showcl(true)">
         <view>{{ dataName || '全部' }}</view>
       </div>
 

src/views/distribution/inventory/CreateOrder.vue

@@ -1144,7 +1144,7 @@
                 filterable
                 remote
                 reserve-keyword
-                placeholder="结算品类"
+                placeholder="收入品类"
                 @change="
                   val => {
                     const _item =

src/views/finance/WaybillAudit.vue

@@ -139,8 +139,9 @@
             >
               审核
             </el-text>
-            <el-text v-else @click="handleCloseAudit(slotProps.scope)"> 取消审核 </el-text>
-            <el-text @click="handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
+            <el-text v-else @click="() => handleCloseAudit(slotProps.scope)"> 取消审核 </el-text>
+            <el-text @click="() => handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
+            <el-text @click="() => handleServiceType(slotProps.scope)">切换服务类型</el-text>
           </template>
         </template>
       </tablecmt>
@@ -207,7 +208,7 @@
     :show-close="false"
     v-model="details.popUpShow.checkVisted"
   >
-    <div class="title">
+    <div class="title mb20">
       <template v-if="details.isBatch"> 批量审核 </template>
       <template v-else> 运单号：{{ details.form.waybillNo }} </template>
     </div>
@@ -227,6 +228,38 @@
     </div>
   </el-dialog>
 
+  <!-- 切换服务类型 -->
+  <el-dialog
+    title="切换服务类型"
+    width="780px"
+    :show-close="false"
+    v-model="details.popUpShow.changeServiceTypeVisted"
+  >
+    <div class="title mb20">
+      <template v-if="details.isBatch"> 批量审核 </template>
+      <template v-else> 运单号：{{ details.changeServiceTypeInfo.waybillNo }} </template>
+    </div>
+    <el-form label-width="100px">
+      <el-form-item label="服务类型：">
+        <el-select v-model="details.changeServiceTypeInfo.serviceType">
+          <el-option
+            v-for="item in details.serviceOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <div class="flex-c-c mt10">
+      <el-button @click="details.popUpShow.changeServiceTypeVisted = false">关 闭</el-button>
+      <el-button type="primary" icon="Position" @click="handleSubmitChangeServiceType">
+        提 交
+      </el-button>
+    </div>
+  </el-dialog>
+
   <!-- 列表配置显示 -->
   <edittablehead
     @closce="showdrawer"
@@ -253,7 +286,11 @@ import {
 } from '@/api/finance/WaybillAudit';
 import { postCheckWaybill, postCancleCheckWaybill } from '@/api/distribution/CreateOrder.js';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
-import { postAbolishWaybill, postSaveWaybillReturn } from '@/api/waybill/WaybillOrderList.js';
+import {
+  postAbolishWaybill,
+  postSaveWaybillReturn,
+  postUpdateWaybillTypeService,
+} from '@/api/waybill/WaybillOrderList.js';
 import {
   downloadXls,
   setNodeHeight,
@@ -368,6 +405,8 @@ const details = reactive<any>({
     view: false,
     /** 审核 */
     checkVisted: false,
+    /** 切换服务类型 */
+    changeServiceTypeVisted: false,
   },
   /** 列表复选框选中的数据 */
   selectionList: [],
@@ -395,6 +434,8 @@ const details = reactive<any>({
   }),
   /** 是否为批量操作 */
   isBatch: false,
+  changeServiceTypeInfo: {},
+  serviceOption: [],
 });
 
 const tableNodeRef = ref();
@@ -827,6 +868,40 @@ const handlePictureCardPreview: UploadProps['onPreview'] = uploadFile => {
   details.dialogImageUrl = uploadFile.url!;
   details.popUpShow.dialogVisible = true;
 };
+
+/** 切换服务类型 */
+const handleServiceType = ({ row }) => {
+  details.popUpShow.changeServiceTypeVisted = true;
+  details.changeServiceTypeInfo = { ...row };
+  for (let i = 0; i < details.columnList.length; i++) {
+    const value = details.columnList[i];
+
+    if (value.label !== '服务类型') continue;
+    details.serviceOption = [...value.checkarr];
+    break;
+  }
+};
+
+const handleSubmitChangeServiceType = async () => {
+  try {
+    if (!details.changeServiceTypeInfo.serviceType) return ElMessage.warning('请选择服务类型');
+    details.popUpShow.changeServiceTypeVisted = false;
+    details.loadingObj.pageLoading = true;
+    const res = await postUpdateWaybillTypeService({
+      id: details.changeServiceTypeInfo.id,
+      serviceType: details.changeServiceTypeInfo.serviceType,
+    });
+
+    const { code, msg } = res.data;
+    if (code !== 200) return;
+    ElMessage.success(msg);
+    onLoad();
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
 </script>
 
 <style scoped lang="scss">