Merge remote-tracking branch 'origin/dev' into dev

src/api/distribution/distributionParcelDetails.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/blade-distributionParcelDetails/distributionParcelDetails/list',
+    url: '/api/logpm-distribution/distributionParcelDetails/list',
     method: 'get',
     params: {
       ...params,
@@ -13,7 +13,7 @@ export const getList = (current, size, params) => {
 }
 export const getListParcelDetails = (current, size, params) => {
   return request({
-    url: '/blade-distributionParcelDetails/distributionParcelDetails/list',
+    url: '/api/logpm-distribution/distributionParcelDetails/list',
     method: 'get',
     params: {
       ...params,
@@ -25,7 +25,7 @@ export const getListParcelDetails = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/blade-distributionParcelDetails/distributionParcelDetails/detail',
+    url: '/api/logpm-distribution/distributionParcelDetails/detail',
     method: 'get',
     params: {
       id
@@ -35,7 +35,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/blade-distributionParcelDetails/distributionParcelDetails/remove',
+    url: '/api/logpm-distribution/distributionParcelDetails/remove',
     method: 'post',
     params: {
       ids,
@@ -45,7 +45,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/blade-distributionParcelDetails/distributionParcelDetails/submit',
+    url: '/api/logpm-distribution/distributionParcelDetails/submit',
     method: 'post',
     data: row
   })
@@ -53,7 +53,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/blade-distributionParcelDetails/distributionParcelDetails/submit',
+    url: '/api/logpm-distribution/distributionParcelDetails/submit',
     method: 'post',
     data: row
   })

src/api/distribution/distributionUnpackingDetails.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/blade-distributionUnpackingDetails/distributionUnpackingDetails/list',
+    url: '/api/logpm-distribution/distributionUnpackingDetails/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/blade-distributionUnpackingDetails/distributionUnpackingDetails/detail',
+    url: '/api/logpm-distribution/distributionUnpackingDetails/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/blade-distributionUnpackingDetails/distributionUnpackingDetails/remove',
+    url: '/api/logpm-distribution/distributionUnpackingDetails/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/blade-distributionUnpackingDetails/distributionUnpackingDetails/submit',
+    url: '/api/logpm-distribution/distributionUnpackingDetails/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/blade-distributionUnpackingDetails/distributionUnpackingDetails/submit',
+    url: '/api/logpm-distribution/distributionUnpackingDetails/submit',
     method: 'post',
     data: row
   })

src/option/distribution/distributionStockList.js

@@ -117,10 +117,10 @@ export default {
       label: "拆包数",
       prop: "cargoUnit",
     },
-    {
-      label: "需拆包数",
-      prop: "need",
-    },
+    // {
+    //   label: "需拆包数",
+    //   prop: "need",
+    // },
 
 
   ],

src/views/distribution/inventory/distributionStockList.vue

@@ -88,7 +88,7 @@
         <!-- 列表模块 -->
         <el-table ref="table" v-loading="loading"
                   @selection-change="selectionChangeDismantle"
-                  :data="data"
+                  :data="formDetails"
                   style="width: 100%"
                   :border="option.border">
           <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
@@ -110,6 +110,20 @@
             </template>
           </el-table-column>
         </el-table>
+
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="sizeChangeDetails"
+                           @current-change="currentChangeDetails"
+                           :current-page="pageDetails.currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50, 100]"
+                           :page-size="pageDetails.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="pageDetails.total">
+            </el-pagination>
+          </div>
         <!-- 表单按钮 -->
         <template #footer>
           <span  class="dialog-footer">
@@ -207,10 +221,16 @@ export default {
         pageSize: 10,
         total: 40
       },
+      pageDetails: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
       // 表单数据
       form: {},
       // 选择行
       selectionList: [],
+      formDetails: [],
       selectionListDismantle: [],
       // 表单配置
       option: option,
@@ -307,15 +327,21 @@ export default {
 
     },
     handleViewDismantle (row) {
+      console.log("><<>L:",row);
       this.dismantle = true;
       this.view = true;
       this.title = '拆包';
       //查询包件详情表
       let par ={
-        parcelListId : row.id
+        parcelListId : row.parcelListId
       }
-      getListParcelDetails(this.page.pageSize,this.page.currentPage,par).then(res => {
-        this.formDetails = res.data.data;
+      getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
+        console.log("<><>===", res.data.data);
+        const data = res.data.data;
+        this.pageDetails.total = data.total;
+        this.formDetails = data.records;
+        this.loading = false;
+        this.selectionClear();
       });
     },
     handleDelete () {
@@ -381,6 +407,14 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
+    currentChangeDetails (currentPage) {
+      this.pageDetails.currentPage = currentPage;
+      // this.handleViewDismantle(this.page);
+    },
+    sizeChangeDetails (pageSize) {
+      this.pageDetails.pageSize = pageSize;
+      // this.handleViewDismantle(this.page);
+    },
     onLoad (page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {