From 1f9c32908a68eef81f549b6986a9bc1f05056108 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 16:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/common/customerorder.vue |   70 +++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/views/common/customerorder.vue b/src/views/common/customerorder.vue
index 17f04bd..6cf7722 100644
--- a/src/views/common/customerorder.vue
+++ b/src/views/common/customerorder.vue
@@ -82,22 +82,22 @@
           {
             minWidth: '100',
             width: '100px',
-            prop: 'customerOrderNo',
+            prop: 'contractNo',
             label: '瀹㈡埛璁㈠崟鍙�',
             sort: true,
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
           },
-          {
-            minWidth: '120',
-            prop: 'customerNo',
-            label: '瀹㈡埛缂栧彿',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'text'
-          },
+          // {
+          //   minWidth: '120',
+          //   prop: 'customerNo',
+          //   label: '瀹㈡埛缂栧彿',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: true,
+          //   searchInfoType: 'text'
+          // },
           {
             minWidth: '120',
             prop: 'customerName',
@@ -120,15 +120,15 @@
               return this.coStateList
             }
           },
-          {
-            minWidth: '120',
-            prop: 'coLineNo',
-            label: '琛屽彿',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'text'
-          },
+          // {
+          //   minWidth: '120',
+          //   prop: 'coLineNo',
+          //   label: '琛屽彿',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: true,
+          //   searchInfoType: 'text'
+          // },
           {
             minWidth: '120',
             width: '100px',
@@ -142,7 +142,7 @@
           {
             minWidth: '120',
             width: '100px',
-            prop: 'partName',
+            prop: 'productName',
             label: '闆朵欢鍚嶇О',
             sort: true,
             isTrue: true,
@@ -160,7 +160,7 @@
           },
           {
             minWidth: '140',
-            prop: 'requireNumber',
+            prop: 'buyQtyDue',
             label: '宸蹭笅鍙戞暟閲�',
             sort: true,
             isTrue: true,
@@ -169,7 +169,7 @@
           },
           {
             minWidth: '80',
-            prop: 'unit',
+            prop: 'otcUnit',
             label: '闆朵欢鍗曚綅',
             sort: true,
             isTrue: true,
@@ -179,25 +179,25 @@
           {
             minWidth: '140',
             width: '120',
-            prop: 'wantedDeliveryDate',
-            label: '鏈熸湜浜よ揣鏃堕棿',
+            prop: 'deliveryDate',
+            label: '浜よ揣鏃堕棿',
             sort: true,
             isTrue: true,
             isSearch: true,
             searchInfoType: 'datetimerange',
             formatter: this.formatDutyDate
           },
-          {
-            minWidth: '200',
-            width: '120',
-            prop: 'plannedDeliveryDate',
-            label: '璁″垝浜よ揣鏃堕棿',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'datetimerange',
-            formatter: this.formatDutyDate
-          },
+          // {
+          //   minWidth: '200',
+          //   width: '120',
+          //   prop: 'plannedDeliveryDate',
+          //   label: '璁″垝浜よ揣鏃堕棿',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: true,
+          //   searchInfoType: 'datetimerange',
+          //   formatter: this.formatDutyDate
+          // },
           {
             minWidth: '200',
             width: '120',

--
Gitblit v1.9.3