Merge pull request '进仓确认执行之后，触发更新' (#9) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-oms-frontend/pulls/9

src/views/oms/emisWaybill/WsInBatchList.vue

@@ -404,6 +404,10 @@ export default {
       }
       let res = await cusConfirmWsIn({ inNo, confirmStatus, _loading: true ,serialNo:serialNo }).then(() => {
         this.$modal.msgSuccess("操作成功");
+        //刷新列表
+        this.getList();
+        //触发父组件更新进仓单详情
+        this.$emit('updateWhsInDetail');
       })
     },
     async handleFeedDialogClick(item) {

src/views/oms/orderCheck/WarehouseInBatchPanel.vue

@@ -52,7 +52,7 @@
 
   <div style="margin-bottom:20px">
       <div>
-        <WsInBatchList :inNo="settleBillNo" :stockInBatchList="whsInInfo.stockInBatchList"> </WsInBatchList>
+        <WsInBatchList :inNo="settleBillNo" :stockInBatchList="whsInInfo.stockInBatchList" @updateWhsInDetail="onUpdateWhsInDetail"> </WsInBatchList>
       </div>
   </div>
 
@@ -154,148 +154,19 @@ export default {
     /** 查询进仓单批次列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
-        this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
-        this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
-      }
-      if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
-        this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
-        this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
       getWarehouseInDetail({'inNo':this.settleBillNo}).then(response => {
         this.whsInInfo=response.data;
         this.loading = false;
       });
     },
-
+    handleShowOrderInfo(){
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "新增";
-    },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-       this.currentId= row.id;
-       this.openForm = true;
-       this.titleForm = "修改";
-    },
-    handleView(row) {
-       this.id=row.id;
-       this.titleView="查看";
-       this.openView=true;
-    //   this.router.push({ path: '/oms2c/emisWarehouseInBatch/viewDetail', query: { id: row.id }})
-    },
-    handleFormChanged(){
-        this.openForm = false;
-        this.getList();
-    },
-    cancelForm(){
-      this.openForm = false;
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisWarehouseInBatch(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisWarehouseInBatch/export', {
-    //     ...this.queryParams
-    //   }, `emisWarehouseInBatch_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
-
-       getWarehouseInDetail({inNo:this.settleBillNo}).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','进仓序列号','进仓单号','进仓子批次单号in_no+001','客户编号','客户名称','订单号','运单号','运输工具编号','进仓日期','客户确认状态','确认时间','状态','总件数','总体积','总重量','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','serialNo','inNo','inBatchNo','customerCode','customerName','orderSn','billCode','transCarNo','entryDate','confirmStatus','confirmDate','status','totalParcelQty','totalVolume','totalWeight','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '进仓单批次',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
-    },
-    formatJson(filterVal, jsonData, resData) {
-      let index = 0
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'index') {
-          return ++index
-        }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
-        }
-        return v[j]
-      }))
-    },
-    /** 列索引函数  */
-    getIndex($index) {
-          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-    },
-    /** 时间搜索响应函数 */
-    dateTimeChange(value){
-        this.dateTimeRange=value;
-    },
-      handleShowOrderInfo(){
       this.currentTraceBillCode=this.whsInInfo.billCode;
       this.openTraceInfo=true;
     },
+    // 触发父组件更新进仓单详情
+    onUpdateWhsInDetail() {
+      this.getList();
+    }
   }
 };
 </script>