From 1f1af2c66d3c31d51530f25b1e7b80d805c50b41 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 25 Apr 2022 14:34:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=A1=A5=E5=BD=95=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B3=A8=E9=87=8A=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8C=89=E9=92=AE=EF=BC=8C=E6=9B=BF=E6=8D=A2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=B8=BA=E8=A1=A5=E5=BD=95=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=202.=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/order.js                   | 20 ++++++-
 src/views/inventory/InvPreProductsDetail.vue | 63 ++++----------------
 src/views/warehouse/AdditionalOrder.vue      | 33 ++++------
 src/views/warehouse/InvProducts.vue          |  4 +-
 src/views/warehouse/addOrder.vue             | 29 ++-------
 5 files changed, 49 insertions(+), 100 deletions(-)

diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js
index 92baf16..d5269bc 100644
--- a/src/api/warehouse/order.js
+++ b/src/api/warehouse/order.js
@@ -93,7 +93,7 @@ export function mergeOrder(query) {
 
 export function updateUnit(query) {
     return axios({
-        url: "/udiwms/inout/order/updateUnit",
+        url: "/warehouse/inout/order/unit",
         method: "post",
         data: query
     });
@@ -314,4 +314,22 @@ export function getSupplementOrder(query) {
     });
 }
 
+//查询补录单据数据
+export function additionalOrderList(query) {
+    return axios({
+        url: "/warehouse/inout/order/filterAdditionalOrder",
+        method: "get",
+        params: query
+    });
+}
+
+export function updateCodeBindSup(query) {
+    return axios(
+        {
+            url: "/udiwms/addCode/updateBindSup",
+            method: "post",
+            data: query
+        }
+    )
+}
 
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index 5355322..955649b 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -1,12 +1,11 @@
 <template>
     <div>
-
         <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
             <el-descriptions-item>
                 <template slot="label">
                     产品名称
                 </template>
-                {{ idQuery.cpmctymc }}
+                {{ idQuery.productsName }}
             </el-descriptions-item>
             <el-descriptions-item>
                 <template slot="label">
@@ -41,39 +40,6 @@
             </el-descriptions-item>
         </el-descriptions>
 
-<!--        <el-descriptions style="margin-top: 15px" class="margin-top" title="库存统计" :column="3" :size="size" border>-->
-
-<!--            <el-descriptions-item>-->
-<!--                <template slot="label">-->
-<!--                    入库数量-->
-<!--                </template>-->
-<!--                {{ statData.inCount }}-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item>-->
-<!--                <template slot="label">-->
-<!--                    出库数量-->
-<!--                </template>-->
-<!--                {{ statData.outCount }}-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item>-->
-<!--                <template slot="label">-->
-<!--                    结余数量-->
-<!--                </template>-->
-<!--                {{ (statData.inCount - statData.outCount) }}-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item>-->
-<!--                <template slot="label">-->
-<!--                    普通采购数量-->
-<!--                </template>-->
-<!--                {{ statData.commonCount }}-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item>-->
-<!--                <template slot="label">-->
-<!--                    预入库数量-->
-<!--                </template>-->
-<!--                {{ statData.advanceCount }}-->
-<!--            </el-descriptions-item>-->
-<!--        </el-descriptions>-->
 
         <el-form :inline="true" :model="query" class="query-form" size="mini">
             <el-form-item class="query-form-item">
@@ -93,7 +59,7 @@
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column
                 label="条码"
-                prop="originCode"
+                prop="code"
                 show-overflow-tooltip
             ></el-table-column>
             <el-table-column label="单据类型" prop="action" width="150">
@@ -106,7 +72,8 @@
                 prop="mainActionStr"
                 width="150"
                 show-overflow-tooltip
-            ></el-table-column>
+            >
+            </el-table-column>
             <el-table-column
                 label="入库数量"
                 prop="inCount"
@@ -121,12 +88,6 @@
                 show-overflow-tooltip
             ></el-table-column>
 
-<!--            <el-table-column-->
-<!--                label="数量"-->
-<!--                prop="count"-->
-<!--                width="150"-->
-<!--                show-overflow-tooltip-->
-<!--            ></el-table-column>-->
             <el-table-column
                 label="订单日期"
                 prop="updateTime"
@@ -153,11 +114,12 @@
 
 <script>
 import {
-    filterDetailProducts, statDetailProducts
+    statDetailProducts
 } from "../../api/inventory/InvPreProducts";
+import {filterDetailProducts} from "../../api/warehouse/InvProducts";
 import store from "../../store";
 import draggable from "vuedraggable";
-import {getBussinessType} from "../../api/basic/bussinessType";
+import { getBusTypeByUser} from "../../api/warehouse/BusRole";
 
 export default {
     name: "idQuery",
@@ -185,7 +147,7 @@ export default {
             deleteLoading: false,
             orderNo: null,
             busTypes: [],
-            statData: {},
+            statData: {}
         };
     },
     components: {
@@ -266,15 +228,14 @@ export default {
                 }
             }
         },
-        getBusType() {
+        getBusTypeByUser() {
             let query = {
-                enabled: true,
+                enabled: true
             };
-            getBussinessType(query)
+            getBusTypeByUser(query)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
                     this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
                 })
                 .catch(() => {
                 });
@@ -288,9 +249,9 @@ export default {
         };
     },
     created() {
-        this.getBusType();
         this.getCodeList();
         this.getStat();
+        this.getBusTypeByUser();
     },
 };
 </script>
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 7877776..d0f9edc 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -95,13 +95,13 @@
                 </el-table-column>
                 <el-table-column label="操作" width="180" fixed="right">
                     <template slot-scope="scope">
-                        <el-button
+                       <!-- <el-button
                             type="text"
                             size="small"
                             @click.native.stop="addOrders(scope.row)"
                         >编辑
                         </el-button
-                        >
+                        >-->
                         <el-button
                             type="text"
                             size="small"
@@ -240,8 +240,7 @@
 
 <script>
 import {
-    orderListError,
-    getSupplementOrder,
+    additionalOrderList,
     deleteByOrderId,
     addCommitOrder,
     updateUnit
@@ -250,9 +249,8 @@ import draggable from "vuedraggable";
 import codeDetail from "./errorCode";
 import addOrder from "./addOrder";
 import store from "../../store";
-import { getBasicUnitMaintains } from "@/api/basic/basicUnitMaintain";
+import {getUnitMaintain} from "../../api/receipts/unitMaintain";
 import { filterAllByUser } from "@/api/basic/invWarehouse";
-import { getLocalJoinByUser } from "@/api/basic/busLocalType";
 import {getBusTypeByUser} from "@/api/warehouse/BusRole";
 
 const formJson = {
@@ -268,6 +266,7 @@ export default {
         return {
             filterQuery: {
                 id: "",
+                orderId: "",
                 mainAction: null,
                 action: null,
                 page: 1,
@@ -375,7 +374,7 @@ export default {
         },
         getUnitList() {
             this.loading = true;
-            getBasicUnitMaintains(this.unitquery)
+            getUnitMaintain(this.unitquery)
                 .then((response) => {
                     this.loading = false;
                     this.unitlist = response.data.page.list || [];
@@ -386,7 +385,6 @@ export default {
         },
 
         selectUnit(row) {
-            console.log(row.id);
             this.unitUpdateQuery.id = this.curIndex;
             this.unitUpdateQuery.fromCorp = row.name;
             this.unitUpdateQuery.fromCorpId = row.erpId;
@@ -404,9 +402,8 @@ export default {
             this.loading = true;
             this.filterQuery.status = 5;
             this.filterQuery.customerId = store.getters.customerId;
-            orderListError(this.filterQuery)
+            additionalOrderList(this.filterQuery)
                 .then((response) => {
-                    console.log(response);
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
@@ -468,27 +465,18 @@ export default {
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             var corpOrderId = mOrder.remark;
-
             this.errorDetail = mOrder.remark;
-            console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
             this.dialogVisible = true;
         },
 
         intentDetail(row) {
             this.codeDetailVisible = true;
-            this.idQuery.id = row.id;
+            this.idQuery.id = row.orderId;
         },
         getBusType() {
             let query = {
                 enabled: true
             };
-            /*getLocalJoinByUser(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                })
-                .catch(() => {
-                });*/
             getBusTypeByUser(query).then((res) => {
                 this.busTypes = res.data.list || [];
                 this.filterQuery.billAction = this.busTypes[0].action;
@@ -518,13 +506,12 @@ export default {
             }
         },
         addOrders(row) {
-            console.log(row);
             this.idQuery.id = "";
             this.idQuery.actDate = "";
             this.idQuery.corpOrderId = "";
             this.idQuery.billType = row.action;
-            if (row.id !== null && row.id !== undefined && row.id !== "") {
-                this.idQuery.id = row.id;
+            if (row.id !== null && row.orderId !== undefined && row.orderId !== "") {
+                this.idQuery.id = row.orderId;
                 this.idQuery.actDate = row.actDate;
                 this.idQuery.corpOrderId = row.corpOrderId;
             }
diff --git a/src/views/warehouse/InvProducts.vue b/src/views/warehouse/InvProducts.vue
index 5892199..a591577 100644
--- a/src/views/warehouse/InvProducts.vue
+++ b/src/views/warehouse/InvProducts.vue
@@ -67,7 +67,7 @@
        </el-card>
 
         <el-dialog
-            title="库存详情"
+            title="库存码详情"
             :visible.sync="codeDetailVisible"
             width="65%"
             v-if="codeDetailVisible"
@@ -92,7 +92,7 @@ import {
     deleteProducts
 } from "../../api/warehouse/InvProducts";
 import draggable from "vuedraggable";
-import codeDetail from "./InvProductsDetail";
+import codeDetail from "../inventory/InvPreProductsDetail";
 import store from "../../store";
 import { getBusType } from "../../api/warehouse/BusRole";
 
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 1cea6ad..bfa63c4 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -92,13 +92,9 @@
 
                     <el-col :span="8">
                         <el-form-item prop="locStorageCode">
-                            <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
-                            <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
-                            <!--</el-select>-->
                             <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
                                        :disabled="corpOrderIdDisabled">
                                 <el-option
-
                                     v-for="item in storageList"
                                     :key="item.name"
                                     :label="item.name"
@@ -153,10 +149,6 @@
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
                           :row-style="rowStyle"
                           ref="multipleTable">
-                    <!--                <el-table-column-->
-                    <!--                    type="selection"-->
-                    <!--                    width="55">-->
-                    <!--                </el-table-column>-->
                     <el-table-column label="序号" type="index" width="45"></el-table-column>
                     <el-table-column
                         label="条码"
@@ -252,16 +244,13 @@ import {
     addOrderWeb,
     deleteCodesTempById,
     submitOrderWeb,
-    updateCodeBindSup,
-    expireTimeCheck
+    updateCodeBindSup
 } from "../../api/warehouse/order";
 import draggable from "vuedraggable";
-import {saveAs} from "file-saver";
-import {getBussinessType} from "../../api/basic/bussinessType";
 import {parseTime} from "../../filtres/index";
 import store from "../../store";
-import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
-import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
+import { filterAllByUser} from "@/api/basic/invWarehouse";
+import {getBusTypeByUser} from "../../api/warehouse/BusRole";
 import DialogSelectUnit from "./DialogSelectUnit";
 import selectRlDialog from "./DialogSelectRl";
 
@@ -587,12 +576,11 @@ export default {
             let query = {
                 enabled: true,
             };
-            getLocalJoinBusType(query)
+            getBusTypeByUser(query)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
                     this.curAction = this.busTypes[0];
                     this.getStorage(this.formData.billType);
-                    // this.getList();
                 })
                 .catch(() => {
                 });
@@ -601,13 +589,9 @@ export default {
             this.$router.go(-1);
         },
         getStorage(event) {
-            let query = {
-                // advanceType: this.getActionName(event),
-                isDefault: true,
-            };
+            let query = {};
             this.storageList = [];
-            // this.formData.locStorageCode = null;
-            filterAll(query)
+            filterAllByUser(query)
                 .then((response) => {
                     this.storageList = response.data || [];
                 })
@@ -645,7 +629,6 @@ export default {
                 id: this.curRow.id,
                 relId: row.id,
             };
-            console.log("row.relId = " + row.id);
             updateCodeBindSup(query).then((response) => {
                 if (response.code == 20000) {
                     this.$message.success("绑定成功");