From a8794cef58973a1d8b392ab3fdc3820471b12343 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 06:44:51 +0800
Subject: [PATCH] md

---
 src/layout/components/Navbar.vue              |   2 +-
 .../emisCustomerAddress/recipientAddress.vue  |   7 +
 .../emisCustomerAddress/senderAddress.vue     |  11 +-
 .../emis/emisCustomerUser/monthUserList.vue   |  38 ++--
 src/views/emis/emisDestination/index.vue      |   8 +-
 src/views/emis/emisElectronicPag/index.vue    |  32 +--
 .../emis/emisElectronicPagApply/index.vue     |   7 +
 src/views/emis/emisGoods/index.vue            |  11 +-
 src/views/emis/emisMonthpayAccount/index.vue  |   8 +-
 src/views/emis/emisMonthpayUseApply/index.vue |  31 +--
 src/views/emis/emisNotCalcAging/index.vue     |   8 +
 src/views/emis/emisPrintTpl/index.vue         |  10 +
 .../emisProblemType/emisProblemTypeForm.vue   | 203 ------------------
 .../emisProblemType/emisProblemTypeView.vue   |  88 --------
 src/views/emis/emisProblemType/index.vue      |  69 +++---
 .../emisQuotePrice/specialQuotePriceList.vue  |  17 +-
 .../emisQuotePrice/transQuotePriceList.vue    |  18 +-
 src/views/emis/emisRegion/PcdPanel.vue        |   7 +
 src/views/emis/emisSite/index.vue             |  12 +-
 src/views/emis/emisSiteAccount/index.vue      |  33 +--
 .../emis/emisSpecialCalcWeight/index.vue      |   8 +-
 src/views/emis/emisTransLine/index.vue        |   7 +
 src/views/emis/emisTransProduct/index.vue     |   8 +-
 src/views/emis/emisUser/index.vue             |  14 +-
 src/views/emis/emisWarehouseIn/index.vue      |  32 +--
 src/views/emis/emisWarehouseInBatch/index.vue |  32 ++-
 src/views/emis/emisWaybill/orderList.vue      |   8 +
 .../emis/emisWaybill/waybillIsPrinted.vue     |   8 +
 src/views/emis/emisWaybill/waybillList.vue    |   8 +
 29 files changed, 287 insertions(+), 458 deletions(-)
 delete mode 100644 src/views/emis/emisProblemType/emisProblemTypeForm.vue
 delete mode 100644 src/views/emis/emisProblemType/emisProblemTypeView.vue

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 77347395..6fae7744 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -395,7 +395,7 @@ export default {
     top: 0px;
     background: white;
     z-index: 9999;
-    width: 100%;
+    width: 70%;
     padding-left: 20px;
     margin-left: 14px;
   }
diff --git a/src/views/emis/emisCustomerAddress/recipientAddress.vue b/src/views/emis/emisCustomerAddress/recipientAddress.vue
index 2696e641..fba5da95 100644
--- a/src/views/emis/emisCustomerAddress/recipientAddress.vue
+++ b/src/views/emis/emisCustomerAddress/recipientAddress.vue
@@ -296,6 +296,13 @@
       <!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
       <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
       <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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
diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue
index abd7ed33..9cc78906 100644
--- a/src/views/emis/emisCustomerAddress/senderAddress.vue
+++ b/src/views/emis/emisCustomerAddress/senderAddress.vue
@@ -292,10 +292,13 @@
       <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
       <!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
       <el-table-column :label="$t('所属站点')" align="center" prop="useSite" min-width="100" />
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
-      <!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 825cee29..ef2d1677 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -103,6 +103,7 @@
                 >新增客户</el-button>
               </el-col>
 
+
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -125,7 +126,25 @@
                   v-hasPermi="['emis:emisCustomerUser:remove']"
                 >删除</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleUpload"
+                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                >导入</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleUpload"
+                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                >下载导入模版</el-button>
+              </el-col>
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -134,7 +153,7 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisCustomerUser:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
 
@@ -157,19 +176,6 @@
       <el-table-column :label="$t('联系人')" align="left" prop="contact" width="120" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('电话')" align="center" prop="phone" width="100" />
 
-      <!-- <el-table-column :label="$t('英文简称')" align="center" prop="customerNameEn" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('手机号')" align="center" prop="mobile" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('客户类型')" align="center" prop="customerType" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('结算类型')" align="center" prop="settledType" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('用户类型')" align="center" prop="userType" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('头像')" align="center" prop="avatar" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('性别')" align="center" prop="sex" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('邀请人')" align="center" prop="invitationInfo" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('最后登录ip')" align="center" prop="loginIp" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('最后登录日期')" align="center" prop="loginDate" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('union_id')" align="center" prop="unionId" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('登录账号')" align="center" prop="userName" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('登录密码')" align="center" prop="password" min-width="100" /> -->
       <el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
       <el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('城市')" align="left" prop="citeName" min-width="130" :show-overflow-tooltip="true" >
@@ -443,7 +449,7 @@ export default {
        qParam.pageNum=1;
        qParam.pageSize=5000;
 
-       listEmisCustomerUser(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+       listMonthUser(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
         this.downloadLoading = false
         if (response.code === 200) {
                 const curList = response.rows
diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index c4ffac82..74f5915e 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -160,7 +160,13 @@
             <!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
           </template>
         </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="170" />
+        <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+        <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisElectronicPag/index.vue b/src/views/emis/emisElectronicPag/index.vue
index d407665c..8d7670e6 100644
--- a/src/views/emis/emisElectronicPag/index.vue
+++ b/src/views/emis/emisElectronicPag/index.vue
@@ -160,33 +160,15 @@
           <span>成功生成明细</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('创建网点')" align="center" prop="createSiteCode" min-width="100" /> -->
-      <el-table-column  :label="$t('创建网点')" align="center" prop="createSiteCode" min-width="100" >
-        <template slot-scope="scope">
-          <span>总部</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column :label="$t('创建人')" align="center" prop="createBy" min-width="100" /> -->
-      <el-table-column  :label="$t('创建人')" align="center" prop="createBy" min-width="100">
-        <template slot-scope="scope">
-          <span>管理员</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column :label="$t('修改站点代码')" align="center" prop="modifySiteCode" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <!-- <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisElectronicPag:edit']"
-          >修改</el-button>
 
-        </template>
-      </el-table-column> -->
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
     </xd-table>
 
     <!-- 添加或修改电子面单对话框 -->
diff --git a/src/views/emis/emisElectronicPagApply/index.vue b/src/views/emis/emisElectronicPagApply/index.vue
index 121bb20d..f3a920b3 100644
--- a/src/views/emis/emisElectronicPagApply/index.vue
+++ b/src/views/emis/emisElectronicPagApply/index.vue
@@ -416,6 +416,13 @@
       <el-table-column :label="$t('申购网点编号')" align="center" prop="applySiteCode" min-width="100" />
 
       <el-table-column :label="$t('申购人')" align="center" prop="applyMan" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <!-- <el-table-column :label="$t('申购人编号')" align="center" prop="applyManCode" min-width="100" /> -->
 
 
diff --git a/src/views/emis/emisGoods/index.vue b/src/views/emis/emisGoods/index.vue
index effb434d..41ffb8b2 100644
--- a/src/views/emis/emisGoods/index.vue
+++ b/src/views/emis/emisGoods/index.vue
@@ -443,11 +443,11 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('货号')" align="center" prop="goodsSn" width="80" >
+      <!-- <el-table-column :label="$t('货号')" align="center" prop="goodsSn" width="80" >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.goodsSn}}</div>
          </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('货物名称')" align="left" prop="goodsName" width="120" >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.goodsName}}</div>
@@ -506,6 +506,13 @@
       <el-table-column :label="$t('口岸编码')" align="center" prop="portCode" 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="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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
diff --git a/src/views/emis/emisMonthpayAccount/index.vue b/src/views/emis/emisMonthpayAccount/index.vue
index 1f228ea8..9d49a7d1 100644
--- a/src/views/emis/emisMonthpayAccount/index.vue
+++ b/src/views/emis/emisMonthpayAccount/index.vue
@@ -137,7 +137,13 @@
       <el-table-column :label="$t('归属网点')" align="center" prop="ownerSiteName" width="100" />
       <el-table-column :label="$t('回款联系人')" align="center" prop="payeeName" width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmenName" width="100" />
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" />
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <!-- <el-table-column :label="$t('所属业务员')" align="center" prop="marketMan" min-width="100" /> -->
       <!-- <el-table-column :label="$t('邀请人')" align="center" prop="invitationInfo" min-width="100" /> -->
       <!-- <el-table-column :label="$t('合同类型')" align="center" prop="contractType" min-width="100" /> -->
diff --git a/src/views/emis/emisMonthpayUseApply/index.vue b/src/views/emis/emisMonthpayUseApply/index.vue
index 8b07a508..157f69c1 100644
--- a/src/views/emis/emisMonthpayUseApply/index.vue
+++ b/src/views/emis/emisMonthpayUseApply/index.vue
@@ -1,7 +1,7 @@
 <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="custNo">
         <el-input
           v-model="queryParams.custNo"
@@ -100,8 +100,8 @@
       </el-form-item>
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
+
+    <XdTable v-loading="loading"
            border stripe
            size="small"
            :data="emisMonthpayUseApplyList"
@@ -112,7 +112,7 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -125,7 +125,7 @@
                   v-hasPermi="['emis:emisMonthpayUseApply:add']"
                 >新增</el-button>
               </el-col>
-              <!-- 
+              <!--
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -160,7 +160,7 @@
               </el-col> -->
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
       <!--
       <el-table-column label="序号" align="center" min-width="60">
@@ -168,7 +168,7 @@
                 <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>
@@ -210,7 +210,14 @@
       <el-table-column :label="$t('审核人编号')" align="center" prop="auditBy" min-width="100" />
       <el-table-column :label="$t('审核验证码')" align="center" prop="msgCode" 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="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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
@@ -220,7 +227,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisMonthpayUseApply:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -235,7 +242,7 @@
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisMonthpayUseApplyForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisMonthpayUseApplyForm>
     </el-dialog>
-    
+
 
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
@@ -275,7 +282,7 @@ export default {
       total: 0,
       // 月结账号使用申请关联表格数据
       emisMonthpayUseApplyList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -341,7 +348,7 @@ export default {
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/emis/emisNotCalcAging/index.vue b/src/views/emis/emisNotCalcAging/index.vue
index c2966ad8..4b9d90d9 100644
--- a/src/views/emis/emisNotCalcAging/index.vue
+++ b/src/views/emis/emisNotCalcAging/index.vue
@@ -109,6 +109,14 @@
           </template>
         </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
+
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisPrintTpl/index.vue b/src/views/emis/emisPrintTpl/index.vue
index 22c67156..5e087215 100644
--- a/src/views/emis/emisPrintTpl/index.vue
+++ b/src/views/emis/emisPrintTpl/index.vue
@@ -136,6 +136,16 @@
       <!-- <el-table-column :label="$t('0-初始')" align="center" prop="status" min-width="100" /> -->
       <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+
+
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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
diff --git a/src/views/emis/emisProblemType/emisProblemTypeForm.vue b/src/views/emis/emisProblemType/emisProblemTypeForm.vue
deleted file mode 100644
index ab32b274..00000000
--- a/src/views/emis/emisProblemType/emisProblemTypeForm.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<template>
-  <div >
-    <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="24">
-            <el-form-item label="类型名称" prop="typeName">
-              <el-input v-model="form.typeName" placeholder="请输入类型名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="英文名称" prop="typeNameEn">
-              <el-input v-model="form.typeNameEn" placeholder="请输入英文名称" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="对象类型" prop="objectType">
-              <el-select v-model="form.objectType" placeholder="请选择对象类型">
-                <el-option
-                  v-for="dict in dict.type.emis_problem_object_type"
-                  :key="dict.value"
-                  :label="dict.label"
-:value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="顺延天数" prop="delayDay">
-              <el-input v-model="form.delayDay" placeholder="请输入顺延天数" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="启用状态" prop="status">
-              <el-input v-model="form.status" placeholder="请输入启用状态" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-        </el-col>
-
-         <el-form-item label="上级字典">
-              <treeselect
-                ref="tree"
-                v-model="form.parentId"
-                :options="emisProblemTypeOptions"
-                :normalizer="normalizer"
-                :default-expand-level="1"
-                :show-count="true"
-                placeholder="选择上级"
-              />
-        </el-form-item>
-
-
-        </el-form>
-      </el-row>
-      <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 { listEmisProblemType, getEmisProblemType, delEmisProblemType, addEmisProblemType, updateEmisProblemType } from "@/api/emis/emisProblemType";
-
-export default {
-  name: "emisProblemTypeForm",
-  props:{
-    id:undefined
-  },
-  components: {  },
-  dicts: [
-        'sys_is_send_sms',
-        'emis_problem_object_type',
-        'sys_normal_disable',
-  ],
-  data() {
-    return {
-      emisProblemTypeOptions: [],
-      // 遮罩层
-      loading: true,
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        typeName: [
-          { required: true, message: "类型名称不能为空", trigger: "blur" }
-        ],
-        isSendSms: [
-          { required: true, message: "是否发送短信不能为空", trigger: "blur" }
-        ],
-        objectType: [
-          { required: true, message: "对象类型不能为空", trigger: "change" }
-        ],
-        delayDay: [
-          { required: true, message: "顺延天数不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "启用状态不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-   watch: {
-      "id": {
-        handler (newValue, oldValue) {
-          this.id = newValue;
-          this.initData();
-        },
-        deep: true
-      }
-  },
-  created() {
-    this.initData();
-  },
-
-  methods: {
-    initData() {
-        this.reset();
-        if(this.id !=undefined) {
-          this.loading = true;
-          getEmisProblemType(this.id).then(response => {
-            this.form = response.data;
-            this.loading = false;
-          });
-        }
-        this.getTreeselect();
-    },
-    // 取消按钮
-    cancel() {
-      this.reset();
-      this.$emit("on-cancel");
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        typeName: null,
-        typeNameEn: null,
-        isSendSms: null,
-        objectType: null,
-        delayDay: null,
-        status: null,
-        remark: null,
-        tenantId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateEmisProblemType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.$emit("on-changed");
-            });
-          } else {
-            addEmisProblemType(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 = {}
-      listEmisProblemType(queryParams).then(response => {
-        this.emisProblemTypeOptions = [];
-        const rootItem = { idId: 0, emisProblemTypeName: '-', children: [] };
-        rootItem.children = this.handleTree(response.data, "id");
-        this.emisProblemTypeOptions.push(rootItem);
-
-        if(this.parentId != undefined) {
-          this.form.parentId = this.parentId;
-        }
-
-      });
-    },
-  }
-};
-</script>
diff --git a/src/views/emis/emisProblemType/emisProblemTypeView.vue b/src/views/emis/emisProblemType/emisProblemTypeView.vue
deleted file mode 100644
index f2bb4fb6..00000000
--- a/src/views/emis/emisProblemType/emisProblemTypeView.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-  <div class="">
-        <el-row>
-          <el-button  icon="el-icon-arrow-left" size="small" @click="backClick">返回</el-button>
-          <el-button  size="small" @click="successOrder">操作</el-button>
-        </el-row> 
-        <el-descriptions title="基本信息：" class="margin-top" :column="1" border>
-            <el-descriptions-item label="序号">{{ emisProblemType.id }}</el-descriptions-item>
-            <el-descriptions-item label="类型名称">{{ emisProblemType.typeName }}</el-descriptions-item>
-            <el-descriptions-item label="英文名称">{{ emisProblemType.typeNameEn }}</el-descriptions-item>
-            <el-descriptions-item label="是否发送短信">{{ emisProblemType.isSendSms }}</el-descriptions-item>
-            <el-descriptions-item label="对象类型">{{ emisProblemType.objectType }}</el-descriptions-item>
-            <el-descriptions-item label="顺延天数">{{ emisProblemType.delayDay }}</el-descriptions-item>
-            <el-descriptions-item label="启用状态">{{ emisProblemType.status }}</el-descriptions-item>
-            <el-descriptions-item label="备注">{{ emisProblemType.remark }}</el-descriptions-item>
-            <el-descriptions-item label="租户ID">{{ emisProblemType.tenantId }}</el-descriptions-item>
-            <el-descriptions-item label="删除标志（0代表存在">{{ emisProblemType.delFlag }}</el-descriptions-item>
-            <el-descriptions-item label="创建者">{{ emisProblemType.createBy }}</el-descriptions-item>
-            <el-descriptions-item label="创建时间">{{ emisProblemType.createTime }}</el-descriptions-item>
-            <el-descriptions-item label="更新者">{{ emisProblemType.updateBy }}</el-descriptions-item>
-            <el-descriptions-item label="更新时间">{{ emisProblemType.updateTime }}</el-descriptions-item>
-        </el-descriptions>
-    </div>
-</template>
-
-<script>
-import {  getEmisProblemType } from "@/api/emis/emisProblemType";
-
-export default {
-  name: "emisProblemTypeView",
-   props:{
-    id:undefined
-  },
-  dicts: [],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 问题件类型表格数据
-      emisProblemType: {}
-
-    };
-  },
-  created() {
-    this.initData();
-  },
-  watch: {
-      "id": {
-      handler (newValue, oldValue) {
-        this.id = newValue;
-        this.initData();
-      },
-      deep: true
-    }
-  },
-  methods: {
-    /** 查询问题件类型列表 */
-    initData() {
-         this.loading = true;
-        getEmisProblemType(this.id).then(response => {
-         this.emisProblemType = response.data;
-          this.loading = false;
-        });
-     
-    },
-    
-  }
-};
-</script>
-
-
-<style rel="stylesheet/scss" lang="scss">
-
-.margin-top{
-  margin-top: 20px;
-}
-
-.el-descriptions-item__label.is-bordered-label {
-    min-width: 80px;
-}
-
-.printMeClass {
-  font-family: SimHei;
-  label {
-    font-weight: normal;
-  }
-}
-</style>
diff --git a/src/views/emis/emisProblemType/index.vue b/src/views/emis/emisProblemType/index.vue
index 16f3ff1b..fcce912c 100644
--- a/src/views/emis/emisProblemType/index.vue
+++ b/src/views/emis/emisProblemType/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="68px">
 
       <el-form-item label="" prop="typeName">
         <el-input
@@ -99,7 +99,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="emisProblemTypeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" size="mini" :data="emisProblemTypeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="类型编号" align="center" prop="id" min-width="100" />
       <el-table-column label="类型名称" align="left" prop="typeName" min-width="160">
@@ -125,7 +125,15 @@
               <el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
           </template>
         </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" min-width="100" />
+        <el-table-column label="排序" align="center" prop="orderNum" width="80" :sort-orders="['descending','ascending']" sortable="custom" />
+        <el-table-column label="备注" align="center" prop="remark"  width="80"/>
+        <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+        <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -158,14 +166,9 @@
     />
 
     <!-- 添加或修改问题件类型对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
-      <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-          <!-- <el-col :span="24">
-            <el-form-item label="类型编号" prop="typeCode">
-              <el-input v-model="form.typeCode" placeholder="请输入类型编号" />
-            </el-form-item>
-          </el-col> -->
+    <el-dialog :title="title" :visible.sync="open" width="40%" :close-on-click-modal="false" v-dialogDrag append-to-body>
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="110px">
           <el-col :span="24">
             <el-form-item label="类型名称" prop="typeName">
               <el-input v-model="form.typeName" placeholder="请输入类型名称" />
@@ -176,18 +179,8 @@
               <el-input v-model="form.typeNameEn" placeholder="请输入英文名称" />
             </el-form-item>
           </el-col> -->
+
           <el-col :span="24">
-              <el-form-item label="是否发送短信" prop="status">
-              <el-radio-group v-model="form.isSendSms">
-                <el-radio
-                  v-for="dict in dict.type.sys_is_send_sms"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
               <el-form-item label="对象类型" prop="objectType">
                 <el-select v-model="form.objectType" placeholder="">
                   <el-option
@@ -199,19 +192,32 @@
                 </el-select>
               </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="顺延天数" prop="delayDay">
               <el-input v-model="form.delayDay" placeholder="请输入顺延天数" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <el-form-item label="是否发送短信" prop="isSendSms">
+              <el-radio-group v-model="form.isSendSms">
+                    <el-radio :label="1">是</el-radio>
+                    <el-radio :label="0">否</el-radio>
+                  </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
               <el-form-item label="启用状态" prop="status">
                 <el-radio-group v-model="form.status">
-                    <el-radio :label="'1'">启用</el-radio>
-                    <el-radio :label="'0'">停用</el-radio>
+                    <el-radio :label="1">启用</el-radio>
+                    <el-radio :label="0">停用</el-radio>
                   </el-radio-group>
              </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <el-form-item label="排序" prop="orderNum">
+                <el-input v-model="form.orderNum" placeholder="" />
+              </el-form-item>
+            </el-col>
         <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -234,27 +240,16 @@
     </el-dialog>
 
 
-    <!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
-      <emisProblemTypeForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisProblemTypeForm>
-    </el-dialog> -->
-
-<!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  append-to-body>
-        <emisProblemTypeView :id="id" ></EmisProblemTypeView>
-    </el-dialog> -->
-
   </div>
 </template>
 
 <script>
 import { listEmisProblemType, getEmisProblemType, delEmisProblemType, addEmisProblemType, updateEmisProblemType } from "@/api/emis/emisProblemType";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-import emisProblemTypeView from '@/views/emis/emisProblemType/emisProblemTypeView';
-import emisProblemTypeForm from '@/views/emis/emisProblemType/emisProblemTypeForm';
 
 export default {
   name: "emisProblemType",
-  components: { elDateSimplePicker,emisProblemTypeView,emisProblemTypeForm },
+  components: { elDateSimplePicker },
   dicts: [
         'sys_is_send_sms',
         'emis_problem_object_type',
diff --git a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
index 20966b0d..2a8c4fbe 100644
--- a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
@@ -202,16 +202,13 @@
       <el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
 
 
-      <!-- <el-table-column label="修改人" align="center" prop="updateBy" min-width="100" />
-      <el-table-column label="修改人编号" align="center" prop="updateBy" min-width="100" />
-      <el-table-column label="修改站点" align="center" prop="updateSite" min-width="100" />
-      <el-table-column label="修改站点ID" align="center" prop="updateSiteCode" min-width="100" />
-      <el-table-column label="修改时间" align="center" prop="updateTime" min-width="100" />
-      <el-table-column label="创建日期" align="center" prop="createTime" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="createBy" min-width="100" />
-      <el-table-column label="创建网点" align="center" prop="createSite" min-width="100" />
-      <el-table-column label="创建网点编号" align="center" prop="createSiteCode" min-width="100" />
-      <el-table-column label="创建人编号" align="center" prop="createByCode" min-width="100" /> -->
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisQuotePrice/transQuotePriceList.vue b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
index f89e45e7..e7c14d5f 100644
--- a/src/views/emis/emisQuotePrice/transQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
@@ -202,16 +202,14 @@
       <el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
 
 
-      <!-- <el-table-column label="修改人" align="center" prop="updateBy" min-width="100" />
-      <el-table-column label="修改人编号" align="center" prop="updateBy" min-width="100" />
-      <el-table-column label="修改站点" align="center" prop="updateSite" min-width="100" />
-      <el-table-column label="修改站点ID" align="center" prop="updateSiteCode" min-width="100" />
-      <el-table-column label="修改时间" align="center" prop="updateTime" min-width="100" />
-      <el-table-column label="创建日期" align="center" prop="createTime" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="createBy" min-width="100" />
-      <el-table-column label="创建网点" align="center" prop="createSite" min-width="100" />
-      <el-table-column label="创建网点编号" align="center" prop="createSiteCode" min-width="100" />
-      <el-table-column label="创建人编号" align="center" prop="createByCode" min-width="100" /> -->
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisRegion/PcdPanel.vue b/src/views/emis/emisRegion/PcdPanel.vue
index d86a6765..6cb92128 100644
--- a/src/views/emis/emisRegion/PcdPanel.vue
+++ b/src/views/emis/emisRegion/PcdPanel.vue
@@ -142,6 +142,13 @@
            <!-- <el-table-column :label="$t('国家代码')" align="center" prop="countryCode" min-width="100" /> -->
           <el-table-column :label="$t('所属国家')" align="center" prop="countryName" width="80" />
           <!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
+          <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index 8a00521f..552335e3 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -208,12 +208,14 @@
         <el-table-column label="特殊区域" align="center" prop=""  width="80"/>
         <el-table-column label="对外备注" align="center" prop=""  width="80"/>
         <el-table-column label="数据来源" align="center" prop="dataFrom"  width="80"/>
+
+
         <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-        <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisSiteAccount/index.vue b/src/views/emis/emisSiteAccount/index.vue
index 70dc4a1b..e00e9f0e 100644
--- a/src/views/emis/emisSiteAccount/index.vue
+++ b/src/views/emis/emisSiteAccount/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-   
+
       <el-form-item label="" prop="accCode">
         <el-input
           v-model="queryParams.accCode"
@@ -180,8 +180,8 @@
       </el-form-item>
     </search-form>
 
-   
-    <xd-table v-loading="loading" 
+
+    <xd-table v-loading="loading"
            border stripe
            size="small"
            :data="emisSiteAccountList"
@@ -192,7 +192,7 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -205,7 +205,7 @@
                   v-hasPermi="['emis:emisSiteAccount:add']"
                 >新增</el-button>
               </el-col>
-              <!-- 
+              <!--
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -240,7 +240,7 @@
               </el-col> -->
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
       <!--
       <el-table-column label="序号" align="center" min-width="60">
@@ -248,7 +248,7 @@
                 <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>
@@ -298,9 +298,16 @@
       <el-table-column label="清理站点代码" align="center" prop="clearSiteCode" min-width="100" />
       <el-table-column label="清理日期" align="center" prop="clearDate" min-width="100" />
       <el-table-column label="清理人编号" align="center" prop="clearManCode" min-width="100" />
-      <el-table-column label="创建站点代码" align="center" prop="createSiteCode" min-width="100" />
-      <el-table-column label="修改站点代码" align="center" prop="modifySiteCode" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
+
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -310,7 +317,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisSiteAccount:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -321,7 +328,7 @@
         </template>
       </el-table-column>
     </xd-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -447,11 +454,11 @@
             </el-form-item>
           </el-col>
 
-         <!-- 
+         <!--
          <el-col :span="24" v-show="moreInputVisible" >  </el-col>
          <el-col :span="24">
              <el-divider content-position="right"  @click="handleShowMoreInput" >更多信息[+]</el-divider>
-         </el-col> 
+         </el-col>
          -->
 
         </el-form>
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index d1d7fbef..efa80ad6 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -118,7 +118,13 @@
       <el-table-column :label="$t('失效时间')" align="center" prop="endDate" min-width="170" />
       <!-- <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="$t('创建时间')" align="center" prop="createTime" min-width="170" />
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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">
diff --git a/src/views/emis/emisTransLine/index.vue b/src/views/emis/emisTransLine/index.vue
index a26a76d6..ba080054 100644
--- a/src/views/emis/emisTransLine/index.vue
+++ b/src/views/emis/emisTransLine/index.vue
@@ -148,6 +148,13 @@
           </template>
       </el-table-column>
       <el-table-column label="排序" align="center" prop="orderNum" width="100" :sort-orders="['descending','ascending']" sortable="custom" />
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisTransProduct/index.vue b/src/views/emis/emisTransProduct/index.vue
index bffd650d..ac137387 100644
--- a/src/views/emis/emisTransProduct/index.vue
+++ b/src/views/emis/emisTransProduct/index.vue
@@ -153,7 +153,13 @@
         </template>
       </el-table-column>
       <el-table-column label="排序" align="center" prop="orderNum" width="100" :sort-orders="['descending','ascending']" sortable="custom" />
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisUser/index.vue b/src/views/emis/emisUser/index.vue
index 3f4eabfd..b1747081 100644
--- a/src/views/emis/emisUser/index.vue
+++ b/src/views/emis/emisUser/index.vue
@@ -211,11 +211,15 @@
               ></el-switch>
             </template>
           </el-table-column> -->
-          <el-table-column label="创建时间" align="center" prop="createTime"  width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
+
+          <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
           <el-table-column
             label="操作"
             align="center"
diff --git a/src/views/emis/emisWarehouseIn/index.vue b/src/views/emis/emisWarehouseIn/index.vue
index 3520588e..ddf78ffd 100644
--- a/src/views/emis/emisWarehouseIn/index.vue
+++ b/src/views/emis/emisWarehouseIn/index.vue
@@ -1,7 +1,7 @@
 <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"
@@ -108,8 +108,8 @@
       </el-form-item>
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
+
+    <XdTable v-loading="loading"
            border stripe
            size="small"
            :data="emisWarehouseInList"
@@ -120,7 +120,7 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -133,7 +133,7 @@
                   v-hasPermi="['emis:emisWarehouseIn:add']"
                 >新增</el-button>
               </el-col>
-              <!-- 
+              <!--
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -168,7 +168,7 @@
               </el-col> -->
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
       <!--
       <el-table-column label="序号" align="center" min-width="60">
@@ -176,7 +176,7 @@
                 <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>
@@ -219,7 +219,15 @@
       <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="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
+
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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
@@ -229,7 +237,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisWarehouseIn:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -244,7 +252,7 @@
     <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>
@@ -284,7 +292,7 @@ export default {
       total: 0,
       // 进仓单表格数据
       emisWarehouseInList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -351,7 +359,7 @@ export default {
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/emis/emisWarehouseInBatch/index.vue b/src/views/emis/emisWarehouseInBatch/index.vue
index 39fab685..47faa15f 100644
--- a/src/views/emis/emisWarehouseInBatch/index.vue
+++ b/src/views/emis/emisWarehouseInBatch/index.vue
@@ -1,7 +1,7 @@
 <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"
@@ -140,8 +140,8 @@
       </el-form-item>
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
+
+    <XdTable v-loading="loading"
            border stripe
            size="small"
            :data="emisWarehouseInBatchList"
@@ -152,7 +152,7 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -165,7 +165,7 @@
                   v-hasPermi="['emis:emisWarehouseInBatch:add']"
                 >新增</el-button>
               </el-col>
-              <!-- 
+              <!--
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -200,7 +200,7 @@
               </el-col> -->
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
       <!--
       <el-table-column label="序号" align="center" min-width="60">
@@ -208,7 +208,7 @@
                 <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>
@@ -256,6 +256,16 @@
       <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="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  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
@@ -265,7 +275,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisWarehouseInBatch:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -280,7 +290,7 @@
     <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>
@@ -320,7 +330,7 @@ export default {
       total: 0,
       // 进仓单批次表格数据
       emisWarehouseInBatchList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -391,7 +401,7 @@ export default {
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/emis/emisWaybill/orderList.vue b/src/views/emis/emisWaybill/orderList.vue
index 749c561c..d3c0163d 100644
--- a/src/views/emis/emisWaybill/orderList.vue
+++ b/src/views/emis/emisWaybill/orderList.vue
@@ -426,6 +426,14 @@
       <el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
     </XdTable>
 
     <!--
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index dd79759f..0147fad7 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -423,6 +423,14 @@
       <el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
 
     </XdTable>
 
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 5c31324c..f602095c 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -404,6 +404,14 @@
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
     </XdTable>
 
     <!--