新增清单导出

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -288,7 +288,9 @@
             <!--              </el-text>-->
             <!--            </template>-->
             <template #default="slotProps">
-              <el-text size="small" @click="handleInventoryQRCode(slotProps.scope.row)">查看二维码</el-text>
+              <el-text size="small" @click="handleInventoryQRCode(slotProps.scope.row)"
+                >查看二维码</el-text
+              >
             </template>
           </tablecmt>
         </el-tab-pane>
@@ -418,16 +420,12 @@
               :width="item.width"
               :key="index"
             >
-
               <!--                            :align="center"-->
             </el-table-column>
 
-<!--            <span>操作</span>-->
+            <!--            <span>操作</span>-->
           </template>
-          <el-table-column
+          <el-table-column fixed="right" label="操作" width="100">
-                  fixed="right"
-                  label="操作"
-                  width="100">
             <template #default="scope">
               <el-button size="small" @click="handleQRCode(scope.row)">查看二维码</el-button>
             </template>
@@ -457,7 +455,14 @@
         <!--        </template>-->
       </el-dialog>
 
-      <el-dialog class="el_foot" :title="signtitle" v-model="signBox" width="45%" append-to-body :style="{height:windowHeight+'px',overflow:'scroll'}">
+      <el-dialog
+        class="el_foot"
+        :title="signtitle"
+        v-model="signBox"
+        width="45%"
+        append-to-body
+        :style="{ height: windowHeight + 'px', overflow: 'scroll' }"
+      >
         <!-- <avue-form :option="signoption" v-model="signform" :data="signdata" ref="signform">
         </avue-form> -->
         <!-- <div style="bottom: 7%; margin-left: 500px; width: 50%">
@@ -633,7 +638,7 @@ import { getToken } from '@/utils/auth';
 export default {
   data() {
     return {
-      html:'',
+      html: '',
       dialogImageUrl: '', //图片放大地址
       dialogVisible: false, //图片状态
       dialogImageUrlA: '',
@@ -662,7 +667,7 @@ export default {
       // 签收照
       SignForPhotos: [],
       reservationId: null, //当前行的ID
-      windowHeight:null,
+      windowHeight: null,
       columnList: [
         {
           prop: 'reservationCode',
@@ -1616,7 +1621,8 @@ export default {
           fixed: false,
           sortable: true,
           head: false,
-        },        {
+        },
+        {
           prop: 'orderCode',
           label: '订单自编码',
           type: 2,
@@ -2732,6 +2738,7 @@ export default {
   mounted() {
     this.init();
     this.onLoad();
+
     this.windowHeight = window.innerHeight * 0.8;
     console.log(`浏览器窗口的高度为：${this.windowHeight}px`);
   },
@@ -2875,20 +2882,19 @@ export default {
     btnsc() {},
     selectsc() {},
 
-    handleInventoryQRCode(row){
+    handleInventoryQRCode(row) {
       this.materialQRCode = row;
-      console.log('row------------>',row);
+      console.log('row------------>', row);
       // let qr = {
       //   ids: row.id,
       // };
       this.html = '';
-      showInventoryPackgeCode(row.reservationId,row.id).then(res => {
+      showInventoryPackgeCode(row.reservationId, row.id).then(res => {
         // this.orderPackageCode = res.data
         console.log(res.data);
         this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
       this.dialogVisibleF = true;
-
     },
     /**
      * 查看二维码
@@ -3221,7 +3227,6 @@ export default {
       this.loading = true;
       this.$confirm('确认一键装车？')
         .then(_ => {
-
           let data = {};
           data.reservationId = row.id;
           data.deliveryId = this.deliverydata.id;
@@ -3232,16 +3237,14 @@ export default {
           });
         })
         .catch(_ => {})
-              .finally(()=>{
+        .finally(() => {
           this.loading = false;
-
         });
-
     },
     //一键签收
     handleSignone(row) {
       console.log('一键签收222>>>>>>>>>>', row);
-      if (row.loadingStatus != '已装车'){
+      if (row.loadingStatus != '已装车') {
         ElMessage({
           message: '请先进行装车',
           type: 'warning',
@@ -3465,7 +3468,7 @@ export default {
     width: 100%;
   }
 }
-.el_foot{
+.el_foot {
   overflow: scroll;
 }
 </style>

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -58,10 +58,12 @@
             <el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
               >导出
             </el-button>
+            <el-button type="danger" icon="el-icon-bottom" @click="handleExportDetails" plain
+              >清单导出
+            </el-button>
             <el-button type="primary" text icon="el-icon-edit" @click="handleForklift"
               >指派备货信息</el-button
             >
-
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -104,7 +106,7 @@
           </template>
         </tablecmt>
       </el-row>
-      <el-row class='el-fy'>
+      <el-row class="el-fy">
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -1057,12 +1059,37 @@ export default {
       } else {
         row.ids = '';
       }
-       row.typeService='1',//固定参数代表当前页面
+      (row.typeService = '1'), //固定参数代表当前页面
         $_CommercialMarket(row).then(res => {
           console.log(res.data);
           downloadXls(res.data, '商配备货列表.xlsx');
         });
     },
+    /** 导出清单 */
+    handleExportDetails() {
+      let row = {};
+      // 查询信息
+      // query: {},
+      if (this.query) {
+        for (let prop in this.query) {
+          row[prop] = this.query[prop];
+        }
+      }
+      if (!!this.ids) {
+        row.ids = this.ids;
+      } else {
+        row.ids = '';
+      }
+      if (row.ids === '') {
+        this.$message.warning('请选择备货任务!');
+        return;
+      }
+      console.log('row-------->', row);
+      $_CommercialDetail(row.ids).then(res => {
+        console.log(res.data);
+        downloadXls(res.data, '市配备货列表.xlsx');
+      });
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
@@ -1187,9 +1214,9 @@ export default {
     height: 30px !important;
   }
 }
-:deep(.el-form-item__label){
+:deep(.el-form-item__label) {
-  width:auto !important;
+  width: auto !important;
-  padding:0;
+  padding: 0;
 }
 :deep(.avue-crud) {
   display: flex;

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -13,7 +13,7 @@
           <el-form-item label="指派状态;1-未指派、2-已指派:">
             <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
           </el-form-item>-->
-          <div class='el-input-so'>
+          <div class="el-input-so">
             <el-form-item label="备货时间:" class="el-times">
               <el-date-picker
                 v-model="stockupDate"
@@ -25,7 +25,7 @@
                 :shortcuts="shortcuts"
               />
             </el-form-item>
-           <el-form-item style="margin-left: 24px;"  label="客户名称">
+            <el-form-item style="margin-left: 24px" label="客户名称">
               <el-input v-model="query.consignee" placeholder="请输入客户名称" />
             </el-form-item>
           </div>
@@ -45,6 +45,9 @@
             <el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
               >导出
             </el-button>
+            <el-button type="danger" icon="el-icon-bottom" @click="handleExportDetails" plain
+              >清单导出
+            </el-button>
             <el-button type="primary" text icon="el-icon-edit" @click="handleForklift"
               >指派备货信息</el-button
             >
@@ -934,6 +937,31 @@ export default {
           downloadXls(res.data, '市配备货列表.xlsx');
         });
     },
+    /** 导出清单 */
+    handleExportDetails() {
+      let row = {};
+      // 查询信息
+      // query: {},
+      if (this.query) {
+        for (let prop in this.query) {
+          row[prop] = this.query[prop];
+        }
+      }
+      if (!!this.ids) {
+        row.ids = this.ids;
+      } else {
+        row.ids = '';
+      }
+      if (row.ids === '') {
+        this.$message.warning('请选择备货任务!');
+        return;
+      }
+      console.log('row-------->', row);
+      $_CommercialDetail(row.ids).then(res => {
+        console.log(res.data);
+        downloadXls(res.data, '市配备货列表.xlsx');
+      });
+    },
     searchReset() {
       this.query = {};
       this.stockupDate = [];
@@ -1159,7 +1187,6 @@ export default {
   display: flex;
   align-items: flex-end;
 }
-.el-input-so{
+.el-input-so {
-
 }
 </style>

vite.config.js

@@ -22,8 +22,9 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.75:8777',
           // 新zyc
           // target: 'http://192.168.6.116:8777',
+          target: 'http://192.168.10.25:13000',
 
-          target: 'http://192.168.6.122:8777',
+          // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.6.116:8777',
           // tjj
           // sst