diff --git a/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue b/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue
index b4e1e651..d79210a1 100644
--- a/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue
+++ b/src/views/emis/EmisBaseTools/WarehouseInNoPicker.vue
@@ -6,11 +6,13 @@
       clearable
       ref="selectRef"
       remote
-      :remote-method="remoteMethod"
+      :remote-method="queryData"
       v-model="svalue"
       :placeholder="placeholder"
       style="width:100%"
-      @change="onChange">
+       @focus="onFocus"
+      @change="onChange"
+      >
         <el-option v-for="item in filterData" :key="item.inNo" :label="item.inNo" :value="item.inNo">
         </el-option>
     </el-select>
@@ -61,6 +63,10 @@
       this.queryData();
     },
     methods: {
+      onFocus(val){
+        this.optionItems=[];
+        this.queryData();
+      },
       onChange(val) {
 
         let selCodeStr = "";
@@ -82,16 +88,10 @@
         this.$emit('onChange', selCodeStr)
 
       },
-      remoteMethod(queryVal) {
+
+      queryData(val) {
         this.queryParams.pageNum=1;
-        this.queryParams.goodsName=queryVal;
-        this.queryData();
-      },
-      loadmore() {
-        this.queryParams.pageNum++;
-        this.queryData();
-      },
-      queryData() {
+        this.queryParams.inNo=val;
         listSimpleEmisWarehouseIn(this.queryParams).then(response => {
           this.filterData= response.rows
           this.filterData.forEach(item => {
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 0f5de84d..f3b8c9f2 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -34,7 +34,7 @@
             <el-descriptions-item label="寄件人">{{ form.sender.name }}</el-descriptions-item>
             <el-descriptions-item label="寄件电话">{{ form.sender.phone }}</el-descriptions-item>
             <el-descriptions-item label="寄件公司">{{ form.sender.company }}</el-descriptions-item>
-            <el-descriptions-item label="客户名称">{{ form.customerName }}</el-descriptions-item>
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户">{{ form.customerName }}</el-descriptions-item>
             <!-- <el-descriptions-item label="寄件人国家">{{ form.sendCountry }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="寄件省">{{ form.sendProvince }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="寄件市">{{ form.sendCity }}</el-descriptions-item> -->
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 94b4f35f..770ef249 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -123,7 +123,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="780px"  :close-on-click-modal="false" :destroy-on-close="true" v-dialogDrag append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">