From 7f5659967e4b5864d1c56a6072ebfe3abe4702dc Mon Sep 17 00:00:00 2001
From: chenwei <chenwei@cqprow.com>
Date: 星期五, 04 六月 2021 17:32:01 +0800
Subject: [PATCH] 订单跟踪的完善

---
 src/components/agopage/comment/InfoDialog.vue |  163 +++---
 src/components/agopage/home/Wind.vue          |   59 +-
 src/components/agopage/comment/CarSharing.vue |  107 ++++
 src/views/agomiddle/InquiryCenter.vue         |   36 +
 public/index.html                             |    2 
 public/img/map/position.png                   |    0 
 src/components/agopage/home/Harbour.vue       |  220 +++++---
 src/views/frontdesk/OrderTrack.vue            |  147 ++++-
 src/components/agopage/comment/BoxType.vue    |  694 +++++++++++++++------------
 public/niu.ico                                |    0 
 src/router/index.js                           |   24 
 11 files changed, 894 insertions(+), 558 deletions(-)

diff --git a/public/img/map/position.png b/public/img/map/position.png
new file mode 100644
index 0000000..2ff51cc
--- /dev/null
+++ b/public/img/map/position.png
Binary files differ
diff --git a/public/index.html b/public/index.html
index 695587c..4bc949a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>niu.ico">
     <style>
       .amap-sug-result {
   z-index: 5000 !important;
diff --git a/public/niu.ico b/public/niu.ico
new file mode 100644
index 0000000..4df855f
--- /dev/null
+++ b/public/niu.ico
Binary files differ
diff --git a/src/components/agopage/comment/BoxType.vue b/src/components/agopage/comment/BoxType.vue
index 436e621..f656dfa 100644
--- a/src/components/agopage/comment/BoxType.vue
+++ b/src/components/agopage/comment/BoxType.vue
@@ -25,12 +25,12 @@
                 >
                 </el-date-picker>
               </div>
-              <div class="weight">
+              <!-- <div class="weight">
                 <el-input
                   v-model="item.tempOrder.Weight"
                   @change="weightChange($event, item)"
                 ></el-input>
-              </div>
+              </div> -->
               <div class="type">
                 <el-checkbox
                   v-model="item.tempOrder.IsUrgent"
@@ -44,8 +44,12 @@
                 >
               </div>
 
-              <div class="box" @click="perfectInfo(item,index)">
-                <span v-if="item.tempOrder.TempOrderContainer.length!=0">绠卞彿:{{item.tempOrder.TempOrderContainer[0].ContainerNo}}</span>
+              <div class="box" @click="perfectInfo(item, index)">
+                <span v-if="item.tempOrder.TempOrderContainer.length != 0"
+                  >绠卞彿:{{
+                    item.tempOrder.TempOrderContainer[0].ContainerNo
+                  }}</span
+                >
                 <span v-else>璇风偣鍑绘澶勫畬鍠勪俊鎭�</span>
                 <i class="el-icon-s-unfold"></i>
               </div>
@@ -61,13 +65,17 @@
                 </div>
               </div> -->
 
-              <div class="number" v-if="item.tempOrder.TempOrderContainer.length==0">
+              <div
+                class="number"
+                v-if="item.tempOrder.TempOrderContainer.length == 0"
+              >
                 <el-input-number
                   v-model="item.tempOrder.ContainerNub"
                   @change="handleChange($event, item)"
                   :min="1"
                   :max="10"
-                  label="鏁伴噺" :disabled="item.isNumDisable"
+                  label="鏁伴噺"
+                  :disabled="item.isNumDisable"
                 ></el-input-number>
               </div>
               <div class="number" v-else>
@@ -76,228 +84,267 @@
                   @change="handleChange($event, item)"
                   :min="1"
                   :max="10"
-                  label="鏁伴噺" :disabled="true"
+                  label="鏁伴噺"
+                  :disabled="true"
                 ></el-input-number>
               </div>
+              <div class="box-count" style="width: 33px; text-align: center">
+                {{ item.tempOrder.ContainerNub }}
+              </div>
+              <div
+                style="text-align: center; color: #d9001b; width: 50px"
+                v-if="item.tempOrder.ToTalMoney != null"
+              >
+                锟{ item.tempOrder.ToTalMoney }}
+              </div>
               <div class="money">
-                <div
-                  style="min-width: 42px"
-                  v-if="item.tempOrder.ToTalMoney != null"
-                >
-                  {{ item.tempOrder.ToTalMoney }}
-                </div>
-                <div style="min-width: 42px" v-else>闇�璇环</div>
+                <!-- style="min-width: 42px" -->
+
+                <!-- <div style="min-width: 42px" v-else>闇�璇环</div> -->
                 <div>
                   <el-button
+                    title="鍒犻櫎"
+                    icon="el-icon-delete"
                     plain
-                    size="small"
-                    @click="delOrder(item.tempOrder.TempOrderID,index)"
-                    >鍒犻櫎</el-button
+                    size="mini"
+                    @click="delOrder(item.tempOrder.TempOrderID, index)"
+                  ></el-button>
+                  <el-button
+                    size="mini"
+                    icon="el-icon-document-copy"
+                    title="澶嶅埗"
                   >
+                  </el-button>
                 </div>
-                <div style="width: 72px">
-                  <button
-                    @click="enquiry(item.tempOrder.TempOrderID, item)"
-                    v-if="item.tempOrder.IsInquiryAllowed == 1"
-                  >
+                <div v-if="item.tempOrder.IsInquiryAllowed == 1">
+                  <button @click="enquiry(item.tempOrder.TempOrderID, item)">
                     <i class="el-icon-phone-outline"></i> 璇� 浠�
                   </button>
                 </div>
+                <div
+                  style="width: 72px"
+                  v-if="item.tempOrder.IsInquiryAllowed == 0"
+                ></div>
               </div>
             </div>
+            <!-- 鍙屾墭绠卞瀷 -->
           </div>
           <div class="box-diff">
-            <div class="one" v-if="item.tempOrder.Container.CntrType == 1">
-              <el-checkbox v-model="item.tempOrder.IsCarPooling"
-                @change="isCarPool($event,item)">鍚屾剰鎷艰溅鐪侀挶</el-checkbox
-              >
-            </div>
+            <div>
+              <!-- 娌″�肩殑鍒ゆ柇 -->
+              <div v-if="item.orderinqiry == null">
+                <div v-if="item.tempOrder.Container.CntrType == 2">
+                  <div
+                    v-if="
+                      item.tempOrder.Container.CntrName.substring(2) == 'FR'
+                    "
+                    class="two"
+                  >
+                    <div class="input-info">
+                      <span>璐х墿:</span>
+                      <el-input
+                        v-model="item.orderData.OdiqGoods"
+                        clearable
+                      ></el-input>
+                    </div>
+                    <div class="bulk">
+                      <div>
+                        <span>闀�:</span>
+                        <el-input
+                          v-model="item.orderData.OdiqLong"
+                          clearable
+                        ></el-input>
+                      </div>
+                      <div>
+                        <span>瀹�:</span>
+                        <el-input
+                          v-model="item.orderData.OdiqWidth"
+                          clearable
+                        ></el-input>
+                      </div>
+                      <div>
+                        <span>楂�:</span>
+                        <el-input
+                          v-model="item.orderData.OdiqHeight"
+                          clearable
+                        ></el-input>
+                      </div>
+                    </div>
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                      <el-input
+                        v-model="item.orderData.OdiqRemarks"
+                        clearable
+                      ></el-input>
+                    </div>
+                  </div>
+                  <!-- RF -->
+                  <div
+                    v-if="
+                      item.tempOrder.Container.CntrName.substring(2) == 'RF'
+                    "
+                    class="two"
+                  >
+                    <div class="input-info">
+                      <span><i class="iconfont icon-wendu1"></i>娓╁害:</span>
+                      <el-input
+                        v-model="item.orderData.OdiqTemperature"
+                        clearable
+                      ></el-input>
+                      <span>鈩�</span>
+                    </div>
+                    <div class="input-info">
+                      <span>璐х墿:</span>
+                      <el-input
+                        v-model="item.orderData.OdiqGoods"
+                        clearable
+                      ></el-input>
+                    </div>
 
-            <div
-              class="two"
-              v-if="
-                item.tempOrder.Container.CntrType == 2 &&
-                item.orderinqiry == null &&
-                item.tempOrder.Container.CntrName.substring(2) == 'FR'
-              "
-            >
-              <router-link to="/inquiry">鐗规畩绠辫浠�</router-link>
-
-              <div class="input-info">
-                <span>璐х墿:</span>
-                <el-input
-                  v-model="item.orderData.OdiqGoods"
-                  clearable
-                ></el-input>
-              </div>
-              <div class="bulk">
-                <div>
-                  <span>闀�:</span>
-                  <el-input
-                    v-model="item.orderData.OdiqLong"
-                    clearable
-                  ></el-input>
-                </div>
-                <div>
-                  <span>瀹�:</span>
-                  <el-input
-                    v-model="item.orderData.OdiqWidth"
-                    clearable
-                  ></el-input>
-                </div>
-                <div>
-                  <span>楂�:</span>
-                  <el-input
-                    v-model="item.orderData.OdiqHeight"
-                    clearable
-                  ></el-input>
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                      <el-input
+                        v-model="item.orderData.OdiqRemarks"
+                        clearable
+                      ></el-input>
+                    </div>
+                  </div>
+                  <!--OT  -->
+                  <div
+                    v-if="
+                      item.tempOrder.Container.CntrName.substring(2) == 'OT'
+                    "
+                    class="two"
+                  >
+                    <div class="input-info">
+                      <span>璐х墿:</span>
+                      <el-input v-model="item.orderData.OdiqGoods"></el-input>
+                    </div>
+                    <div class="bulk">
+                      <div>
+                        <span>楂�:</span>
+                        <el-input
+                          v-model="item.orderData.OdiqHeight"
+                        ></el-input>
+                      </div>
+                    </div>
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                      <el-input v-model="item.orderData.OdiqRemarks"></el-input>
+                    </div>
+                  </div>
+                  <!-- 鍒濇涔嬪鐨勬牱寮� -->
+                  <div   v-if="
+                      (item.tempOrder.Container.CntrName.substring(2) != 'OT'&& item.tempOrder.Container.CntrName.substring(2) != 'FR')&& item.tempOrder.Container.CntrName.substring(2) != 'RF'
+                    "
+                    class="two" >
+                        <div class="input-info">
+                      <span>璐х墿:</span>
+                      <el-input v-model="item.orderData.OdiqGoods"></el-input>
+                    </div>
+                  
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                      <el-input v-model="item.orderData.OdiqRemarks"></el-input>
+                    </div>
+                  </div>
                 </div>
               </div>
-              <div class="input-remark">
-                <span>澶囨敞:</span>
-                <el-input
-                  v-model="item.orderData.OdiqRemarks"
-                  clearable
-                ></el-input>
+              <!-- 鏈夊�肩殑鍒ゆ柇 -->
+              <div v-else>
+                 <div v-if="item.tempOrder.Container.CntrType == 2">
+                  <div
+                    v-if="
+                      item.tempOrder.Container.CntrName.substring(2) == 'FR'
+                    "
+                    class="two"
+                  >
+                    <div class="input-info">
+                      <span>璐х墿:</span>
+                       <span>{{item.orderData.OdiqGoods}}</span>
+                    </div>
+                    <div class="bulk">
+                      <div>
+                        <span>闀�:</span>
+                        <span>{{item.orderData.OdiqLong}}</span>
+                      </div>
+                      <div>
+                        <span>瀹�:</span>
+                        <span>{{item.orderData.OdiqWidth}}</span>
+                       
+                      </div>
+                      <div>
+                        <span>楂�:</span>
+                        <span>{{item.orderData.OdiqHeight}}</span>
+                      </div>
+                    </div>
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                      <span>{{item.orderData.OdiqRemarks}}</span>
+                    </div>
+                  </div>
+                  <!-- RF -->
+                  <div
+                    v-if="
+                      item.tempOrder.Container.CntrName.substring(2) == 'RF'
+                    "
+                    class="two"
+                  >
+                    <div class="input-info">
+                      <span><i class="iconfont icon-wendu1"></i>娓╁害:</span>
+                      <span>{{item.orderData.OdiqTemperature}}鈩�</span>
+                    </div>
+                    <div class="input-info">
+                      <span>璐х墿:</span>
+                      <span>{{item.orderData.OdiqGoods}}</span>
+                    </div>
+
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                      <span>{{item.orderData.OdiqRemarks}}</span>
+                    </div>
+                  </div>
+                  <!--OT  -->
+                  <div
+                    v-if="
+                      item.tempOrder.Container.CntrName.substring(2) == 'OT'
+                    "
+                    class="two"
+                  >
+                    <div class="input-info">
+                      <span>璐х墿:</span>
+                      <span>{{item.orderData.OdiqGoods}}</span>
+                    </div>
+                    <div class="bulk">
+                      <div>
+                        <span>楂�:</span>
+                        <span>{{item.orderData.OdiqHeight}}</span>
+                      </div>
+                    </div>
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                      <span>{{item.orderData.OdiqRemarks}}</span>
+                    </div>
+                  </div>
+                  <!-- 鍒濇涔嬪鐨勬牱寮� -->
+                  <div   v-if="
+                      (item.tempOrder.Container.CntrName.substring(2) != 'OT'&& item.tempOrder.Container.CntrName.substring(2) != 'FR')&& item.tempOrder.Container.CntrName.substring(2) != 'RF'
+                    "
+                    class="two" >
+                        <div class="input-info">
+                      <span>璐х墿:</span>
+                      <span>{{item.orderData.OdiqGoods}}</span>
+                    </div>
+                  
+                    <div class="input-remark">
+                      <span>澶囨敞:</span>
+                       <span>{{item.orderData.OdiqRemarks}}</span>
+                    </div>
+                  </div>
+                </div>
               </div>
             </div>
-
-            <!-- <div class="two" v-if="item.orderinqiry!=null">
-              <div>宸茶浠�
-                <span>璇环鏃堕棿锛�2021-03-31</span>
-              </div>
-              <div class="input-info">
-                <span>璐х墿:鏂扮枂妫夎姳</span>
-              
-              </div>
-              <div class="bulk">
-                <div>
-                  <span>闀�:2绫�</span>
-                
-                </div>
-                <div>
-                  <span>瀹�:1绫�</span>
-               
-                </div>
-                <div>
-                  <span>楂�:1.5绫�</span>
-                 
-                </div>
-              </div>
-              <div class="input-remark">
-                <span>澶囨敞:</span>
-                <span>娴嬭瘯澶囨敞澶囨敞</span>
-              </div>
-              <div class="time">
-                璇环绛夊緟鏃堕暱:1澶�2灏忔椂
-              </div>
-            </div> -->
-            <!-- 鏈夊�艰繘琛屽睍绀� -->
-            <div class="two four" v-if="item.orderinqiry != null">
-              <div>
-                宸茶浠�
-                <span>璇环鏃堕棿锛歿{ item.orderinqiry.OdiqReplyTime }}</span>
-              </div>
-              <div class="input-info">
-                <span>璐х墿:{{ item.orderinqiry.OdiqGoods }}</span>
-              </div>
-              <div class="bulk">
-                <div>
-                  <span>闀�:{{ item.orderinqiry.OdiqLong }}绫�</span>
-                </div>
-                <div>
-                  <span>瀹�:{{ item.orderinqiry.OdiqWidth }}绫�</span>
-                </div>
-                <div>
-                  <span>楂�:{{ item.orderinqiry.OdiqHeight }}绫�</span>
-                </div>
-              </div>
-              <div class="input-remark">
-                <span>澶囨敞:</span>
-                <span>{{ item.orderinqiry.OdiqRemarks }}</span>
-              </div>
-              <div class="time-two">
-                璇环鏃堕暱:{{ item.orderinqiry.OdiqWaitDuration }}
-              </div>
-              <div class="money">
-                <span v-if="item.orderinqiry.OdiqMoney != null"
-                  >锟� {{ item.orderinqiry.OdiqMoney }}</span
-                >
-              </div>
-            </div>
-
-            <div
-              class="two"
-              v-if="
-                item.tempOrder.Container.CntrType == 2 &&
-                item.orderinqiry == null &&
-                item.tempOrder.Container.CntrName.substring(2) == 'OT'
-              "
-            >
-              <router-link to="/inquiry">鐗规畩绠辫浠�</router-link>
-              <div class="input-info">
-                <span>璐х墿:</span>
-                <el-input v-model="item.orderData.OdiqGoods"></el-input>
-              </div>
-              <!-- <div class="input-info">
-                <span>閲嶉噺:</span>
-                <el-input></el-input>
-              </div> -->
-              <div class="bulk">
-                <div>
-                  <span>楂�:</span>
-                  <el-input v-model="item.orderData.OdiqHeight"></el-input>
-                </div>
-              </div>
-              <div class="input-remark">
-                <span>澶囨敞:</span>
-                <el-input v-model="item.orderData.OdiqRemarks"></el-input>
-              </div>
-            </div>
-
-            <div
-              class="two"
-              v-if="
-                item.tempOrder.Container.CntrType == 2 &&
-                item.orderinqiry == null &&
-                item.tempOrder.Container.CntrName.substring(2) == 'RF'
-              "
-            >
-              <div
-                class="one"
-                v-if="item.tempOrder.Container.IsCarPooling == 1"
-              >
-                <el-checkbox v-model="checked">鍚屾剰鎷艰溅鐪侀挶</el-checkbox>
-              </div>
-              <div class="input-info">
-                <span><i class="iconfont icon-wendu1"></i>娓╁害:</span>
-                <el-input
-                  v-model="item.orderData.OdiqTemperature"
-                  clearable
-                ></el-input>
-                <span>鈩�</span>
-              </div>
-              <div class="input-info">
-                <span>璐х墿:</span>
-                <el-input
-                  v-model="item.orderData.OdiqGoods"
-                  clearable
-                ></el-input>
-              </div>
-
-              <div class="input-remark">
-                <span>澶囨敞:</span>
-                <el-input
-                  v-model="item.orderData.OdiqRemarks"
-                  clearable
-                ></el-input>
-              </div>
-            </div>
-
-
           </div>
-
-          
         </div>
       </div>
     </div>
@@ -308,7 +355,13 @@
       width="30%"
       :before-close="handleClose"
     >
-      <info-dialog  :demo="perfectBoxData" :count="boxCount" @info="acceptInfo" ></info-dialog>
+      <info-dialog
+        :demo="perfectBoxData"
+        :count="boxCount"
+        :type="orderType"
+        :self="selfOwer"
+        @info="acceptInfo"
+      ></info-dialog>
     </el-dialog>
   </div>
 </template>
@@ -337,9 +390,11 @@
       },
       pollArr: [],
       pollData: [],
-      perfectBoxData:{},
-      boxCount:1,
-     
+      perfectBoxData: {},
+      boxCount: 1,
+      begin: {},
+      orderType:0, //瑁呭嵏绫诲瀷
+      selfOwer:false
     };
   },
   props: ["orderall"],
@@ -347,61 +402,62 @@
     infoDialog,
   },
   created() {
-    
+   
   },
   watch: {
-    orderall:{
-      handler(val){
-           for (var i = 0; i < val.tempOrderForms.length; i++) {
-        // var orderinQiry = {
-        //   TempOrderID: "",
-        //   OdiqWeight: "",
-        //   OdiqTemperature: "",
-        //   OdiqLong: "",
-        //   OdiqWidth: "",
-        //   OdiqHeight: "",
-        //   OdiqRemarks: "",
-        //   OdiqGoods:""
-        // };
-        // val.tempOrderForms[i].orderData = orderinQiry;
-         val.tempOrderForms[i].isNumDisable = false;
-        if (
-          val.tempOrderForms[i].tempOrder.IsUrgent == null ||
-          val.tempOrderForms[i].tempOrder.IsUrgent == 0
-        ) {
-          val.tempOrderForms[i].tempOrder.IsUrgent = false;
-        } else {
-          val.tempOrderForms[i].tempOrder.IsUrgent = true;
-        }
+    orderall: {
+      handler(val) {
+        console.log("绠卞瓙绫诲瀷閲岄潰鏀跺埌鐨勫��",val)
+        this.orderType = val.OrderType;
+        for (var i = 0; i < val.tempOrderForms.length; i++) {
+          // var orderinQiry = {
+          //   TempOrderID: "",
+          //   OdiqWeight: "",
+          //   OdiqTemperature: "",
+          //   OdiqLong: "",
+          //   OdiqWidth: "",
+          //   OdiqHeight: "",
+          //   OdiqRemarks: "",
+          //   OdiqGoods:""
+          // };
+          // val.tempOrderForms[i].orderData = orderinQiry;
+          val.tempOrderForms[i].isNumDisable = false;
+          if (
+            val.tempOrderForms[i].tempOrder.IsUrgent == null ||
+            val.tempOrderForms[i].tempOrder.IsUrgent == 0
+          ) {
+            val.tempOrderForms[i].tempOrder.IsUrgent = false;
+          } else {
+            val.tempOrderForms[i].tempOrder.IsUrgent = true;
+          }
 
-        if (
-          val.tempOrderForms[i].tempOrder.SelfBox == null ||
-          val.tempOrderForms[i].tempOrder.SelfBox == 0
-        ) {
-          val.tempOrderForms[i].tempOrder.SelfBox = false;
-        } else {
-          val.tempOrderForms[i].tempOrder.SelfBox = true;
+          if (
+            val.tempOrderForms[i].tempOrder.SelfBox == null ||
+            val.tempOrderForms[i].tempOrder.SelfBox == 0
+          ) {
+            val.tempOrderForms[i].tempOrder.SelfBox = false;
+            this.selfOwer = false;
+          } else {
+            val.tempOrderForms[i].tempOrder.SelfBox = true;
+            this.selfOwer = true;
+          }
+          if (
+            val.tempOrderForms[i].tempOrder.IsCarPooling == null ||
+            val.tempOrderForms[i].tempOrder.IsCarPooling == 0
+          ) {
+            val.tempOrderForms[i].tempOrder.IsCarPooling = false;
+          } else {
+            val.tempOrderForms[i].tempOrder.IsCarPooling = true;
+          }
         }
-        if (
-          val.tempOrderForms[i].tempOrder.IsCarPooling == null ||
-          val.tempOrderForms[i].tempOrder.IsCarPooling == 0
-        ) {
-          val.tempOrderForms[i].tempOrder.IsCarPooling = false;
-        } else {
-          val.tempOrderForms[i].tempOrder.IsCarPooling = true;
-        }
-        
-      }
-      this.tempOrderForms = val.tempOrderForms;
-    
+        this.tempOrderForms = val.tempOrderForms;
       },
-      deep:true,
-     
+      deep: true,
     },
     pollArr(val) {
-      var begin;
       if (val.length != 0) {
-        begin = setInterval(() => {
+        console.log(val);
+        this.begin = setInterval(() => {
           this.getPolling({ OdiqIds: val });
 
           if (this.pollData.length != 0) {
@@ -411,38 +467,39 @@
               }
             });
           }
-        }, 30000);
+        }, 3000);
       } else {
-        clearInterval(begin);
+        console.log(this.pollArr);
+        console.log(this.begin);
+        clearInterval(this.begin);
       }
     },
   },
   methods: {
-    perfectInfo(content,index){
-       this.boxCount = index;
-         this.perfectBoxData=content.tempOrder;
-         setTimeout(()=>{
-             this.infoDialog = true;
-         },200)
-       
-      
-       
-        console.log(content.tempOrder.TempOrderContainer);
+    perfectInfo(content, index) {
+      console.log("绠卞瓙淇℃伅",content);
+      this.boxCount = index;
+      this.perfectBoxData = content.tempOrder;
+      setTimeout(() => {
+        this.infoDialog = true;
+      }, 200);
+
+      console.log(content.tempOrder.TempOrderContainer);
     },
     //璋冩暣鎷艰溅
-    isCarPool(val,content){
-         if (val) {
+    isCarPool(val, content) {
+      if (val) {
         this.getSingeTemp({
           IsCarPooling: 1,
           TempOrderID: content.tempOrder.TempOrderID,
         });
-        this.$emit("pinche",content.tempOrder.TempOrderID)
+        this.$emit("pinche", content.tempOrder.TempOrderID);
       } else {
         this.getSingeTemp({
           IsCarPooling: 0,
           TempOrderID: content.tempOrder.TempOrderID,
         });
-         this.$emit("pinche","")
+        this.$emit("pinche", "");
       }
     },
     //璋冩暣鏃堕棿
@@ -480,23 +537,25 @@
           SelfBox: 1,
           TempOrderID: content.tempOrder.TempOrderID,
         });
+        this.selfOwer = val;
       } else {
         this.getSingeTemp({
           SelfBox: 0,
           TempOrderID: content.tempOrder.TempOrderID,
         });
+          this.selfOwer = val;
       }
     },
     //璋冩暣鏁伴噺
-    handleChange(val,content) {
-       this.getSingeTemp({
+    handleChange(val, content) {
+      this.getSingeTemp({
         ContainerNub: val,
         TempOrderID: content.tempOrder.TempOrderID,
       });
-        this.perfectBoxData=content.tempOrder;
+      this.perfectBoxData = content.tempOrder;
     },
     // 鍒犻櫎
-    delOrder(id,index) {
+    delOrder(id, index) {
       this.$confirm("纭鍒犻櫎璇ユ潯鏁版嵁鍚楋紵", "鎻愮ず", {
         confirmButtonText: "纭畾",
         cancelButtonText: "鍙栨秷",
@@ -509,7 +568,7 @@
               this.$qs.stringify({ tmpOrderId: id })
             )
             .then((res) => {
-              this.tempOrderForms.splice(index,1);
+              this.tempOrderForms.splice(index, 1);
               console.log(res);
             })
             .catch((err) => {
@@ -536,14 +595,17 @@
           console.log(err);
         });
     },
- //鑾峰彇涓存椂璁㈠崟
-    async getTempOrder(){
-     await this.$axios.post("/api/Order/GetTempOrderAll").then(res=>{
-        // console.log(res);
-        this.tempOrderForms = res.data.tempOrderForms;
-      }).catch(err=>{
-        console.log(err);
-      })
+    //鑾峰彇涓存椂璁㈠崟
+    async getTempOrder() {
+      await this.$axios
+        .post("/api/Order/GetTempOrderAll")
+        .then((res) => {
+          // console.log(res);
+          this.tempOrderForms = res.data.tempOrderForms;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     //鍗曠嫭璋冩暣涓存椂琛ㄥ崟鍗曟潯鏁版嵁
     async getSingeTemp(model) {
@@ -571,36 +633,37 @@
     acceptInfo(e) {
       this.infoDialog = false;
       var arr = [];
-      if(e.moreBox.length>1){
-        for(var i=0;i<e.moreBox.length;i++){
-            arr.push({
-              
-               BolCode: e.BolCode,
-              TradeCode:e.TradeCode ,
-              ShipAgent: e.ShipAgent,
-              ContainerOwner: e.ContainerOwner,
-              ContainerNo:e.moreBox[i].ContainerNo,
-               BoxSeal:e.moreBox[i].BoxSeal
-            })
+      if (e.moreBox.length > 1) {
+        for (var i = 0; i < e.moreBox.length; i++) {
+          arr.push({
+            BolCode: e.BolCode,
+            TradeCode: e.TradeCode,
+            ShipAgent: e.ShipAgent,
+            ContainerOwner: e.ContainerOwner,
+            ContainerNo: e.moreBox[i].ContainerNo,
+            BoxSeal: e.moreBox[i].BoxSeal,
+          });
         }
-      }else{
-         arr.push({
-             
-               BolCode: e.BolCode,
-              TradeCode:e.TradeCode ,
-              ShipAgent: e.ShipAgent,
-              ContainerOwner: e.ContainerOwner,
-              ContainerNo:e.moreBox[0].ContainerNo,
-               BoxSeal:e.moreBox[0].BoxSeal
-            })
+      } else {
+        arr.push({
+          BolCode: e.BolCode,
+          TradeCode: e.TradeCode,
+          ShipAgent: e.ShipAgent,
+          ContainerOwner: e.ContainerOwner,
+          ContainerNo: e.moreBox[0].ContainerNo,
+          BoxSeal: e.moreBox[0].BoxSeal,
+        });
       }
-      this.getSingeTemp({TempOrderID:e.id,TempOrderContainer:arr});
-       this.tempOrderForms[e.index].TempOrderContainer[0].ContainerNo = e.moreBox[0].ContainerNo;
+      this.getSingeTemp({ TempOrderID: e.id, TempOrderContainer: arr });
+      // 缁欑鍙峰鍒惰繘琛屽睍绀�
+      this.tempOrderForms[e.index].TempOrderContainer[0].ContainerNo =
+        e.moreBox[0].ContainerNo;
+      //绂佺敤鏁伴噺
       this.tempOrderForms[e.index].isNumDisable = true;
-      setTimeout(()=>{
+      setTimeout(() => {
         this.getTempOrder();
-      },200)
-      console.log( this.tempOrderForms);
+      }, 200);
+      console.log(this.tempOrderForms);
     },
 
     handleClose(done) {
@@ -650,6 +713,11 @@
   border-radius: 3px;
   color: #b2b2b2;
   font-size: 14px;
+  width: 145px;
+  overflow: hidden;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 .show-data .one .gp {
   font-weight: bold;
diff --git a/src/components/agopage/comment/CarSharing.vue b/src/components/agopage/comment/CarSharing.vue
new file mode 100644
index 0000000..17d82b6
--- /dev/null
+++ b/src/components/agopage/comment/CarSharing.vue
@@ -0,0 +1,107 @@
+<template>
+  <div class="car-shar">
+    <div class="title">
+      <div>纭璁㈠崟</div>
+      <div>
+        <i class="el-icon-user"></i>
+        <span>鎴戠殑灏忕墰甯�:</span>
+        <span>锟�5060.00</span>
+      </div>
+    </div>
+    <div class="oprator">
+      <div>
+        <span>閰嶆嫋绠�:</span>
+        <div>
+          <i class="iconfont icon-jizhuangxiang_container"></i>
+          <span>20GP</span>
+        </div>
+      </div>
+      <el-button plain size="mini">鍚堝苟鏁磋溅</el-button>
+      <el-button plain size="mini">鏁磋溅鎷嗗垎</el-button>
+    </div>
+    <div class="car-pool-show">
+      <div>
+        <div>
+          <el-tag effect="dark" type="warning" size="mini">杞�</el-tag>
+        </div>
+        <div>
+          <el-checkbox></el-checkbox>
+        </div>
+      </div>
+      <div>
+        <div>
+          <div>鎻愮鍦�</div>
+          <div>
+            <el-select v-model="value" placeholder="璇烽�夋嫨">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div>
+          <el-select v-model="value" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+      <div class="three">
+        <div>
+          <div>瑁呭嵏鍦�</div>
+          <div>
+            <span>閲嶅簡甯傛笣鍖楀尯榫欐邯闀囧浗瀹惧煄12鏍�</span>
+            <i class="el-icon-caret-bottom"></i>
+          </div>
+        </div>
+        <div>
+          <el-date-picker
+            v-model="value1"
+            type="daterange"
+            range-separator="鑷�"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          >
+          </el-date-picker>
+        </div>
+      </div>
+      <div class="four">
+          <div></div>
+          <div>
+              <span>鏁伴噺:1</span>
+              <el-button icon="el-icon-close" size="mini" title="鍒犻櫎"></el-button>
+              <el-button icon="el-icon-document-copy" size="mini" title="澶嶅埗"></el-button>
+              <span>锟�300.00</span>
+          </div>
+      </div>
+    </div>
+    <div class="money">
+      <span>鎷艰溅浠�:</span>
+      <span>锟�300.00</span>
+    </div>
+  </div>
+</template>
+<script>
+export default {};
+</script>
+<style lang="less" scoped>
+.car-shar {
+  font-size: 16px;
+}
+.car-pool-show{
+    display: flex;
+  justify-content: space-between;
+}
+.title{
+    display: flex;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/agopage/comment/InfoDialog.vue b/src/components/agopage/comment/InfoDialog.vue
index 8a11fd4..0b54552 100644
--- a/src/components/agopage/comment/InfoDialog.vue
+++ b/src/components/agopage/comment/InfoDialog.vue
@@ -1,7 +1,8 @@
 <template>
-  <div>
-  
-    <el-form
+  <div >
+    <el-alert style="margin-bottom: 10px;" title="瀹屽杽绠卞瓙淇℃伅鍚庡皢涓嶈兘淇敼鏁伴噺" type="warning" :closable="false">
+    </el-alert>
+    <el-form 
       :model="ruleForm"
       :rules="rules"
       ref="ruleForm"
@@ -28,7 +29,8 @@
       </el-form-item>
       <div v-for="(item, index) in ruleForm.moreBox" :key="index">
         <el-divider>绠卞瓙{{ index + 1 }}</el-divider>
-        <el-form-item
+        <el-form-item 
+         v-if="(type==1&&self)||type==2"
           label="绠卞彿"
           :prop="'moreBox.' + index + '.ContainerNo'"
           :rules="{
@@ -39,7 +41,7 @@
         >
           <el-input v-model="item.ContainerNo"></el-input>
         </el-form-item>
-        <el-form-item
+        <el-form-item v-if="type==2"
           label="灏佸彿"
           :prop="'moreBox.' + index + '.BoxSeal'"
           :rules="{
@@ -49,6 +51,21 @@
           }"
         >
           <el-input v-model="item.BoxSeal"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="閲嶉噺"
+          :prop="'moreBox.' + index + '.BoxSeal'"
+          :rules="{
+            required: true,
+            message: '璇峰~鍐欓噸閲�',
+            trigger: 'blur',
+          }"
+        >
+          <el-input
+            v-model="item.BoxSeal"
+            type="number"
+            placeholder="璇疯緭鍏ユ暟瀛�"
+          ></el-input>
         </el-form-item>
       </div>
 
@@ -84,69 +101,64 @@
           { required: true, message: "璇烽�夋嫨绠变富", trigger: "change" },
         ],
       },
-      temId:"",
+      temId: "",
     };
   },
-  props: ["demo", "count"],
-  created(){
-   
+  props: ["demo", "count","type","self"],
+  created() {
     this.$set(this.demo);
-    
   },
-  mounted(){
-//  this.$set(this.count);
+  mounted() {
+    //  this.$set(this.count);
   },
   watch: {
-  
-    demo:{
-       
-       handler(val,oldVal){
-        
-     
-      this.temId = val.TempOrderID;
-      if (val.TempOrderContainer.length != 0) {
-        this.ruleForm.BolCode = val.TempOrderContainer[0].BolCode;
-        this.ruleForm.TradeCode = val.TempOrderContainer[0].TradeCode;
-        this.ruleForm.ShipAgent = val.TempOrderContainer[0].ShipAgent;
-        this.ruleForm.ContainerOwner = val.TempOrderContainer[0].ContainerOwner;
-        if(val.TempOrderContainer.length>1){
-          console.log("澶氫釜绠卞瓙");
-          this.ruleForm.moreBox=[];
-          for(var i=0;i<val.TempOrderContainer.length;i++){
-            this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" }) 
-         
-          }
-           for(var j=0;j<this.ruleForm.moreBox.length;j++){
-          
-             this.ruleForm.moreBox[j].ContainerNo = val.TempOrderContainer[j].ContainerNo;
-             this.ruleForm.moreBox[j].BoxSeal = val.TempOrderContainer[j].BoxSeal;
-          }
-
-        }else{
-          console.log("鍗曚釜绠卞瓙")
-            this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "" }];
-           this.ruleForm.moreBox[0].ContainerNo = val.TempOrderContainer[0].ContainerNo;
-             this.ruleForm.moreBox[0].BoxSeal = val.TempOrderContainer[0].BoxSeal;
-        }
-        console.log(this.ruleForm);
-      }else{
-        if(val.ContainerNub==1){
-             this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "" }];
-        }else{
-           this.ruleForm.moreBox = [];
-          for(var i=0;i<val.ContainerNub;i++){
+    demo: {
+      handler(val, oldVal) {
+        this.temId = val.TempOrderID;
+        if (val.TempOrderContainer.length != 0) {
+          this.ruleForm.BolCode = val.TempOrderContainer[0].BolCode;
+          this.ruleForm.TradeCode = val.TempOrderContainer[0].TradeCode;
+          this.ruleForm.ShipAgent = val.TempOrderContainer[0].ShipAgent;
+          this.ruleForm.ContainerOwner =
+            val.TempOrderContainer[0].ContainerOwner;
+          if (val.TempOrderContainer.length > 1) {
+            console.log("澶氫釜绠卞瓙");
+            this.ruleForm.moreBox = [];
+            for (var i = 0; i < val.TempOrderContainer.length; i++) {
               this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" });
+            }
+            for (var j = 0; j < this.ruleForm.moreBox.length; j++) {
+              this.ruleForm.moreBox[j].ContainerNo =
+                val.TempOrderContainer[j].ContainerNo;
+              this.ruleForm.moreBox[j].BoxSeal =
+                val.TempOrderContainer[j].BoxSeal;
+            }
+          } else {
+            console.log("鍗曚釜绠卞瓙");
+            this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "" }];
+            this.ruleForm.moreBox[0].ContainerNo =
+              val.TempOrderContainer[0].ContainerNo;
+            this.ruleForm.moreBox[0].BoxSeal =
+              val.TempOrderContainer[0].BoxSeal;
+          }
+          console.log(this.ruleForm);
+        } else {
+          if (val.ContainerNub == 1) {
+            this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "" }];
+          } else {
+            this.ruleForm.moreBox = [];
+            for (var i = 0; i < val.ContainerNub; i++) {
+              this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" });
+            }
           }
         }
-         
-      }
-       },
-       deep:true,
-        immediate :true
+      },
+      deep: true,
+      immediate: true,
     },
     // demo(val) {
     //   console.log(val)
-     
+
     //   this.temId = val.TempOrderID;
     //   if (val.TempOrderContainer.length != 0) {
     //     this.ruleForm.BolCode = val.TempOrderContainer[0].BolCode;
@@ -157,7 +169,7 @@
     //       console.log("澶氫釜绠卞瓙");
     //       this.ruleForm.moreBox=[];
     //       for(var i=0;i<val.TempOrderContainer.length;i++){
-    //         this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" }) 
+    //         this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" })
     //         //  this.ruleForm.moreBox[i].ContainerNo = val.TempOrderContainer[i].ContainerNo;
     //         //  this.ruleForm.moreBox[i].BoxSeal = val.TempOrderContainer[i].BoxSeal;
     //       }
@@ -177,17 +189,16 @@
     //           this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" });
     //       }
     //     }
-         
+
     //   }
     // },
-    count:{
-        handler(val){
-          this.ruleForm.index = val;
-        },
-         deep:true,
-        immediate :true
+    count: {
+      handler(val) {
+        this.ruleForm.index = val;
+      },
+      deep: true,
+      immediate: true,
     },
-  
   },
   methods: {
     infoCancel() {
@@ -199,17 +210,17 @@
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-           this.$confirm("瀹屽杽绠卞瓙淇℃伅鍚庡皢涓嶈兘淇敼鏁伴噺", "鎻愮ず", {
-        confirmButtonText: "纭畾",
-        cancelButtonText: "鍙栨秷",
-        type: "warning",
-      })
-        .then(() => {
-            this.ruleForm.id=this.temId;
-          this.$emit("info", this.ruleForm);
-        })
-        .catch(() => {});
-            console.log( this.ruleForm)
+          this.$confirm("瀹屽杽绠卞瓙淇℃伅鍚庡皢涓嶈兘淇敼鏁伴噺", "鎻愮ず", {
+            confirmButtonText: "纭畾",
+            cancelButtonText: "鍙栨秷",
+            type: "warning",
+          })
+            .then(() => {
+              this.ruleForm.id = this.temId;
+              this.$emit("info", this.ruleForm);
+            })
+            .catch(() => {});
+          console.log(this.ruleForm);
         } else {
           console.log("error submit!!");
           return false;
diff --git a/src/components/agopage/home/Harbour.vue b/src/components/agopage/home/Harbour.vue
index d4edc94..82b473d 100644
--- a/src/components/agopage/home/Harbour.vue
+++ b/src/components/agopage/home/Harbour.vue
@@ -4,20 +4,20 @@
       <div class="nav">
         <div
           v-for="(item, index) in nav"
-          :key="index+1"
-          @click="changeType(item)"
-          :class="{ meactive: item == isType }"
+          :key="index + 1"
+          @click="changeType(index + 1)"
+          :class="{ meactive: index + 1 == isType }"
         >
           {{ item }}
         </div>
       </div>
-       <div class="form">
+      <div class="form">
         <el-form ref="form" :model="submitForm" label-width="160px">
           <el-form-item>
             <template slot="label">
               <div class="form-label">
                 <i class="iconfont icon-listmatou"></i>
-             
+
                 <span>鎻愮鍦� : </span>
               </div>
             </template>
@@ -25,12 +25,11 @@
               <div class="tibox-adres">
                 <el-input
                   @focus="tiFocus"
-               
                   readonly
                   v-model="playBox"
                 ></el-input>
                 <div class="select-tibox" v-if="isTShow">
-                  <div v-if="pickPlaceList.length==0">鏆� 鏃� 鏁� 鎹�</div>
+                  <div v-if="pickPlaceList.length == 0">鏆� 鏃� 鏁� 鎹�</div>
                   <el-tabs v-model="submitForm.CityId" @tab-click="handleClick">
                     <el-tab-pane
                       v-for="item in pickPlaceList"
@@ -53,7 +52,7 @@
               </div>
 
               <div class="suffix-txt">
-                <div v-for="(item,pindex) in pickPlaceList" :key="pindex">
+                <div v-for="(item, pindex) in pickPlaceList" :key="pindex">
                   <div
                     class="shortcut"
                     v-for="(shortcut, sindex) in item.PortList"
@@ -82,7 +81,7 @@
                 id="tipinput"
                 clearable
               ></el-input>
-           
+
               <div class="suffix-txt">
                 <div @click="usualAdrDialog = true">甯哥敤鍦板潃</div>
               </div>
@@ -91,24 +90,25 @@
           <el-form-item>
             <template slot="label">
               <div class="form-label">
-               
                 <i class="iconfont icon-components-full"></i>
                 <span>杩樼鍦� : </span>
               </div>
             </template>
-            <box-adress :boxaddress="retrunPlaceList" @acceptreturn="acceptReturnAdress"></box-adress>
+            <box-adress
+              :boxaddress="retrunPlaceList"
+              @acceptreturn="acceptReturnAdress"
+            ></box-adress>
           </el-form-item>
           <el-form-item>
             <template slot="label">
               <div class="form-label">
-               
                 <i class="iconfont icon-express-package-full"></i>
                 <span>绠卞瀷 : </span>
               </div>
             </template>
             <div class="form-input">
               <div class="box-type">
-                <div v-for="(box,bindex) in boxType" :key="bindex+3">
+                <div v-for="(box, bindex) in boxType" :key="bindex + 3">
                   <label :for="box.CntrId">
                     <input
                       type="checkbox"
@@ -126,7 +126,7 @@
                     </div>
                   </label>
 
-                  <div v-if="box.CntrType == 1">
+                  <!-- <div v-if="box.CntrType == 1">
                     <label :for="box.CntrId + 1">
                       <div class="carpool-moneny">
                         <input
@@ -137,11 +137,11 @@
                         <span>鍚屾剰鎷艰溅鏇寸渷閽�</span>
                       </div>
                     </label>
-                  </div>
+                  </div> -->
                 </div>
 
                 <div>
-                  <div class="default" @click="chooseSpecial">
+                  <div class="default special-container" @click="chooseSpecial">
                     <i class="iconfont icon-jizhuangxiang_container"></i>
                     <span>鐗圭绠�</span>
                   </div>
@@ -149,7 +149,7 @@
                     <div>
                       <el-input
                         v-model="specialVal"
-                        @input="searchSpecial"
+                        
                       ></el-input>
                     </div>
                     <div
@@ -172,12 +172,12 @@
                         </div>
                       </label>
 
-                      <el-switch
+                      <!-- <el-switch
                         v-if="item.CntrType == 1"
                         v-model="item.pinche"
                         active-text="鎷艰溅"
                       >
-                      </el-switch>
+                      </el-switch> -->
                     </div>
                     <div class="public-btn spe-btn">
                       <button @click="specialSure">纭� 瀹�</button>
@@ -190,32 +190,41 @@
           <el-form-item>
             <template slot="label">
               <div class="form-label">
-              
                 <i class="iconfont icon-shijian"></i>
                 <span>鍒拌揪鏃堕棿 : </span>
               </div>
             </template>
             <div class="form-input">
               <el-date-picker
-              v-if="!timeUrgent"
-                v-model="value1"
+                
+                v-if="!timeUrgent"
+                v-model="submitForm.ArriveTime"
                 type="datetime"
+                placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+               :picker-options="urgentTime"
+                value-format="yyyy-MM-dd HH:mm"
+              >
+              </el-date-picker>
+              <!-- <div v-if="timeUrgent">
+                   <el-date-picker
+                @change=urgentTimeChange
+              
+                v-model="submitForm.ArriveTime"
+                type="date"
                 placeholder="閫夋嫨鏃ユ湡鏃堕棿"
                 :picker-options="urgentTime"
                 value-format="yyyy-MM-dd HH:mm"
               >
               </el-date-picker>
-              <div v-if="timeUrgent">
-
-              </div>
-              <el-checkbox v-model="timeUrgent" @change="urgentChange">鍔犳��</el-checkbox>
-              
+              </div> -->
+              <!-- <el-checkbox v-model="timeUrgent" @change="urgentChange"
+                >鍔犳��</el-checkbox
+              > -->
             </div>
           </el-form-item>
           <el-form-item>
             <template slot="label">
               <div class="form-label">
-             
                 <i class="iconfont icon-express-package-full"></i>
                 <span>鐗╁搧 : </span>
               </div>
@@ -245,7 +254,6 @@
           <span>绠卞瓙鍏蜂綋淇℃伅[鏅鸿兘杈撳叆]</span>
         </div>
       </div>
-      
     </div>
     <div class="btns">
       <div v-if="1 == 2">
@@ -271,21 +279,20 @@
       width="30%"
       :before-close="handleClose"
     >
-      <div class="" v-for="(item, index) in CommonAdressList" :key="index" @click="selAdress(item)">
+      <div
+        class="common-adress"
+        v-for="(item, index) in CommonAdressList"
+        :key="index"
+        @click="selAdress(item)"
+      >
         <i class="iconfont icon-zb"></i>
         <span>{{ item.ComAdress }}</span>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="usualAdrDialog = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="usualAdrDialog = false"
-          >纭� 瀹�</el-button
-        >
-      </span>
     </el-dialog>
   </div>
 </template>
 <script>
-import BoxAdress from "../comment/BoxAdress"
+import BoxAdress from "../comment/BoxAdress";
 export default {
   data() {
     return {
@@ -293,7 +300,7 @@
       CommonAdressList: [
         { ComAdress: "閲嶅簡鏋滃洯娓�", ComLongitude: "109", ComLatitude: "22" },
       ],
-      isType: "鎴戣瑁�",
+      isType: "1",
       submitForm: {
         CityId: "5dc90c98-475e-4529-bb3a-c3010a82b0e1",
         OrderType: 1,
@@ -324,28 +331,34 @@
       mapVal: "",
       usualAdrDialog: false,
       specialVal: "",
-
+      former:[],
       isSpecial: false,
       pickPlaceList: [],
-      retrunPlaceList:[],
+      retrunPlaceList: [],
       activeProduct: "",
       productVal: "",
-      urgentTime:{
-         disabledDate(time) {
-           let Y = (new Date()).getFullYear();
-            let M = (new Date()).getMonth();
-            let D = (new Date()).getDate();
-            let curDate = (new Date()).getTime();
-            let defDate = (new Date(Y,M,D)).getTime() - new Date(2021,5,30).getTime(); // 14 * 24 * 3600 * 1000;鍥犱负鏈堜唤鍙栧嚭鏉ョ殑鍊煎皬1锛屾墍浠ョ洿鎺ョ敤浜唍ew Date(2019,3,11).getTime()
-            // let chooseDate = curDate - defDate;
+      isSelect: "",
+      urgentBeginTime:"",
+      urgentEndTime:"",
+      urgentTime: {
+        disabledDate(time,urgentFinshTime) {
+          // let test = "2021-06-03";
+          // // test  = urgentFinshTime;
 
-            let chooseDate =curDate-defDate;
-            return time.getTime()<Date.now() || time.getTime() <chooseDate;
-          }
-      }
+          //  let Y = (new Date()).getFullYear();
+          //   let M = (new Date()).getMonth();
+          //   let D = (new Date()).getDate();
+          //   let curDate = (new Date()).getTime();
+          //   let defDate = (new Date(Y,M,D)).getTime() - new Date(test).getTime(); // 14 * 24 * 3600 * 1000;鍥犱负鏈堜唤鍙栧嚭鏉ョ殑鍊煎皬1锛屾墍浠ョ洿鎺ョ敤浜唍ew Date(2019,3,11).getTime()
+            // let chooseDate = curDate - defDate;
+            // let chooseDate =curDate-defDate; ||chooseDate<time.getTime()
+           
+            return time.getTime() < Date.now() - 8.64e7;
+        }
+      },
     };
   },
-  components:{BoxAdress},
+  components: { BoxAdress },
   props: ["alldata"],
   watch: {
     alldata(val) {
@@ -360,15 +373,26 @@
         item.pinche = false;
       });
       this.SpecialContainerList = val.SpecialContainerList;
+      this.former = val.SpecialContainerList;
       this.pickPlaceList = val.PickPlaceList;
       this.CommonAdressList = val.CommonAdressList;
       this.retrunPlaceList = val.RetrunPlaceList;
+      this.urgentBeginTime = val.GetUrgentBeginTime;
+      this.urgentEndTime = val.GetUrgentEndTime;
+      console.log(val);
+    },
+    specialVal(val){
+       console.log(val)
+        this.searchSpecial(val);
     },
   },
-  mounted() {},
+  mounted() {
+   
+  },
   methods: {
-    acceptReturnAdress(e){
-        this.submitForm.ReturnPlace=e;
+  
+    acceptReturnAdress(e) {
+      this.submitForm.ReturnPlace = e;
     },
     selectBoxType(e, id) {
       console.log(id);
@@ -406,24 +430,28 @@
     shortCut(content, short) {
       this.submitForm.CityId = content.CityId;
       this.submitForm.PickPlace = short.PortId;
-       this.submitForm.ReturnPlace = short.PortId;
+      this.submitForm.ReturnPlace = short.PortId;
       this.playBox = short.PortName;
     },
     //鎼滅储瑙﹀彂鐨勪簨浠�
-    searchSpecial() {
-      this.SpecialContainerList = [
-        { CntrId: 1, select: false, CntrName: "20RT", pinche: false },
-      ];
-      // var searchVal = this.specialVal;
-      // this.SpecialContainerList.forEach((item,index,arr)=>{
-      //     if(item.CntrName==searchVal){
-      //         arr=[];
-      //         arr.push(item);
-      //     }
-      // })
-      console.log(this.specialVal);
+    searchSpecial(val) {
+      var arr = [];
+      if (val != "") {
+        for (var i = 0; i < this.former.length; i++) {
+          if (this.former[i].CntrName.indexOf(val) != -1) {
+            arr.push(this.former[i]);
+          } else if (this.former[i].CntrName == val) {
+            arr = [];
+            arr.push(this.former[i]);
+          }
+        }
+         this.SpecialContainerList = arr;
+      }else{
+        this.SpecialContainerList = this.former;
+      }
     },
     changeType(item) {
+      this.submitForm.OrderType = item;
       this.isType = item;
     },
     //寰幆鍙栧埌宸茬粡閫夋嫨鐨勭瀛�
@@ -450,7 +478,7 @@
       if (this.activeProduct == "") {
         this.submitForm.TransportGoods = this.productVal;
       }
-      this.submitForm.ArriveTime = this.value1;
+      // this.submitForm.ArriveTime = this.value1;
       this.getForBox(this.boxType);
       this.getForBox(this.SpecialContainerList);
       console.log(this.submitForm);
@@ -474,24 +502,26 @@
     //杈撳叆鐗╁搧
     proInput() {
       this.activeProduct = "";
-     
     },
-    urgentChange(val){
-        if(val){
-          this.urgentTime.disabledDate()
-        }
-    },
+    // urgentChange(val) {
+    //   if (val) {
+    //      let year = this.urgentEndTime.slice(0,10)
+    //      console.log(year)
+    //             this.urgentTime.disabledDate(new Date() ,"2021-06-03");
+    //   }
+    // },
     //閫夊彇甯哥敤鍦板潃
-    selAdress(content){
-          this.submitForm.OrderAddressLongitude = content.lng;
-        this.submitForm.OrderAddressLatitude = e.poi.location.lat;
-        this.submitForm.OrderAddress = e.poi.name;
+    selAdress(content) {
+      this.submitForm.OrderAddressLongitude = content.ComLongitude;
+      this.submitForm.OrderAddressLatitude = content.ComLatitude;
+      this.mapVal = content.ComAdress;
+      this.usualAdrDialog = false;
     },
     tiFocus() {
       this.isTShow = true;
     },
-    tBlur(){
-      this.isTShow=false;
+    tBlur() {
+      this.isTShow = false;
     },
     TiLose() {
       this.isTShow = false;
@@ -500,16 +530,19 @@
       this.isTShow = false;
     },
     mapAdre() {
-      var map = new AMap.Map("container", {
-        resizeEnable: true,
-      });
+      // var map = new AMap.Map("container", {
+      
+      //   resizeEnable: true,
+      // });
       //杈撳叆鎻愮ず
       var auto = new AMap.Autocomplete({
+       
         input: "tipinput",
+         city:"閲嶅簡"
       });
-      var placeSearch = new AMap.PlaceSearch({
-        map: map,
-      }); //鏋勯�犲湴鐐规煡璇㈢被
+      // var placeSearch = new AMap.PlaceSearch({
+      //   map: map,
+      // }); //鏋勯�犲湴鐐规煡璇㈢被
       AMap.event.addListener(auto, "select", select);
 
       //娉ㄥ唽鐩戝惉锛屽綋閫変腑鏌愭潯璁板綍鏃朵細瑙﹀彂
@@ -532,6 +565,13 @@
 };
 </script>
 <style lang="less" scoped>
+.common-adress {
+  padding: 3px 0px;
+  cursor: pointer;
+}
+.common-adress:hover {
+  color: #409eff;
+}
 .special-box {
   padding: 6px;
   position: absolute;
@@ -594,6 +634,10 @@
   background-color: #fff;
   color: #aaaaaa;
   margin-right: 6px;
+  margin-bottom: 10px;
+}
+.special-container{
+  margin-bottom: 0px;
 }
 .activebox {
   border: 1px solid #e6a23c;
diff --git a/src/components/agopage/home/Wind.vue b/src/components/agopage/home/Wind.vue
index b602101..42e3529 100644
--- a/src/components/agopage/home/Wind.vue
+++ b/src/components/agopage/home/Wind.vue
@@ -23,15 +23,10 @@
                 </div>
               </template>
               <div class="form-input">
-                <el-select v-model="form.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
-                  <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
-                  <el-option label="鍖哄煙浜�" value="beijing"></el-option>
-                </el-select>
-                <div class="suffix-txt">
-                  <div>鏋滃洯娓�</div>
-                  <div>鏋滃洯娓�</div>
-                  <div>鏋滃洯娓�</div>
-                </div>
+                <box-adress
+                  :boxaddress="retrunPlaceList"
+                  @acceptreturn="acceptReturnAdress"
+                ></box-adress>
               </div>
             </el-form-item>
             <el-form-item>
@@ -180,21 +175,19 @@
         <button @click="sharePill">鎷� 鍗�</button>
       </div>
     </div>
-        <el-dialog title="椤洪杈炬嫾杞�" :visible.sync="carDialog" width="50%">
-    
-
-    
-        <car-pool></car-pool>
-     
+    <el-dialog title="椤洪杈炬嫾杞�" :visible.sync="carDialog" width="900px" class="ride">
+      <!-- <car-pool></car-pool> -->
+        <car-sharing></car-sharing>
     </el-dialog>
-
   </div>
 </template>
 <script>
 import Wind from "./Wind.vue";
 import ShareCar from "../comment/ShareCar.vue";
-import CarPool from "./CarPool.vue";
-import AiAdress from'../map/AiAdress.vue'
+// import CarPool from "./CarPool.vue";
+import CarSharing from'../comment/CarSharing.vue'
+import AiAdress from "../map/AiAdress.vue";
+import BoxAdress from"../comment/BoxAdress"
 export default {
   data() {
     return {
@@ -216,6 +209,11 @@
         resource: "",
         desc: "",
       },
+      submitForm: {
+        CityId: "5dc90c98-475e-4529-bb3a-c3010a82b0e1",
+        OrderType: 3,
+       
+      },
       radio1: "",
       productData: [
         "鐗╁搧1",
@@ -229,24 +227,22 @@
       value1: "",
       factory: ["閲嶅簡闀垮畨鏂板巶鍖�", "閲嶅簡绂忕壒鍘傚尯", "閲嶅簡绂忕壒閰嶄欢鍘傚尯"],
       activeVal: "",
-      carDialog:false
+      carDialog: false,
     };
   },
-  components:{
-         Wind,
+  components: {
+    Wind,
     ShareCar,
-    CarPool,AiAdress
+    // CarPool,
+    AiAdress,BoxAdress,CarSharing
   },
   props: ["cardialog"],
   methods: {
     proActive(content) {
-    
-        this.activeVal = content;
-     
-     
+      this.activeVal = content;
     },
-    proInput(){
-      this.activeVal="";
+    proInput() {
+      this.activeVal = "";
     },
     changeType(item) {
       this.isType = item;
@@ -262,6 +258,13 @@
 };
 </script>
 <style lang="less" scoped>
+// 淇敼寮圭獥鐨勬牱寮�
+.ride{
+  /deep/.el-dialog__body{
+    padding: 0 10px;
+    padding-bottom: 10px;
+  }
+}
 .activepro {
   background-color: #e6a23c;
   color: #fff;
diff --git a/src/router/index.js b/src/router/index.js
index ffcec07..e1f88de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -79,18 +79,18 @@
     component: Index,
     meta:{requireAuth: true },
     children:[
-      {
-        path:"/daytask",
-        name:"褰撴棩浠诲姟",
-        component:()=>import('../components/mainpage/DayTask.vue'),
-        meta:{requireAuth: true },
-      },
-      {
-        path:"/task",
-        name:"浠诲姟鍒楄〃",
-        component:()=>import('../components/mainpage/TaskList.vue'),
-        meta:{requireAuth: true },
-      },
+      // {
+      //   path:"/daytask",
+      //   name:"褰撴棩浠诲姟",
+      //   component:()=>import('../components/mainpage/DayTask.vue'),
+      //   meta:{requireAuth: true },
+      // },
+      // {
+      //   path:"/task",
+      //   name:"浠诲姟鍒楄〃",
+      //   component:()=>import('../components/mainpage/TaskList.vue'),
+      //   meta:{requireAuth: true },
+      // },
       {
         path:"/order",
         name:"鎴戠殑璁㈠崟",
diff --git a/src/views/agomiddle/InquiryCenter.vue b/src/views/agomiddle/InquiryCenter.vue
index 6552fe9..e0778c1 100644
--- a/src/views/agomiddle/InquiryCenter.vue
+++ b/src/views/agomiddle/InquiryCenter.vue
@@ -15,7 +15,7 @@
           </div>
           <div>
             <img src="../../../public/img/index/gouxuan2.svg" alt="" />
-            <span>鎴戣瑁�</span>
+            <span>{{allOrder.OrderType==1?'鎴戣瑁�':'鎴戣鍗�'}}</span>
           </div>
         </div>
       </div>
@@ -40,11 +40,13 @@
           <div class="table-title">
             <span class="box">绠卞瀷</span>
             <span class="time">鍒拌揪鏃堕棿</span>
-            <span class="weight">閲嶉噺(鍚�)</span>
             <span class="type">绫诲瀷</span>
             <span class="info">绠卞瓙淇℃伅</span>
-            <span class="number">鏁伴噺</span>
-            <span class="money">浠锋牸</span>
+            <span class="number">鏁伴噺(杞�)</span>
+              <span  style="width:33px;">绠遍噺</span>
+            <!-- <span class="number">绠遍噺</span> -->
+            <span style="width:50px;">浠锋牸</span>
+            <span style="width:195px;"></span>
           </div>
 
           <box-type :orderall="allOrder" @pinche="acceptPin"></box-type>
@@ -143,7 +145,7 @@
             </div>
           </div>
 
-          <div class="linkman-title shunfeng" v-if="isShowShun">
+          <!-- <div class="linkman-title shunfeng" v-if="isShowShun">
             <div>
               <i class="iconfont icon-wuliuxinxi"></i>
               <span>椤洪杈�</span>
@@ -168,7 +170,7 @@
             <div class="link-ramark shun-remark">
               <span>澶囨敞:</span><el-input type="textarea" v-model="orderRemark"></el-input>
             </div>
-          </div>
+          </div> -->
         </div>
         <div class="quan">鎴戠殑浼樻儬鍒�</div>
         <div class="reduce">
@@ -270,8 +272,23 @@
              EndTime: this.endtime,
                OrderRemark: this.orderRemark
         });
-          }
+        }
+          
         }else{
+            this.portOrderSave.OrderDetailed.push({
+                CtnerId: this.allOrder.tempOrderForms[i].tempOrder.TempOrderID,
+          CtnerNub: this.allOrder.tempOrderForms[i].tempOrder.ContainerNub,
+          SelfBox: this.allOrder.tempOrderForms[i].tempOrder.SelfBox?1:0,
+         
+          OdtaskIsUrgent: this.allOrder.tempOrderForms[i].tempOrder.IsUrgent?1:0,
+
+          Defaultset: 0,
+           IsCarPooling: this.allOrder.tempOrderForms[i].tempOrder.IsCarPooling?1:0,
+
+            Weight: this.allOrder.tempOrderForms[i].tempOrder.Weight,
+             EndTime: this.endtime,
+               OrderRemark: this.orderRemark
+            })
           //  this.portOrderSave.OrderDetailed=[];
         }
       
@@ -338,6 +355,7 @@
          
     },
     placeOrder() {
+      console.log(this.allOrder);
       this.getPayCaptal();
       this.getMyCoupon();
       if(this.pid!=""){
@@ -485,7 +503,7 @@
   text-align: center;
 }
 .table-title .box {
-  width: 127px;
+  width: 157px;
 }
 .table-title .time {
   width: 220px;
@@ -494,7 +512,7 @@
   width: 65px;
 }
 .table-title .info {
-  width: 107px;
+  width: 157px;
 }
 .table-title .number {
   width: 100px;
diff --git a/src/views/frontdesk/OrderTrack.vue b/src/views/frontdesk/OrderTrack.vue
index b398c83..9f56d46 100644
--- a/src/views/frontdesk/OrderTrack.vue
+++ b/src/views/frontdesk/OrderTrack.vue
@@ -51,7 +51,7 @@
     </div>
     <div class="foot" v-if="isNoDispatch">
       <div class="track-foot">
-        <div @click="addMarker">绛夊緟</div>
+        <div >绛夊緟</div>
         <div class="track-show">
           <div><i class="iconfont icon-changyongicon-1"></i></div>
           <div class="track-box" v-for="item in waiting" :key="item.BoxId">
@@ -69,6 +69,8 @@
         </div>
       </div>
     </div>
+
+    <!-- 鏌ョ湅璇︽儏寮圭獥 -->
   </div>
 </template>
 <script>
@@ -84,6 +86,7 @@
       orderTrackingModel:[],
       waiting:[],
       count:0,
+      boxDetails:{}
     };
   },
   mounted() {
@@ -105,9 +108,15 @@
         this.getAllBox()
     },
     trackBox(content){
-      console.log(content);
-        this.addMarker(content)
+      new Promise(resolve=>{
+            let result =this.getDetails({box_id:content.BoxId});
+            resolve(result);
+      }).then(res=>{
+             this.addMarker(content,res);
+      })
+     
     },
+
     //鑾峰彇绠卞瓙淇℃伅
     async getAllBox(){
      this.isAllShow= true;
@@ -132,12 +141,14 @@
        })
     },
     //鑾峰彇璇︽儏
-    async getDetails(){
-      await this.$axios.post("api/OrderTracking/QueryOrderTrackingDetails").then(res=>{
-        console.log(res);
+    async getDetails(model){
+      await this.$axios.post("api/OrderTracking/QueryOrderTrackingDetails",this.$qs.stringify(model)).then(res=>{
+        
+        this.boxDetails = res.data;
       }).catch(err=>{
             console.log(err);
       })
+      return this.boxDetails;
     },
     init() {
       let map = new AMap.Map("container", {
@@ -150,8 +161,10 @@
       this.activeBtn = content;
     },
     addMarker(content) {
-      
-        let map = new AMap.Map("container", {
+      let newBoxDetails = this.boxDetails;
+      let newthis = this;
+      new Promise(resolve=>{
+ let map = new AMap.Map("container", {
         center: [content.CtoLongitude, content.CtoLatitude],
         resizeEnable: true,
         zoom: 10,
@@ -159,50 +172,121 @@
       var marker = new AMap.Marker({
         map: map,
         position: [content.CtoLongitude, content.CtoLatitude],
-        icon: require("../../../public/img/order/宸插嚭鍙�.png"),
+        icon: require("../../../public/img/map/position.png"),
         offset: new AMap.Pixel(-13, -30),
       });
       // map.remove(markers);
       map.add(marker);
       //鏋勫缓淇℃伅绐椾綋涓樉绀虹殑鍐呭
       var info = [];
-      let showInfo = ` <div class="box-info-show" >
-          <div class="top-box">
-            <div class="left">
-              <i class="iconfont icon-jizhuangxiang_container"></i>
-              <span>${content.BoxTypeCode}</span>
-              <span>闄愰噸${content.WeightLimit}T</span>
-            </div>
+      let showInfo = `  <div style="width: 300px;" >
+        <div  style="display:flex;justify-content: space-between;margin-top:13px;">
+          <div style="border: 1px solid #c3c3c3;padding: 3px;">
+            <i class="iconfont icon-jizhuangxiang_container"></i>
+            <span>${content.BoxTypeCode}</span>
+            <span>闄愰噸${content.WeightLimit.slice(0,2)}T</span>
           </div>
-          <div class="info">
-            <i class="iconfont icon-matou"></i>
-            <span>${content.BolCode}鎻愬崟鍙�</span>
+          <div style="border: 1px solid #c3c3c3;padding:3px 8px;color:#E6A23C;background-color:#f2f2f2 ;">鍑哄彂</div>
+        </div>
+        <div class="info" style="padding: 6px 0px;">
+          <i class="iconfont icon-matou"></i>
+          <span>${content.BolCode}鎻愬崟鍙�</span>
+        </div>
+        <div style="margin-bottom: 6px;">
+          <i class="iconfont icon-fenxiang"></i>
+          <span>${content.ObcarContainerNo}绠卞彿</span>
+        </div>
+        <div class="info">
+          <div id="select">
+                 <span id="xiangqing" style="text-decoration: underline;color:#409EFF;">鏌ョ湅璇︽儏</span>
+                 <i class="el-icon-caret-bottom"></i>
           </div>
-          <div class="info">
-            <i class="iconfont icon-fenxiang"></i>
-            <span>${content.ObcarContainerNo}绠卞彿</span>
-          </div>
-          <div class="info">
-            <span onclick="demo()">鏌ョ湅璇︽儏</span>
-          </div>
-        </div>`;
+         <div id="packup" style="display:none;">
+              <span id="fewer" style="text-decoration: underline;color:#409EFF;">鏀惰捣璇︽儏</span>
+                 <i class="el-icon-caret-top"></i>
+         </div>
+       
+         
+        </div>
 
+        <div style="display:none" id="details">
+          <div style="margin-top:6px;">
+            <b>${newBoxDetails.CarName}</b><span>${newBoxDetails.UderName}</span>
+          </div>
+           
+           <div  >
+              <i class="el-icon-phone-outline"></i>
+              <span>${newBoxDetails.UderPhone}</span>
+           </div>
+
+           <div >
+              <i class="iconfont icon-listmatou"></i>
+              <span>${newBoxDetails.TradeCode}</span>
+              <span>杩涜埍缂栧彿</span>
+           </div>
+
+          <div >
+              <i class="iconfont icon-listmatou"></i>
+              <span>${newBoxDetails.ObcarContainerOwner}</span>
+              <span>绠变富</span>
+           </div>
+
+             <div>
+              <i class="iconfont icon-listmatou"></i>
+              <span>${newBoxDetails.ObcarBoxSeal}</span>
+              <span>灏佸彿</span>
+           </div>
+
+        </div>
+      </div>`;
+      
       info.push(showInfo);
      var infoWindow = new AMap.InfoWindow({
-        anchor: "top-left",
+        offset: new AMap.Pixel(13, -30),
         content: info.join("<br/>"), //浣跨敤榛樿淇℃伅绐椾綋妗嗘牱寮忥紝鏄剧ず淇℃伅鍐呭
       });
 
       infoWindow.open(map, [content.CtoLongitude, content.CtoLatitude]);
       map.setFitView([marker]);
-      function demo(){
-        alert(123)
-      }
+      setTimeout(()=>{
+           resolve("hello");
+      },200)
+     
+      }).then(res=>{
+        newthis.demo();
+         newthis.pickupDetails();
+  //  document.getElementById("xiangqing").onclick=function(){
+  //       alert(res)
+  //     }
+      })
+       
+
+      // setTimeout(()=>{
+         
+      // },200)
+    
     },
+    pickupDetails(){
+        document.getElementById("fewer").onclick=function(){
+            document.getElementById("details").style.display="none";
+          document.getElementById("packup").style.display='none';
+          document.getElementById("select").style.display='block';
+        }
+    },
+    demo(){
+      document.getElementById("xiangqing").onclick=function(){
+          document.getElementById("details").style.display="block";
+          document.getElementById("packup").style.display='block';
+          document.getElementById("select").style.display='none';
+      }
+    }
   },
 };
 </script>
 <style lang="less" scoped>
+.amap-info-content{
+  border-radius: 10px  !important;
+}
 .map-container {
   position: absolute;
   left: 0;
@@ -227,6 +311,7 @@
   padding: 10px;
 }
 .foot {
+  
   display: flex;
   justify-content: center;
 }

--
Gitblit v1.9.1