feat(销售订单): 优化销售订单状态枚举并优化进度筛选逻辑，采购订单退货详情增加退货数量字段

src/enum/dict.js

@@ -149,6 +149,20 @@ export const saleOrderProgressStatusEnum = [
   { value: 800, label: '全部发货' },
   { value: 1000, label: '完成' }
 ];
+
+//销售订单进度
+export const saleOrderStatusEnum = [
+  { value: 0, label: '未开始' },
+  { value: 100, label: '待排程' },
+  { value: 200, label: '已排程' },
+  { value: 300, label: '待派单' },
+  { value: 400, label: '已派单' },
+  { value: 500, label: '生产执行中' },
+  { value: 501, label: '部分入库' },
+  { value: 600, label: '已入库' },
+  { value: 1000, label: '完成' }
+];
+
 //采购计划整体进度
 export const purchasePlanProgressStatusEnum = [
   { value: 0, label: '未开始' },

src/views/purchasingManage/purchaseOrder/orderAssociation/returnGoodsList.vue

@@ -96,6 +96,13 @@
               showOverflowTooltip: true,
               minWidth: 180,
             },
+            {
+              prop: 'productCount',
+              label: '退货数量',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 180,
+            },
             {
               prop: 'payAmount',
               label: '应付金额',

src/views/saleManage/saleOrder/components/searchTable.vue

@@ -3,7 +3,7 @@
   <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 <script>
-  import { reviewStatusSelect, saleOrderProgressStatusEnum } from '@/enum/dict';
+  import { reviewStatusSelect, saleOrderStatusEnum } from '@/enum/dict';
   export default {
     data() {
       return {};
@@ -124,7 +124,7 @@
             label: '订单进度',
             value: 'progress',
             type: 'select',
-            planList: saleOrderProgressStatusEnum,
+            planList: saleOrderStatusEnum,
             width: 380,
             placeholder: ''
           },

src/views/saleManage/saleOrder/index.vue

@@ -29,9 +29,9 @@
             <search-table @search="reload"></search-table>
             <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
               <el-tab-pane label="全部" name="all"></el-tab-pane>
-              <el-tab-pane label="未发货" name="700"></el-tab-pane>
+              <el-tab-pane label="待发货" name="700"></el-tab-pane>
               <el-tab-pane label="部分发货" name="701"></el-tab-pane>
-              <el-tab-pane label="已发货" name="800"></el-tab-pane>
+              <el-tab-pane label="全部发货" name="800"></el-tab-pane>
             </el-tabs>
             <!-- 数据表格 -->
             <ele-pro-table
@@ -392,7 +392,7 @@ import {
 import { getToDoReminder } from '@/api/common/index';
 import { exportSaleorder } from '@/api/system/file/index.js';
 import dictMixins from '@/mixins/dictMixins';
-import { reviewStatus, saleOrderProgressStatusEnum } from '@/enum/dict';
+import { reviewStatus, saleOrderProgressStatusEnum, saleOrderStatusEnum } from '@/enum/dict';
 import entrustedReceive from '@/views/saleManage/saleOrder/entrustedReceive/index.vue';
 import autogenerateDialog from '@/BIZComponents/autogenerateDialog.vue';
 import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
@@ -737,7 +737,7 @@ export default {
           minWidth: 120
         },
         {
-          prop: 'inventoryQuantity',
+          prop: 'inventoryQuantity1',
           label: '库存状态',
           align: 'center',
           showOverflowTooltip: true,
@@ -959,15 +959,33 @@ export default {
     },
     /* 表格数据源 */
     datasource({ page, limit, where, order }) {
+      console.log('where~~~', where);
       if (this.contactData.id) {
         where['contactId'] = this.contactData.id;
       }
+
+      // 构建进度列表参数
+      const progressList = [];
+      // 添加标签页进度筛选（如果不是'all'标签）
+      if (this.activeName !== 'all') {
+        progressList.push(this.activeName);
+      }
+      // 添加搜索条件中的进度筛选
+      if (where?.progress) {
+        progressList.push(where.progress);
+      }
+      
+      // 构建请求参数
       this.params = {
         pageNum: page,
         size: limit,
-        ...where,
-        progress: this.activeName == 'all' ? '' : this.activeName
+        ...where
       };
+      delete this.params.progress;
+      // 仅当进度列表有值时添加到请求参数
+      if (progressList.length > 0) {
+        this.params.progressList = progressList.join(',');
+      }
       return getTableList(this.params);
     },
 
@@ -977,10 +995,9 @@ export default {
       this.getToDoReminder();
     },
     handleClick() {
-      this.activeName;
       this.$refs.table.reload({
         page: 1,
-        where: { progress: this.activeName == 'all' ? '' : this.activeName }
+        // where: { progress: this.activeName == 'all' ? '' : this.activeName }
       });
     },
     //新增编辑