订单管理打印出库单-接口更改

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

@@ -53,7 +53,7 @@
         label="规格"
         prop="productSpecifications"
       ></el-table-column>
-      <el-table-column label="批号" prop="lotNum"></el-table-column>
+      <el-table-column label="批号" prop="lotNumber"></el-table-column>
       <el-table-column label="单位" prop="unit">
         <template slot-scope="scope">
           <el-input
@@ -64,15 +64,18 @@
           ></el-input>
         </template>
       </el-table-column>
-      <el-table-column label="数量" prop="weight"></el-table-column>
-      <el-table-column label="单价" prop="unitPrice"></el-table-column>
-      <el-table-column label="金额" prop="price"></el-table-column>
+      <el-table-column label="数量" prop="productNumber"></el-table-column>
+      <el-table-column label="单价" prop="productUnitPrice"></el-table-column>
+      <el-table-column label="金额" prop="productAmounts"></el-table-column>
     </el-table>
   </div>
 </template>
 
 <script>
-import { productInvoiceInfo } from "@/api/tablelist/commonTable";
+import {
+  productInvoiceInfo,
+  outboundOrderInfo,
+} from "@/api/tablelist/commonTable";
 export default {
   name: "OutBound",
   props: [],
@@ -85,9 +88,9 @@ export default {
         outStockDate: new Date(),
       },
       rules: {
-        unitName: [
-          { required: true, message: "请输入单位名称", trigger: "blur" },
-        ],
+        // unitName: [
+        //   { required: true, message: "请输入单位名称", trigger: "blur" },
+        // ],
       },
       tableData: [],
       columns: [],
@@ -112,19 +115,19 @@ export default {
         let payload = {
           saleOrderNo: row.saleOrderSaleNo,
         };
-        let res = await productInvoiceInfo(payload);
+        let res = await outboundOrderInfo(payload);
         if (res.code == 200) {
-          res.data.saleProductInfoList.forEach((item) => {
-            if (Number(item.weight) && Number(item.unitPrice)) {
-              item.price = (
-                Number(item.weight) * Number(item.unitPrice)
-              ).toFixed(2);
-            } else {
-              item.price = 0;
-            }
+          res.data.forEach((item) => {
+            // if (Number(item.productNumber) && Number(item.productUnitPrice)) {
+            //   item.price = (
+            //     Number(item.productNumber) * Number(item.productUnitPrice)
+            //   ).toFixed(2);
+            // } else {
+            //   item.price = 0;
+            // }
             item.unit = "";
           });
-          this.tableData = res.data.saleProductInfoList;
+          this.tableData = res.data;
         }
       } catch (error) {}
     },

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

@@ -57,8 +57,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="发货员" prop="drawer">
-              {{ form.drawer }}
+            <el-form-item label="发货员" prop="deliveryClerk">
+              {{ form.deliveryClerk }}
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -148,6 +148,7 @@ import {
   queryDropDownBoxData,
   noticeOutStorage,
 } from "@/api/tablelist/commonTable";
+import { mapState } from "vuex";
 export default {
   name: "OutStock",
   props: [],
@@ -163,10 +164,11 @@ export default {
         salesman: "", //销售员
         sellingUnit: "", //售货单位
         truckRegistration: "", //货车信息
-        drawer: "", //发货员
+        drawer: "", //开票员
+        deliveryClerk: "", // 发货员
         dispatchNoteRemark: "", //备注
         customerName: "", //客户名称
-        deliveryDate: "", //发货日期
+        deliveryDate: new Date(), //发货日期
         deliveryWarehouse: "", //发货仓库
         transferWarehouse: "", //调拨仓库
         id: "",
@@ -283,7 +285,7 @@ export default {
             salesman, //销售员
             sellingUnit, //售货单位
             truckRegistration, //货车信息
-            drawer, //发货员
+            drawer, //开票员
             dispatchNoteRemark, //备注
             saleProductInfoList, //产品信息
             id,
@@ -297,17 +299,22 @@ export default {
             salesman, //销售员
             sellingUnit, //售货单位
             truckRegistration, //货车信息
-            drawer, //发货员
             dispatchNoteRemark, //备注
             customerName, //客户名称
             id,
           });
+          this.form.deliveryClerk = this.nickName;
         }
       } catch (error) {
         console.log(error);
       }
     },
   },
+  computed: {
+    ...mapState({
+      nickName: (state) => state.user.nickName,
+    }),
+  },
   mounted() {
     this.initData();
     this.initWarehouse();