From c73a88f095411e6170e9cd6a07e7f3e0c75a07df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com>
Date: Fri, 14 Jan 2022 18:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E6=B1=BD=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ux/vw/dataInput/hq_y_outorder/detail.vue  | 152 ++++--------------
 1 file changed, 33 insertions(+), 119 deletions(-)

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 e760d149..47ac84be 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
@@ -1,4 +1,4 @@
-<!--一汽轿车平台出库单-明细数据-->
+<!--红旗H平台出库单-明细数据-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -32,7 +32,7 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
-       <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="danger"
@@ -44,7 +44,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照看板号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -101,27 +101,6 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
-       <el-table-column
-        prop="OutPutQty"
-        label="出库数量"
-        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">
-      </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;"-->
@@ -140,7 +119,7 @@
         :title="formTitle"
         width="700px"
       >
-         <el-form
+        <el-form
           ref="accountDatelist"
           :inline="true"
           :model="accountDatelist"
@@ -166,9 +145,7 @@
           <el-button
             v-loading="formLoading"
             type="primary"
-            
             @click="handleCreateBills()"
-            
             >确认</el-button
           >
         </div>
@@ -212,8 +189,6 @@ export default {
       customerInfo: {
         parentId: "",
         version: "",
-
-
       },
       form: {
         dicDetailID: "",
@@ -256,8 +231,6 @@ export default {
         guids: "",
         billNum: "",
         accountDate: "",
-        branchId:"",
-        outPutQty:"",
       },
        listDeleteQuery: {
         billNum: "",
@@ -268,7 +241,6 @@ export default {
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
-       stockQty: "",
       drawer: false,
       showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 230,
@@ -316,6 +288,11 @@ export default {
         prop: "version",
         width: 110,
       });
+      tempsTabs.push({
+        label: "订单号",
+        prop: "billNum",
+        width: 170,
+      });
       tempsTabs.push({
         label: "订货看板编号",
         prop: "kanban",
@@ -331,91 +308,12 @@ export default {
       tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
       tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
-      //tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
 
       return tempsTabs;
     },
   },
   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) {
       //版本下拉选择
@@ -492,8 +390,25 @@ export default {
        if (this.$refs["accountDatelist"] !== undefined) {
         this.$refs["accountDatelist"].resetFields();
       }
+        //     this.$axios
+        // .posts(
+        //   "/api/settleaccount/WmsHQCaroutput/WmsHQCaroutput-Pass",
+        //   this.listOutPutQuery
+        // )
+        // .then((response) => {
+        //   const index = this.list.indexOf(row);
+        //   this.$notify({
+        //     title: "成功",
+        //     message: "生成成功",
+        //     type: "success",
+        //     duration: 2000,
+        //   });
+        //   this.getList();
+        //   this.listLoading = false;
+        // })
     },
-     handleCreateBillsEnd(row) {
+    handleCreateBillsEnd(row)
+    {
       this.dialogFormVisible = false;
       this.getList();
     },
@@ -512,7 +427,7 @@ export default {
         this.getList();
         return;
         //this.getList();
-      } else {
+      }else {
       if (this.accountDatelist != "") {
         this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       }
@@ -535,7 +450,7 @@ export default {
             duration: 2000,
           });
           this.accountDatelist.accountDate = "";
-            this.dialogFormVisible = false;
+          this.dialogFormVisible = false;
           this.getList();
           this.listLoading = false;
           this.dialogFormVisible = false;
@@ -561,17 +476,16 @@ export default {
           });
           myalert = "选中项";
         }
-         this.listDeleteQuery.billNum = this.listQuery.billNum ;
+        this.listDeleteQuery.billNum = this.listQuery.billNum ;
       console.log("单据号：" + JSON.stringify(this.listDeleteQuery));
         this.$confirm("是否删除" + myalert + "?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         })
-        
           .then(() => {
             this.$axios
-              .posts("/api/settleaccount/WmsHQCaroutput/WmsOutPutDelete", this.listDeleteQuery)
+              .posts("/api/settleaccount/WmsHQCaroutput/WmsOutPutDelete",  this.listDeleteQuery)
               .then((response) => {
                 const index = this.list.indexOf(row);
                 this.$notify({
@@ -689,7 +603,7 @@ export default {
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "materialCode";
+        var column = "billNum";
         let filter = {
           logic: 0,
           column: column,