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 1/5] =?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;

From e055116aaf6a3d61244c728d054173d604806a19 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:32:47 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataInput/hq_f_outorder_chickout/detail.vue   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

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 c3895aae..04d2178a 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
@@ -102,7 +102,7 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
-      </el-table-column>
+     
       <el-table-column
         prop="state"
         :formatter="fieldFormatter"
@@ -249,15 +249,9 @@ export default {
         version: "",
         guids: "",
         billNum: "",
-<<<<<<< .mine
         accountDate:"",
         branchId:"",
         outPutQty:"",
-=======
-        accountDate: "",
-
-
->>>>>>> .theirs
       },
       listDeleteQuery: {
         billNum: "",
@@ -535,12 +529,7 @@ export default {
               this.getList();
             });
           });
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
+       
     },
     /** 刷新列表 */
     handleHandle(data) {

From deed41cdecef59dafcd0f109ca789c823fb3824c Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Thu, 13 Jan 2022 17:45:11 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/components/ImportExcel-base/index.vue | 10 +++++++--
 vue/src/views/role/index.vue                  |  2 +-
 vue/src/views/ux/basedata/priceList/index.vue | 22 +++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 34d458f6..080f1eb6 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -284,7 +284,7 @@ export default {
       return this.stepsActive == 1;
     },
     getMoudleDisable() {
-      if (this.crmType == "prebatch") {
+      if (this.crmType == "priceList") {
         //只状态可用
         this.isEditYearMont = true;
         this.isEditFactory = true;
@@ -298,6 +298,7 @@ export default {
       return (
         {
           invoice: "大众发票汇总",
+          priceList: "标准价格单",
           vWKanBan: "大众看板结算明细",
           scrapClaims: "CP7报废和索赔",
           sparePart: "大众备件结算明细",
@@ -338,6 +339,7 @@ export default {
       return (
         {
           invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入
+          priceList: "/api/settleaccount/PriceList/ExcelImport-Map", //标准价格单
           vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入
           scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入
           sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入
@@ -563,7 +565,11 @@ export default {
         fd.append("period", "03");
         fd.append("customerCode", "03");
         fd.append("factory", this.YearMonthValue);
-        fd.append("version", this.versionValue);
+        if (this.crmType == "priceList") {
+          fd.append("version", "202110");
+        } else {
+          fd.append("version", this.versionValue);
+        }
         const webapi = this.getWebApi;
         this.$axios
           .posts(webapi, fd)
diff --git a/vue/src/views/role/index.vue b/vue/src/views/role/index.vue
index 825e30cc..8a0845f9 100644
--- a/vue/src/views/role/index.vue
+++ b/vue/src/views/role/index.vue
@@ -321,7 +321,7 @@ export default {
           if (this.isEdit) {
             this.$axios
               .puts("/api/identity/roles/" + this.form.id, this.form)
-              .then((response) => {
+              .then((response) => { 
                 this.formLoading = false;
                 this.$notify({
                   title: "成功",
diff --git a/vue/src/views/ux/basedata/priceList/index.vue b/vue/src/views/ux/basedata/priceList/index.vue
index 89361616..0b32b699 100644
--- a/vue/src/views/ux/basedata/priceList/index.vue
+++ b/vue/src/views/ux/basedata/priceList/index.vue
@@ -9,6 +9,15 @@
         @value-change="selectValue"
       ></XhJSSelect>
 
+       <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入文件（Excel）
+      </el-button>
+
       <el-input
         v-model="searchContent"
         clearable
@@ -119,22 +128,12 @@
 import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
+import importExcel from "@/components/ImportExcel-base";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
 import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 import moment from "moment";
 
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
 
 export default {
   name: "PriceList",
@@ -222,7 +221,6 @@ export default {
       //   userId: "00000000-0000-0000-0000-000000000000",
       // },
       page: 1,
-      bomUnit,
       multipleSelection: [],
       drawer: false,
       tableHeight: document.documentElement.clientHeight - 260,

From bb061bbf433838bb75a749a69c2c91397f408e1a Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Fri, 14 Jan 2022 09:09:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8F=8A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E4=BB=B7=E6=A0=BC=E5=8D=95=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/router/modules/hq_menu.js             | 2 +-
 vue/src/router/modules/hq_out_order.js        | 1 +
 vue/src/router/modules/vw_menu.js             | 2 +-
 vue/src/router/modules/vw_out_order.js        | 1 +
 vue/src/views/ux/basedata/priceList/index.vue | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js
index 273decdb..6d3f5d6c 100644
--- a/vue/src/router/modules/hq_menu.js
+++ b/vue/src/router/modules/hq_menu.js
@@ -9,7 +9,7 @@ const hqMenudataRouter = {
     meta: {
         title: '红旗工厂',
         icon: '红旗',
-        roles: ['SettleAccount.WMSHQ'],
+        roles: ['SettleAccount.WMSHQ','SettleAccount.HQ_HPlatform', 'SettleAccount.HQ_MPlatform','SettleAccount.HQ_FPlatform','SettleAccount.BT_Carlatform','SettleAccount.Reports'],
         keepAlive: false,
     },
     children: [
diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js
index 715e6813..0423cf81 100644
--- a/vue/src/router/modules/hq_out_order.js
+++ b/vue/src/router/modules/hq_out_order.js
@@ -13,6 +13,7 @@ const hqOutOrderDataRouter = {
     index: 0,
     type: 'crm',
     icon: '单据导入',
+    roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
     keepAlive: false,
   },
   children: [
diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js
index 49df7f94..666a6709 100644
--- a/vue/src/router/modules/vw_menu.js
+++ b/vue/src/router/modules/vw_menu.js
@@ -9,7 +9,7 @@ const vwMenudataRouter = {
     meta: {
         title: '大众工厂',
         icon: 'vw',
-        //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
+        roles: ['SettleAccount.Invoices', 'SettleAccount.SettleAccounts', 'SettleAccount.UnSettleAccount', 'SettleAccount.VWKanBan', 'SettleAccount.SparePart', 'SettleAccount.ScrapClaims', 'SettleAccount.Reports'],
         keepAlive: false,
     },
     children: [
diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js
index 52723efd..2eeffa64 100644
--- a/vue/src/router/modules/vw_out_order.js
+++ b/vue/src/router/modules/vw_out_order.js
@@ -13,6 +13,7 @@ const vwOutOrderDataRouter = {
     index: 0,
     type: 'crm',
     icon: '单据导入',
+    roles: ['SettleAccount.WMSJIT'],
     keepAlive: false,
   },
   children: [
diff --git a/vue/src/views/ux/basedata/priceList/index.vue b/vue/src/views/ux/basedata/priceList/index.vue
index 0b32b699..bcaa8f53 100644
--- a/vue/src/views/ux/basedata/priceList/index.vue
+++ b/vue/src/views/ux/basedata/priceList/index.vue
@@ -15,6 +15,7 @@
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
+        v-permission="['SettleAccount.PriceLists.Create']"
         >导入文件（Excel）
       </el-button>
 

From 1301fa3484df4d56f582a46bf29cdf88a1811b69 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 11:10:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=8D=95=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/components/ImportExcel-base/index.vue |   6 +-
 vue/src/router/modules/basedata.js            |  10 +
 .../views/ux/basedata/spareparts/index.vue    | 567 ++++++++++++++++++
 vue/static/tableFieldForSearch.json           |  38 +-
 4 files changed, 617 insertions(+), 4 deletions(-)
 create mode 100644 vue/src/views/ux/basedata/spareparts/index.vue

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 080f1eb6..39f5cbf7 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -284,7 +284,7 @@ export default {
       return this.stepsActive == 1;
     },
     getMoudleDisable() {
-      if (this.crmType == "priceList") {
+      if (this.crmType == "priceList" || this.crmType == "spareparts") {
         //只状态可用
         this.isEditYearMont = true;
         this.isEditFactory = true;
@@ -299,6 +299,7 @@ export default {
         {
           invoice: "大众发票汇总",
           priceList: "标准价格单",
+          spareparts: "备件价格单",
           vWKanBan: "大众看板结算明细",
           scrapClaims: "CP7报废和索赔",
           sparePart: "大众备件结算明细",
@@ -340,6 +341,7 @@ export default {
         {
           invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入
           priceList: "/api/settleaccount/PriceList/ExcelImport-Map", //标准价格单
+          spareparts: "/api/SettleAccount/PriceListBJ/ExcelImport-Map", //备件价格单
           vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入
           scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入
           sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入
@@ -565,7 +567,7 @@ export default {
         fd.append("period", "03");
         fd.append("customerCode", "03");
         fd.append("factory", this.YearMonthValue);
-        if (this.crmType == "priceList") {
+        if (this.crmType == "priceList" || this.crmType == "spareparts") {
           fd.append("version", "202110");
         } else {
           fd.append("version", this.versionValue);
diff --git a/vue/src/router/modules/basedata.js b/vue/src/router/modules/basedata.js
index 6efa7d1c..7937c43f 100644
--- a/vue/src/router/modules/basedata.js
+++ b/vue/src/router/modules/basedata.js
@@ -49,6 +49,16 @@ const basedataRouter = {
         icon: '结算'
       }
     },
+    {
+      path: 'spareparts',
+      component: () => import('@/views/ux/basedata/spareparts/index'),
+      name: 'Spareparts',//命名路由
+      meta: {
+        title: '备件价格单',
+        roles: ['SettleAccount.PriceLists'],
+        icon: '结算'
+      }
+    },
   //   {
   //     path: 'wms-kanban',
   //     component: () => import('@/views/ux/vw/dataInput/wmsKanban'),
diff --git a/vue/src/views/ux/basedata/spareparts/index.vue b/vue/src/views/ux/basedata/spareparts/index.vue
new file mode 100644
index 00000000..0a6c8506
--- /dev/null
+++ b/vue/src/views/ux/basedata/spareparts/index.vue
@@ -0,0 +1,567 @@
+<!--备件价格单信息页-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect>
+
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        v-permission="['SettleAccount.PriceLists.Create']"
+        >导入文件（Excel）
+      </el-button>
+
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照物料编号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-bottom"
+        @click="handleCommand()"
+        >导出Excel
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+
+      <!-- <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown> -->
+    </flexbox>
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-base";
+import Lockr from "lockr";
+import { downloadFile } from "@/utils/crmindex.js";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+import moment from "moment";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "Spareparts",
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "spareparts",
+      versionValue: "",
+      versionList: [], //版本列表
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      // listQuery: {
+      //    Filters: [
+      //    {
+      //         "logic": 0,
+      //         "column": "enabled",
+      //         "action": 0,
+      //         "value": "true"
+      //       }//默认查询可用的
+      //     ],
+      //     //OrgID:"",
+      //     "SkipCount": 0,
+      //     "MaxResultCount": 15
+      // },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: null,
+        fileType: 0,
+        userId: "00000000-0000-0000-0000-000000000000",
+      },
+      listVersionQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        fileType: 0,
+      },
+      // listVersionQuery: {
+
+      //   SkipCount: 0,
+      //   MaxResultCount: 15,
+      //   ParentId: null,
+      //   fileType: 0,
+      //   userId: "00000000-0000-0000-0000-000000000000",
+      // },
+      page: 1,
+      bomUnit,
+      multipleSelection: [],
+      drawer: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getVersionInfo();
+    this.getList();
+  },
+  // watch: {
+  //   customerInfos: {
+  //     handler(newVal) {
+  //       if (newVal == "" || newVal == "undefined") {
+  //         //TODO
+  //       } else {
+  //         newVal.forEach((element) => {
+  //           this.customerInfo.bomId = element.BomId;
+  //         });
+  //         if (this.customerInfo.bomId != "") {
+  //           this.getList();
+  //         }
+  //       }
+  //     },
+  //   },
+  // },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({
+        label: "物料编号",
+        prop: "materialCode",
+        width: 230,
+      });
+      // tempsTabs.push({
+      //   label: "价格类型",
+      //   prop: "type",
+      //   width: 100,
+      // });
+      tempsTabs.push({
+        label: "价格",
+        prop: "price",
+        width: 100,
+      });
+      // tempsTabs.push({ label: "开始日期", prop: "beginDate", width: 120 });
+      // tempsTabs.push({ label: "结束日期", prop: "endDate", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      this.listQuery.fileType = 1; //0是csv,1是excel
+      /* switch (command) {
+        case "excel":
+          this.listQuery.fileType = 1; //0是csv,1是excel
+          break;
+        case "csv":
+          this.listQuery.fileType = 0; //0是csv,1是excel
+          break;
+        default:
+          //这里是没有找到对应的值处理
+          break;
+      } */
+      this.listLoading = true;
+      /* if (this.versionValue === "") {
+        this.$message.error("必需选择版本！");
+        this.listLoading = false;
+        return;
+      } */
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("产品结构导出：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/PriceListBJ/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/PriceListBJ/versionlist",
+          this.listVersionQuery
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.id;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].value;
+            this.getList();
+          }
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "projectRole") {
+        return { 0: "是", 1: "否" }[row[column.property]];
+      }
+      if (column.property == "beginDate" || column.property == "endDate") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList() {
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (this.listQuery.Sorting === "") {
+        this.listQuery.Sorting = "materialCode ascending";
+      }
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.$axios
+        .posts("/api/settleaccount/PriceListBJ/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          this.listQuery.Sorting = "";
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/PriceListBJ/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json
index f0bb53dd..f201fd3c 100644
--- a/vue/static/tableFieldForSearch.json
+++ b/vue/static/tableFieldForSearch.json
@@ -1825,8 +1825,7 @@
         "setting": []
       }
     ]
-  }
-  ,
+  },
   "priceList": {
     "id": "31",
     "data": [
@@ -1862,6 +1861,41 @@
       }
     ]
   },
+  "spareparts": {
+    "id": "31",
+    "data": [
+      {
+        "fieldId": 0,
+        "formType": "text",
+        "name": "价格",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "price",
+        "setting": []
+      },
+      {
+        "fieldId": 1,
+        "formType": "text",
+        "name": "物料编号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialCode",
+        "setting": []
+      },
+      {
+        "fieldId": 1,
+        "formType": "text",
+        "name": "期间",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "version",
+        "setting": []
+      }
+    ]
+  },
   "invoice": {
     "id": "31",
     "data": [