yusheng 1 年間 前
コミット
4bb7dfbc5a

+ 11 - 0
src/api/saleManage/palletManagement.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request';
+/**
+ * 获取信息列表
+ */
+export async function getTableList(data) {
+  const res = await request.post(`/eom/saleordersendrecord/listForTrayList`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 2 - 2
src/views/saleManage/saleOrder/customerReturnOrder/index.vue

@@ -93,7 +93,7 @@
             >
               提交
             </el-link>
-            <el-link
+            <!-- <el-link
               type="primary"
               :underline="false"
               icon="el-icon-plus"
@@ -101,7 +101,7 @@
               v-if="[2].includes(row.approvalStatus)&&!row.resendId"
             >
               创建发货单
-            </el-link>
+            </el-link> -->
             <el-popconfirm
               class="ele-action"
               title="确定要删除此信息吗?"

+ 1 - 6
src/views/saleManage/saleOrder/palletManagement/components/searchTable.vue

@@ -56,12 +56,7 @@ export default {
   data() {
     // 默认表单数据
     const defaultParams = {
-      contractName: '',
-      contractId: '',
-      docNo: '',
-      orderId: '',
-      replied: null,
-      reviewStatus: null,
+      orderNo:'',
       projectName:''
     };
     return {

+ 31 - 30
src/views/saleManage/saleOrder/palletManagement/index.vue

@@ -20,13 +20,13 @@
  
 
 
-          <template v-slot:orderCode="{ row }">
+          <template v-slot:orderNo="{ row }">
             <el-link
               type="primary"
               :underline="false"
-              @click="openorderDetail(row, 'orderCode')"
+              @click="openorderDetail(row, 'orderNo')"
             >
-              {{ row.orderCode }}
+              {{ row.orderNo }}
             </el-link>
           </template>
 
@@ -45,6 +45,7 @@
   import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
 
   import dictMixins from '@/mixins/dictMixins';
+  import { getTableList } from '@/api/saleManage/palletManagement';
 
   export default {
     mixins: [dictMixins],
@@ -69,21 +70,22 @@
             showOverflowTooltip: true,
             fixed: 'left'
           },
+          
           {
-            prop: 'orderCode',
-            label: '销售订单编码',
+            prop: 'projectName',
+            label: '项目名称',
             align: 'center',
-            sortable: true,
-            slot: 'orderCode',
             showOverflowTooltip: true,
-            minWidth: 200
+            minWidth: 180
           },
           {
-            prop: 'projectName',
-            label: '项目名称',
+            prop: 'orderNo',
+            label: '销售订单编码',
             align: 'center',
+            sortable: true,
+            // slot: 'orderNo',
             showOverflowTooltip: true,
-            minWidth: 180
+            minWidth: 200
           },
           {
             prop: 'productName',
@@ -101,33 +103,33 @@
           },
    
           {
-            prop: 'receiveCount',
+            prop: 'resviceNum',
             label: '已回收数量',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 140
           },
           {
-            prop: 'noReceiveCount',
+            prop: 'noResviceNum',
             label: '未回收数量',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 140
           },
-          {
-            prop: 'createUserName',
-            label: '创建人',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 80
-          },
-          {
-            prop: 'createTime',
-            label: '创建时间',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 170
-          },
+          // {
+          //   prop: 'createUserName',
+          //   label: '创建人',
+          //   align: 'center',
+          //   showOverflowTooltip: true,
+          //   minWidth: 80
+          // },
+          // {
+          //   prop: 'createTime',
+          //   label: '创建时间',
+          //   align: 'center',
+          //   showOverflowTooltip: true,
+          //   minWidth: 170
+          // },
       
         ]
       };
@@ -137,8 +139,7 @@
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        return []
-        return getSendTableList({
+        return getTableList({
           pageNum: page,
           size: limit,
           ...where
@@ -156,7 +157,7 @@
         if (type === 'docNo') {
           this.$refs.DetailDialogRef.open(row);
         }
-        if (type === 'orderCode') {
+        if (type === 'orderNo') {
           this.$refs.orderDetailDialogRef.open({ id: row.orderId });
         }
       }