From cbbaddaf6b6d0fcea8a3add020129a98fb24212e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 13 Dec 2022 16:38:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=86=85=E9=83=A8=E7=A0=81?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/stockOrderNewSelectProduct.vue   | 34 +++++++++++--------
 src/views/inventory/innerOrder.vue            |  4 +--
 src/views/inventory/innerOrderEditDialog.vue  | 27 +++++++++------
 3 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue
index 98ddb8e..d3a1b07 100644
--- a/src/views/business/stockOrderNewSelectProduct.vue
+++ b/src/views/business/stockOrderNewSelectProduct.vue
@@ -178,15 +178,14 @@ export default {
     data() {
         return {
             listQuery: {
-                billNo: "",
+                udiCode: null,
+                unicode: null,
+                cpmctymc: null,
+                ggxh: null,
+                ylqxzcrbarmc: null,
+                thrPiId: null,
                 page: 1,
-                limit: 10,
-            },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
+                limit: 10
             },
             ids:[],
             radioCheck: null,
@@ -244,12 +243,19 @@ export default {
             this.$router.push({
                 path: "",
             });
-            this.listQuery.udiCode=null
-            this.listQuery.unionCode=null
-            this.listQuery.cpmctymc=null
-            this.listQuery.ggxh=null
-            this.listQuery.ylqxzcrbarmc=null
-            this.listQuery.thrPiId=null
+            this.listQuery = {
+                udiCode: null,
+                unicode: null,
+                cpmctymc: null,
+                ggxh: null,
+                ylqxzcrbarmc: null,
+                thrPiId: null,
+                page: 1,
+                limit: 10
+            }
+            this.multipleSelection = [];
+            this.radioCheck = null;
+            this.currentRow = null;
             this.getList();
         },
         tableRowClassName({row}) {
diff --git a/src/views/inventory/innerOrder.vue b/src/views/inventory/innerOrder.vue
index 5c79e14..dfe9011 100644
--- a/src/views/inventory/innerOrder.vue
+++ b/src/views/inventory/innerOrder.vue
@@ -7,7 +7,7 @@
                     <el-form-item class="query-form-item">
                         <el-input
                             v-model="filterQuery.recordKey"
-                            placeholder="内部码打印单"
+                            placeholder="单据号"
                             clearable
                         ></el-input>
                     </el-form-item>
@@ -270,13 +270,11 @@ export default {
             listInnerOrderDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-                    this.total = response.data.total || 0;
                     this.loading = false;
                 })
                 .catch(() => {
                     this.loading = false;
                     this.detailList = [];
-                    this.total = 0;
                 });
         },
         submitOrder(row) {
diff --git a/src/views/inventory/innerOrderEditDialog.vue b/src/views/inventory/innerOrderEditDialog.vue
index 1274d49..a93b459 100644
--- a/src/views/inventory/innerOrderEditDialog.vue
+++ b/src/views/inventory/innerOrderEditDialog.vue
@@ -39,16 +39,8 @@
                         </div>
                     </el-col>
                     <el-col :span="7">
-                        <el-form-item prop="billdate">
-                            <el-date-picker
-                                v-model="formData.billDate"
-                                type="datetime"
-                                placeholder="选择日期"
-                                style="width: 100%"
-                                :clearable="false"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                            >
-                            </el-date-picker>
+                        <el-form-item prop="billNo">
+                            <el-input v-model="formData.billDate" auto-complete="off" :disabled="true"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -189,6 +181,7 @@
 import draggable from "vuedraggable";
 import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
 import {inserThrOrderWeb, delInnerOrderDetail, listInnerOrderDetail} from "@/api/inventory/innerOrder";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "idQuery",
@@ -267,7 +260,7 @@ export default {
                     }
                     if (status === '0') {
                         for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
                                 return this.$message.error('单据数量不能为0');
                             }
                         }
@@ -275,6 +268,16 @@ export default {
                     if (status == "1") {
                         this.submitFunction(status);
                     } else {
+                        if (this.codeArray.length < 1) {
+                            this.$message.warning('未添加产品');
+                            return;
+                        }
+                        for (let i = 0; i < this.codeArray.length; i++) {
+                            if (isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
+                                this.$message.error('单据数量不能为0');
+                                return;
+                            }
+                        }
                         let tip = "是否确定提交订单?";
                         this.$confirm(tip, "提示", {
                             confirmButtonText: "确定",
@@ -419,6 +422,8 @@ export default {
             this.query.limit = 100;
             this.query.orderIdFk = this.idQuery.id;
             this.formData = this.idQuery.formData;
+            this.formData.billNo = this.idQuery.formData.recordKey;
+            this.formData.billDate = this.idQuery.formData.createTime;
             this.orderEditor = true;
             this.sValue = this.formData.corpName;
             this.getStockOrderDetailList();