From 648c231096cc16456a45cb720c975638854b91fe Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Tue, 23 Nov 2021 09:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=AF=A2?=
 =?UTF-8?q?=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerInquiry/add.vue                   |  9 +--
 .../customerInquiry/index.vue                 | 58 ++++++++++---------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/views/productionPlanning/customerInquiry/add.vue b/src/views/productionPlanning/customerInquiry/add.vue
index ea9e899..95f5dde 100644
--- a/src/views/productionPlanning/customerInquiry/add.vue
+++ b/src/views/productionPlanning/customerInquiry/add.vue
@@ -89,14 +89,7 @@ export default {
                     message: '此项不能为空',
                     trigger: 'blur'
                     },
-                ],
-                'CustomerOrderReviewInfo-ExpectedDate': [
-                    {
-                    required: true,
-                    message: '此项不能为空',
-                    trigger: 'blur'
-                    },
-                ],
+                ]
             },
             loading: false,
             // 菜单树选项
diff --git a/src/views/productionPlanning/customerInquiry/index.vue b/src/views/productionPlanning/customerInquiry/index.vue
index f2b4b78..4b3dc8e 100644
--- a/src/views/productionPlanning/customerInquiry/index.vue
+++ b/src/views/productionPlanning/customerInquiry/index.vue
@@ -49,25 +49,25 @@
             type="selection"
             width="55">
             </el-table-column>
-            <el-table-column
-            v-for="item in headers"
-            :key="item"
-            :label="getColumnName(item)"
-            :prop="item"
-            :show-overflow-tooltip="true" >
-            <template #default="scope">
-                <span v-if="item === 'CustomerOrderReviewInfo-CustomerId'">{{
-                mappingText(customerList, scope.row["CustomerOrderReviewInfo-CustomerId"], 'Customer-CustomerId', 'Customer-Name1')
-                }}</span>
-                <template v-else-if="item === 'CustomerOrderReviewInfo-ReplyDate' && scope.row['CustomerOrderReviewInfo-ReplyDate']" >
-                    <span v-if="compareDate(scope.row['CustomerOrderReviewInfo-ExpectedDate'], scope.row['CustomerOrderReviewInfo-ReplyDate'])" 
-                    style="color:#2D9B8E" >{{ scope.row[item] }}</span>
-                    <span v-else style="color:#FC524B">{{ scope.row[item] }}</span>
-                    </template>
+                <el-table-column
+                v-for="item in headers"
+                :key="item"
+                :label="getColumnName(item)"
+                :prop="item"
+                :show-overflow-tooltip="true" >
+                <template #default="scope">
+                    <span v-if="item === 'CustomerOrderReviewInfo-CustomerId'">{{
+                    mappingText(customerList, scope.row["CustomerOrderReviewInfo-CustomerId"], 'Customer-CustomerId', 'Customer-Name1')
+                    }}</span>
+                    <template v-else-if="item === 'CustomerOrderReviewInfo-ReplyDate' && scope.row['CustomerOrderReviewInfo-ReplyDate']" >
+                        <span v-if="compareDate(scope.row['CustomerOrderReviewInfo-ExpectedDate'], scope.row['CustomerOrderReviewInfo-ReplyDate'])" 
+                        style="color:#2D9B8E" >{{ scope.row[item] }}</span>
+                        <span v-else style="color:#FC524B">{{ scope.row[item] }}</span>
+                        </template>
 
-                <span v-else>{{ scope.row[item] }}</span>
-            </template>
-            </el-table-column>
+                    <span v-else>{{ scope.row[item] }}</span>
+                </template>
+                </el-table-column>
             <el-table-column
             label="操作"
             align="center"
@@ -163,12 +163,11 @@ export default {
                 link.click();
             })
         },
-  
         // 上传回调
         completeCallBack(dataList) {
             this.tableData = dataList
 
-            this.showUploadDailog = false
+            this.importDialogVisable = false
         },
         // 工厂列表
         getCustomerList(){
@@ -185,15 +184,18 @@ export default {
             this.tableData.push(data)
         },
         compareDate(expectedDate,replyDate){
-            if(!replyDate) {
-                return
+
+            if(!expectedDate) {
+                return true
             }
             let expectedDateArr = expectedDate.split("-")
             let expectedDateTime = new Date(expectedDateArr[0], expectedDateArr[1], expectedDateArr[2])
-
+            if(!replyDate) {
+                return false
+            }
             let replyDateArr = replyDate.split("-")
             let replyDateTime = new Date(replyDateArr[0], replyDateArr[1], replyDateArr[2])
-            if (expectedDateTime.getTime() >= replyDateTime.getTime()) {
+            if (expectedDateTime.getTime() > replyDateTime.getTime()) {
                 return false
             } else {
                 return true
@@ -211,7 +213,7 @@ export default {
                         "CustomerOrderReviewInfo-CustomerId": row['CustomerOrderReviewInfo-CustomerId'],
                         "CustomerOrderReviewInfo-ArtId": row['CustomerOrderReviewInfo-ArtId'],
                         "CustomerOrderReviewInfo-Qty":  parseFloat(row['CustomerOrderReviewInfo-Qty']),
-                        "CustomerOrderReviewInfo-ExpectedDate": row['CustomerOrderReviewInfo-ExpectedDate']
+                        "CustomerOrderReviewInfo-ExpectedDate": row['CustomerOrderReviewInfo-ExpectedDate']==""?null:row['CustomerOrderReviewInfo-ExpectedDate']
                     })
                 })
                 this.deliveryTrialDisable = true
@@ -220,10 +222,12 @@ export default {
                         this.detailHeaders = []
                         this.detailTableData = []
                         res.data.forEach( (item,index) => {
-                            this.tableData[index]["CustomerOrderReviewInfo-ReplyDate"] = item['CustomerOrderReviewInfo-ReplyDate']
+                            this.multipleSelection[index]["CustomerOrderReviewInfo-ReplyDate"] = item['CustomerOrderReviewInfo-ReplyDate']
                         })
                         this.deliveryTrialDisable = false
                     }
+                }).catch(() => {
+                    this.deliveryTrialDisable = false
                 })
             }
         },
@@ -233,7 +237,7 @@ export default {
                 "CustomerOrderReviewInfo-CustomerId": row['CustomerOrderReviewInfo-CustomerId'],
                 "CustomerOrderReviewInfo-ArtId": row['CustomerOrderReviewInfo-ArtId'],
                 "CustomerOrderReviewInfo-Qty":  parseFloat(row['CustomerOrderReviewInfo-Qty']),
-                "CustomerOrderReviewInfo-ExpectedDate": row['CustomerOrderReviewInfo-ExpectedDate']
+                "CustomerOrderReviewInfo-ExpectedDate": row['CustomerOrderReviewInfo-ExpectedDate']==""?null:row['CustomerOrderReviewInfo-ExpectedDate']
             }]
             // searchParam = [{
             //     "CustomerOrderReviewInfo-CustomerId": "3",