diff --git a/src/views/emis/EmisBaseTools/EmisBrandPicker.vue b/src/views/emis/EmisBaseTools/EmisBrandPicker.vue
index 3f95579d..c03a560d 100644
--- a/src/views/emis/EmisBaseTools/EmisBrandPicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisBrandPicker.vue
@@ -6,7 +6,7 @@
       :placeholder="placeholder"
       style="width: 100%;"
       @change="onChange">
-        <el-option key="all" label="全部" value="all" ></el-option>
+        <el-option key="-1" label="全部" value="-1" ></el-option>
         <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
     </el-select>
     <!-- <div >{{ item.name }}({{ item.nameEn }})</div> -->
diff --git a/src/views/emis/emisBrand/index.vue b/src/views/emis/emisBrand/index.vue
index 9ca2b80b..4f46c4b9 100644
--- a/src/views/emis/emisBrand/index.vue
+++ b/src/views/emis/emisBrand/index.vue
@@ -142,7 +142,7 @@
     </xd-table>
 
     <!-- 添加或修改品牌对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" v-dialogDrag append-to-body>
       <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-col :span="12">
@@ -192,7 +192,7 @@
     </el-dialog>
 
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" v-dialogDrag  append-to-body>
       <emisBrandForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisBrandForm>
     </el-dialog>
 
diff --git a/src/views/emis/emisContinent/index.vue b/src/views/emis/emisContinent/index.vue
index e2f534f3..3b5c4912 100644
--- a/src/views/emis/emisContinent/index.vue
+++ b/src/views/emis/emisContinent/index.vue
@@ -126,7 +126,7 @@
     />
 
     <!-- 添加或修改地球洲对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" v-dialogDrag  append-to-body>
       <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-col :span="24">
@@ -167,12 +167,12 @@
     </el-dialog>
 
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" v-dialogDrag  append-to-body>
       <emisContinentForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisContinentForm>
     </el-dialog>
 
 
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  append-to-body>
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag  append-to-body>
         <emisContinentView :id="id" ></EmisContinentView>
     </el-dialog>
 
diff --git a/src/views/emis/emisCountry/index.vue b/src/views/emis/emisCountry/index.vue
index f311736e..bedbba5d 100644
--- a/src/views/emis/emisCountry/index.vue
+++ b/src/views/emis/emisCountry/index.vue
@@ -176,7 +176,7 @@
             </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="160" :sort-orders="['descending','ascending']" sortable="custom" /> -->
-            <el-table-column label="备注" align="center" prop=""  width="80"/>
+            <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"/>
@@ -208,7 +208,7 @@
     </el-row>
 
     <!-- 添加或修改国家对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="45%" :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="45%" :close-on-click-modal="false" v-dialogDrag  append-to-body>
         <el-row :gutter="0">
           <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
             <el-col :span="24">
@@ -273,7 +273,7 @@
       </el-dialog>
 
       <!-- 添加或修改地球洲对话框 -->
-      <el-dialog :title="titleForm" :visible.sync="openForm" :destroy-on-close="true" width="500px" append-to-body>
+      <el-dialog :title="titleForm" :visible.sync="openForm" :destroy-on-close="true" width="500px" v-dialogDrag  append-to-body>
         <emisContinentForm :id="currentContinentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisContinentForm>
       </el-dialog>
   </div>
diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue
index a0fc9fa4..624c546d 100644
--- a/src/views/emis/emisCustomerUser/moneyUserList.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserList.vue
@@ -155,6 +155,7 @@
       <!-- <el-table-column :label="$t('真实姓名')" align="center" prop="realName" min-width="100" /> -->
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+
       <!-- <el-table-column :label="$t('是否开通oms')" align="center" prop="blOpenOms" min-width="100" /> -->
       <!-- <el-table-column :label="$t('是否短信')" align="center" prop="blSms" min-width="100" /> -->
       <!-- <el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" /> -->
@@ -180,6 +181,14 @@
       <el-table-column :label="$t('最近下单时间')" align="center" prop="createTime" min-width="170" />
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
+      <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="$t('排序')" align="center" prop="orderNum" 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" /> -->
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index d7a2a506..41aba132 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -44,6 +44,25 @@
           <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
 
         </el-form-item>
+        <el-form-item :label="$t('启用状态')" prop="status">
+            <el-select v-model="queryParams.status" no-match-text filterable :placeholder="$t('启用状态')" @change="handleQuery">
+              <el-option key="0" label="停用" :value="0" />
+              <el-option key="1" label="启用" :value="1" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('开通OMS')" prop="blOpenOms">
+            <el-select v-model="queryParams.blOpenOms" no-match-text filterable :placeholder="$t('启用状态')" @change="handleQuery">
+              <el-option key="0" label="否" :value="0" />
+              <el-option key="1" label="是" :value="1" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('发送短信')" prop="blOpenOms">
+            <el-select v-model="queryParams.blSms" no-match-text filterable :placeholder="$t('启用状态')" @change="handleQuery">
+              <el-option key="0" label="否" :value="0" />
+              <el-option key="1" label="是" :value="1" />
+            </el-select>
+          </el-form-item>
+
 
     </SearchForm>
 
@@ -155,16 +174,7 @@
       <!-- <el-table-column :label="$t('区县')" align="center" prop="county" min-width="100" /> -->
       <!-- <el-table-column :label="$t('镇')" align="center" prop="town" min-width="100" /> -->
       <el-table-column :label="$t('地址')" align="center" prop="address" min-width="100" :show-overflow-tooltip="true" />
-      <!-- <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('发件国')" align="center" prop="sendCountry" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('发件省')" align="center" prop="sendProvince" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('发件区')" align="center" prop="sendCity" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('发件区')" align="center" prop="sendCounty" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('发件镇')" align="center" prop="sendTown" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('启用状态')" align="center" prop="status" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('真实姓名')" align="center" prop="realName" min-width="100" /> -->
-      <el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="150" :show-overflow-tooltip="true"/>
+         <el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="150" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
       <el-table-column :label="$t('开通oms')" align="center" prop="blOpenOms" min-width="100" >
@@ -193,6 +203,14 @@
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
       <el-table-column :label="$t('最近下单时间')" align="center" prop="loginDate" min-width="170" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
+      <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="$t('排序')" align="center" prop="orderNum" 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" /> -->
diff --git a/src/views/emis/emisElectronicPag/index.vue b/src/views/emis/emisElectronicPag/index.vue
index b9c6d71e..d407665c 100644
--- a/src/views/emis/emisElectronicPag/index.vue
+++ b/src/views/emis/emisElectronicPag/index.vue
@@ -190,7 +190,7 @@
     </xd-table>
 
     <!-- 添加或修改电子面单对话框 -->
-    <el-dialog :title="title"  :visible.sync="open" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="title"  :visible.sync="open" width="50%" v-dialogDrag :close-on-click-modal="false" v-dialogDrag  append-to-body>
       <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules"  label-width="100px">
           <el-col :span="12">
diff --git a/src/views/emis/emisElectronicPagApply/index.vue b/src/views/emis/emisElectronicPagApply/index.vue
index 83c8fbcf..121bb20d 100644
--- a/src/views/emis/emisElectronicPagApply/index.vue
+++ b/src/views/emis/emisElectronicPagApply/index.vue
@@ -442,7 +442,7 @@
     </xd-table>
 
     <!-- 添加或修改网点电子面单申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="50%" v-dialogDrag :close-on-click-modal="false" v-dialogDrag  append-to-body>
       <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules"  label-width="80px">
           <el-col :span="12">
diff --git a/src/views/emis/emisQuoteDispArea/index.vue b/src/views/emis/emisQuoteDispArea/index.vue
index 4bf57f31..f12d75bd 100644
--- a/src/views/emis/emisQuoteDispArea/index.vue
+++ b/src/views/emis/emisQuoteDispArea/index.vue
@@ -215,7 +215,7 @@
     />
 
     <!-- 添加或修改派件区域对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" v-dialogDrag  append-to-body>
       <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-col :span="24">
@@ -285,7 +285,7 @@
     </el-dialog>
 
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" v-dialogDrag  append-to-body>
       <emisQuoteDispAreaForm :areaId="currentAreaId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuoteDispAreaForm>
     </el-dialog>
 
diff --git a/src/views/emis/emisQuoteExpression/quoteExpressionPanel.vue b/src/views/emis/emisQuoteExpression/quoteExpressionPanel.vue
index b91d28c7..c33bb147 100644
--- a/src/views/emis/emisQuoteExpression/quoteExpressionPanel.vue
+++ b/src/views/emis/emisQuoteExpression/quoteExpressionPanel.vue
@@ -69,7 +69,7 @@
 
                 <!-- @click="handleDelete(scope.row)" -->
     <!-- 添加或修改费用计算表达式对话框 -->
-    <el-dialog :title="title"  :visible.sync="open" width="50%" :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="title"  :visible.sync="open" width="50%" :close-on-click-modal="false" v-dialogDrag  append-to-body>
       <el-row :gutter="0">
         <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
           <el-col :span="24">
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 5740baeb..301ae57e 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -272,7 +272,7 @@
           </el-col>
     </el-row>
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
@@ -318,7 +318,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="titleDictType" :visible.sync="openDictType" width="500px" append-to-body>
+    <el-dialog :title="titleDictType" :visible.sync="openDictType" width="500px" v-dialogDrag append-to-body>
       <dict-edit-form :dictId="currentDictId" :parentId="currentParentDictId"  @on-changed="handleDictTypeOnChanged" @on-cancel="cancelDictType"></dict-edit-form>
     </el-dialog>
   </div>