From 1fe8ef60dd7c16147c97a18cf14c03fad5299178 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 20 May 2024 17:41:59 +0800
Subject: [PATCH 1/2] md

---
 src/views/emis/emisTransLine/emisTransLineForm.vue | 2 +-
 src/views/emis/emisWaybill/emisWaybillRecord.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/emis/emisTransLine/emisTransLineForm.vue b/src/views/emis/emisTransLine/emisTransLineForm.vue
index 403fab53..4f854d87 100644
--- a/src/views/emis/emisTransLine/emisTransLineForm.vue
+++ b/src/views/emis/emisTransLine/emisTransLineForm.vue
@@ -310,7 +310,7 @@ export default {
             });
           } else {
             addEmisTransLine(this.form).then(response => {
-               this.$modal.msgSuccess("修改成功");
+               this.$modal.msgSuccess("新增成功");
                this.$emit("on-changed");
             });
           }
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 50374ce8..e30ed565 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -1466,7 +1466,7 @@ methods: {
     if(row!=null){
 
       if(row.calcExp){
-        let expr=row.calcExp+"";
+        let expr=row.calcExp+"s+w*d";
         expr=expr.replace("s",row.initialWeightFee);
         expr=expr.replace("d",row.addWeightPrice);
         expr=expr.replace("w",this.form.settlementWeight);

From 2c89086ab15d4278aaaef3e1b2af2fd8f430ef5a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 20 May 2024 17:42:30 +0800
Subject: [PATCH 2/2] md

---
 src/api/emis/emisWaybillProblemFaq.js         |   44 +
 .../emisWaybill/emisWaybillModify copy.vue    | 1492 +++++++++++++++++
 .../emisWaybillProblemFaqForm.vue             |  196 +++
 .../emis/emisWaybillProblemFaq/index.vue      |  402 +++++
 4 files changed, 2134 insertions(+)
 create mode 100644 src/api/emis/emisWaybillProblemFaq.js
 create mode 100644 src/views/emis/emisWaybill/emisWaybillModify copy.vue
 create mode 100644 src/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm.vue
 create mode 100644 src/views/emis/emisWaybillProblemFaq/index.vue

diff --git a/src/api/emis/emisWaybillProblemFaq.js b/src/api/emis/emisWaybillProblemFaq.js
new file mode 100644
index 00000000..37616f86
--- /dev/null
+++ b/src/api/emis/emisWaybillProblemFaq.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询问题件FAG列表
+export function listEmisWaybillProblemFaq(query) {
+  return request({
+    url: '/emis/emisWaybillProblemFaq/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询问题件FAG详细
+export function getEmisWaybillProblemFaq(id) {
+  return request({
+    url: '/emis/emisWaybillProblemFaq/' + id,
+    method: 'get'
+  })
+}
+
+// 新增问题件FAG
+export function addEmisWaybillProblemFaq(data) {
+  return request({
+    url: '/emis/emisWaybillProblemFaq',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改问题件FAG
+export function updateEmisWaybillProblemFaq(data) {
+  return request({
+    url: '/emis/emisWaybillProblemFaq',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除问题件FAG
+export function delEmisWaybillProblemFaq(id) {
+  return request({
+    url: '/emis/emisWaybillProblemFaq/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/emis/emisWaybill/emisWaybillModify copy.vue b/src/views/emis/emisWaybill/emisWaybillModify copy.vue
new file mode 100644
index 00000000..d8835fee
--- /dev/null
+++ b/src/views/emis/emisWaybill/emisWaybillModify copy.vue	
@@ -0,0 +1,1492 @@
+<template>
+  <div class="app-container" >
+    <el-form ref="form"  size="mini" :model="form" :rules="rules" label-width="100px">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="" name="1">
+            <template slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
+            </template>
+            <div>
+              <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+                <el-col :span="8">
+                    <el-form-item label="运单号" prop="billCode"  >
+                      <div style="display:inline-flex">
+                          <div>
+                            <el-input v-model="form.billCode" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" style="font-weight:600;color:black" >
+                              <i slot="suffix" class="iconfont">&#xe656;</i>
+                            </el-input>
+                          </div>
+                          <!-- <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div> -->
+                      </div>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="6">
+                    <el-form-item :label="$t('发货时间')" prop="sendDate">
+                      <el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="10">
+                </el-col>
+
+
+
+
+                  <el-col :span="6">
+                    <el-form-item label="目的国" prop="reciever.country">
+                        <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="产品类型" prop="productType">
+                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
+                      <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="5">
+                    <el-form-item label="报关方式" prop="customsEclaration">
+                      <el-select v-model="form.customsEclaration" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_declare_mode"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="5">
+                    <el-form-item label="清关方式" prop="customsClear">
+                      <el-select v-model="form.customsClear" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_customs_clear"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="6">
+                    <el-form-item label="取件方式" prop="pickupMethod">
+                      <el-select v-model="form.pickupMethod" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_qujian_fangshi"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6" v-if="form.pickupMethod==2">
+                    <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
+                      <EmisUserSimplePicker0  :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6" v-if="form.pickupMethod==1">
+                    <el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
+                      <EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="派件方式" prop="dispatchMethod">
+                      <el-radio-group v-model="form.dispatchMethod">
+                        <el-radio
+                          v-for="dict in dict.type.emis_tab_dispatch_mode"
+                          :key="dict.value"
+                          :label="dict.value"
+                        >
+                        <!-- style="font-size:10px" -->
+                        <span  >{{dict.label}}</span>
+                      </el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                      <el-form-item label="寄件网点" prop="sendSiteName">
+                        <el-input v-model="form.sendSiteName" placeholder="" disabled />
+                      </el-form-item>
+                  </el-col>
+
+                  <el-col :span="18">
+                    <el-form-item label="打印选项:" prop="sendSiteName">
+                      <el-checkbox-group v-model="printTypeCheckList">
+                        <el-checkbox
+                          v-for="dict in dict.type.emis_print_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                        >
+                          <span style="font-size:13px" >{{dict.label}}</span>
+                        </el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                    <!-- <div style="display:flex;padding-left: 30px;">
+                      <el-checkbox-group v-model="printTypeCheckList">
+                        <el-checkbox
+                          v-for="dict in dict.type.emis_print_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                        >
+                          <span style="font-size:13px" >{{dict.label}}</span>
+                        </el-checkbox>
+                      </el-checkbox-group>
+                    </div> -->
+                  </el-col>
+
+                  <!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
+                    <el-form-item label="寄件客户" prop="customerCode">
+                          <customer-picker0 v-model="form.customerCode"></customer-picker0>
+                    </el-form-item>
+                  </el-col> -->
+              </el-row>
+
+            </div>
+          </el-collapse-item>
+          <el-collapse-item title="" name="2">
+            <template slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
+            </template>
+            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
+                <el-col :span="12">
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px">
+                    <el-col :span="24" style="display:inline-flex; margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
+                      <div class="form-group-title" style="width:50%">
+                          <span style="border-radius: 15px;
+                            padding: 5px 15px;
+                            background: black;
+                            font-size: 13px;
+                            color: white;">寄件信息</span>
+                      </div>
+                      <div style="width:50%;text-align:right;padding-right: 15px;">
+                          <!-- icon="el-icon-edit" -->
+                        <el-button
+                        size="mini"
+                        type="text"
+                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
+                        class="iconfont icon-dizhibao"
+                        @click="handleSelectCustomerAddress(1)"
+                      >寄件地址薄</el-button>
+                      </div>
+                    </el-col>
+
+                    <el-col :span="12">
+                      <el-form-item label="寄件人" prop="sender.name">
+                        <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="寄件电话" prop="sender.phone">
+                        <el-input v-model="form.sender.phone" placeholder="" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="国家地区" prop="sender.province"  >
+                        <div style="display:inline-flex">
+                          <country-picker1 v-model="form.sender.country" ></country-picker1>
+                          <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
+                          <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
+                          <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
+                        </div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="寄件地址" prop="sender.address">
+                        <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="寄件公司" prop="sender.company">
+                        <el-input v-model="form.sender.company" placeholder="" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="" prop="blMessage">
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
+                      </el-form-item>
+                    </el-col>
+
+                  </el-row>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
+                      <el-col :span="24" style="display:inline-flex;margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
+                        <div class="form-group-title" style="width:50%">
+                          <span style="border-radius: 15px;
+                              padding: 5px 15px;
+                              background: #b12e29;
+                              font-size: 13px;
+                              color: white;">收件信息</span>
+                          </div>
+                        <div style="width:50%;text-align:right;padding-right: 15px;">
+                          <el-button
+                          size="mini"
+                          type="text"
+                          style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
+                          class="iconfont icon-dizhibao"
+                          @click="handleSelectCustomerAddress(2)"
+                        >收件地址薄</el-button>
+                        </div>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="收件人" prop="reciever.name">
+                          <CustomerAddressSimplePicker1 addressType="2"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="收件电话" prop="reciever.phone">
+                          <el-input v-model="form.reciever.phone" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="国家地区" prop="reciever.province">
+                          <div style="display:inline-flex">
+                            <country-picker2 v-model="form.reciever.country" ></country-picker2>
+                            <ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px"></ProvincePicker2>
+                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
+                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
+                          </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="收件地址" prop="reciever.address">
+                          <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="收件公司" prop="reciever.company">
+                          <el-input v-model="form.reciever.company" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="目的地" prop="destinationCode">
+                          <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="派件网点" prop="dispatchSite">
+                          <el-input v-model="form.dispatchSite" placeholder="" disabled />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="" prop="blAcceptMessage">
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
+                        </el-form-item>
+                      </el-col>
+                      <!-- <el-col :span="12">
+                        <el-form-item label="邮编" prop="receivePostcode">
+                          <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
+                        </el-form-item>
+                      </el-col> -->
+                  </el-row>
+                </el-col>
+            </el-row>
+          </el-collapse-item>
+          <el-collapse-item title="" name="3">
+            <template slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('重量收费信息') }}</span>
+              </div>
+            </template>
+            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+              <el-col :span="12">
+
+                <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
+                    <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
+                    <el-col :span="24">
+                        <el-form-item label="" prop="goodsType" label-width="0px">
+                          <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker>
+                            <el-table
+                            class="cargoList"
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
+                            border
+                            stripe
+                            :data="form.cargoList"
+                            size="small"
+                            style="width: 100%"
+                            max-height="300px"
+                          >
+
+
+                          <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.goodsName" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+
+                            <el-table-column prop="length" label="长(cm)" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.length" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="width" label="宽(cm)" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.width" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="height" label="高(cm)" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.height" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="volume" label="体积(m³)" align="center" width="80">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="cargoQty" label="件数" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.cargoQty" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+
+
+                            <el-table-column label="操作" align="center" width="50">
+                                  <template slot-scope="scope">
+                                    <span class="icon iconfont"
+                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
+                                    @click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span>
+                                  </template>
+                            </el-table-column>
+
+                          </el-table>
+
+                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" disabled />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="12">
+                        <el-form-item label="实际重量" prop="billWeight" label-width="70px">
+                          <el-input v-model="form.billWeight" @blur="reCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
+                          <div style="">
+                            <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积" >
+                              <span slot="suffix">(m³)</span>
+                            </el-input>
+                          </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
+                          <el-input v-model="form.parcelQty" style="text-align: right;" placeholder=""  />
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
+                          <el-input v-model="form.volumeWeight" placeholder="" disabled>
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
+                          <el-input v-model="form.settlementWeight" placeholder="" disabled >
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="包装类型" prop="packType" label-width="70px"">
+                            <el-select v-model="form.packType" placeholder="请选择">
+                              <el-option
+                                v-for="dict in dict.type.emis_tab_packing_type"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              ></el-option>
+                            </el-select>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="" prop="blOverWeight">
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12" v-if="form.blOverWeight==1">
+                        <el-form-item label="超重件数" prop="overWeightNumber" label-width="70px">
+                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" v-if="this.form.billCode && this.form.parcelQty>0">
+                          <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill">
+                            <el-radio :key="1"  :label="1">是</el-radio>
+                            <el-radio :key="0"  :label="0">否</el-radio>
+                          </el-radio-group>
+
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24" v-if="form.blGenSubbill==1">
+                        <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
+                          <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="进仓单" prop="warehouseInNo" label-width="70px">
+                          <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="合同号" prop="custOrderId" label-width="70px">
+                          <el-input v-model="form.custOrderId" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="运单备注" prop="remark" label-width="70px">
+                          <el-input v-model="form.remark" type="textarea" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                  </el-row>
+
+              </el-col>
+               <el-col :span="12" >
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
+
+                    <el-col :span="24">
+                      <el-form-item label="计费方式" prop="calcFeeType" label-width="70px">
+                        <!-- <el-input v-model="form.calcFeeType" placeholder="请输入计费方式" /> -->
+                        <el-radio-group v-model="form.calcFeeType" >
+                          <el-radio
+                            v-for="dict in dict.type.emis_calc_fee_type"
+                            :key="dict.value"
+                            :label="dict.value"
+                            >{{dict.label}}</el-radio>
+                        </el-radio-group>
+
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <el-form-item label="" prop="goodsType" label-width="0px">
+                            <el-table
+                            class="cargoList"
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
+                            border
+                            stripe
+                            :data="form.feeItems"
+                            size="mini"
+                            max-height="300px"
+                            style="width: 100%"
+                          >
+
+
+                            <el-table-column prop="feeName" label="收费项" align="center" width="70">
+                              <template slot-scope="scope">
+                                <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="fee" label="应收" align="center" width="50">
+                              <template slot-scope="scope">
+                                <span>{{ scope.row.fee }}</span>
+                              </template>
+                            </el-table-column>
+
+                            <el-table-column prop="initialWeightFee" label="首重费" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="remark" label="描述" align="center" min-width="50">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.remark" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column label="操作" align="center" width="50">
+                                  <template slot-scope="scope">
+                                    <span class="icon iconfont"
+                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
+                                    v-if="scope.row.blAutoGen==0"
+                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
+                                  </template>
+                            </el-table-column>
+
+                          </el-table>
+                          <div>
+                            <el-popover
+                                trigger="click"
+                                ref="popoverFeeRef"
+                                placement="top"
+                                :width="400"
+                                effect="light"
+                                :show-arrow="false"
+                              >
+                                <feeItemForm :triggerCount="triggerCount" :feeList="this.form.feeItems" @on-changed="onFeeItemChange" @on-cancel="onFeeItemChange"></feeItemForm>
+                                <el-button
+                                     slot="reference"
+                                      style="padding: 0px;font-size: 12px;"
+                                      size="mini"
+                                      type="text"
+                                      icon="el-icon-plus"
+                                      @click="handleAddFee"
+                                    >增加自定义费用</el-button>
+                              </el-popover>
+                          </div>
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="总运费" prop="freight" label-width="70px">
+                            <el-input v-model="form.freight" placeholder="" >
+                        </el-input>
+                      </el-form-item>
+                      <el-form-item label="费用备注" prop="feeRemaker" label-width="70px">
+                            <el-input v-model="form.feeRemaker" type="textarea" placeholder="" >
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="付款方式" prop="paymentType" label-width="70px">
+                        <el-select v-model="form.paymentType" placeholder="请选择">
+                            <el-option
+                              v-for="dict in dict.type.emis_payment_type"
+                              :key="dict.value"
+                              :label="dict.label"
+                              :value="dict.value"
+                            ></el-option>
+                          </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                    </el-col>
+                    <el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
+                      <el-form-item label="月结账号" prop="thirdCustomerCode" label-width="70px">
+                        <EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="回款联系人" prop="payee" label-width="80px">
+                        <EmisUserSimplePicker2 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker2>
+
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="销售联系人" prop="salesmen" label-width="80px">
+                        <EmisUserSimplePicker3 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker3>
+                      </el-form-item>
+                    </el-col>
+
+
+
+
+
+                  </el-row>
+
+               </el-col>
+            </el-row>
+          </el-collapse-item>
+
+      </el-collapse>
+
+    </el-form>
+    <div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="initData">重置</el-button>
+    </div>
+
+    <el-dialog :title="titleSelectAddress" :visible.sync="openSelectAddress" width="60%" :destroy-on-close="true"  v-dialogDrag append-to-body>
+        <AddressSelectPicker0 :addressType="addressType"   @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
+    </el-dialog>
+
+</div>
+</template>
+
+<script>
+import { realMatchWaybill } from "@/api/emis/emisElectronicPag";
+import { getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
+import { parseTime } from "@/utils/custom";
+import { getDestSite } from "@/api/emis/emisDestination";
+
+import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue';
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+
+import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
+import ProvincePicker1 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+import CityPicker1 from '@/views/emis/EmisBaseTools/CityPicker.vue';
+import DistrictPicker1 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
+// import TownPicker1 from '@/views/emis/EmisBaseTools/TownPicker.vue';
+
+import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+import CityPicker2 from '@/views/emis/EmisBaseTools/CityPicker.vue';
+import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
+// import TownPicker2 from '@/views/emis/EmisBaseTools/TownPicker.vue';
+
+// import CustomerPicker0 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
+// import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
+// import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
+
+import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
+import CustomerAddressSimplePicker0 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
+import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
+import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
+import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
+import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
+
+import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
+import feeItemForm from './feeItemForm.vue';
+
+
+
+export default {
+  name: "WaybillModify",
+  // props:{
+  //   billCode:{
+  //     type:String
+  //   }
+  // },
+components: {
+  feeItemForm,
+  TransProductCasPicker,
+  WarehouseInNoPicker,
+  EmisMonthpayAccountPicker,
+  AddressSelectPicker0,
+  AddressSelectPicker1,
+  CustomerAddressSimplePicker0,
+  CustomerAddressSimplePicker1,
+  GoodsSimplePicker,
+  EmisUserSimplePicker0,
+  EmisUserSimplePicker1,
+  EmisUserSimplePicker2,
+  EmisUserSimplePicker3,
+  // CustomerPicker0,
+  // CustomerPicker1,
+  // CustomerPicker2,
+  DestinationPicker,
+  TransLinePicker,
+  TransProductPicker,
+  // AreaPicker0,
+  CountryPicker0,
+  CountryPicker1,
+  ProvincePicker1,
+  CityPicker1,
+  DistrictPicker1,
+  // TownPicker1,
+  CountryPicker2,
+  ProvincePicker2,
+  CityPicker2,
+  DistrictPicker2,
+  // TownPicker2,
+},
+dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type'],
+data() {
+  return {
+    activeNames:['1','2','3','4'],
+    billCode:null,
+    emisWaybillOptions: [],
+    addressType:null,
+    // 遮罩层
+    loading: true,
+    isNeedSave:false,
+    triggerCount:0,
+    printTypeCheckList:['1','2','5'],
+    // 表单参数
+    form: {},
+    timer:null,
+    isNeedCalc:false,
+    titleSelectAddress:'',
+    openSelectAddress:false,
+    // 表单校验
+    rules: {
+      billCode: [
+        { required: true, message: "运单号不能为空", trigger: ["blur",'change']  }
+      ],
+      reciever:{
+        name: [
+          { required: true, message: "收货人名不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "收货人手机号不能为空", trigger: "blur" }
+        ],
+        country: [
+          { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
+        ],
+        province: [
+          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
+        ],
+        // city: [
+        //   { required: true, message: "市不能为空", trigger: "blur" }
+        // ],
+        // county: [
+        //   { required: true, message: "区不能为空", trigger: "blur" }
+        // ],
+        address: [
+          { required: true, message: "收货地址不能为空", trigger: "blur" }
+        ],
+      },
+      sender:{
+        name: [
+          { required: true, message: "寄件人名不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "寄件人手机号不能为空", trigger: "blur" }
+        ],
+        country: [
+          { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change']  }
+        ],
+        province: [
+          { required: true, message: "寄件省不能为空", trigger: ["blur",'change']  }
+        ],
+        // city: [
+        //   { required: true, message: "寄件市不能为空", trigger: "blur" }
+        // ],
+        // county: [
+        //   { required: true, message: "寄件区不能为空", trigger: "blur" }
+        // ],
+        address: [
+          { required: true, message: "寄件地址不能为空", trigger: "blur" }
+        ],
+      },
+      paymentType: [
+        { required: true, message: "支付方式不能为空", trigger: ["blur",'change']  }
+      ],
+      calcFeeType: [
+        { required: true, message: "计费方式不能为空", trigger: ["blur",'change']  }
+      ],
+      transLine: [
+        { required: true, message: "快递线路不能为空", trigger: ["blur",'change']  }
+      ],
+      productType: [
+        { required: true, message: "快递产品类型不能为空", trigger: ["blur",'change']  }
+      ],
+      customsClear: [
+        { required: true, message: "清关方式不能为空", trigger: ["blur",'change']  }
+      ],
+      customsEclaration: [
+        { required: true, message: "报关方式不能为空", trigger: ["blur",'change']  }
+      ],
+      packType: [
+        { required: true, message: "包装类型不能为空",trigger: ["blur",'change']  }
+      ],
+      dispatchMethod: [
+        { required: true, message: "派件方式不能为空", trigger: ["blur",'change']  }
+      ],
+      pickupMethod: [
+        { required: true, message: "取件方式为空", trigger: ["blur",'change']  }
+      ],
+      goodsInfo: [
+        { required: true, message: "货物描述不能为空", trigger: ["blur",'change']  }
+      ],
+      totalVolume: [
+        { required: true, message: "总体积不能为空", trigger: "blur" }
+      ],
+      parcelQty: [
+        { required: true, message: "件数不能为空", trigger: "blur" }
+      ],
+      billWeight: [
+        { required: true, message: "实际重量不能为空", trigger: "blur" }
+      ],
+      volumeWeight: [
+        { required: true, message: "体积重量不能为空", trigger: "blur" }
+      ],
+      settlementWeight: [
+        { required: true, message: "结算重量不能为空", trigger: "blur" }
+      ],
+      freight: [
+        { required: true, message: "运费不能为空", trigger: "blur" }
+      ],
+      sendSiteCode: [
+        { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
+      ],
+      sendDate: [
+        { required: true, message: "发货时间不能为空", trigger: "blur" }
+      ],
+      dispatchUnderlingSiteCode: [
+        { required: true, message: "目的地网点代码不能为空", trigger: "blur" }
+      ],
+      // payee: [
+      //   { required: true, message: "销售回款人不能为空", trigger: "blur" }
+      // ],
+      // salesmen: [
+      //   { required: true, message: "销售联系人不能为空", trigger: "blur" }
+      // ],
+      takePieceEmployeeCode: [
+        { required: true, message: "取件员代码不能为空", trigger: ["blur",'change']  }
+      ],
+      operateEmployeeCode: [
+        { required: true, message: "操作员代码不能为空", trigger: ["blur",'change']  }
+      ],
+    }
+  };
+},
+ watch: {
+    "form.reciever.province":{
+      handler (newValue, oldValue) {
+        // this.isNeedSave=true;
+        this.calcDestSite();
+      },
+      immediate: false,
+      deep: true,
+    },
+    "form.totalVolume":{
+      handler (newValue, oldValue) {
+        this.reCalcVolumeWeight();
+      },
+      deep: true
+    },
+    "form.volumeWeight":{
+      handler (newValue, oldValue) {
+        this.reCalcSettlementWeight();
+      },
+      immediate: false,
+      deep: true
+    },
+    "form.billWeight":{
+      handler (newValue, oldValue) {
+        this.reCalcSettlementWeight();
+      },
+      immediate: false,
+      deep: true
+    },
+    "form.calcFeeType":{
+      handler (newValue, oldValue) {
+          this.calcBillFee();
+      },
+      immediate: false,
+      deep: true
+    },
+    "form.settlementWeight":{
+      handler (newValue, oldValue) {
+          this.calcBillFee();
+      },
+      immediate: false,
+      deep: true
+    },
+    "form.parcelQty":{
+      handler (newValue, oldValue) {
+          this.handleGenSubbill();
+      },
+      immediate: false,
+      deep: true
+    },
+
+},
+activated(){
+},
+mouted(){
+},
+updated(){
+},
+created() {
+  this.billCode=this.$route.query.billCode;
+  this.initData();
+
+},
+methods: {
+  handleScanInput(){
+    if(this.form.billCode==null || this.form.billCode==''){
+      this.$message.error("输入单号后回车");
+      return;
+    }
+    this.billCode=this.form.billCode;
+    this.initData();
+  },
+  handleAddFee(){
+    this.triggerCount++;
+  },
+  onFeeItemChange(item){
+    this.$refs.popoverFeeRef.doClose();
+    if(item!=null){
+      let newItem=Object.assign({},item)
+      this.form.feeItems.push(newItem);
+      this.handleCalcFeeItem();
+    }
+
+  },
+  deleteFeeItem(row){
+    if(row.blAutoGen==1){
+      this.$message('不允许删除!')
+      return;
+    }
+    this.$confirm('确定删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+      let newList = this.form.feeItems.filter(item => item.feeCode !== row.feeCode);
+      this.form.feeItems=newList;
+
+    }).catch(() => {
+    })
+
+  },
+  deleteGoodsItem(row){
+    this.$confirm('确定删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+      let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName);
+      this.form.cargoList=newList;
+      this.handleCalcQty();
+      this.handleCalcVolume();
+    }).catch(() => {
+    })
+
+  },
+  lpadZero(val,len) {
+    return (new Array(len + 1).join('0') + val).slice(-len);
+  },
+  handleGenSubbill(value){
+    if(this.form.blGenSubbill==1 && this.form.parcelQty > 0 && this.form.billCode){
+        // let billSubCodeStr="";
+        // for(let i=1;i<this.form.parcelQty;i++){
+        //   let subBillCode = this.form.billCode+""+this.lpadZero(i,3);
+        //   billSubCodeStr=billSubCodeStr+subBillCode+";"
+        //   console.log(billSubCodeStr);
+        // }
+        let billSubCodeStr = this.form.billCode+"["+this.lpadZero(1,3)+"-"+this.lpadZero(this.form.parcelQty,3)+"]";
+        console.log(billSubCodeStr);
+        this.form.billCodeSub=billSubCodeStr;
+    }else{
+      this.form.billCodeSub=null;
+    }
+
+  },
+  openCollapse(index){
+
+  },
+  initData() {
+      this.reset();
+
+      this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
+      this.form.sendSiteName=this.$store.getters.ownerSiteName;
+      console.log(this.form.sendSiteName)
+
+      if(this.billCode !=null) {
+        this.loading = true;
+        getWaybillDetail(this.billCode).then(response => {
+          this.form = response.data;
+          this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
+          this.loading = false;
+
+          this.isNeedSave=true;
+
+          this.form.sendDate =  parseTime(new Date());
+
+        });
+      }else{
+        // console.log(this.dict.type.emis_declare_mode[0]);
+
+        // this.form.customsEclaration = this.dict.type.emis_declare_mode[0].value;
+        this.form.customsEclaration='1';
+        this.form.customsClear='1';
+        this.form.pickupMethod='2';
+        this.form.dispatchMethod='1';
+        // this.form.billWeight=1.0;
+        // this.form.totalVolume=0.0;
+        this.form.parcelQty=1;
+        this.form.packType='2';
+        this.form.blOverWeight='0';
+        this.form.blGenSubbill=0;
+        this.form.paymentType='1';
+        this.form.calcFeeType='1';
+        this.form.blMessage='1'
+
+        this.isNeedSave=true;
+      }
+
+
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+  },
+  // 取消按钮
+  cancel() {
+    this.reset();
+    this.$emit("on-cancel");
+  },
+
+  // 表单重置
+  reset() {
+    this.form = {
+      id:null,
+      reciever: {
+          country: null,
+          name: null,
+          phone:null,
+          province: null,
+          city: null,
+          district: null,
+          town: null,
+          address: null,
+          postCode: null,
+          email: null,
+          company: null,
+      },
+      sender: {
+          country: null,
+          name: null,
+          phone:null,
+          province: null,
+          city: null,
+          district: null,
+          town: null,
+          address: null,
+          postCode: null,
+          email: null,
+          company: null,
+      },
+      feeItems: [],
+      cargoList: [],
+      attachmentList: [],
+      printTypeCheckList:[],
+      billCode: null,
+      orderDate:  null,
+      openId: null,
+      customerCode: null,
+      paymentType: null,
+      calcFeeType: '1',
+      custNo:  null,
+      productTypeSelArr: null,
+      transLine:  null,
+      productType: null,
+      customsClear: null,
+      customsEclaration: null,
+      packType: null,
+      dispatchMethod: "1",
+      pickupMethod: null,
+      pickStartDate: null,
+      pickFinishDate: null,
+      intoWarehouseCode: null,
+      intoWarehouseName: null,
+      intoWarehouseAddress: null,
+      intoWarehouseContact: null,
+      intoWarehousePhone:  null,
+      intoWarehouseBillCode: null,
+      customerDeliveryBeginTime: null,
+      goodsType:null,
+      goodsInfo: null,
+      length:null,
+      width:null,
+      height:null,
+      totalWeight: null,
+      totalVolume: null,
+      parcelQty: null,
+      billWeight: null,
+      volumeWeight: null,
+      settlementWeight: null,
+      feeWeight: null,
+      freight: null,
+      blOverLong: null,
+      blOverWeight: null,
+      overWeightNumber: null,
+      feeRemaker: null,
+      realValue: null,
+      takePieceEmployeeCode: null,
+      sendSiteCode: null,
+      sendSiteName: null,
+      destinationCode:  null,
+      dispatchUnderlingSiteCode: null,
+      destinationCenterCode: null,
+      marketManCode: null,
+      payee: null,
+      salesmen: null,
+      operateEmployeeCode: null,
+      blMessage: null,
+      blAcceptMessage: null,
+      meterType:null,
+      blGenSubbill:null,
+      billCodeSub:null,
+  };
+    this.resetForm("form");
+  },
+  onProductChange(item){
+    this.form.transLine=item[0];
+    this.form.productType=item[1];
+  },
+  /** 提交按钮 */
+  submitForm() {
+    this.$refs["form"].validate(valid => {
+      if (valid) {
+        realSubmitOrder(this.form).then(response => {
+            this.$modal.msgSuccess("下单成功");
+            this.$emit("on-changed");
+        });
+      }
+    });
+  },
+   // 弹出地址簿选择
+   handleSelectCustomerAddress(addressType){
+       this.addressType = addressType;
+       this.titleSelectAddress = this.addressType==1? this.$t('选择寄件人'):this.$t('选择收件人');
+       this.openSelectAddress = true;
+  },
+  // 地址薄选择后返回
+  onAddressChangeSelect(item){
+    if(this.addressType == 1){
+      this.onChangeSelectSender(item);
+    }else{
+      this.onChangeSelectReceiver(item);
+    }
+    this.openSelectAddress = false;
+
+  },
+  onChangeSelectSender(value){
+    this.form.sender.name=value.name;
+    this.form.sender.phone=value.phone;
+    this.form.sender.country=value.country;
+    this.form.sender.province=value.province;
+    this.form.sender.city=value.city;
+    this.form.sender.county=value.district;
+    // this.form.receiveTown=value.town;
+    this.form.sender.address=value.address;
+    this.form.sender.company=value.company;
+  },
+  onChangeSelectReceiver(value){
+    this.form.reciever.name=value.name;
+    this.form.reciever.phone=value.phone;
+    this.form.reciever.country=value.country;
+    this.form.reciever.province=value.province;
+    this.form.reciever.city=value.city;
+    this.form.reciever.county=value.district;
+    // this.form.receiveTown=value.town;
+    this.form.reciever.address=value.address;
+    this.form.reciever.company=value.company;
+
+  },
+  // 计算目的站点
+  calcDestSite(){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
+    let queryParams = {
+            province:this.form.reciever.province
+    };
+
+    if(this.form.reciever.province){
+        getDestSite(queryParams).then(response => {
+          console.log(response);
+          this.form.destinationCode = response.data.destCode+'';
+          this.form.dispatchUnderlingSiteCode= response.data.siteCode;
+          this.form.dispatchSiteCode= response.data.siteCode;
+
+          this.form.dispatchUnderlingSite= response.data.siteName;
+          this.form.dispatchSite= response.data.siteName;
+
+        });
+    }
+  },
+  handleCalcVolume(val,row){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
+    let totalVolume=0.0;
+    if(row!=null){
+      let volume=parseFloat(row.length)*parseFloat(row.width)*parseFloat(row.height);
+      row.volume=parseFloat((volume/1000000).toFixed(5));
+    }
+
+    this.form.cargoList.forEach(item=>{
+        totalVolume=totalVolume+item.volume;
+    });
+    this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
+
+  },
+  handleCalcQty(val,row){
+    let totalCargoQty=0;
+    let goodsInfo='';
+
+    this.form.cargoList.forEach(item=>{
+        totalCargoQty=totalCargoQty+parseInt(item.cargoQty);
+        goodsInfo=goodsInfo+item.goodsName+"x"+item.cargoQty+",";
+
+    });
+
+    this.form.goodsInfo = goodsInfo;
+    this.form.parcelQty = totalCargoQty;
+
+    this.handleGenSubbill();
+  },
+  handleCalcFeeItem(val,row){
+    let totalFee=0;
+    this.form.feeItems.forEach(item=>{
+      totalFee=totalFee+parseInt(item.realFee);
+    });
+    this.form.freight = totalFee;
+  },
+  // 计算体积重量
+  reCalcVolumeWeight(){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
+    if( this.form.totalVolume
+        && this.form.productType
+      ){
+        let postData={
+            productType: this.form.productType,
+            totalVolume: this.form.totalVolume,
+        }
+
+        calcVolumeWeight(postData).then(response => {
+              this.form.volumeWeight = response.data.volumeWeight;
+        });
+      }
+
+  },
+   // 计算计算重量
+  reCalcSettlementWeight(){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
+      if(this.form.billWeight
+        && this.form.volumeWeight
+        && this.form.productType
+      ){
+        setTimeout(()=>{
+            let postData={
+              productType: this.form.productType,
+              volumeWeight: this.form.volumeWeight,
+              billWeight: this.form.billWeight,
+            }
+
+            calcSetteldWeight(postData).then(response => {
+                  this.form.settlementWeight = response.data.settlementWeight;
+                  this.form.feeWeight = this.form.settlementWeight ;
+            });
+        },1000);
+      }
+
+  },
+  calcBillFee(){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
+    if(this.form.settlementWeight
+        && this.form.productType
+        && this.form.sendSiteCode
+        && this.form.dispatchUnderlingSiteCode
+        && this.form.calcFeeType
+      ){
+        let postData={
+          productType: this.form.productType,
+          customerCode: this.form.customerCode,
+          custNo: this.form.custNo,
+          calcFeeType: this.form.calcFeeType,
+          settlementWeight: this.form.settlementWeight,
+          sendSiteCode: this.form.sendSiteCode,
+          dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
+        }
+
+        calcWaybillFee(postData).then(response => {
+              let newFeeList=response.data.feeList;
+              let newFeeMap = new Map();
+              newFeeList.forEach(item=>{
+                  newFeeMap[item.feeCode]=item;
+              });
+
+
+              let custFeeList = [];
+              this.form.feeItems.forEach(item=>{
+                  if(item.blAutoGen!='1' && !(item.feeCode in newFeeMap)){
+                    custFeeList.push(item);
+                  }
+              });
+
+              this.form.feeItems = newFeeList.concat(custFeeList);
+              this.handleCalcFeeItem();
+        });
+      }
+  },
+  onDestinationChange(item){
+    // this.form.destinationCode = item.destCode;
+    this.form.dispatchUnderlingSiteCode= item.siteCode;
+    this.form.dispatchSiteCode= item.siteCode;
+
+    this.form.dispatchUnderlingSite= item.siteName;
+    this.form.dispatchSite= item.siteName;
+  },
+  onGoodsChange(goodsName){
+      if(goodsName&& goodsName!='') {
+        // 旧map
+        let nameOldMap = new Map();
+        if(this.form.cargoList!=null&& this.form.cargoList.length>0){
+          this.form.cargoList.forEach(item=>{
+            nameOldMap[item.goodsName]=item;
+          });
+        }
+
+        if(!(goodsName in nameOldMap)){
+            let cargo={
+              "goodsCode": goodsName,
+              "goodsName": goodsName,
+              "cargoQty": 1,
+              "length": 0,
+              "width": 0,
+              "height": 0,
+              "volume": 0,
+            }
+            this.form.cargoList.push(cargo);
+        }
+
+        this.handleCalcQty();
+        this.handleCalcVolume();
+      }
+  },
+  showLocalTime(){
+
+  },
+  /** 鼠标移入cell */
+  handleGoodsCellEnter (row, column, cell, event) {
+    row.isEdit = true
+  },
+  /** 鼠标移出cell */
+  handleGoodsCellLeave (row, column, cell, event) {
+    row.isEdit = false
+  },
+  // 实时获取运单号
+  handleBillCodeChange(checked,item){
+    if(checked){
+      realMatchWaybill().then(response => {
+          this.form.billCode=response.data;
+      });
+    }else{
+      this.form.billCode=""
+    }
+  },
+}
+};
+</script>
+
+<style lang="scss">
+
+.el-form-item__label {
+    color: #000;
+}
+
+.el-input-group__append {
+    padding: 0 4px;
+}
+
+.el-row{
+      display:flex;
+      flex-wrap: wrap;
+      // padding-right: 10px;
+ }
+
+.el-form-item__label {
+  font-size: 12px!important;
+}
+
+
+ .platform-auto-complete {
+  .el-autocomplete-suggestion__wrap {
+    padding: 5px 0;
+    ul li {
+      pointer-events: none; // 阻止可点击事件
+      .default {
+        text-align: center;
+        color: #999;
+      }
+      &:hover {
+        background-color: #fff;
+      }
+    }
+  }
+}
+
+.el-collapse {
+    border-top: none!important;
+    border-bottom: none!important;
+}
+
+.el-table .el-table__cell:first-child .cell {
+  padding: 0px;
+}
+
+.el-table .cell {
+    padding: 0px;
+}
+
+.cargoList{
+  .el-input__inner {
+      height: 28px;
+      line-height: 28px;
+      border: none;
+      background: #ffffcd;
+      font-size: 10px;
+      padding: 0px;
+      text-align: center;
+  }
+}
+
+  .el-collapse-item__content {
+      padding-bottom: 0px;
+  }
+  .el-collapse-item__header{
+    pointer-events: none;
+  }
+
+  .el-collapse-item__arrow {
+    pointer-events: auto;
+  }
+
+
+
+
+
+
+</style>
+
diff --git a/src/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm.vue b/src/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm.vue
new file mode 100644
index 00000000..1d5b3e65
--- /dev/null
+++ b/src/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm.vue
@@ -0,0 +1,196 @@
+<template>
+  <div >
+       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+          <el-col :span="24">
+            <el-form-item label="运单编号" prop="billCode">
+              <el-input v-model="form.billCode" placeholder="请输入运单编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="具体内容" prop="content">
+              <el-input v-model="form.content" placeholder="请输入具体内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态" prop="status">
+              <el-input v-model="form.status" placeholder="请输入状态" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否显示" prop="showFlag">
+              <el-input v-model="form.showFlag" placeholder="请输入是否显示" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+
+        <!--
+         <el-form-item label="上级字典">
+              <treeselect
+                ref="tree"
+                v-model="form.parentId"
+                :options="emisWaybillProblemFaqOptions"
+                :normalizer="normalizer"
+                :default-expand-level="1"
+                :show-count="true"
+                placeholder="选择上级"
+              />
+        </el-form-item>
+        -->
+        </el-row>
+      </el-form>
+      <div style="text-align: center;margin-bottom: 10px;">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    
+  </div>
+</template>
+
+<script>
+import { listEmisWaybillProblemFaq, getEmisWaybillProblemFaq, delEmisWaybillProblemFaq, addEmisWaybillProblemFaq, updateEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
+
+export default {
+  name: "emisWaybillProblemFaqForm",
+  props:{
+    id:{
+        type:Number
+    }
+  },
+  components: {  },
+  dicts: [
+  ],
+  data() {
+    return {
+      emisWaybillProblemFaqOptions: [],
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "id不能为空", trigger: "blur" }
+        ],
+        probId: [
+          { required: true, message: "问题件序号不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "具体内容不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+   watch: {
+      "id": {
+        handler (newValue, oldValue) {
+          this.id = newValue;
+          this.initData();
+        },
+        deep: true
+      }
+  },
+  created() {
+    this.initData();
+  },
+
+  methods: {
+    initData() {
+       
+        if(this.id !=null) {
+          this.loading = true;
+          getEmisWaybillProblemFaq(this.id).then(response => {
+            this.form = response.data;
+            this.loading = false;
+          });
+        }else{
+            this.reset();
+        }
+        // this.getTreeselect();
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.$emit("on-cancel");
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        probId: null,
+        billCode: null,
+        title: null,
+        content: null,
+        status: null,
+        showFlag: null,
+        replayId: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        createSite: null,
+        updateSite: null
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateEmisWaybillProblemFaq(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("on-changed");
+            });
+          } else {
+            addEmisWaybillProblemFaq(this.form).then(response => {
+               this.$modal.msgSuccess("修改成功");
+               this.$emit("on-changed");
+            });
+          }
+        }
+      });
+    },
+    //   /** 转换菜单数据结构 */
+    //  normalizer(node) {
+    //   if (node.children && !node.children.length) {
+    //     delete node.children;
+    //   }
+    //   return {
+    //     id: node.id,
+    //     label: node.idName,
+    //     children: node.children
+    //   };
+    // },
+    //  /** 查询菜单下拉树结构 */
+    // getTreeselect() {
+    //   const queryParams = {}
+    //   listEmisWaybillProblemFaq(queryParams).then(response => {
+    //     this.emisWaybillProblemFaqOptions = [];
+    //     const rootItem = { idId: 0, emisWaybillProblemFaqName: '-', children: [] };
+    //     rootItem.children = this.handleTree(response.data, "id");
+    //     this.emisWaybillProblemFaqOptions.push(rootItem);
+
+    //     if(this.parentId != undefined) {
+    //       this.form.parentId = this.parentId;
+    //     }
+
+    //   });
+    // },
+  }
+};
+</script>
diff --git a/src/views/emis/emisWaybillProblemFaq/index.vue b/src/views/emis/emisWaybillProblemFaq/index.vue
new file mode 100644
index 00000000..3ab1abed
--- /dev/null
+++ b/src/views/emis/emisWaybillProblemFaq/index.vue
@@ -0,0 +1,402 @@
+<template>
+  <div class="app-container">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+   
+      <el-form-item label="" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          :placeholder="$t('运单编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          :placeholder="$t('标题')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="content">
+        <el-input
+          v-model="queryParams.content"
+          :placeholder="$t('具体内容')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="status">
+        <el-input
+          v-model="queryParams.status"
+          :placeholder="$t('状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="showFlag">
+        <el-input
+          v-model="queryParams.showFlag"
+          :placeholder="$t('是否显示')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          :placeholder="$t('备注')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </SearchForm>
+
+   
+    <XdTable v-loading="loading" 
+           border stripe
+           size="small"
+           :data="emisWaybillProblemFaqList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+      
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisWaybillProblemFaq:add']"
+                >新增</el-button>
+              </el-col>
+              <!-- 
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleUpdate"
+                  v-hasPermi="['emis:emisWaybillProblemFaq:edit']"
+                >修改</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['emis:emisWaybillProblemFaq:remove']"
+                >删除</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisWaybillProblemFaq:export']"
+                >导出</el-button>
+              </el-col> -->
+          </el-row>
+      </div>
+      
+      <el-table-column type="selection" width="55" align="center" />
+      <!--
+      <el-table-column label="序号" align="center" min-width="60">
+             <template slot-scope="scope">
+                <span v-text="getIndex(scope.$index)"> </span>
+             </template>
+      </el-table-column>
+       
+       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
+         </template>
+      </el-table-column>
+
+      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
+            <template slot-scope="scope">
+              <div v-if="scope.row.settleStatus == 0" style="color:red;">
+                    <span class="el-tag el-tag--info">未结算</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 10" style="color:red;">
+                <span class="el-tag">待确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 11" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 20" >
+                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 21" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 40" style="color:red;">
+                <span class="el-tag el-tag--danger">已拒绝</span>
+              </div>
+            </template>
+          </el-table-column>
+      -->
+
+      <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="100" />
+      <el-table-column :label="$t('标题')" align="center" prop="title" min-width="100" />
+      <el-table-column :label="$t('具体内容')" align="center" prop="content" min-width="100" />
+      <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
+      <el-table-column :label="$t('是否显示')" align="center" prop="showFlag" min-width="100" />
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['emis:emisWaybillProblemFaq:edit']"
+          >修改</el-button>
+          <!-- 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['emis:emisWaybillProblemFaq:remove']"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+    </XdTable>
+
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+      <emisWaybillProblemFaqForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillProblemFaqForm>
+    </el-dialog>
+    
+
+    <!--
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+        <emisWaybillProblemFaqView :id="id" ></EmisWaybillProblemFaqView>
+    </el-dialog>
+    -->
+
+  </div>
+</template>
+
+<script>
+import { listEmisWaybillProblemFaq, getEmisWaybillProblemFaq, delEmisWaybillProblemFaq, addEmisWaybillProblemFaq, updateEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+// import emisWaybillProblemFaqView from '@/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqView';
+import emisWaybillProblemFaqForm from '@/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm';
+
+export default {
+  name: "emisWaybillProblemFaq",
+  components: { elDateSimplePicker,emisWaybillProblemFaqForm },
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 问题件FAG表格数据
+      emisWaybillProblemFaqList: [],
+    
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新站点时间范围
+      daterangeCreateTime: [],
+      // 更新站点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        billCode: null,
+        title: null,
+        content: null,
+        status: null,
+        showFlag: null,
+        remark: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询问题件FAG列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listEmisWaybillProblemFaq(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        this.emisWaybillProblemFaqList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
+    },
+    handleShowMoreInput(){
+      this.moreInputVisible = !this.moreInputVisible;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/emis/emisWaybillProblemFaq/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisWaybillProblemFaq(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisWaybillProblemFaq/export', {
+    //     ...this.queryParams
+    //   }, `emisWaybillProblemFaq_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisWaybillProblemFaq(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['id','问题件序号','运单编号','标题','具体内容','状态','是否显示','针对的回复的ID','删除标志（0代表存在','创建者','创建时间','更新者','update_time','备注','创建站点','更新站点',];
+                  const filterVal = ['id','probId','billCode','title','content','status','showFlag','replayId','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '问题件FAG',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>