diff --git a/src/api/emis/emisWaybill.js b/src/api/emis/emisWaybill.js
index fb059051..4ae5a823 100644
--- a/src/api/emis/emisWaybill.js
+++ b/src/api/emis/emisWaybill.js
@@ -186,6 +186,22 @@ export function cancelOrder(data) {
   })
 }
 
+export function assignTakeMan(data) {
+  return request({
+    url: '/emis/emisWaybill/assignTakeMan',
+    method: 'post',
+    data: data
+  })
+}
+
+export function assignSendSite(data) {
+  return request({
+    url: '/emis/emisWaybill/assignSendSite',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改运单列表
 export function confirmOrder(data) {
   return request({
diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss
index a3963c55..cbd26f39 100644
--- a/src/assets/styles/custom.scss
+++ b/src/assets/styles/custom.scss
@@ -470,3 +470,11 @@
 }
 
 
+.query-label {
+  .el-radio{
+      display: block;
+      line-height: 23px;
+      white-space: normal;
+      margin-right: 0;
+  }
+}
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index e263f303..bdc877ac 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -140,7 +140,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  padding: 8px 20px;
   background-color: #fff;
   // margin: 5px 5px 15px 0px;
   // box-shadow: 0px 0px 3px rgb(0 63 235 / 10%);
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 8ab2fb4b..6f623961 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -13,6 +13,14 @@ const state = {
 }
 
 const mutations = {
+  EDIT_VISITED_VIEWS: (state, view) => {
+		for (var Index in state.visitedViews) {
+			console.log(state.visitedViews[Index].path)
+			if (state.visitedViews[Index].path == view.path) {
+				state.visitedViews[Index].title = view.meta.title
+			}
+		}
+	},
   SET_LATEST_ACTION_LIST:(state, actionList) => {
     state.latestActionList = actionList;
   },
@@ -135,6 +143,15 @@ const actions = {
   addCachedView({ commit }, view) {
     commit('ADD_CACHED_VIEW', view)
   },
+  //动态改变tab 页签(上方还有代码) 调用debug/debugData/calibrationRecord.vue
+	// this.$route.meta.title = reportName
+	// this.$store.dispatch('tagsView/editVisitedViews', this.$route)
+	editVisitedViews({ commit, state }, view) {
+		return new Promise((resolve) => {
+			commit('EDIT_VISITED_VIEWS', view)
+			resolve([...state.visitedViews])
+		})
+	},
   // 获取站点信息
   initLatestActions({commit,state}) {
     let lastUpdateTime=state.lastUpdateTime;
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
index a20dd563..02b60cdc 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
@@ -1,14 +1,21 @@
 <template>
   <div >
         <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-            <el-form-item label="账单号" prop="settleBillNo">
+          <el-form-item label="" prop="billCode" label-width="80px">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <el-radio :key="2" label="2">账单号</el-radio>
+                      </el-radio-group>
+                  </div>
                   <XdTextareaInput
                     v-model="queryParams.settleBillNo"
-                    :placeholder="$t('多个编号逗号或换行隔开')"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
-                    :rows="1"
+                    :rows="2"
                   />
-            </el-form-item>
+                        <!-- @keyup.enter.native="handleQuery" -->
+                </el-form-item>
 
             <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
               <EmisSiteSimplePicker1  v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
@@ -220,6 +227,8 @@ export default {
       // 结算总账单表格数据
       emisSettleBillList: [],
 
+      queryOrderType:null,
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -288,13 +297,17 @@ export default {
         siteConfirmNote: null,
         remark: null,
         delFlag: null,
+        params:{
+          billCode:null,
+        }
       },
-      templateFile: '/static/tpl/billExportTpl.xls',
     };
   },
    watch: {
   },
   created() {
+    this.queryOrderType="1"
+
     this.getList();
   },
 
@@ -303,6 +316,13 @@ export default {
   getList() {
       this.loading = true;
 
+
+      // 按运单查询时的处理
+      if(this.queryOrderType==1){
+        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+        this.queryParams.settleBillNo=null;
+      }
+
       listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
@@ -624,3 +644,22 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+</style>
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
index 2fc01007..2e1315ff 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
@@ -1,20 +1,27 @@
 <template>
   <div >
         <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-            <el-form-item label="账单号" prop="settleBillNo">
+          <el-form-item label="" prop="billCode" label-width="80px">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <el-radio :key="2" label="2">账单号</el-radio>
+                      </el-radio-group>
+                  </div>
                   <XdTextareaInput
                     v-model="queryParams.settleBillNo"
-                    :placeholder="$t('多个编号逗号或换行隔开')"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
-                    :rows="1"
+                    :rows="2"
                   />
-            </el-form-item>
+                        <!-- @keyup.enter.native="handleQuery" -->
+                </el-form-item>
 
             <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
               <EmisSiteSimplePicker1  v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
             </el-form-item> -->
             <el-form-item :label="$t('开票状态')" prop="openBillStatus">
-              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="开票状态">
+              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="">
                 <el-option key="1" label="已开票" value="1"></el-option>
                   <el-option key="0" label="未开票" value="0"></el-option>
                   <el-option key="3" label="不开票" value="3"></el-option>
@@ -22,14 +29,14 @@
               </el-select>
             </el-form-item>
             <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
-              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="收款状态">
+              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="">
                   <el-option key="0" label="未收款" value="0"></el-option>
                   <el-option key="1" label="已收款" value="1"></el-option>
                   <el-option key="2" label="部分收款" value="2"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
-              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态">
+              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="">
                   <el-option key="0" label="未核销" value="0"></el-option>
                   <el-option key="1" label="已核销" value="1"></el-option>
               </el-select>
@@ -249,6 +256,8 @@ export default {
       openForm: false,
       titleForm: "",
 
+      queryOrderType:null,
+
       subBillTotal: 0,
      // 结算子账单表格数据
      emisSettleSubBillList: [],
@@ -313,6 +322,9 @@ export default {
         siteConfirmNote: null,
         remark: null,
         delFlag: null,
+        params:{
+          billCode:null,
+        }
       },
       templateFile: '/static/tpl/billExportTpl.xls',
     };
@@ -320,6 +332,8 @@ export default {
    watch: {
   },
   created() {
+    this.queryOrderType="1"
+
     this.getList();
   },
 
@@ -328,6 +342,12 @@ export default {
   getList() {
       this.loading = true;
 
+      // 按运单查询时的处理
+      if(this.queryOrderType==1){
+        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+        this.queryParams.settleBillNo=null;
+      }
+
       listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
@@ -649,3 +669,22 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+</style>
diff --git a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
index f5f707a8..e69e2413 100644
--- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
@@ -1,13 +1,20 @@
 <template>
   <div >
         <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-            <el-form-item label="账单号" prop="settleBillNo">
+            <el-form-item label="" prop="billCode" label-width="80px">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <el-radio :key="2" label="2">账单号</el-radio>
+                      </el-radio-group>
+                  </div>
                   <XdTextareaInput
                     v-model="queryParams.settleBillNo"
-                    :placeholder="$t('多个编号逗号或换行隔开')"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
-                    :rows="1"
+                    :rows="2"
                   />
+                        <!-- @keyup.enter.native="handleQuery" -->
             </el-form-item>
 
             <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
@@ -229,6 +236,8 @@ export default {
       // 结算总账单表格数据
       emisSettleBillList: [],
 
+      queryOrderType:null,
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -298,6 +307,9 @@ export default {
         siteConfirmNote: null,
         remark: null,
         delFlag: null,
+        params:{
+          billCode:null,
+        }
       },
       templateFile: '/static/tpl/billExportTpl.xls',
     };
@@ -305,6 +317,8 @@ export default {
    watch: {
   },
   created() {
+    this.queryOrderType="1"
+
     this.getList();
   },
 
@@ -313,6 +327,12 @@ export default {
   getList() {
       this.loading = true;
 
+      // 按运单查询时的处理
+      if(this.queryOrderType==1){
+        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+        this.queryParams.settleBillNo=null;
+      }
+
       listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
@@ -613,3 +633,22 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+</style>
diff --git a/src/views/emis/emisSettleBill/panel/MonthPanel.vue b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
index df2bdaf5..4ef5143b 100644
--- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
@@ -1,14 +1,21 @@
 <template>
   <div >
         <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-            <el-form-item label="账单号" prop="settleBillNo">
+          <el-form-item label="" prop="settleBillNo" label-width="80px">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <el-radio :key="2" label="2">账单号</el-radio>
+                      </el-radio-group>
+                  </div>
                   <XdTextareaInput
                     v-model="queryParams.settleBillNo"
-                    :placeholder="$t('多个编号逗号或换行隔开')"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
-                    :rows="1"
+                    :rows="2"
                   />
-            </el-form-item>
+                        <!-- @keyup.enter.native="handleQuery" -->
+                </el-form-item>
 
             <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
               <EmisSiteSimplePicker1  v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
@@ -16,29 +23,28 @@
 
 
 
-            <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" min-width="100" >
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
-                <el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
-                <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
-              </template>
-            </el-table-column>
-
             <el-form-item :label="$t('开票状态')" prop="openBillStatus">
               <el-select  clearable v-model="queryParams.openBillStatus" placeholder="">
-                 <el-option key="0" label="未开票" value="0"></el-option>
-                  <el-option key="1" label="已开票" value="1"></el-option>
+                <el-option key="1" label="已开票" value="1"></el-option>
+                  <el-option key="0" label="未开票" value="0"></el-option>
                   <el-option key="3" label="不开票" value="3"></el-option>
                   <el-option key="2" label="部分开票" value="2"></el-option>
               </el-select>
             </el-form-item>
-
+            <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
+              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="">
+                  <el-option key="0" label="未收款" value="0"></el-option>
+                  <el-option key="1" label="已收款" value="1"></el-option>
+                  <el-option key="2" label="部分收款" value="2"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
               <el-select  clearable v-model="queryParams.chargeStatus" placeholder="">
                   <el-option key="0" label="未核销" value="0"></el-option>
                   <el-option key="1" label="已核销" value="1"></el-option>
               </el-select>
             </el-form-item>
+
             <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
                   <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
               </el-form-item>
@@ -207,6 +213,8 @@ export default {
       // 结算总账单表格数据
       emisSettleBillList: [],
 
+      queryOrderType:null,
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -276,6 +284,9 @@ export default {
         siteConfirmNote: null,
         remark: null,
         delFlag: null,
+        params:{
+          billCode:null,
+        }
       },
       templateFile: '/static/tpl/billExportTpl.xls',
     };
@@ -283,6 +294,8 @@ export default {
    watch: {
   },
   created() {
+    this.queryOrderType="1"
+
     this.getList();
   },
 
@@ -291,6 +304,12 @@ export default {
   getList() {
       this.loading = true;
 
+      // 按运单查询时的处理
+      if(this.queryOrderType==1){
+        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+        this.queryParams.settleBillNo=null;
+      }
+
       listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
@@ -592,3 +611,22 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+</style>
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index 81fa1c60..062a555b 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -1,14 +1,30 @@
 <template>
   <div >
         <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-            <el-form-item label="账单号" prop="settleBillNo">
+            <!-- <el-form-item label="账单号" prop="settleBillNo">
                   <XdTextareaInput
                     v-model="queryParams.settleBillNo"
                     :placeholder="$t('多个编号逗号或换行隔开')"
                     clearable
                     :rows="1"
                   />
-            </el-form-item>
+            </el-form-item> -->
+
+            <el-form-item label="" prop="billCode" label-width="80px">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <el-radio :key="2" label="2">账单号</el-radio>
+                      </el-radio-group>
+                  </div>
+                  <XdTextareaInput
+                    v-model="queryParams.settleBillNo"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
+                    clearable
+                    :rows="2"
+                  />
+                        <!-- @keyup.enter.native="handleQuery" -->
+                </el-form-item>
 
             <!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
               <EmisSiteSimplePicker1  v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
@@ -246,6 +262,8 @@ export default {
 
      currentSettleBillNo:null,
 
+     queryOrderType:null,
+
       // 弹出展示层
       id:null,
       titleView:"",
@@ -308,13 +326,16 @@ export default {
         confirmSiteCode: null,
         remark: null,
         delFlag: null,
+        params:{
+          billCode:null,
+        }
       },
-      templateFile: '/static/tpl/billExportTpl.xls',
     };
   },
    watch: {
   },
   created() {
+    this.queryOrderType="1"
     this.getList();
   },
 
@@ -323,6 +344,12 @@ export default {
   getList() {
       this.loading = true;
 
+      // 按运单查询时的处理
+      if(this.queryOrderType==1){
+        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+        this.queryParams.settleBillNo=null;
+      }
+
       console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
       if(this.$store.getters.ownerSiteCode !='88888'){
         this.queryParams.salesmen=this.$store.getters.empName
@@ -630,3 +657,23 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+</style>
diff --git a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
index b9563c15..be689262 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
@@ -754,7 +754,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .el-divider{
     margin-top: 0px;
     background: 0 0;
diff --git a/src/views/emis/emisWarehouseIn/index.vue b/src/views/emis/emisWarehouseIn/index.vue
deleted file mode 100644
index 19fb6e98..00000000
--- a/src/views/emis/emisWarehouseIn/index.vue
+++ /dev/null
@@ -1,492 +0,0 @@
-<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="serialNo">
-        <el-input
-          v-model="queryParams.serialNo"
-          :placeholder="$t('进仓序列号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="inNo">
-        <el-input
-          v-model="queryParams.inNo"
-          :placeholder="$t('进仓单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderSn">
-        <el-input
-          v-model="queryParams.orderSn"
-          :placeholder="$t('订单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <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="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="entryDate">
-        <el-date-picker clearable
-          v-model="queryParams.entryDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('进仓日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="confirmStatus">
-        <el-input
-          v-model="queryParams.confirmStatus"
-          :placeholder="$t('客户确认状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="confirmDate">
-        <el-date-picker clearable
-          v-model="queryParams.confirmDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('确认时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="usedStatus">
-        <el-input
-          v-model="queryParams.usedStatus"
-          :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="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    </SearchForm>
-
-
-    <XdTable v-loading="loading"
-           border
-           size="small"
-           :data="emisWarehouseInList"
-           :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:emisWarehouseIn: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:emisWarehouseIn: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:emisWarehouseIn: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:emisWarehouseIn: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="serialNo" min-width="100" />
-      <el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
-      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
-      <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
-      <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
-      <el-table-column :label="$t('占用状态')" align="center" prop="usedStatus" min-width="100" />
-      <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-
-      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
-
-
-      <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:emisWarehouseIn:edit']"
-          >修改</el-button>
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisWarehouseIn: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>
-      <emisWarehouseInForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInForm>
-    </el-dialog>
-
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-        <emisWarehouseInView :id="id" ></EmisWarehouseInView>
-    </el-dialog>
-    -->
-
-  </div>
-</template>
-
-<script>
-import { listEmisWarehouseIn, getEmisWarehouseIn, delEmisWarehouseIn, addEmisWarehouseIn, updateEmisWarehouseIn } from "@/api/emis/emisWarehouseIn";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisWarehouseInView from '@/views/emis/emisWarehouseIn/emisWarehouseInView';
-import emisWarehouseInForm from '@/views/emis/emisWarehouseIn/emisWarehouseInForm';
-
-export default {
-  name: "emisWarehouseIn",
-  components: { elDateSimplePicker,emisWarehouseInForm },
-  dicts: [
-  ],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 创建时间搜索
-      dateTimeRange:[],
-      // 总条数
-      total: 0,
-      // 进仓单表格数据
-      emisWarehouseInList: [],
-
-      currentId:null,
-      openForm: false,
-      titleForm: "",
-
-      // 弹出展示层
-      id:null,
-      titleView:"",
-      openView: false,
-      // 更新站点时间范围
-      daterangeEntryDate: [],
-      // 更新站点时间范围
-      daterangeConfirmDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        serialNo: null,
-        inNo: null,
-        orderSn: null,
-        billCode: null,
-        customerCode: null,
-        customerName: null,
-        entryDate: null,
-        confirmStatus: null,
-        confirmDate: null,
-        usedStatus: null,
-        status: null,
-        remark: null,
-        delFlag: null,
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询进仓单列表 */
-    getList() {
-      this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
-        this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
-        this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
-      }
-      if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
-        this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
-        this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
-      }
-      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];
-      }
-      listEmisWarehouseIn(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
-        this.emisWarehouseInList = 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/emisWarehouseIn/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 delEmisWarehouseIn(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisWarehouseIn/export', {
-    //     ...this.queryParams
-    //   }, `emisWarehouseIn_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
-
-       listEmisWarehouseIn(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代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','serialNo','inNo','orderSn','billCode','customerCode','customerName','entryDate','confirmStatus','confirmDate','usedStatus','status','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '进仓单',
-                    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>
diff --git a/src/views/emis/emisWarehouseInBatch/emisWarehouseInBatchForm.vue b/src/views/emis/emisWarehouseInBatch/emisWarehouseInBatchForm.vue
deleted file mode 100644
index 814e707b..00000000
--- a/src/views/emis/emisWarehouseInBatch/emisWarehouseInBatchForm.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<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="serialNo">
-              <el-input v-model="form.serialNo" placeholder="请输入进仓序列号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="进仓单号" prop="inNo">
-              <el-input v-model="form.inNo" placeholder="请输入进仓单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="进仓子批次单号in_no+001" prop="inBatchNo">
-              <el-input v-model="form.inBatchNo" placeholder="请输入进仓子批次单号in_no+001" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="客户编号" prop="customerCode">
-              <el-input v-model="form.customerCode" placeholder="请输入客户编号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderSn">
-              <el-input v-model="form.orderSn" placeholder="请输入订单号" />
-            </el-form-item>
-          </el-col>
-          <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="transCarNo">
-              <el-input v-model="form.transCarNo" placeholder="请输入运输工具编号" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="进仓日期" prop="entryDate">
-              <el-date-picker clearable
-                v-model="form.entryDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择进仓日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="客户确认状态" prop="confirmStatus">
-              <el-input v-model="form.confirmStatus" placeholder="请输入客户确认状态" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="确认时间" prop="confirmDate">
-              <el-date-picker clearable
-                v-model="form.confirmDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择确认时间">
-              </el-date-picker>
-            </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="totalParcelQty">
-              <el-input v-model="form.totalParcelQty" placeholder="请输入总件数" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="总体积" prop="totalVolume">
-              <el-input v-model="form.totalVolume" placeholder="请输入总体积" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="总重量" prop="totalWeight">
-              <el-input v-model="form.totalWeight" 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-col :span="24">
-            <el-form-item label="删除标志（0代表存在" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
-            </el-form-item>
-          </el-col>
-
-        <!--
-         <el-form-item label="上级字典">
-              <treeselect
-                ref="tree"
-                v-model="form.parentId"
-                :options="emisWarehouseInBatchOptions"
-                :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 { listEmisWarehouseInBatch, getEmisWarehouseInBatch, delEmisWarehouseInBatch, addEmisWarehouseInBatch, updateEmisWarehouseInBatch } from "@/api/emis/emisWarehouseInBatch";
-
-export default {
-  name: "emisWarehouseInBatchForm",
-  props:{
-    id:{
-        type:Number
-    }
-  },
-  components: {  },
-  dicts: [
-  ],
-  data() {
-    return {
-      emisWarehouseInBatchOptions: [],
-      // 遮罩层
-      loading: true,
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
-        delFlag: [
-          { required: true, message: "删除标志（0代表存在不能为空", 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;
-          getEmisWarehouseInBatch(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,
-        serialNo: null,
-        inNo: null,
-        inBatchNo: null,
-        customerCode: null,
-        customerName: null,
-        orderSn: null,
-        billCode: null,
-        transCarNo: null,
-        entryDate: null,
-        confirmStatus: null,
-        confirmDate: null,
-        status: null,
-        totalParcelQty: null,
-        totalVolume: null,
-        totalWeight: null,
-        remark: null,
-        tenantId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        createSite: null,
-        updateSite: null
-      };
-      this.resetForm("form");
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateEmisWarehouseInBatch(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.$emit("on-changed");
-            });
-          } else {
-            addEmisWarehouseInBatch(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 = {}
-    //   listEmisWarehouseInBatch(queryParams).then(response => {
-    //     this.emisWarehouseInBatchOptions = [];
-    //     const rootItem = { idId: 0, emisWarehouseInBatchName: '-', children: [] };
-    //     rootItem.children = this.handleTree(response.data, "id");
-    //     this.emisWarehouseInBatchOptions.push(rootItem);
-
-    //     if(this.parentId != undefined) {
-    //       this.form.parentId = this.parentId;
-    //     }
-
-    //   });
-    // },
-  }
-};
-</script>
diff --git a/src/views/emis/emisWarehouseInBatch/index.vue b/src/views/emis/emisWarehouseInBatch/index.vue
deleted file mode 100644
index 9f827604..00000000
--- a/src/views/emis/emisWarehouseInBatch/index.vue
+++ /dev/null
@@ -1,534 +0,0 @@
-<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="serialNo">
-        <el-input
-          v-model="queryParams.serialNo"
-          :placeholder="$t('进仓序列号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="inNo">
-        <el-input
-          v-model="queryParams.inNo"
-          :placeholder="$t('进仓单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="inBatchNo">
-        <el-input
-          v-model="queryParams.inBatchNo"
-          :placeholder="$t('进仓子批次单号in_no+001')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderSn">
-        <el-input
-          v-model="queryParams.orderSn"
-          :placeholder="$t('订单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <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="transCarNo">
-        <el-input
-          v-model="queryParams.transCarNo"
-          :placeholder="$t('运输工具编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="entryDate">
-        <el-date-picker clearable
-          v-model="queryParams.entryDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('进仓日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="confirmStatus">
-        <el-input
-          v-model="queryParams.confirmStatus"
-          :placeholder="$t('客户确认状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="confirmDate">
-        <el-date-picker clearable
-          v-model="queryParams.confirmDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('确认时间')">
-        </el-date-picker>
-      </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="totalParcelQty">
-        <el-input
-          v-model="queryParams.totalParcelQty"
-          :placeholder="$t('总件数')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="totalVolume">
-        <el-input
-          v-model="queryParams.totalVolume"
-          :placeholder="$t('总体积')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="totalWeight">
-        <el-input
-          v-model="queryParams.totalWeight"
-          :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>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    </SearchForm>
-
-
-    <XdTable v-loading="loading"
-           border
-           size="small"
-           :data="emisWarehouseInBatchList"
-           :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:emisWarehouseInBatch: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:emisWarehouseInBatch: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:emisWarehouseInBatch: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:emisWarehouseInBatch: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="serialNo" min-width="100" />
-      <el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
-      <el-table-column :label="$t('进仓子批次单号in_no+001')" align="center" prop="inBatchNo" min-width="100" />
-      <el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('运输工具编号')" align="center" prop="transCarNo" min-width="100" />
-      <el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
-      <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
-      <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
-      <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
-      <el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
-      <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
-      <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-
-
-      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
-
-
-      <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:emisWarehouseInBatch:edit']"
-          >修改</el-button>
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisWarehouseInBatch: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>
-      <emisWarehouseInBatchForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInBatchForm>
-    </el-dialog>
-
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-        <emisWarehouseInBatchView :id="id" ></EmisWarehouseInBatchView>
-    </el-dialog>
-    -->
-
-  </div>
-</template>
-
-<script>
-import { listEmisWarehouseInBatch, getEmisWarehouseInBatch, delEmisWarehouseInBatch, addEmisWarehouseInBatch, updateEmisWarehouseInBatch } from "@/api/emis/emisWarehouseInBatch";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisWarehouseInBatchView from '@/views/emis/emisWarehouseInBatch/emisWarehouseInBatchView';
-import emisWarehouseInBatchForm from '@/views/emis/emisWarehouseInBatch/emisWarehouseInBatchForm';
-
-export default {
-  name: "emisWarehouseInBatch",
-  components: { elDateSimplePicker,emisWarehouseInBatchForm },
-  dicts: [
-  ],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 创建时间搜索
-      dateTimeRange:[],
-      // 总条数
-      total: 0,
-      // 进仓单批次表格数据
-      emisWarehouseInBatchList: [],
-
-      currentId:null,
-      openForm: false,
-      titleForm: "",
-
-      // 弹出展示层
-      id:null,
-      titleView:"",
-      openView: false,
-      // 更新站点时间范围
-      daterangeEntryDate: [],
-      // 更新站点时间范围
-      daterangeConfirmDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        serialNo: null,
-        inNo: null,
-        inBatchNo: null,
-        customerCode: null,
-        customerName: null,
-        orderSn: null,
-        billCode: null,
-        transCarNo: null,
-        entryDate: null,
-        confirmStatus: null,
-        confirmDate: null,
-        status: null,
-        totalParcelQty: null,
-        totalVolume: null,
-        totalWeight: null,
-        remark: null,
-        delFlag: null,
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询进仓单批次列表 */
-    getList() {
-      this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
-        this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
-        this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
-      }
-      if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
-        this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
-        this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
-      }
-      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];
-      }
-      listEmisWarehouseInBatch(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
-        this.emisWarehouseInBatchList = 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/emisWarehouseInBatch/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 delEmisWarehouseInBatch(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisWarehouseInBatch/export', {
-    //     ...this.queryParams
-    //   }, `emisWarehouseInBatch_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
-
-       listEmisWarehouseInBatch(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','进仓序列号','进仓单号','进仓子批次单号in_no+001','客户编号','客户名称','订单号','运单号','运输工具编号','进仓日期','客户确认状态','确认时间','状态','总件数','总体积','总重量','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','serialNo','inNo','inBatchNo','customerCode','customerName','orderSn','billCode','transCarNo','entryDate','confirmStatus','confirmDate','status','totalParcelQty','totalVolume','totalWeight','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '进仓单批次',
-                    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>
diff --git a/src/views/emis/emisWaybill/orderList.vue b/src/views/emis/emisWaybill/orderList.vue
index fb90795f..de732cd4 100644
--- a/src/views/emis/emisWaybill/orderList.vue
+++ b/src/views/emis/emisWaybill/orderList.vue
@@ -15,44 +15,41 @@
       </div>
     <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item label="" prop="billCode">
-              <div slot="label">
-                <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
-                    <el-radio label="1">运单号</el-radio>
-                    <el-radio label="0">订单号</el-radio>
-                  </el-radio-group>
-              </div>
-              <el-input
-                v-model="queryParams.billCode"
-                :placeholder="$t('多个流水号逗号或换行隔开')"
-                clearable
-                          type="textarea"
-                          rows="2"
-                @keyup.enter.native="handleQuery"
-              />
-
-
+      <el-form-item label="运单号" prop="billCode">
+              <XdTextareaInput
+                    v-model="queryParams.billCode"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
+                    clearable
+                    :rows="1"
+                  />
 
             </el-form-item>
-            <el-form-item label="" prop="dateTimeRange">
-              <div slot="label">
-                      <el-radio-group  class="query-label" v-model="queryParams.params.queryOrderDateType">
-                          <el-radio label="1">下单时间</el-radio>
-                          <el-radio label="0">录单时间</el-radio>
-                        </el-radio-group>
-              </div>
+            <el-form-item label="下单日期" prop="dateTimeRange">
               <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
             <el-form-item label="寄件网点" prop="productType">
               <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
             </el-form-item>
+            <el-form-item label="取件方式" prop="pickupMethod">
+                      <el-select v-model="queryParams.pickupMethod" clearable 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-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
+                <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode" postCode="RSD"></EmisUserSimplePicker1>
+              </el-form-item>
 
             <el-form-item label="收件人" prop="receiveName">
               <el-input
                 v-model="queryParams.receiveName"
                 :placeholder="$t('收件人')"
                 clearable
-                @keyup.enter.native="handleQuery"
               />
             </el-form-item>
             <el-form-item label="收件电话" prop="receiveMobile">
@@ -60,7 +57,6 @@
                 v-model="queryParams.receiveMobile"
                 :placeholder="$t('收件电话')"
                 clearable
-                @keyup.enter.native="handleQuery"
               />
             </el-form-item>
             <el-form-item label="收件公司" prop="receiveCompany">
@@ -68,7 +64,6 @@
                 v-model="queryParams.receiveCompany"
                 :placeholder="$t('收件公司')"
                 clearable
-                @keyup.enter.native="handleQuery"
               />
             </el-form-item>
 
@@ -81,7 +76,6 @@
                 v-model="queryParams.sendName"
                 :placeholder="$t('寄件人')"
                 clearable
-                @keyup.enter.native="handleQuery"
               />
             </el-form-item>
             <el-form-item label="寄件人电话" prop="sendMobile">
@@ -89,7 +83,6 @@
                 v-model="queryParams.sendMobile"
                 :placeholder="$t('寄件人电话')"
                 clearable
-                @keyup.enter.native="handleQuery"
               />
             </el-form-item>
             <el-form-item label="寄件公司" prop="sendCompany">
@@ -97,16 +90,15 @@
                 v-model="queryParams.sendCompany"
                 :placeholder="$t('寄件公司')"
                 clearable
-                @keyup.enter.native="handleQuery"
               />
             </el-form-item>
 
             <el-form-item label="寄件国" prop="sendCountry">
-              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker1>
+              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('目的国')" ></CountryPicker1>
 
             </el-form-item>
 
-            <el-form-item label="运单状态" prop="siteType">
+            <!-- <el-form-item label="运单状态" prop="siteType">
               <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
                     <el-option
                       v-for="dict in dict.type.emis_waybill_status"
@@ -115,7 +107,7 @@
                       :value="dict.value"
                     />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
             <el-form-item label="报关方式" prop="customsEclaration">
                 <el-select v-model="queryParams.customsEclaration" placeholder="请选择">
@@ -191,26 +183,62 @@
                   v-hasPermi="['emis:emisWaybill:edit']"
                 >取消订单</el-button>
               </el-col>
-              <el-col :span="1.5" v-if="$store.getters.ownerSiteCode== '88888'" >
-                <el-button
-                  type="primary"
-                  plain
-                  size="mini"
-                  :disabled="single"
-                  @click="handleSetSite"
-                  v-hasPermi="['emis:emisWaybill:edit']"
-                >指派网点</el-button>
+              <el-col :span="1.5"  v-if="activeTab=='waitConfirm' && $store.getters.ownerSiteCode== '88888'" >
+                <el-popover
+                                trigger="click"
+                                ref="popoverRef1"
+                                placement="bottom"
+                                :width="400"
+                                :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }"
+                              >
+                              <div  style="text-align: center;">
+                                <div style="font-weight: 600;color: black;margin-bottom: 10px;">选择指派网点</div>
+                                <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
+                                <el-button
+                                 style="margin-top: 10px;margin-bottom: 10px;"
+                                  type="primary"
+                                  size="mini"
+                                  @click="handleSetSite"
+                                >确定</el-button>
+                              </div>
+                                <el-button
+                                  slot="reference"
+                                  type="primary"
+                                  size="mini"
+                                  :disabled="single"
+                                  v-hasPermi="['emis:emisWaybill:edit']"
+                                >指派网点</el-button>
+                      </el-popover>
               </el-col>
               <el-col :span="1.5" v-if="activeTab=='waitConfirm'" >
-                <!-- <EmisSiteSimplePicker v-model="sendSiteCode"  ></EmisSiteSimplePicker> -->
-                <el-button
-                  type="primary"
-                  plain
-                  size="mini"
-                  :disabled="single"
-                  @click="handleSetTakeMan"
-                  v-hasPermi="['emis:emisWaybill:edit']"
-                >指派取件员</el-button>
+                <el-popover
+                                trigger="click"
+                                ref="popoverRef2"
+                                placement="bottom"
+                                :width="400"
+                                :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }"
+                              >
+                              <div  style="text-align: center;">
+                                <div style="font-weight: 600;color: black;margin-bottom: 10px;">选择取件员</div>
+
+                                <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode" postCode="RSD"></EmisUserSimplePicker1>
+                                <el-button
+                                  style="margin-top: 10px;margin-bottom: 10px;"
+                                  type="primary"
+                                  size="mini"
+                                  @click="handleSetTakeMan"
+                                >确定</el-button>
+                              </div>
+                                <el-button
+                                  slot="reference"
+                                  type="primary"
+                                  plain
+                                  size="mini"
+                                  :disabled="single"
+                                  v-hasPermi="['emis:emisWaybill:edit']"
+                                >指派取件员</el-button>
+                      </el-popover>
+
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -285,7 +313,7 @@
       -->
       <el-table-column :label="$t('下单日期')" align="center" prop="orderDate" min-width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150"  :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="150"  :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="150"  :show-overflow-tooltip="true"/> -->
       <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="80"  :show-overflow-tooltip="true">
         <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_order_status" :value="scope.row.orderStatus"/>
@@ -321,7 +349,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件员')"  align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
+        <el-table-column :label="$t('取件员')"  align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
              <span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
              <span v-else></span>
@@ -486,19 +514,44 @@
 </template>
 
 <script>
-import { listEmisOrder,cancelOrder, getEmisWaybill, delEmisWaybill, addEmisWaybill, updateEmisWaybill } from "@/api/emis/emisWaybill";
+import { listEmisOrder,cancelOrder,assignTakeMan,assignSendSite, getEmisWaybill, delEmisWaybill, addEmisWaybill, updateEmisWaybill } from "@/api/emis/emisWaybill";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import waybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
 
 
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+
+
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.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 EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
+
 export default {
-  name: "WaybillIsPrinted",
-  components: { elDateAdvPicker,CountryPicker0,CountryPicker1 ,EmisSiteSimplePicker1,waybillDetailReadOnly},
+  name: "OrderList",
+  components: { elDateAdvPicker,CountryPicker0,CountryPicker1 ,
+    EmisSiteSimplePicker1,waybillDetailReadOnly,
+    EmisSiteSimplePicker2,
+    EmisUserSimplePicker0,
+    EmisUserSimplePicker1,
+    EmisUserSimplePicker2,
+    PayeePicker,
+    SalemanPicker,
+    TransLinePicker,
+    TransProductPicker
+  },
   dicts: ['emis_order_status','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','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
@@ -529,6 +582,11 @@ export default {
 
       currentSelectOrder:null,
 
+      // 指派网点
+      dispSendSiteCode:null,
+      // 指派业务员
+      dispTakeManCode:null,
+
       sendSiteCode:null,
 
       currentId:null,
@@ -718,6 +776,15 @@ export default {
   },
   created() {
 
+    if(this.$store.getters.ownerSiteCode!='88888'){
+      this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+    }
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[timeFormat(start), timeFormat(end)]
+
     this.queryParams.orderStatus='0';
     this.getList();
   },
@@ -740,7 +807,7 @@ export default {
     /** 查询运单列表列表 */
     getList() {
       this.loading = true;
-      listEmisOrder(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisOrder(this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate")).then(response => {
         this.emisWaybillList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -804,7 +871,8 @@ export default {
       // 跳转到开单界面
       if(this.selectionList&&this.selectionList.length>0){
         let billCode=this.selectionList[0].billCode;
-        this.$router.push({ path: '/d24/waybillManagement/WaybillRecord', query: { action: "add",billCode: billCode,addFrom:"userOrder"}})
+
+        this.$router.push({ path: '/d24/waybillManagement/WaybillRecord', query: {name:"接单", action: "add",billCode: billCode,addFrom:"userOrder"}})
       }
 
     },
@@ -823,17 +891,29 @@ export default {
             this.$modal.msgSuccess("操作成功" );
             this.getList();
         });
+
       }).catch(() => {});
     },
     handleSetSite(){
+      this.$refs.popoverRef1.doClose();
 
+        let orderSn=this.selectionList[0].orderSn;
+        console.log("====>handleSetTakeMan=orderSn=>",orderSn);
+        assignSendSite({orderSn:orderSn,sendSiteCode:this.queryParams.sendSiteCode}).then(response => {
+            this.$modal.msgSuccess("操作成功" );
+            this.getList();
+        });
     },
     handleSetTakeMan(){
-
+      this.$refs.popoverRef2.doClose();
+      let orderSn=this.selectionList[0].orderSn;
+        console.log("====>handleSetSite=orderSn=>",orderSn);
+        assignTakeMan({orderSn:orderSn,takePieceEmployeeCode:this.queryParams.takePieceEmployeeCode}).then(response => {
+            this.$modal.msgSuccess("操作成功" );
+            this.getList();
+        });
     },
-    handleSetTakeMan(){
 
-    },
 
     handleFormChanged(){
         this.openForm = false;
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 2f4c01e7..f47344d1 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -29,6 +29,12 @@
                       </div>
                     </el-form-item>
                 </el-col>
+                  <!-- <el-col :span="8" v-if="action=='add' && addFrom=='userOrder'">
+                    <el-form-item :label="$t('寄件网点')"  prop="sendSiteCode">
+                      <EmisSiteSimplePicker v-if="$store.getters.ownerSiteCode== '88888'" v-model="form.sendSiteCode"  @onChange="onSendSiteSelect"  ></EmisSiteSimplePicker>
+                      <el-input v-else  v-model="form.sendSiteName" placeholder="" disabled />
+                  </el-form-item>
+                </el-col> -->
 
                 <!-- 运单录入 end -->
 
@@ -154,9 +160,10 @@
                   </el-col>
 
               </el-row>
-
-              <div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
-                    <div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
+              <!-- v-if="action=='add' || action=='preAdd'" -->
+              <div  style="position: absolute;right: 80px;top: 60px;z-index: 100;">
+                <!--  -->
+                    <div style="display:inline-flex;font-size: 15px;font-weight: 700;">
 
                       <div style="width:230px">
                           <el-form-item  prop="sendSiteCode">
@@ -165,16 +172,17 @@
                             <el-input v-else  v-model="form.sendSiteName" placeholder="" disabled />
                           </el-form-item>
                       </div>
-                        <div style="margin-left: 12px;">
+                        <div style="margin-left: 12px;" v-if="totalAvailablePag.mainHasCnt>0">
                           {{ $t('主单剩余') }}:<span>{{ totalAvailablePag.mainHasCnt }}</span>
                         </div>
-                        <div>
+                        <div v-if="totalAvailablePag.mainHasCnt>0">
                           {{ $t('子单剩余') }}:<span>{{ totalAvailablePag.subHasCnt }}</span>
                         </div>
+                        <div v-else @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
                     </div>
-                    <div v-else >
-                        <div @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
-                    </div>
+                    <!-- <div >
+                        <div v-if="totalAvailablePag.mainHasCnt>0" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
+                    </div> -->
               </div>
 
             </div>
@@ -679,6 +687,7 @@
                                       type="text"
                                       icon="el-icon-plus"
                                       @click="handleAddFee"
+                                      :disabled="form.calcFeeType=='3'"
                                     >{{ $t('增加自定义费用') }}</el-button>
                               </el-popover>
                           </div>
@@ -1012,39 +1021,31 @@ data() {
 computed: {
 },
  watch: {
-    // "form.parcelQty":{
-    //   handler (newValue, oldValue) {
-    //       this.handleGenSubbill();
-    //   },
-    //   immediate: false,
-    //   deep: true
-    // },
-    // "form.billCode":{
-    //   handler (newValue, oldValue) {
-    //       this.handleGenSubbill();
-    //   },
-    //   immediate: false,
-    //   deep: true
-    // },
-    // "form.blGenSubbill":{
-    //   handler (newValue, oldValue) {
-    //       this.handleGenSubbill();
-    //   },
-    //   immediate: false,
-    //   deep: true
-    // },
-
+    $route () {
+	      if(this.$route.query.addFrom=="userOrder"){
+          this.action="add";
+          this.addFrom="userOrder";
+          this.billCode=this.$route.query.billCode;
+          this.$route.meta.title = "接单";
+          this.initData();
+	      }
+	  }
 },
-
+// beforeRouteEnter(to,from,next){
+//     if(to.query.name){
+//       to.meta.title = to.query.name;
+//     }
+//     next()
+// },
 created() {
   this.action=this.$route.query.action;
-  this.addFrom=this.$route.query.addFrom;
   if(!this.action){
     this.action="add";
   }
 
-  if(this.addFrom=="userOrder"){
+  if(this.$route.query.addFrom=="userOrder"){
       this.billCode=this.$route.query.billCode;
+      this.addFrom="userOrder";
   }
 
   this.initData();
@@ -1382,6 +1383,20 @@ methods: {
             this.form.packType=this.form.packType.split(",");
           }
 
+
+          if(!this.form.feeItems){
+            this.form.feeItems=[];
+          }
+
+          if(!this.form.cargoList){
+            this.form.cargoList=[];
+            this.handleInitGenGoods();
+          }
+
+          if(!this.form.attachmentList){
+            this.form.attachmentList=[];
+          }
+
           if(this.form.lockFlag=="T"&&this.addFrom!='userOrder'){
             this.$confirm(this.form.lockReason, '提示', {
                   confirmButtonText: '确认',
@@ -1395,6 +1410,8 @@ methods: {
           }
 
           if(this.addFrom=="userOrder"){
+             // 获取可用运单数
+            this.initGetTotalAvailablePag(this.form.sendSiteCode);
             this.startTimer();
           }
 
@@ -1425,7 +1442,7 @@ methods: {
         this.isNeedSave=true;
         this.form.printTypeCheckList=[0,1,5],
 
-              // 获取可用运单数
+        // 获取可用运单数
         this.initGetTotalAvailablePag(this.form.sendSiteCode);
 
         this.handleInitGenGoods();
@@ -1634,6 +1651,7 @@ methods: {
 
     realSubmitOrder(postForm).then(response => {
         this.$modal.msgSuccess("下单成功");
+        this.addFrom=null;
         // 新开单才需要打印
         if(this.action == "add"){
           // 做揽收扫描记录
@@ -1924,6 +1942,7 @@ methods: {
 
         // 提前重算费用
         let custFeeList = [];
+
         this.form.feeItems.forEach(item=>{
             if(item.blAutoGen!='1'){
               custFeeList.push(item);
@@ -2244,3 +2263,4 @@ methods: {
 // }
 
 </style>
+
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 9e125f6b..bf6db850 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -687,6 +687,7 @@
                                       type="text"
                                       icon="el-icon-plus"
                                       @click="handleAddFee"
+                                      :disabled="form.calcFeeType=='3'"
                                     >{{ $t('增加自定义费用') }}</el-button>
                               </el-popover>
                           </div>
@@ -1020,46 +1021,31 @@ data() {
 computed: {
 },
  watch: {
-    // "form.parcelQty":{
-    //   handler (newValue, oldValue) {
-    //       this.handleGenSubbill();
-    //   },
-    //   immediate: false,
-    //   deep: true
-    // },
-    // "form.billCode":{
-    //   handler (newValue, oldValue) {
-    //       this.handleGenSubbill();
-    //   },
-    //   immediate: false,
-    //   deep: true
-    // },
-    // "form.blGenSubbill":{
-    //   handler (newValue, oldValue) {
-    //       this.handleGenSubbill();
-    //   },
-    //   immediate: false,
-    //   deep: true
-    // },
     $route () {
 	      if(this.$route.query.addFrom=="userOrder"){
           this.action="add";
+          this.addFrom="userOrder";
           this.billCode=this.$route.query.billCode;
+          this.$route.meta.title = "接单";
           this.initData();
 	      }
 	  }
-
 },
-
+// beforeRouteEnter(to,from,next){
+//     if(to.query.name){
+//       to.meta.title = to.query.name;
+//     }
+//     next()
+// },
 created() {
   this.action=this.$route.query.action;
-  this.addFrom=this.$route.query.addFrom;
   if(!this.action){
     this.action="add";
   }
 
-  if(this.addFrom=="userOrder"){
+  if(this.$route.query.addFrom=="userOrder"){
       this.billCode=this.$route.query.billCode;
+      this.addFrom="userOrder";
   }
 
   this.initData();
@@ -1397,6 +1383,20 @@ methods: {
             this.form.packType=this.form.packType.split(",");
           }
 
+
+          if(!this.form.feeItems){
+            this.form.feeItems=[];
+          }
+
+          if(!this.form.cargoList){
+            this.form.cargoList=[];
+            this.handleInitGenGoods();
+          }
+
+          if(!this.form.attachmentList){
+            this.form.attachmentList=[];
+          }
+
           if(this.form.lockFlag=="T"&&this.addFrom!='userOrder'){
             this.$confirm(this.form.lockReason, '提示', {
                   confirmButtonText: '确认',
@@ -1942,6 +1942,7 @@ methods: {
 
         // 提前重算费用
         let custFeeList = [];
+
         this.form.feeItems.forEach(item=>{
             if(item.blAutoGen!='1'){
               custFeeList.push(item);