ymy 1 年之前
父节点
当前提交
58a4fc60ad
共有 2 个文件被更改,包括 60 次插入4 次删除
  1. 5 4
      src/views/oms/B2BOrder/components/autoSplit.vue
  2. 55 0
      src/views/oms/jushuitanOrder/index.vue

+ 5 - 4
src/views/oms/B2BOrder/components/autoSplit.vue

@@ -2,7 +2,7 @@
   <vxe-modal v-model="value" id="autoSplitModal" width="400" v-loading="load" @show="show" @hide="hide" height="260" show-footer title="自动拆分">
     <div class="split-num">
       <div class="max-label">可拆分类型:</div>
-      <el-select v-model="type" placeholder="请选择类型">
+      <el-select v-model="type" size="mini" style="width:200px" placeholder="请选择类型">
         <el-option
           v-for="item in options"
           :key="item.value"
@@ -13,7 +13,7 @@
     </div>
     <div class="split-num">
       <div class="max-label">可拆分数量:</div>
-      <vxe-input v-model="val" size="small" placeholder="请输入" type="integer"></vxe-input>
+      <vxe-input v-model="val" size="small" style="width:200px" placeholder="请输入" type="integer"></vxe-input>
     </div>
     <template #footer>
       <div class="btn">
@@ -73,7 +73,7 @@ export default class UpdateRmkModal extends Vue {
           for(const item of ele.items){
             if(item.qty > n){
               if(this.type){
-                if(this.type == item.orderType){
+                if(this.type == ele.orderType){
                   obj.splitInfos.push({
                     qty:n,
                     orderItemId:item.id
@@ -91,9 +91,10 @@ export default class UpdateRmkModal extends Vue {
             paramArr.push(obj)
           }
         }
+        
       })
       if(paramArr.length == 0){
-        this.$message('未找到可拆分数量大于'+n+'的订单')
+        this.$message('未找到匹配条件的订单')
         return
       }
       this.load = true

+ 55 - 0
src/views/oms/jushuitanOrder/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <div class="box">
+    <vxe-table
+      size="mini"
+      border
+      stripe
+      ref="table"
+      :height="height"
+      :row-config="{isCurrent: true,isHover: true}"
+      :data="data"></vxe-table>
+    <div class="page">
+      <el-pagination v-if="page.total > 0" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.pageNo" :page-size="page.pageSize"
+        :layout="'total, sizes, prev, pager, next, jumper'" :total="page.total"></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+@Component({components:{}})
+export default class JushuitanOrder extends Vue {
+  data:Array<any>=[]
+  height=700
+  page:any={
+    pageNo: 1, //当前页
+    pageSize: 20, //每页条数
+    total: 0 //总条数
+  }
+  handleSizeChange(v:number){
+    this.page.pageSize = v;
+    this.getList()
+  }
+  handleCurrentChange(v:number){
+    this.page.pageNo = v;
+    this.getList()
+  }
+  getList(){
+
+  }
+
+  mounted() {
+    this.getList()
+    this.$nextTick(() => {
+      this.height = (this as any).$el.offsetHeight;
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.box{
+  height: 100%;
+  width: 100%;
+}
+</style>