From 9cc4a694e473b82187906fe0a814058f232b44d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com>
Date: Thu, 13 Jan 2022 17:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ux/vw/dataInput/hq_f_outorder/detail.vue  |   2 +
 .../hq_f_outorder_chickout/detail.vue         |  63 ++++++++-
 .../ux/vw/dataInput/hq_h_checkout/detail.vue  | 123 ++++++++++++++++--
 .../ux/vw/dataInput/hq_h_outorder/detail.vue  |  18 +++
 .../ux/vw/dataInput/hq_m_checkout/detail.vue  |  63 ++++++++-
 .../ux/vw/dataInput/hq_m_outorder/detail.vue  |   1 +
 .../ux/vw/dataInput/hq_y_checkout/detail.vue  |   1 +
 .../ux/vw/dataInput/hq_y_outorder/detail.vue  |  94 ++++++++++++-
 8 files changed, 348 insertions(+), 17 deletions(-)

diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
index d087bb52..cf762e52 100644
--- a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
@@ -232,6 +232,7 @@ export default {
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
+       stockQty: "",
       drawer: false,
       showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 230,
@@ -404,6 +405,7 @@ export default {
             });
             this.getList();
             this.listLoading = false;
+            this.dialogFormVisible = false;
           })
           .catch(() => {
             this.listLoading = false;
diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
index 96b3c02d..be0ae196 100644
--- a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
@@ -97,8 +97,8 @@
         prop="OutPutQty"
         label="出库数量"
         width="100">
-         <template slot-scope="scope">
-      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
+        <template slot-scope="list">
+      <el-input size="small" v-model="list.row.outPutQty" @change="handleEdit(list.$index, list.row)"></el-input>
     </template>
       </el-table-column>
       <el-table-column
@@ -107,6 +107,15 @@
         label="状态"
         width="100">
       </el-table-column>
+       <el-table-column label="操作" align="center">
+            <template slot-scope="list">
+               <el-button
+                type="primary"
+                v-if="list.$index=1"
+                @click="handle(list.row)"
+              >确定</el-button>
+           </template>
+          </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -238,7 +247,9 @@ export default {
         version: "",
         guids: "",
         billNum: "",
-        accountDate:""
+        accountDate:"",
+        branchId:"",
+        outPutQty:"",
       },
       page: 1,
       JobversionValue: "",
@@ -315,6 +326,51 @@ export default {
     },
   },
   methods: {
+     //可获取到编辑的数据
+     handleEdit(index, row) {
+      console.log(index, row);
+
+    },
+    handle(row){
+       this.multipleSelection.forEach((element) => {
+           let outPutQty=element.outPutQty;
+        });
+      if (row.outPutQty > row.stockQty) {
+        this.$message({
+          message: "出库数量大于寄售库存,不允许出库！",
+          type: "warning",
+        });
+      } else {
+       if (row.branchId != "") {
+        this.listOutPutQuery.branchId = row.branchId;
+      }
+      if (row.outPutQty != "") {
+        this.listOutPutQuery.outPutQty = row.outPutQty;
+      }
+       console.log(
+        "111111结算数量按钮：" + JSON.stringify(this.listOutPutQuery)
+      );
+      //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
+      this.$axios
+            .posts(
+              "/api/settleaccount/wmsHQFSharePartoutput/WmsSharePartOutPutModify",
+              this.listOutPutQuery
+            )
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "操作成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            })
+             .catch(() => {
+          this.listLoading = false;
+        });
+      }
+    },
     //版本下拉列表选择项
     JobVersionValue(params) {
       //版本下拉选择
@@ -419,6 +475,7 @@ export default {
             });
             this.getList();
             this.listLoading = false;
+            this.dialogFormVisible = false;
           })
           .catch(() => {
             this.listLoading = false;
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
index d94c4c7c..e35c0b76 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
@@ -58,6 +58,7 @@
       </c-r-m-table-head>
     </flexbox>
     <!--表格渲染-->
+
     <el-table
       ref="multipleTable"
       v-loading="listLoading"
@@ -94,18 +95,35 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="OutPutQty"
+        prop="outPutQty"
         label="出库数量"
-        width="100">
-         <template slot-scope="scope">
-      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
-    </template>
+        v-model="outPutQtylist.outPutQty"
+        width="100"
+      >
+        <template slot-scope="list">
+          <el-input
+            size="small"
+            v-model="list.row.outPutQty"
+            @change="handleEdit(list.$index, list.row)"
+          ></el-input>
+        </template>
       </el-table-column>
       <el-table-column
         prop="state"
         :formatter="fieldFormatter"
         label="状态"
-        width="100">
+        width="100"
+      >
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <template slot-scope="list">
+          <el-button
+            type="primary"
+            v-if="(list.$index = 1)"
+            @click="handle(list.row)"
+            >确定</el-button
+          >
+        </template>
       </el-table-column>
     </el-table>
     <div class="table-footer">
@@ -125,7 +143,7 @@
         :title="formTitle"
         width="700px"
       >
-       <el-form
+        <el-form
           ref="accountDatelist"
           :inline="true"
           :model="accountDatelist"
@@ -229,7 +247,7 @@ export default {
           }, //默认查询可用的
         ],
         SkipCount: 0,
-        MaxResultCount: 15,
+        MaxResultCount: 1000,
         billNum: "",
       },
       listOutPutQuery: {
@@ -237,6 +255,8 @@ export default {
         guids: "",
         billNum: "",
         accountDate: "",
+        branchId: "",
+        outPutQty: "",
       },
       page: 1,
       JobversionValue: "",
@@ -244,12 +264,23 @@ export default {
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
+      stockQty: "",
+      qty:"",
       drawer: false,
       showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 230,
       isEdit: false,
       accountDatelist: {
         accountDate: "",
+        // materialCode:"",
+        // state:"",
+        // extend1:"",
+        // qty:"",
+        // outPutQty:"",
+      },
+      outPutQtylist: {
+        outPutQty: "",
+        taskId: "",
       },
     };
   },
@@ -305,7 +336,7 @@ export default {
       });
       tempsTabs.push({ label: "结算零件号", prop: "extend1", width: 220 });
       //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
-      tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
+      tempsTabs.push({ label: "寄售库存", prop: "stockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
       //tempsTabs.push({ label: "状态", prop: "state", width: 100 });
 
@@ -313,6 +344,61 @@ export default {
     },
   },
   methods: {
+    //可获取到编辑的数据
+    handleEdit(index, row) {
+      console.log(index, row);
+    },
+    // rowstyle({ row, rowIndex }) {
+    //         console.log(row, rowIndex);
+    //         let stylejson = {};
+    //         if (this.listOutPutQuery.outPutQty>this.stockQty) {
+    //             stylejson.background = "red";// 背景颜色
+    //             return stylejson;
+    //         } else {
+    //             return "";
+    //         }
+    //     },
+    handle(row) {
+        this.multipleSelection.forEach((element) => {
+           let outPutQty=element.outPutQty;
+        });
+      if (row.outPutQty > row.stockQty) {
+        this.$message({
+          message: "出库数量大于寄售库存,不允许出库！",
+          type: "warning",
+        });
+      } else {
+        if (row.branchId != "") {
+          this.listOutPutQuery.branchId = row.branchId;
+        }
+        if (row.outPutQty != "") {
+          this.listOutPutQuery.outPutQty = row.outPutQty;
+        }
+        console.log(
+          "111111结算数量按钮：" + JSON.stringify(this.listOutPutQuery)
+        );
+        //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
+        this.$axios
+          .posts(
+            "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPutModify",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
+      }
+     
+    },
     //版本下拉列表选择项
     JobVersionValue(params) {
       //版本下拉选择
@@ -397,6 +483,24 @@ export default {
       if (this.accountDatelist != "") {
         this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       }
+      // if (this.accountDatelist != "") {
+      //   this.listOutPutQuery.materialCode = this.accountDatelist.materialCode;
+      // }
+      // if (this.accountDatelist != "") {
+      //   this.listOutPutQuery.materialGroup = this.accountDatelist.materialGroup;
+      // }
+      // if (this.accountDatelist != "") {
+      //   this.listOutPutQuery.extend1 = this.accountDatelist.extend1;
+      // }
+      // if (this.accountDatelist != "") {
+      //   this.listOutPutQuery.qty = this.accountDatelist.qty;
+      // }
+      // if (this.accountDatelist != "") {
+      //   this.listOutPutQuery.outPutQty = this.accountDatelist.outPutQty;
+      // }
+      // if (this.accountDatelist != "") {
+      //   this.listOutPutQuery.state = this.accountDatelist.state;
+      // }
       //this.listOutPutQuery.accountDate = this.accountDatelist;
       console.log(
         "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
@@ -417,6 +521,7 @@ export default {
           });
           this.getList();
           this.listLoading = false;
+          this.dialogFormVisible = false;
         })
         .catch(() => {
           this.listLoading = false;
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
index 5b1e04c9..ad3a7c9f 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
@@ -376,6 +376,22 @@ export default {
     },
     print() {
       this.dialogFormVisible = true;
+        //     this.$axios
+        // .posts(
+        //   "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass",
+        //   this.listOutPutQuery
+        // )
+        // .then((response) => {
+        //   const index = this.list.indexOf(row);
+        //   this.$notify({
+        //     title: "成功",
+        //     message: "生成成功",
+        //     type: "success",
+        //     duration: 2000,
+        //   });
+        //   this.getList();
+        //   this.listLoading = false;
+        // })
     },
     //出库单
     handleCreateBills(row) {
@@ -407,10 +423,12 @@ export default {
           });
           this.getList();
           this.listLoading = false;
+          this.dialogFormVisible = false;
         })
         .catch(() => {
           this.listLoading = false;
         });
+        
     },
     /** 刷新列表 */
     handleHandle(data) {
diff --git a/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
index e1dffab1..41df5754 100644
--- a/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
@@ -97,8 +97,8 @@
         prop="OutPutQty"
         label="出库数量"
         width="100">
-         <template slot-scope="scope">
-      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
+          <template slot-scope="list">
+      <el-input size="small" v-model="list.row.outPutQty" @change="handleEdit(list.$index, list.row)"></el-input>
     </template>
       </el-table-column>
       <el-table-column
@@ -107,6 +107,15 @@
         label="状态"
         width="100">
       </el-table-column>
+      <el-table-column label="操作" align="center">
+            <template slot-scope="list">
+               <el-button
+                type="primary"
+                v-if="list.$index=1"
+                @click="handle(list.row)"
+              >确定</el-button>
+           </template>
+          </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -238,7 +247,9 @@ export default {
         version: "",
         guids: "",
         billNum: "",
-        accountDate:""
+        accountDate:"",
+        branchId:"",
+        outPutQty:"",
       },
       page: 1,
       JobversionValue: "",
@@ -246,6 +257,7 @@ export default {
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
+       stockQty: "",
       drawer: false,
       showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 230,
@@ -315,6 +327,50 @@ export default {
     },
   },
   methods: {
+     handleEdit(index, row) {
+      console.log(index, row);
+
+    },
+    handle(row){
+      this.multipleSelection.forEach((element) => {
+           let outPutQty=element.outPutQty;
+        });
+      if (row.outPutQty > row.stockQty) {
+        this.$message({
+          message: "出库数量大于寄售库存,不允许出库！",
+          type: "warning",
+        });
+      } else {
+       if (row.branchId != "") {
+        this.listOutPutQuery.branchId = row.branchId;
+      }
+      if (row.outPutQty != "") {
+        this.listOutPutQuery.outPutQty = row.outPutQty;
+      }
+       console.log(
+        "111111结算数量按钮：" + JSON.stringify(this.listOutPutQuery)
+      );
+      //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
+      this.$axios
+            .posts(
+              "/api/settleaccount/WmsHQMSharePartoutput/WmsSharePartOutPutModify",
+              this.listOutPutQuery
+            )
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "操作成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            })
+             .catch(() => {
+          this.listLoading = false;
+        });
+      }
+    },
     //版本下拉列表选择项
     JobVersionValue(params) {
       //版本下拉选择
@@ -419,6 +475,7 @@ export default {
             });
             this.getList();
             this.listLoading = false;
+            this.dialogFormVisible = false;
           })
           .catch(() => {
             this.listLoading = false;
diff --git a/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
index f7a3a4ed..0d1324c9 100644
--- a/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
@@ -404,6 +404,7 @@ export default {
             });
             this.getList();
             this.listLoading = false;
+            this.dialogFormVisible = false;
           })
           .catch(() => {
             this.listLoading = false;
diff --git a/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue
index fa5debfb..0055cf72 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue
@@ -354,6 +354,7 @@ export default {
                 });
                 this.getList();
                 this.listLoading = false;
+                this.dialogFormVisible = false;
               });
           })
           .catch(() => {
diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
index e1c2cafb..a135c65a 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
@@ -97,8 +97,8 @@
         prop="OutPutQty"
         label="出库数量"
         width="100">
-         <template slot-scope="scope">
-      <el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
+        <template slot-scope="list">
+      <el-input size="small" v-model="list.row.outPutQty" @change="handleEdit(list.$index, list.row)"></el-input>
     </template>
       </el-table-column>
       <el-table-column
@@ -107,6 +107,13 @@
         label="状态"
         width="100">
       </el-table-column>
+      <template slot-scope="list">
+               <el-button
+                type="primary"
+                v-if="list.$index=1"
+                @click="handle(list.row)"
+              >确定</el-button>
+           </template>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -241,6 +248,8 @@ export default {
         guids: "",
         billNum: "",
         accountDate: "",
+        branchId:"",
+        outPutQty:"",
       },
       page: 1,
       JobversionValue: "",
@@ -248,6 +257,7 @@ export default {
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
+       stockQty: "",
       drawer: false,
       showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 230,
@@ -316,6 +326,85 @@ export default {
     },
   },
   methods: {
+     handleEdit(index, row) {
+      console.log(index, row);
+
+    },
+    handle(row){
+      this.multipleSelection.forEach((element) => {
+           let outPutQty=element.outPutQty;
+        });
+      if (row.outPutQty > row.stockQty) {
+        this.$message({
+          message: "出库数量大于寄售库存,不允许出库！",
+          type: "warning",
+        });
+      } else {
+       if (row.branchId != "") {
+        this.listOutPutQuery.branchId = row.branchId;
+      }
+      if (row.outPutQty != "") {
+        this.listOutPutQuery.outPutQty = row.outPutQty;
+      }
+       console.log(
+        "111111结算数量按钮：" + JSON.stringify(this.listOutPutQuery)
+      );
+      //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
+      this.$axios
+            .posts(
+              "/api/settleaccount/WmsHQMSharePartoutput/WmsSharePartOutPutModify",
+              this.listOutPutQuery
+            )
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "操作成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            })
+             .catch(() => {
+          this.listLoading = false;
+        });
+      }
+    },
+     //可获取到编辑的数据
+     handleEdit(index, row) {
+      console.log(index, row);
+
+    },
+    handle(row){
+       if (row.taskId != "") {
+        this.listOutPutQuery.taskId = row.taskId;
+      }
+      if (row.outPutQty != "") {
+        this.listOutPutQuery.outPutQty = row.outPutQty;
+      }
+       console.log(
+        "111111结算数量按钮：" + JSON.stringify(this.listOutPutQuery)
+      );
+      //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
+      this.$axios
+            .posts(
+              "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPutModify",
+              this.listOutPutQuery
+            )
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "操作成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            })
+             .catch(() => {
+          this.listLoading = false;
+        });
+    },
     //版本下拉列表选择项
     JobVersionValue(params) {
       //版本下拉选择
@@ -420,6 +509,7 @@ export default {
           });
           this.getList();
           this.listLoading = false;
+          this.dialogFormVisible = false;
         })
         .catch(() => {
           this.listLoading = false;