From ec3263fcc57c74c4780dff44ffa3639b2b74c446 Mon Sep 17 00:00:00 2001
From: MrZhai <zrhdyxa@163.com>
Date: Thu, 10 Mar 2022 17:37:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8F=91=E7=A5=A8=E7=AC=AC=E4=BA=8C=E7=A5=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=A5=A8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=202.=E8=B0=83=E6=95=B4=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/stockOrderDelSearch.vue | 39 ++++++++++++++++----
 src/views/warehouse/stockOrderSearch.vue    | 41 +++++++++++++++++----
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index c1b68d5..24fe404 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -221,11 +221,11 @@
         </el-card>
 
 
-        <el-dialog :visible.sync="salesListNoFormVisible">
+        <el-dialog v-bind:width="'25%'" :visible.sync="salesListNoFormVisible">
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售清单：" :label-width="formLabelWidth">
-                    <el-input style="width: 50%;" v-model="batchForm.secSalesListNo" autocomplete="off"></el-input>
+                    <el-input style="width: 80%;" v-model="batchForm.secSalesListNo" autocomplete="off"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -234,11 +234,11 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="firstSalesInvNoFormVisible">
+        <el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible">
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
-                    <el-input style="width: 50%;" v-model="batchForm.firstSalesInvNo" autocomplete="off"></el-input>
+                    <el-input style="width: 80%;" v-model="batchForm.firstSalesInvNo" autocomplete="off"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -247,11 +247,14 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="secSalesInvNoFormVisible">
+        <el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible">
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售发票第二票：" :label-width="formLabelWidth">
-                    <el-input style="width: 50%;" v-model="batchForm.secSalesInvNo" autocomplete="off"></el-input>
+                    <el-input style="width: 80%;" v-model="batchForm.secSalesInvNo" autocomplete="off"></el-input>
+                </el-form-item>
+                <el-form-item label="发票日期：" :label-width="formLabelWidth">
+                    <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="batchForm.invoiceDate" style="width: 80%;"></el-date-picker>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -461,12 +464,13 @@ export default {
             batchForm: {
                 secSalesListNo: '',
                 firstSalesInvNo: '',
-                secSalesInvNo: ''
+                secSalesInvNo: '',
+                invoiceDate: ''
             },
             salesListNoFormVisible: false,
             firstSalesInvNoFormVisible: false,
             secSalesInvNoFormVisible: false,
-            formLabelWidth: '120px',
+            formLabelWidth: '150px',
             total: 0,
             detailTotal: 0,
             storageList: [],
@@ -603,6 +607,7 @@ export default {
                         }
                     })
                 });
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'firstSalesInvNo') {
                 this.firstSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
@@ -614,17 +619,20 @@ export default {
                         }
                     })
                 });
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'secSalesInvNo') {
                 this.secSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
                         if (data.id == id) {
                             data.secSalesInvNo = this.batchForm.secSalesInvNo;
+                            data.invoiceDate = this.batchForm.invoiceDate;
                             //更新到数据库
                             updateStockOrderDetail(data);
                         }
                     })
                 });
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else {
                 if (this.multipId.length == 0) {
                     this.$message.warning("请选择数据");
@@ -978,5 +986,20 @@ export default {
 
 <style scoped>
 
+.el-dialog{
+    display: flex;
+    flex-direction: column;
+    margin:0 !important;
+    position:absolute;
+    top:50%;
+    left:50%;
+    transform:translate(-50%,-50%);
+}
+
+.el-dialog .el-dialog__body{
+    flex:1;
+    overflow: auto;
+}
+
 </style>
 
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 8f6dda3..455fe05 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -180,6 +180,7 @@
 
             <el-table v-loading="detailLoading"
                       :data="detailList"
+                      @selection-change="changeFun"
                       style="width: 100%">
 
                 <el-table-column
@@ -246,11 +247,11 @@
             </el-pagination>
         </el-card>
 
-        <el-dialog :visible.sync="salesListNoFormVisible">
+        <el-dialog v-bind:width="'25%'" :visible.sync="salesListNoFormVisible">
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售清单：" :label-width="formLabelWidth">
-                    <el-input style="width: 50%;" v-model="batchForm.secSalesListNo" autocomplete="off"></el-input>
+                    <el-input style="width: 80%;;" v-model="batchForm.secSalesListNo" autocomplete="off"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -259,11 +260,11 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="firstSalesInvNoFormVisible">
+        <el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible">
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
-                    <el-input style="width: 50%;" v-model="batchForm.firstSalesInvNo" autocomplete="off"></el-input>
+                    <el-input style="width: 80%;;" v-model="batchForm.firstSalesInvNo" autocomplete="off"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -272,11 +273,14 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="secSalesInvNoFormVisible">
+        <el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible">
             <el-form :model="batchForm">
                 <label></label>
                 <el-form-item label="销售发票第二票：" :label-width="formLabelWidth">
-                    <el-input style="width: 50%;" v-model="batchForm.secSalesInvNo" autocomplete="off"></el-input>
+                    <el-input style="width: 80%;" v-model="batchForm.secSalesInvNo" autocomplete="off"></el-input>
+                </el-form-item>
+                <el-form-item label="发票日期：" :label-width="formLabelWidth">
+                    <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="batchForm.invoiceDate" style="width: 80%;"></el-date-picker>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -503,12 +507,13 @@ export default {
             batchForm: {
                 secSalesListNo: '',
                 firstSalesInvNo: '',
-                secSalesInvNo: ''
+                secSalesInvNo: '',
+                invoiceDate: ''
             },
             salesListNoFormVisible: false,
             firstSalesInvNoFormVisible: false,
             secSalesInvNoFormVisible: false,
-            formLabelWidth: '120px',
+            formLabelWidth: '150px',
             storageList: [],
             total: 0,
             detailTotal: 0,
@@ -633,6 +638,7 @@ export default {
             row.forEach((item) => {
                 _this.multipId.push(item.id);
             })
+            console.log(this.multipId);
         },
         batchSetParams(flag, type) {
             if (flag == '1' && type == 'salesListNo') {
@@ -646,6 +652,8 @@ export default {
                         }
                     })
                 });
+                //置空批量设置表单
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'firstSalesInvNo') {
                 this.firstSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
@@ -657,17 +665,20 @@ export default {
                         }
                     })
                 });
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'secSalesInvNo') {
                 this.secSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
                         if (data.id == id) {
                             data.secSalesInvNo = this.batchForm.secSalesInvNo;
+                            data.invoiceDate = this.batchForm.invoiceDate;
                             //更新到数据库
                             updateStockOrderDetail(data);
                         }
                     })
                 });
+                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else {
                 if (this.multipId.length == 0) {
                     this.$message.warning("请选择数据");
@@ -1000,4 +1011,18 @@ export default {
 
 <style scoped>
 
+.el-dialog{
+    display: flex;
+    flex-direction: column;
+    margin:0 !important;
+    position:absolute;
+    top:50%;
+    left:50%;
+    transform:translate(-50%,-50%);
+}
+
+.el-dialog .el-dialog__body{
+    flex:1;
+    overflow: auto;
+}
 </style>