From 938c1d963404199a6f8c28e7c9713a8118cc3fb6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 18 Aug 2022 18:07:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E5=AE=A1=E6=A0=B8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/stockOrderDelete.vue | 36 ++++--------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index 572eb78..94206c2 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -10,7 +10,7 @@
             >
                 <el-row style="width: 100%">
                     <el-form-item class="query-form-item">
-                        <el-input style="width: 300px" v-model="query.orderId" placeholder="单据号"></el-input>
+                        <el-input style="width: 300px" v-model="query.orderId" placeholder="单据号" clearable></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button-group>
@@ -67,17 +67,6 @@
                         <span>{{ scope.row.actDate }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                    label="审核时间"
-                    prop="actDate"
-                    width="150"
-                    show-overflow-tooltip="true"
-                >
-                    <template slot-scope="scope">
-                        <i class="el-icon-time"></i>
-                        <span>{{ scope.row.auditTime }}</span>
-                    </template>
-                </el-table-column>
                 <el-table-column label="校验状态" prop="contrastStatus" width="120">
                     <template slot-scope="scope">
                         <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
@@ -201,6 +190,8 @@
             :visible.sync="editOrderVisible"
             width="35%"
             v-if="editOrderVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
 
             <el-row style="width: 100%">
@@ -214,17 +205,6 @@
                 </el-date-picker>
             </el-row>
 
-            <el-row style="width: 100%; margin-top: 20px;">
-                <el-lable>审核时间：</el-lable>
-                <el-date-picker
-                    v-model="auditTime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    :picker-options="pickerOptions"
-                    placeholder="选择日期">
-                </el-date-picker>
-            </el-row>
-
             <div style="text-align: right; margin-top: 10px;">
                 <el-button type="primary" size="small" icon="search" @click="updateOrderInfo"
                 >提交
@@ -303,7 +283,6 @@
                 codeDetailVisible: false,
                 editOrderVisible: false,
                 actDate: null, //创建时间
-                auditTime: null, //审核时间
                 orderIds: [],
                 pickerOptions: {
                     disabledDate: time => {
@@ -498,7 +477,6 @@
                     return;
                 }
                 this.actDate = null;
-                this.auditTime = null;
                 this.editOrderVisible = true;
             },
             intentDetail(row) {
@@ -511,10 +489,6 @@
                 this.actDate = actDateSplit[0];
                 this.actDate2 = actDateSplit[1];
 
-                let auditTimeSplit = row.auditTime.split(" ");
-                this.auditTime = auditTimeSplit[0];
-                this.auditTime2 = auditTimeSplit[1];
-
                 this.orderIds = [];
             },
             updateOrderInfo() {
@@ -523,12 +497,12 @@
                     return;
                 }
                 this.editOrderVisible = false;
+                this.orderIds = [];
                 this.list.forEach(item => {
-                    this.orderIds.push(item.id);
+                    this.orderIds.push(item.orderId);
                 });
                 let data = {
                     actDate: this.actDate,
-                    auditTime: this.auditTime,
                     orderIds: this.orderIds
                 };
                 updateOrderInfo(data).then((res) => {