fix：销售出库页面样式紊乱调整、出库批次回传参数

zkqy-ui/src/api/tablelist/commonTable.js

@@ -20,6 +20,7 @@ export function unionListTableData(query) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 定制的订单列表查询方法
 export function getTableList1(query) {
   return request({
@@ -29,6 +30,7 @@ export function getTableList1(query) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 审批列表查询方法
 export function getTableList2(query) {
   return request({
@@ -286,6 +288,7 @@ export function productInvoiceInfo(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  发货单详情接口 新
 export function printDocuments(data) {
   return request({
@@ -295,6 +298,7 @@ export function printDocuments(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  新增发货单接口
 export function addProductInvoice(data) {
   return request({
@@ -304,6 +308,7 @@ export function addProductInvoice(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  修改发货单接口
 export function updateProductInvoice(data) {
   return request({
@@ -339,7 +344,7 @@ export function saleStorageDetails(id) {
   return request({
     url: '/system/ProductInvoice/saleStorageDetails',
     method: 'get',
-    params: { id },
+    params: {id},
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
@@ -353,6 +358,7 @@ export function noticeOutStorage(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 销售出库  旧
 export function oldNoticeOutStorage(data) {
   return request({
@@ -372,6 +378,7 @@ export function outboundOrderInfo(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  打印出库单  获取详情接口    新
 export function printOutsourceOrderList(data) {
   return request({
@@ -383,7 +390,6 @@ export function printOutsourceOrderList(data) {
 }
 
 
-
 // 订单管理  新的获取详情接口
 export function saleOrderList(data) {
   return request({
@@ -393,6 +399,7 @@ export function saleOrderList(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  获取色号选项数据接口
 export function queryMaterielList(data) {
   return request({
@@ -401,6 +408,7 @@ export function queryMaterielList(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  新  获取色号选项数据接口
 export function productColourList(data) {
   return request({
@@ -432,7 +440,7 @@ export function getProductSpecificationsByProductName(data) {
   })
 }
 
-// 订单管理   打印出库单  
+// 订单管理 记录批次
 export function printOutsourceOrder(data) {
   return request({
     url: '/system/order/printOutsourceOrder',
@@ -448,4 +456,4 @@ export function againRecordBatch(data) {
     method: 'post',
     data: data,
   })
-}
+}

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -212,7 +212,6 @@ export default {
           productName: item.productName,
           productSpecifications: item.productSpecifications,
           productColour: item.productColour,
-          productId: item.productId,
           lotNumber: item.lotNumber,
           weight: item.productNumber,
           productPrice: item.productUnitPrice,

zkqy-ui/src/views/orderMange/outStock/index.vue

@@ -5,106 +5,42 @@
         <el-col :span="10">
           <div class="table-area">
             <el-row>
-              <el-form
-                :model="queryParams"
-                ref="queryParams"
-                label-width="80px"
-                :inline="true"
-                size="mini"
-              >
-                <el-col :span="10">
-                  <el-form-item label="客户名称:">
-                    <el-input
-                      style="width: 126px"
-                      placeholder="请输入"
-                      clearable
-                      @keyup.enter.native="initData"
-                      v-model="queryParams.customerName"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label="通知单号:">
-                    <el-input
-                      style="width: 126px"
-                      placeholder="请输入"
-                      clearable
-                      @keyup.enter.native="initData"
-                      v-model="queryParams.noticeNumber"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
+              <el-form :model="queryParams" ref="queryParams" label-width="80px" :inline="true" size="mini">
+                <el-form-item label="客户名称:">
+                  <el-input style="width: 126px" placeholder="请输入" clearable @keyup.enter.native="initData"
+                            v-model="queryParams.customerName"/>
+                </el-form-item>
+                <el-form-item label="通知单号:">
+                  <el-input style="width: 126px" placeholder="请输入" clearable @keyup.enter.native="initData"
+                            v-model="queryParams.noticeNumber"/>
+                </el-form-item>
+                <div style="float: right">
                   <el-form-item>
-                    <el-button
-                      type="success"
-                      size="mini"
-                      @click="handleRefresh"
-                      :icon="loading ? 'el-icon-loading' : 'el-icon-search'"
-                      :disabled="loading"
-                      >查询
+                    <el-button type="success" size="mini" @click="handleRefresh"
+                               :icon="loading ? 'el-icon-loading' : 'el-icon-search'" :disabled="loading">查询
                     </el-button>
-                    <!-- <el-button
-                      type="info"
-                      size="mini"
-                      @click="reSetQueryParams"
-                      icon="el-icon-refresh"
-                      >重置</el-button
-                    > -->
+                    <!-- <el-button type="info" size="mini" @click="reSetQueryParams" icon="el-icon-refresh" >重置</el-button > -->
                   </el-form-item>
-                </el-col>
+                </div>
+                <div style="clear: both"/>
               </el-form>
             </el-row>
-            <el-table
-              ref="leftTableDataRef"
-              :data="leftTableData"
-              border
-              stripe
-              @selection-change="handleSelectionChange"
-              @cell-click="cellClick"
-              highlight-current-row
-            >
+            <el-table ref="leftTableDataRef" :data="leftTableData" border stripe
+                      @selection-change="handleSelectionChange" @cell-click="cellClick" highlight-current-row>
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column type="index" label="序号" width="50" />
-              <el-table-column
-                align="center"
-                prop="customerName"
-                label="客户名称"
-              >
-              </el-table-column>
-              <el-table-column
-                align="center"
-                prop="noticeNumber"
-                label="通知单号"
-              >
-              </el-table-column>
-              <el-table-column
-                align="center"
-                prop="noticeDate"
-                label="开单日期"
-              >
-              </el-table-column>
+              <el-table-column type="index" label="序号" width="50"/>
+              <el-table-column align="center" prop="customerName" label="客户名称"></el-table-column>
+              <el-table-column align="center" prop="noticeNumber" label="通知单号"></el-table-column>
+              <el-table-column align="center" prop="noticeDate" label="开单日期"></el-table-column>
             </el-table>
-            <pagination
-              v-show="total > 0"
-              :total="total"
-              :page.sync="queryParams.pageNum"
-              :limit.sync="queryParams.pageSize"
-              @pagination="initData"
-            />
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                        :limit.sync="queryParams.pageSize" @pagination="initData"/>
           </div>
         </el-col>
         <el-col :span="14">
           <div class="form-area">
             <el-row :gutter="20">
-              <el-form
-                :model="form"
-                ref="form"
-                label-width="80px"
-                :inline="true"
-                size="mini"
-                :rules="rules"
-              >
+              <el-form :model="form" ref="form" label-width="80px" :inline="true" size="mini" :rules="rules">
                 <el-col :span="16">
                   <el-form-item label="通知单号" prop="noticeNumber">
                     <div class="text-area">
@@ -143,9 +79,10 @@
                     {{ form.dispatchNoteRemark }}
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item label="发货日期" prop="deliveryDate">
                     <el-date-picker
+                      style="width: 90%"
                       v-model="form.deliveryDate"
                       type="date"
                       size="mini"
@@ -154,13 +91,11 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item label="发货仓库" prop="deliveryWarehouse">
                     <el-select
                       v-model="form.deliveryWarehouse"
-                      clearable
-                      filterable
-                    >
+                      filterable>
                       <el-option
                         v-for="item in warehouseList"
                         :key="item.id"
@@ -171,11 +106,10 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item label="批次" prop="batchNumber">
                     <el-select
                       v-model="form.batchNumber"
-                      clearable
                       filterable
                       @change="batchChangeHandler"
                     >
@@ -206,17 +140,14 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-                <el-col :span="12">
+                <div style="float: right;">
                   <el-form-item>
-                    <el-button type="primary" @click="outStockHandler"
-                      >出库
-                    </el-button>
+                    <el-button type="primary" @click="outStockHandler">出库</el-button>
                     <el-button @click="refreshHandler">刷新</el-button>
-                    <el-button type="info" @click="outStockDetailHandler"
-                      >出库详情</el-button
-                    >
+                    <el-button type="info" @click="outStockDetailHandler">出库详情</el-button>
                   </el-form-item>
-                </el-col>
+                </div>
+                <div style="clear: both"/>
               </el-form>
             </el-row>
             <el-table
@@ -288,14 +219,17 @@
     <el-dialog title="出库详情" :visible.sync="detailVisible" width="1000px">
       <el-descriptions title="通知单信息">
         <el-descriptions-item label="客户名称">{{
-          currentSaleOrder.customerName
-        }}</el-descriptions-item>
+            currentSaleOrder.customerName
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="通知单号">{{
-          currentSaleOrder.noticeNumber
-        }}</el-descriptions-item>
+            currentSaleOrder.noticeNumber
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="开单日期">{{
-          currentSaleOrder.noticeDate
-        }}</el-descriptions-item>
+            currentSaleOrder.noticeDate
+          }}
+        </el-descriptions-item>
       </el-descriptions>
       <el-tabs v-model="activeName">
         <el-tab-pane
@@ -316,7 +250,7 @@
             <el-table-column type="expand">
               <template slot-scope="props">
                 <el-table v-if="load" :data="props.row.children" border stripe>
-                  <el-table-column type="index" width="50" />
+                  <el-table-column type="index" width="50"/>
                   <el-table-column
                     v-for="col in columns"
                     :key="col.prop"
@@ -333,14 +267,15 @@
                         @click="
                           handleDelete(scope.$index, scope.row, props.row)
                         "
-                        >删除</el-button
+                      >删除
+                      </el-button
                       >
                     </template>
                   </el-table-column>
                 </el-table>
               </template>
             </el-table-column>
-            <el-table-column type="index" width="50" />
+            <el-table-column type="index" width="50"/>
             <el-table-column label="名称" prop="productName"></el-table-column>
             <el-table-column
               label="规格"
@@ -348,7 +283,7 @@
             ></el-table-column>
             <el-table-column label="批号" prop="lotNumber"></el-table-column>
             <el-table-column label="等级" prop="productLevel"></el-table-column>
-            <el-table-column label="单位" prop="unit"> </el-table-column>
+            <el-table-column label="单位" prop="unit"></el-table-column>
             <el-table-column
               label="数量"
               prop="productNumber"
@@ -373,7 +308,8 @@
                   size="mini"
                   type="danger"
                   @click="handleReAcount(scope.row)"
-                  >重新登账</el-button
+                >重新登账
+                </el-button
                 >
               </template>
             </el-table-column>
@@ -399,9 +335,9 @@ import {
   noticeOutStorage,
   printOutsourceOrderList,
 } from "@/api/tablelist/commonTable";
-import { mapState } from "vuex";
-import { outboundDetails } from "@/api/system/retailMange.js";
-import { removeErrorOutboundRecord } from "@/api/system/ProductWarehousingRecord";
+import {mapState} from "vuex";
+import {outboundDetails} from "@/api/system/retailMange.js";
+import {removeErrorOutboundRecord} from "@/api/system/ProductWarehousingRecord";
 
 export default {
   name: "OutStock",
@@ -443,13 +379,13 @@ export default {
       saleProductInfoList: [],
       rules: {
         deliveryDate: [
-          { required: true, message: "请选择发货日期", trigger: "change" },
+          {required: true, message: "请选择发货日期", trigger: "change"},
         ],
         deliveryWarehouse: [
-          { required: true, message: "请选择发货仓库", trigger: "change" },
+          {required: true, message: "请选择发货仓库", trigger: "change"},
         ],
         transferWarehouse: [
-          { required: true, message: "请选择调拨仓库", trigger: "change" },
+          {required: true, message: "请选择调拨仓库", trigger: "change"},
         ],
       },
       queryParams: {
@@ -464,15 +400,15 @@ export default {
       rightProductInfoList: [],
       allSaleProductInfoList: [],
       columns: [
-        { prop: "productName", label: "品名" },
-        { prop: "productSpecifications", label: "规格" },
-        { prop: "productColor", label: "颜色" },
-        { prop: "lotNum", label: "批号" },
-        { prop: "levels", label: "等级" },
-        { prop: "grossWeight", label: "毛重" },
-        { prop: "suttle", label: "净重" },
-        { prop: "qrCode", label: "码单号" },
-        { prop: "boxNum", label: "箱号" },
+        {prop: "productName", label: "品名"},
+        {prop: "productSpecifications", label: "规格"},
+        {prop: "productColor", label: "颜色"},
+        {prop: "lotNum", label: "批号"},
+        {prop: "levels", label: "等级"},
+        {prop: "grossWeight", label: "毛重"},
+        {prop: "suttle", label: "净重"},
+        {prop: "qrCode", label: "码单号"},
+        {prop: "boxNum", label: "箱号"},
       ],
     };
   },
@@ -482,7 +418,7 @@ export default {
       this.$confirm(
         "是否删除名称为 “" + row.productName + "” 出库明细数据",
         "提示",
-        { type: "warning" }
+        {type: "warning"}
       ).then(() => {
         removeErrorOutboundRecord(row.id).then((res) => {
           if (res.code == 200) {
@@ -639,12 +575,12 @@ export default {
       };
       this.initData();
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName({row, rowIndex}) {
       if (!row.actualWeight && row.actualWeight != 0) {
         return "warning-row";
       }
     },
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    objectSpanMethod({row, column, rowIndex, columnIndex}) {
       // 重量
       if (columnIndex === 6 || columnIndex === 7 || columnIndex === 9) {
         const prevRow2 = this.saleProductInfoList[rowIndex - 1]; //上一行数据
@@ -655,7 +591,7 @@ export default {
           prevRow2.productCode == row.productCode &&
           prevRow2.productColor == row.productColor
         ) {
-          return { rowspan: 0, colspan: 0 };
+          return {rowspan: 0, colspan: 0};
         } else {
           // 反之，则循环判断若下一行数据等于当前行数据，则当前行开始进行合并单元格
           let countRowspan2 = 1; //用于合并计数多少单元格
@@ -663,12 +599,12 @@ export default {
             nextRow2 &&
             nextRow2.productCode == row.productCode &&
             nextRow2.productColor == row.productColor
-          ) {
+            ) {
             nextRow2 = this.saleProductInfoList[++countRowspan2 + rowIndex];
           }
           if (countRowspan2 > 1) {
             // this.saleProductInfoList[rowIndex].coutBoxNum = 9;
-            return { rowspan: countRowspan2, colspan: 1 };
+            return {rowspan: countRowspan2, colspan: 1};
           }
         }
       }
@@ -705,12 +641,13 @@ export default {
             type: "warning",
           })
             .then(async () => {
-              let payLoad = { ...this.form };
+              let payLoad = {...this.form};
               payLoad.transferWarehouse = payLoad.deliveryWarehouse;
               if (!this.form.id) {
                 return;
               }
               delete payLoad.documentTypeName;
+              if (payLoad.batchNumber == "all") payLoad.batchNumber = null;
               let res = await noticeOutStorage(payLoad);
               if (res.code == 200) {
                 this.$message.success("出库成功");
@@ -732,7 +669,8 @@ export default {
         }
       });
     },
-    handleSelectionChange() {},
+    handleSelectionChange() {
+    },
     // 初始化仓库选项数据
     async initWarehouse() {
       try {
@@ -779,7 +717,8 @@ export default {
         } else {
           throw new Error(res.msg);
         }
-      } catch (error) {}
+      } catch (error) {
+      }
     },
     // 根据字典获取文件类型
     getdocumentTypeName(value) {
@@ -893,7 +832,7 @@ export default {
         }
 
         // 获取批次数据
-        let lotRes = await printOutsourceOrderList({ saleNo });
+        let lotRes = await printOutsourceOrderList({saleNo});
         if (lotRes.code == 200) {
           let tempMap = {};
           this.batchList = [