From 2cfc9084044a86b70e8da6864db96c61b4dd4a76 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 27 Sep 2022 15:54:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E5=AF=BC=E8=87=B4=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98=202.=E5=8D=95=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E7=A0=81=E8=AF=A6=E6=83=85=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4=E4=B8=BA=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=A0=81=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/codes.js                   | 13 +++++++++++++
 src/api/warehouse/order.js                   |  8 --------
 src/views/warehouse/DialogChangeNewOrder.vue |  6 +++---
 src/views/warehouse/code.vue                 |  2 +-
 src/views/warehouse/codeReplace.vue          |  7 +++++--
 src/views/warehouse/stockOrderEdit.vue       |  2 +-
 6 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 src/api/warehouse/codes.js

diff --git a/src/api/warehouse/codes.js b/src/api/warehouse/codes.js
new file mode 100644
index 0000000..963bde0
--- /dev/null
+++ b/src/api/warehouse/codes.js
@@ -0,0 +1,13 @@
+import axios from "../../utils/axios";
+
+/**
+ * 更新码创建时间
+ * @param data
+ */
+export function updateCodesTime(data) {
+    return axios({
+        url: "/warehouse/inout/code/updateCodesTime",
+        method: "post",
+        data: data
+    });
+}
diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js
index 43b4479..da5461b 100644
--- a/src/api/warehouse/order.js
+++ b/src/api/warehouse/order.js
@@ -9,14 +9,6 @@ export function orderList(query) {
     });
 }
 
-export function orderGetUdi(query) {
-    return axios({
-        url: "/udiwms/inout/order/getUdi",
-        method: "get",
-        params: query
-    });
-}
-
 export function deleteCodesTempById(query) {
     return axios({
         url: "/warehouse/inout/deleteCodesTempById",
diff --git a/src/views/warehouse/DialogChangeNewOrder.vue b/src/views/warehouse/DialogChangeNewOrder.vue
index 338c56d..e11f6e2 100644
--- a/src/views/warehouse/DialogChangeNewOrder.vue
+++ b/src/views/warehouse/DialogChangeNewOrder.vue
@@ -154,9 +154,9 @@
         <el-table v-loading="detailLoading"
                   :data="detailList"
                   style="width: 100%; margin-top: 20px;">
-            <el-table-column label="产品通用名" width="200" prop="coName"></el-table-column>
-            <el-table-column label="包装规格" width="200" prop="packSpec"></el-table-column>
-            <el-table-column label="批次号" width="100" prop="lotno"></el-table-column>
+            <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
+            <el-table-column label="包装规格" width="200" prop="ggxh"></el-table-column>
+            <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
             <el-table-column label="生产日期" width="120" prop="produceDate"></el-table-column>
             <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
             <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
diff --git a/src/views/warehouse/code.vue b/src/views/warehouse/code.vue
index baf1696..e79df77 100644
--- a/src/views/warehouse/code.vue
+++ b/src/views/warehouse/code.vue
@@ -2,7 +2,7 @@
     <div>
         <el-form :inline="true" :model="query" class="query-form" size="mini">
             <el-form-item class="query-form-item">
-                <el-input v-model="query.code" placeholder="条码查询"></el-input>
+                <el-input v-model="query.code" placeholder="条码查询" clearable></el-input>
             </el-form-item>
 
             <el-form-item>
diff --git a/src/views/warehouse/codeReplace.vue b/src/views/warehouse/codeReplace.vue
index 084bd02..7b8ed28 100644
--- a/src/views/warehouse/codeReplace.vue
+++ b/src/views/warehouse/codeReplace.vue
@@ -143,6 +143,8 @@
             :visible.sync="editOrderVisible"
             width="35%"
             append-to-body
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             v-if="editOrderVisible"
         >
 
@@ -172,9 +174,10 @@
 </template>
 
 <script>
-import {codeList, updateOrderInfo, getOrderById} from "../../api/warehouse/order";
+import {codeList, getOrderById} from "../../api/warehouse/order";
 import draggable from "vuedraggable";
 import {replaceCodes} from "@/api/basic/invWarehouse";
+import {updateCodesTime} from "@/api/warehouse/codes";
 
 export default {
     name: "idQuery",
@@ -336,7 +339,7 @@ export default {
                 actDate: this.actDate,
                 orderIds: [this.query.orderId]
             };
-            updateOrderInfo(data).then((res) => {
+            updateCodesTime(data).then((res) => {
                 if (res.code === 20000) {
                     this.$message.success("修改成功");
                     this.getCodeList();
diff --git a/src/views/warehouse/stockOrderEdit.vue b/src/views/warehouse/stockOrderEdit.vue
index 514f0b0..03ebb46 100644
--- a/src/views/warehouse/stockOrderEdit.vue
+++ b/src/views/warehouse/stockOrderEdit.vue
@@ -20,7 +20,7 @@
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
                 <el-table-column label="包装规格" width="200" prop="ggxh"></el-table-column>
-                <el-table-column label="批次号" width="100" prop="lotno"></el-table-column>
+                <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
                 <el-table-column label="生产日期" width="120" prop="produceDate"></el-table-column>
                 <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
                 <el-table-column label="单据数量" width="100" prop="count"></el-table-column>