小牛集卡web 客户端
chenwei
2021-06-04 7f5659967e4b5864d1c56a6072ebfe3abe4702dc
订单跟踪的完善
3 files added
8 files modified
1452 ■■■■■ changed files
public/img/map/position.png patch | view | raw | blame | history
public/index.html 2 ●●● patch | view | raw | blame | history
public/niu.ico patch | view | raw | blame | history
src/components/agopage/comment/BoxType.vue 694 ●●●● patch | view | raw | blame | history
src/components/agopage/comment/CarSharing.vue 107 ●●●●● patch | view | raw | blame | history
src/components/agopage/comment/InfoDialog.vue 163 ●●●● patch | view | raw | blame | history
src/components/agopage/home/Harbour.vue 220 ●●●●● patch | view | raw | blame | history
src/components/agopage/home/Wind.vue 59 ●●●● patch | view | raw | blame | history
src/router/index.js 24 ●●●● patch | view | raw | blame | history
src/views/agomiddle/InquiryCenter.vue 36 ●●●● patch | view | raw | blame | history
src/views/frontdesk/OrderTrack.vue 147 ●●●● patch | view | raw | blame | history
public/img/map/position.png
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;
public/niu.ico
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;
src/components/agopage/comment/CarSharing.vue
New file
@@ -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>
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;
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,所以直接用了new 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,所以直接用了new 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;
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;
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:"我的订单",
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;
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;
}