Merge branch 'branch_ccpg_220107' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG into branch_ccpg_220107

# Conflicts:
#	vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue

vue/src/router/modules/vw_menu.js

@@ -30,7 +30,7 @@ const vwMenudataRouter = {
                     name: 'Invoices',
                     meta: {
                         title: '发票汇总',
-                        roles: ['SettleAccount.Reports'],
+                        roles: ['SettleAccount.Invoices'],
                         icon: '对比'
                     }
                 },

vue/src/views/ux/billManage/kanbanOutOrder/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -226,6 +234,9 @@ export default {
         guids: "",
         billNum: "",
       },
+      listDeleteQuery: {
+        billNum: "",
+      },
       accountDatelist:{
         accountDate:""
       },
@@ -402,6 +413,50 @@ export default {
           });
       
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        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/wmskanbanoutput/WmsOutPutDelete", this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button> -->
       <el-input
         v-model="searchContent"
         clearable
@@ -402,6 +410,48 @@ export default {
           });
       
     },
+    //删除出库单
+    // handleDelete(row){
+    //   var params = [];
+    //     let myalert = ""; //声明变量，其变量必须在此声明后使用
+    //     if (row) {
+    //       //单行
+    //       params.push(row.id);
+    //       myalert = row.name;
+    //     } else {
+    //       //多选
+    //       this.multipleSelection.forEach((element) => {
+    //         let id = element.id;
+    //         params.push(id);
+    //       });
+    //       myalert = "选中项";
+    //     }
+    //     this.$confirm("是否删除" + myalert + "?", "提示", {
+    //       confirmButtonText: "确定",
+    //       cancelButtonText: "取消",
+    //       type: "warning",
+    //     })
+    //       .then(() => {
+    //         this.$axios
+    //           .posts("/api/settleaccount/Job/delete", params)
+    //           .then((response) => {
+    //             const index = this.list.indexOf(row);
+    //             this.$notify({
+    //               title: "成功",
+    //               message: "删除成功",
+    //               type: "success",
+    //               duration: 2000,
+    //             });
+    //             this.getList();
+    //           });
+    //       })
+    //       .catch(() => {
+    //         this.$message({
+    //           type: "info",
+    //           message: "已取消操作",
+    //         });
+    //       });
+    // },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/billManage/sparepartOutOrder/detail.vue

@@ -32,6 +32,14 @@
         @click="print()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -226,6 +234,9 @@ export default {
         billNum: "",
         accountDate:""
       },
+      listDeleteQuery: {
+        billNum: "",
+      },
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
@@ -402,6 +413,50 @@ export default {
           });
       
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        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/wmsSharePartoutput/WmsOutPutDelete", this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/billManage/vwOutOrder/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -225,6 +233,9 @@ export default {
         billNum: "",
         accountDate: "",
       },
+      listDeleteQuery: {
+        billNum: "",
+      },
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
@@ -494,6 +505,50 @@ export default {
           });
       }
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        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/wmsjitoutput/WmsOutPutDelete", this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -225,6 +233,9 @@ export default {
         guids: "",
         billNum: "",
         accountDate:""
+      },
+       listDeleteQuery: {
+        billNum: "",
       },
       page: 1,
       JobversionValue: "",
@@ -412,6 +423,50 @@ export default {
           });
       
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        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/WMSHQFKanbanoutput/WmsOutPutDelete", this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue

@@ -32,6 +32,15 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        v-model="listDeleteQuery.billNum"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -93,19 +102,13 @@
           {{ 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">
+        width="100"
+      >
       </el-table-column>
        <el-table-column label="操作" align="center">
             <template slot-scope="list">
@@ -160,9 +163,7 @@
           <el-button
             v-loading="formLoading"
             type="primary"
-            
             @click="handleCreateBills()"
-            
             >确认</el-button
           >
         </div>
@@ -230,6 +231,7 @@ export default {
           return {};
         },
       },
+
       listQuery: {
         Filters: [
           {
@@ -247,9 +249,18 @@ export default {
         version: "",
         guids: "",
         billNum: "",
+<<<<<<< .mine
         accountDate:"",
         branchId:"",
         outPutQty:"",
+=======
+        accountDate: "",
+
+
+>>>>>>> .theirs
+      },
+      listDeleteQuery: {
+        billNum: "",
       },
       page: 1,
       JobversionValue: "",
@@ -262,8 +273,8 @@ export default {
       tableHeight: document.documentElement.clientHeight - 230,
       isEdit: false,
       accountDatelist: {
-        accountDate:""
+        accountDate: "",
-      }
+      },
     };
   },
   mounted() {
@@ -475,12 +486,61 @@ export default {
           });
           this.getList();
           this.listLoading = false;
-            this.dialogFormVisible = false;
         })
         .catch(() => {
           this.listLoading = false;
         });
+    },
+    //删除出库单
+    handleDelete(row) {
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      // if (this.listDeleteQuery != "") {
+      //   this.listQuery.billNum = this.listDeleteQuery.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/wmsHQFSharePartoutput/WmsOutPutDelete",
+              this.listDeleteQuery
+            )
 
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+          });
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
     },
     /** 刷新列表 */
     handleHandle(data) {

vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -257,6 +265,9 @@ export default {
         accountDate: "",
         branchId: "",
         outPutQty: "",
+      },
+       listDeleteQuery: {
+        billNum: "",
       },
       page: 1,
       JobversionValue: "",
@@ -527,6 +538,50 @@ export default {
           this.listLoading = false;
         });
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        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/WmsHQHSharePartoutput/WmsOutPutDelete", this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -223,6 +231,9 @@ export default {
         guids: "",
         billNum: "",
         accountDate: "",
+      },
+       listDeleteQuery: {
+        billNum: "",
       },
       page: 1,
       JobversionValue: "",
@@ -430,6 +441,50 @@ export default {
         });
         
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        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/WmsHQHKanbanoutput/WmsOutPutDelete",  this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -250,6 +258,9 @@ export default {
         accountDate:"",
         branchId:"",
         outPutQty:"",
+      },
+       listDeleteQuery: {
+        billNum: "",
       },
       page: 1,
       JobversionValue: "",
@@ -482,6 +493,50 @@ export default {
           });
       
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        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/WmsHQMSharePartoutput/WmsOutPutDelete", this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue

@@ -32,6 +32,14 @@
         @click="handleCancelBills()"
         >取消出库(支持批量)
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -225,6 +233,9 @@ export default {
         guids: "",
         billNum: "",
         accountDate:""
+      },
+       listDeleteQuery: {
+        billNum: "",
       },
       page: 1,
       JobversionValue: "",
@@ -410,6 +421,50 @@ export default {
             this.listLoading = false;
           });
       
+    },
+     //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+         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/WMSHQMKanbanoutput/WmsOutPutDelete", this.listDeleteQuery)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
     },
     /** 刷新列表 */
     handleHandle(data) {

vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue

@@ -31,6 +31,14 @@
         icon="el-icon-download"
         @click="handleCancelBills()"
         >取消出库(支持批量)
+      </el-button>
+       <el-button
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-download"
+        @click="handleDelete()"
+        >删除出库单(支持批量)
       </el-button>
       <el-input
         v-model="searchContent"
@@ -250,6 +258,9 @@ export default {
         accountDate: "",
         branchId:"",
         outPutQty:"",
+      },
+       listDeleteQuery: {
+        billNum: "",
       },
       page: 1,
       JobversionValue: "",
@@ -515,6 +526,51 @@ export default {
           this.listLoading = false;
         });
     },
+    //删除出库单
+    handleDelete(row){
+      var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+         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)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {

vue/src/views/ux/vw/dataInput/hq_y_report/index.vue

@@ -702,7 +702,8 @@ export default {
         //判断已经生成出库单的不能再生成出库操作
         this.multipleSelection.forEach((element) => {
           let state = element.fileName;
-          if (state != "" && state != "已确认") {
+          if (state != "" && state != "已确认") 
+          {
             this.isEdit = true;
             getbillNum += state + ",";
           }

vue/src/views/ux/vw/dataInput/r3/index.vue

@@ -17,14 +17,14 @@
         >导入文件（Excel）
       </el-button>
 
-      <el-button
+      <!-- <el-button
         class="filter-item"
         size="mini"
         type="primary"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出Csv
-      </el-button>
+      </el-button> -->
       <el-input
         v-model="searchContent"
         clearable