增加合计功能

肖超群
1 parent f3008be0
Showing 4 changed files with 331 additions and 12 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/components/jeecgbiz/Pagination.vue
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/task/modules/BatchEmptyOutTaskModal.vue
@@ -167,6 +167,8 @@ export const inventoryPort = (params) =&gt; postAction(&#39;/cycleCountDetail/cycleCoun
 export const createEmptyIn = (params) => postAction('/task/taskHeader/createEmptyIn', params);
 //创建空托盘出库任务
 export const createEmptyOut = (params) => postAction('/task/taskHeader/createEmptyOut', params);
+//选择空托盘出库整出口
+export const selectEmptyOutPort = (params) => postAction('/task/taskHeader/selectEmptyOutPort', params);
 //选择出库整出口
 export const selectOutPort = (params) => postAction('/task/taskHeader/selectOutPort', params);
 //选择出库分拣口
@@ -191,6 +193,8 @@ export const confirmGapQty = (params) =&gt; postAction(&#39;/cycleCountDetail/cycleCoun
 export const createManyEmptyIn = (params) => postAction('/task/taskHeader/createManyEmptyIn', params);
 //创建空托盘组出库任务
 export const createManyEmptyOut = (params) => postAction('/task/taskHeader/createManyEmptyOut', params);
+//批量创建空托盘组出库任务
+export const batchCreateEmptyOut = (params) => postAction('/task/taskHeader/batchCreateEmptyOut', params);
 //获取容器打印数据
 export const getPrintContainer = (params) => postAction('/config/container/getPrintContent?ids=' + params, params);
 //获取库位打印数据
+<template>
+  <a-pagination
+    v-model="current"
+    :page-size-options="pageSizeOptions"
+    :total="total"
+    show-size-changer
+    :page-size="pageSize"
+    @showSizeChange="onShowSizeChange"
+    :show-total="(total, range) => `${range[0]}-${range[1]} 共 ${total} 条`"
+  >
+  </a-pagination>
+</template>
+
+<script>
+export default {
+  props: {
+    total: {
+      type: Number,
+      default: 0,
+    },
+    pageSizeOptions: {
+      type: Array,
+      default() {
+        return ['10', '20',  '50', '100']
+      },
+    },
+  },
+  data() {
+    return {
+      pageSize: 10,
+      current: 1,
+    }
+  },
+  mounted() {},
+  methods: {
+    onShowSizeChange(current, pageSize) {
+      this.pageSize = pageSize
+      this.current = current
+      this.$emit('onShowSizeChange', current, pageSize)
+    },
+  },
+  watch: {
+    current(val) {
+      this.$emit('onShowSizeChange', val, this.pageSize)
+    },
+  },
+}
+</script>
+
+<style scoped>
+.ant-pagination {
+  text-align: right !important;
+  margin-top: 20px !important;
+}
+</style>
 \ No newline at end of file
@@ -162,11 +162,19 @@
         class="j-table-force-nowrap"
         :columns="columns"
         :dataSource="dataSource"
-        :pagination="ipagination"
+        :pagination="false"
         :loading="loading"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
       >
+
+         <span slot="action" slot-scope="text, record">
+          <span v-if="record.id == '合计'"></span>
+          <span v-else>
+           <a @click="handleDetail(record)">详情</a>
+          </span>
+        </span>
+
         <span slot="containerStatus_dictText" slot-scope="containerStatus_dictText">
             <a-tag :key="containerStatus_dictText" :color="getStatusColor(containerStatus_dictText)">
               {{ containerStatus_dictText }}
@@ -222,6 +230,17 @@
           </a-popconfirm>
         </span>
       </a-table>
+
+      <!-- 页面使用分页组件 -->
+      <Pagination
+        v-model="ipagination.current"
+        :total="ipagination.total"
+        show-size-changer
+        :page-size="ipagination.pageSize"
+        @onShowSizeChange="onShowSizeChange"
+        :pageSizeOptions="ipagination.pageSizeOptions"
+      ></Pagination>
+
     </div>
  
     <simple-inventory-detail-modal ref="modalForm" @ok="modalFormOk"></simple-inventory-detail-modal>
@@ -237,9 +256,11 @@ import {JeecgListMixin} from &#39;@/mixins/JeecgListMixin&#39;
 import SimpleInventoryDetailModal from './modules/SimpleInventoryDetailModal'
 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 import {getCompanyList, getZoneList,} from "@api/api";
-import {postAction} from '@/api/manage'
+import {getAction, postAction} from '@/api/manage'
 import QuickShipmentDetailModal from "@views/system/shipment/modules/QuickShipmentDetailModal";
 import QualityInventoryDetailModal from "@views/system/inventory/modules/QualityInventoryDetailModal";
+import Pagination from '@/components/jeecgbiz/Pagination'
+import ellipsis from "@comp/Ellipsis"; //引入 Pagination组件
  
 export default {
   name: 'SimpleInventoryDetailList',
@@ -247,10 +268,15 @@ export default {
   components: {
     QualityInventoryDetailModal,
     QuickShipmentDetailModal,
+    Pagination,
     SimpleInventoryDetailModal
   },
   data() {
     return {
+      newArr: [],
+      newDataSource: [],
+      initDateSource: [],
+      initPageSize: 10,
       zoneList: [],
       zoneOptions: [],
       companyList: [],
@@ -264,13 +290,16 @@ export default {
           dataIndex: 'id',
           // fixed: "left",
           // width: 100,
+          customRender: function (text, r, index) {
+            return text !== '合计' ? parseInt(index) + 1 : text
+          },
         },
         {
           title: '货主',
           align: 'center',
           dataIndex: 'companyCode',
           key: 'companyCode',
-          scopedSlots: {customRender: 'companyCode'}
+          scopedSlots: {customRender: 'companyCode'},
         },
         {
           title: '库区',
@@ -410,14 +439,14 @@ export default {
           align: 'center',
           dataIndex: 'updateTime'
         },
-        // {
-        //   title: '操作',
-        //   dataIndex: 'action',
-        //   align: 'center',
-        //   fixed: 'right',
-        //   width: 147,
-        //   scopedSlots: {customRender: 'action'}
-        // }
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
       ],
       url: {
         list: '/inventory/inventoryDetail/list',
@@ -435,6 +464,8 @@ export default {
     }
   },
   created() {
+    this.initPageSize = this.ipagination.pageSize
+    this.loadData()
     this.loadFrom()
     this.getSuperFieldList()
   },
@@ -459,6 +490,63 @@ export default {
     }
   },
   methods: {
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      //设置请求的条数为初始值
+      this.ipagination.pageSize = this.initPageSize
+      var params = this.getQueryParams() //查询条件
+      this.loading = true
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.initDateSource = res.result.records || res.result
+          this.newDataSource = res.result.records || res.result
+          this.dataHandling()
+          if (res.result.total) {
+            this.ipagination.total = res.result.total
+          } else {
+            this.ipagination.total = 0
+          }
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      })
+    },
+    /*如果分页走这个方法*/
+    dataHandling() {
+      //动态新增每页条数
+      this.ipagination.pageSize = this.initPageSize + 1
+      this.newArr = []
+      var arrs = this.newDataSource
+      if (arrs.length > 0) {
+        let item = {}
+        item.id = '合计'
+        var qty = 0
+        for (let i = 0; i < arrs.length; i++) {
+          qty += arrs[i].qty
+        }
+        item.qty = qty
+        this.newDataSource.push(item)
+      }
+      this.dataSource = Object.values(this.newDataSource)
+    },
+    // 分页改变时调用组件里的方法
+    onShowSizeChange(current, pageSize) {
+      this.ipagination.current = current
+      this.ipagination.pageSize = pageSize
+      //调整每页请求数值
+      this.initPageSize = this.ipagination.pageSize
+      this.loadData()
+    },
+
     handleTableChange(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       if (Object.keys(sorter).length > 0) {
@@ -506,7 +594,7 @@ export default {
             this.zoneOptions.splice(0, 1);
             for (let i = 0; i < res.result.length; i++) {
               this.zoneOptions.push({value: res.result[i].code, text: res.result[i].name})
-              this.columns[2].filters.push({value: res.result[i].code,text:res.result[i].name})
+              // this.columns[2].filters.push({value: res.result[i].code,text:res.result[i].name})
             }
           }, 500)
         }
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="库区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zoneCode">
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                @change="getPortList"
+                v-model="model.zoneCode">
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">{{
+                    item.name
+                  }}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库口" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toPortCode">
+              <a-select
+                show-search
+                placeholder="请选择出库口"
+                option-filter-prop="children"
+                v-model="model.toPortCode">
+                <a-select-option v-for="item in portList" :key="item.name" :value="item.code">{{
+                    item.name
+                  }}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
+              <a-input v-model="model.number" placeholder="请输入数量"></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+
+import {httpAction} from '@/api/manage'
+import {validateDuplicateValue} from '@/utils/util'
+import {
+  batchCreateEmptyOut,
+  createEmptyOut,
+  getCompanyList, getCustomerList,
+  getShipmentTypeList,
+  getZoneList,
+  selectEmptyOutPort
+} from '@/api/api'
+import {selectOutPort} from '@/api/api'
+import JSelectMultiEmptyContainer from "@comp/jeecgbiz/JSelectMultiEmptyContainer";
+
+export default {
+  name: "BatchEmptyOutTaskModal",
+  components: {JSelectMultiEmptyContainer},
+  data() {
+    return {
+      title: "操作",
+      width: 500,
+      portList: [],
+      zoneList: [],
+      querySource: {},
+      visible: false,
+      model: {},
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5},
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16},
+      },
+
+      confirmLoading: false,
+      validatorRules: {
+        containerCode: [
+          {required: true, message: '请输入容器编码!'},
+        ],
+        toPortCode: [
+          {required: true, message: '请选择出库口!'},
+        ],
+      },
+      url: {
+        add: "/task/taskHeader/createEmptyOut",
+      }
+
+    }
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    this.loadFrom();
+  },
+  methods: {
+    add() {
+      // $("select").change(function() {	alert("选项已被改变");	console.log($('select').val());});
+      this.edit(this.modelDefault);
+    },
+    edit() {
+      // this.getPortList();
+      // this.model = Object.assign({}, record);
+      this.visible = true;
+    },
+    loadFrom() {
+      getZoneList().then((res) => {
+        if (res.success) {
+          this.zoneList = res.result
+        }
+      });
+    },
+    close() {
+      this.$emit('close');
+      this.visible = false;
+      this.$refs.form.clearValidate();
+    },
+    getPortList() {
+      this.querySource.zoneCode = this.model.zoneCode;
+      selectEmptyOutPort(this.querySource).then((res) => {
+        if (res.success) {
+          this.portList = res.result;
+          this.visible = true;
+        }
+      });
+    },
+    handleOk() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true;
+          batchCreateEmptyOut(this.model).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message);
+              that.$emit('ok');
+              that.model.containerCode = '';
+              that.model.toPortCode = '';
+            } else {
+              that.$message.warning(res.message);
+            }
+          }).finally(() => {
+            that.confirmLoading = false;
+            that.close();
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+
+
+  }
+}
+</script>
 \ No newline at end of file