Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/distribution/distributionReservation.js

@@ -39,6 +39,52 @@ export const reservationExport = (row) => {
   })
 }
 
+/**
+ * 预约订单数据详情导出
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const reservationInfoStockArticleExport = (row) => {
+  return request({
+    url: '/api/logpm-distribution/reservationStockarticle/export-distributionReservationStockarticle',
+    method: 'get',
+    params: {
+      ...row
+    },
+    responseType: 'blob',
+  })
+}
+/**
+ * 预约包件数据详情导出
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const reservationInfoPackageExport = (row) => {
+  return request({
+    url: '/api/logpm-distribution/reservationPackage/distributionReservationPackage/export-distributionReservationPackage',
+    method: 'get',
+    params: {
+      ...row
+    },
+    responseType: 'blob',
+  })
+}
+/**
+ * 预约库存平数据详情导出
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const reservationInfoStockListExport = (row) => {
+  return request({
+    url: '/api/logpm-distribution/reservationStocklist/distributionReservationStocklist/export-distributionReservationStocklist',
+    method: 'get',
+    params: {
+      ...row
+    },
+    responseType: 'blob',
+  })
+}
+
 export const remove = (ids) => {
   return request({
     url: '/api/logpm-distribution/reservation/remove',

src/api/distribution/distrilbutionBillLading.js

@@ -77,6 +77,7 @@ export const getBillLadingExport = params => {
     params: {
       ...params,
     },
+    responseType: 'blob',
   });
 };
 

src/router/views/index.js

@@ -441,6 +441,20 @@ export default [
       },
     ],
   },
+  // 测试页面
+  {
+    path: '/basic/pda/basicPdatt',
+    component: Layout,
+    redirect: '/basic/pda',
+    children: [
+      {
+        path: '/basic/pda/basicPdatt',
+        name: 'pad信息',
+        meta: {},
+        component: () => import('@/views/basic/pda/basicPdatt.vue'),
+      },
+    ],
+  },
   {
     path: '/basic/property/basicPropertyform',
     component: Layout,

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -660,6 +660,7 @@ export default {
       distributionType: [],
       costListName: [],
       certificateType: [],
+
       shortcuts: [
         {
           text: '最近一周',
@@ -739,10 +740,12 @@ export default {
       let row = {};
       if (!!this.ids) {
         row.ids = this.ids;
+      } else {
+        row.ids = '';
       }
       getBillLadingExport(row).then(res => {
         console.log(res.data);
-        downloadXls(res.data, '已确定预约单数据.xlsx');
+        downloadXls(res.data, '提货数据.xlsx');
       });
     },
     showdrawer(value) {

src/views/distribution/reservation/reservationDetails.vue

@@ -133,6 +133,15 @@
                 <el-tabs type="border-card"
                          @tab-click="handleClick">
                     <el-tab-pane label="订单信息">
+                      <el-button
+                        type="danger"
+                        icon="el-icon-download"
+                        @click="handleExportInfo('1')"
+                        plain
+                      >导出
+                      </el-button>
+
+
                         <tablecmt
                                 :columnList="stockArticleColumnList"
                                 :tableData="stockArticleData"
@@ -151,6 +160,13 @@
 
                     </el-tab-pane>
                     <el-tab-pane label="包件信息">
+                      <el-button
+                        type="danger"
+                        icon="el-icon-download"
+                        @click="handleExportInfo('2')"
+                        plain
+                      >导出
+                      </el-button>
                         <tablecmt
                                 :columnList="packageColumnList"
                                 :tableData="parcelList"
@@ -166,6 +182,13 @@
                         </tablecmt>
                     </el-tab-pane>
                     <el-tab-pane label="库存品信息">
+                      <el-button
+                        type="danger"
+                        icon="el-icon-download"
+                        @click="handleExportInfo('3')"
+                        plain
+                      >导出
+                      </el-button>
                       <tablecmt
                               :columnList="stockListColumnList"
                               :tableData="stockList"
@@ -289,12 +312,20 @@
 
 <script>
   import { getList, getDetail, add, update, remove, getDetailById } from '@/api/distribution/distributionSignfor';
-  import { getReservationDetail,getReservationPackage,getReservationPackageList,getReservationStockListInfo } from '@/api/distribution/distributionReservation';
+  import {
+    getReservationDetail,
+    getReservationPackageList,
+    getReservationStockListInfo,
+    reservationInfoPackageExport,
+    reservationInfoStockArticleExport,
+    reservationInfoStockListExport
+  } from '@/api/distribution/distributionReservation';
   import { getStockAddValue } from '@/api/distribution/distributionStockArticle';
   import option from '@/option/distribution/distributionReservationDetails';
 
   import { mapGetters } from 'vuex';
   import { getDictionaryBiz } from '@/api/system/dict';
+  import { downloadXls } from '@/utils/util';
 
   export default {
     data() {
@@ -918,6 +949,37 @@
       }
     },
     methods: {
+      //导出
+      handleExportInfo(type){
+        let row ={};
+        row.reservationId = this.$route.query.id;
+        let nulName ;
+        switch (type){
+          case "1":
+            nulName="预约单订单数据.xlsx";
+            reservationInfoStockArticleExport(row).then(res => {
+              console.log(res.data);
+              downloadXls(res.data, nulName);
+            });
+            break;
+          case "2":
+            nulName="预约单包件数据.xlsx";
+            reservationInfoPackageExport(row).then(res => {
+              console.log(res.data);
+              downloadXls(res.data, nulName);
+            });
+            break;
+          case "3":
+            nulName="预约单库存品数据.xlsx";
+            reservationInfoStockListExport(row).then(res => {
+              console.log(res.data);
+              downloadXls(res.data, nulName);
+            });
+
+            break;
+        }
+
+      },
       //修改
       rowUpdate() {
 

src/views/distribution/signfor/distributionSignforedt.vue

@@ -4,7 +4,7 @@
       <div class="card-header">
         <span>当前签收单状态</span>
       </div>
-      <el-steps :active="1" finish-status="success">
+      <el-steps :active="active" finish-status="success">
         <el-step title="待签收" />
         <el-step title="司机签收" />
         <el-step title="文员审核" />
@@ -160,8 +160,46 @@
           />
         </el-tooltip>
       </div>
+      <div class="el-sw">
+        <div class="el-box">
+          <div class='icon-tit'>
+        <el-icon><LocationInformation /></el-icon>
+        <span class="title-name">文员备注:</span>
+          </div>
+        <el-tooltip
+                :content="form.clerkSignRemarks ? form.clerkSignRemarks : '暂无文员备注'"
+                placement="top"
+        >
+          <el-input
+                  class="positioning"
+                  v-model="form.clerkSignRemarks"
+                  disabled
+                  placeholder="文员备注"
+          />
+        </el-tooltip>
+        </div>
+
+        <div class="el-box">
+          <div class='icon-tit'>
+        <el-icon><LocationInformation /></el-icon>
+        <span class="title-name">司机备注:</span>
+          </div>
+        <el-tooltip
+                :content="form.driverRemarks ? form.driverRemarks : '暂无司机备注'"
+                placement="top"
+        >
+          <el-input
+                  class="positioning"
+                  v-model="form.driverRemarks"
+                  disabled
+                  placeholder="司机备注"
+          />
+        </el-tooltip>
+        </div>
+      </div>
     </div>
 
+
     <div class="FImg">
       <div class="imgName">
         <span
@@ -274,7 +312,9 @@
           <img w-full :src="dialogImageUrlE" alt="IMG" />
         </el-dialog>
       </div>
+
     </div>
+
     <!-- 签收信息 -->
 
     <el-collapse v-model="activeNames" style="margin-top: 10px">
@@ -1458,10 +1498,15 @@ getDetail(RouterId.value).then(res => {
   editLoading.value = false; //表格加载结束
   console.log(res, '基础信息');
   // 当前订单状态
-  if (res.data.data.sijiSigningStatus) {
+  if (res.data.data.sijiSigningStatus == '2') {
     active.value = 2; //司机已签收
   }
-  if (res.data.data.sijiSigningStatus && res.data.data.wenyuanSigningStatus) {
+  // if (res.data.data.sijiSigningStatus == && res.data.data.wenyuanSigningStatus) {
+  //   active.value = 3; //文员已签收
+  // }
+
+  // 文员签收单独判断
+  if (res.data.data.wenyuanSigningStatus == '2') {
     active.value = 3; //文员已签收
   }
   form.value = res.data.data; //基础信息
@@ -1754,4 +1799,21 @@ const ImgSuccessE = (response, uploadFile) => {
     align-items: center;
   }
 }
+  .el-sw{
+    width:100%;
+    margin-top: 15px;
+    display: flex;
+    flex-direction: column;
+    min-height: 82px;
+    justify-content: space-between;
+
+  }
+  .icon-tit{
+    display: flex;
+    min-width: 138px;
+    align-items: center;
+  }
+  .el-box{
+    display:flex;
+  }
 </style>

vite.config.js

@@ -19,8 +19,13 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.75:8777',
+          // cyz
+          // target: 'http://192.168.10.94:8888',
           // tjj
-          target: 'http://192.168.10.29:13000',
+          // target: 'http://192.168.10.29:13000',
+          // sst
+          target: 'http://192.168.10.94:8888',
+          // target: 'http://192.168.10.29:13000',
           // target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',
           changeOrigin: true,