From 4c5a1f0c684192691e9ee028806cc79dbf04e1c2 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sun, 5 Nov 2023 09:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E9=85=8D=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListdis.vue           |  21 +++
 .../inventory/distrilbutionBillLading.vue     | 124 +-----------------
 2 files changed, 23 insertions(+), 122 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index b13d70eb..e6ec88e6 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -129,6 +129,7 @@
           @selection="selectionsc"
         >
           <template #default="slotProps">
+            <el-text size="small" @click="printOrder(slotProps.scope.row)">打印</el-text>
             <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
             <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
             <el-text
@@ -1132,6 +1133,26 @@ export default {
       }
     },
 
+    /**
+     * 获取单个打印页面
+     */
+    async printOrder(row) {
+      console.log('row :>> ', row);
+      const res = await printBatch({ ids: row.id, type: 1 });
+      console.log('res :>> ', res);
+      const {
+        data: { code, data },
+      } = res;
+      if (code === 200) {
+        // 初始化打印页面
+        this.html = '';
+        data.forEach(item => {
+          this.html += item.templateHtml;
+        });
+        this.isShow = true;
+      }
+    },
+
     onLoad(page, params = {}) {
       this.loading = true;
       this.query.type = '1';
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index e9334f62..8df5761e 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1,125 +1,5 @@
 <template>
   <basic-container>
-    <!--    <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
-        &lt;!&ndash; 查询模块 &ndash;&gt;
-        <el-form :inline="true" :model="query">
-          <el-form-item label="提货证件:">
-            <el-input v-model="query.deliveryDocument" placeholder="请输入提货证件"></el-input>
-          </el-form-item>
-          <el-form-item label="证件类型:">
-            <el-input v-model="query.certificateType" placeholder="请输入证件类型"></el-input>
-          </el-form-item>
-          &lt;!&ndash; 查询按钮 &ndash;&gt;
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__header">
-          &lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;
-          <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
-          </div>
-          &lt;!&ndash; 头部右侧按钮模块 &ndash;&gt;
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
-        </div>
-      </el-row>
-      <el-row>
-        &lt;!&ndash; 列表模块 &ndash;&gt;
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
-          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
-          </el-table-column>
-          <template v-for="(item,index) in option.column">
-            &lt;!&ndash; table字段 &ndash;&gt;
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
-            </el-table-column>
-          </template>
-          &lt;!&ndash; 操作栏模块 &ndash;&gt;
-          <el-table-column prop="menu" label="操作" :width="220" align="center">
-            <template #="{row}">
-              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
-          &lt;!&ndash; 分页模块 &ndash;&gt;
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page.currentPage"
-                         :page-sizes="[30, 50,80, 120]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
-          </el-pagination>
-        </div>
-      </el-row>
-      &lt;!&ndash; 表单模块 &ndash;&gt;
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
-        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
-          &lt;!&ndash; 表单字段 &ndash;&gt;
-          <el-form-item label="提货时间" prop="pickUpTime">
-            <el-input v-model="form.pickUpTime" placeholder="请输入提货时间"/>
-          </el-form-item>
-          <el-form-item label="提货人" prop="consignee">
-            <el-input v-model="form.consignee" placeholder="请输入提货人"/>
-          </el-form-item>
-          <el-form-item label="提货车牌" prop="pickUpPlate">
-            <el-input v-model="form.pickUpPlate" placeholder="请输入提货车牌"/>
-          </el-form-item>
-          <el-form-item label="提货证件" prop="deliveryDocument">
-            <el-input v-model="form.deliveryDocument" placeholder="请输入提货证件"/>
-          </el-form-item>
-          <el-form-item label="证件类型" prop="certificateType">
-            <el-select v-model="form.certificateType" clearable placeholder="请选择证件类型">
-              <el-option
-                v-for="item in certificateTypeData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="费用合计" prop="totalCost">
-            <el-input v-model="form.totalCost" placeholder="请输入费用合计"/>
-          </el-form-item>
-        </el-form>
-        &lt;!&ndash; 表单按钮 &ndash;&gt;
-        <template #footer>
-          <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
-            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>-->
     <div class="avue-crud" :style="`height:` + height + ';overflow:auto;'">
       <el-form :disabled="view" ref="form" :model="form" label-width="120px" :rules="rules">
         <!-- 表单字段 -->
@@ -3053,8 +2933,8 @@ export default {
           const zeroOrder = val;
           // 记录传入行的id
           zeroOrder.stockArticleId = val.stockArticleId;
-          // 物料最大限数
-          zeroOrder.maxNum = val.quantity;
+          // 物料最大限数 (总数减去冻结数量)
+          zeroOrder.maxNum = val.quantity - val.deliveryQuantity;
           // 新增时, 检测是否齐套
           zeroOrder.tiQuantity = val.libraryQuantity;
           return zeroOrder;