修改

src/views/home/data.js

@@ -33,10 +33,13 @@ export const columns = [
     showOverflowTooltip: true
   },
   {
-    prop: 'saleTypeName',
+    prop: 'needProduce',
     label: '类型',
     align: 'center',
-    showOverflowTooltip: true
+    showOverflowTooltip: true,
+    formatter: (_row, _column, cellValue) => {
+      return cellValue==1?'生产性订单':cellValue==2?'无客户生产性订单':cellValue==4?'不定向订单':'库存式订单'
+    }
   },
   {
     prop: 'productCodes',
@@ -58,7 +61,7 @@ export const columns = [
     showOverflowTooltip: true
   },
   {
-    prop: 'name6',
+    prop: 'progress',
     label: '进度',
     align: 'center',
     showOverflowTooltip: true,
@@ -110,7 +113,7 @@ export const columns1 = [
     showOverflowTooltip: true
   },
   {
-    prop: 'name6',
+    prop: 'progress',
     label: '进度',
     align: 'center',
     showOverflowTooltip: true,

src/views/home/index.vue

@@ -17,6 +17,7 @@
           </div>
           <ele-pro-table
             ref="table"
+            :pageSize="20"
             :columns="columns"
             :datasource="datasource"
             :toolbar="false"
@@ -34,6 +35,7 @@
           <ele-pro-table
             ref="table"
             :columns="columns1"
+            :pageSize="20"
             :datasource="datasource1"
             :toolbar="false"
             height="calc(100% - 45px)"

src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -951,7 +951,8 @@
         this.$refs.form.validate((valid, obj) => {
           let is = false;
           this.form.datasource.forEach((item) => {
-            if (Number(item.totalCount) > item.orderTotalCount) {
+    
+            if ((Number(item.totalCount)+Number(item.receiveTotalCount)) > item.orderTotalCount) {
               is = true;
             }
           });

src/views/saleManage/saleOrder/index.vue

@@ -372,6 +372,23 @@
             minWidth: 200,
             fixed: 'left'
           },
+          {
+            prop: 'needProduce',
+            label: '订单类型',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 150,
+
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 1
+                ? '生产性订单'
+                : cellValue == 2
+                ? '无客户生产性订单'
+                : cellValue == 4
+                ? '不定向订单'
+                : '库存式订单';
+            }
+          },
           {
             prop: 'preOrderNo',
             label: '预销售订单编码',

src/views/salesServiceManagement/accessory/components/accessoryDialog.vue

@@ -165,6 +165,7 @@ import {
   accessorySave,
   accessoryUpdate
 } from '@/api/salesServiceManagement/index';
+import { getCurrentUser } from '@/utils/token-util';
 
 export default {
   data() {
@@ -187,7 +188,7 @@ export default {
   },
   methods: {
     init(row, type) {
-      let currentUser = JSON.parse(sessionStorage['currentUser']);
+      let currentUser = getCurrentUser()
       this.form.receivingDeptId = currentUser.currentGroupId; // 部门id
       this.roleVOListData();
       this.addRepairNotesDialog = true;

src/views/salesServiceManagement/recycle/component/recycleDialog.vue

@@ -170,7 +170,8 @@
 <script>
 import spareInfo from '@/views/salesServiceManagement/accessory/components/spareInfo.vue';
 import workOrderList from '@/views/salesServiceManagement/accessory/components/workOrderList.vue';
-// import spareParts from '@/views/salesServiceManagement/components/sparePartsList.vue';
+import { getCurrentUser } from '@/utils/token-util';
+
 import {
   recycleSave,
   getSalesWorkOrderById,
@@ -205,7 +206,7 @@ export default {
       this.editRepairNotesDialog = true;
       this.type = type;
       this.title = type == 'add' ? '新增' : '详情';
-      let currentUser = JSON.parse(sessionStorage['currentUser']);
+      let currentUser = getCurrentUser()
       this.form.recycleDeptId = currentUser.currentGroupId; // 部门id
       this.roleVOListData();
       if (row?.id) {