提交

1

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -18,7 +18,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="search"
-            placeholder="分部名称/编号"
+            placeholder="分部名称/编号/地址"
           ></el-input>
         </el-form-item>
         <el-form-item>

src/views/contentManager/model/systemNotifyModel.vue

@@ -532,6 +532,7 @@ export default {
     },
     handleSuccess(res) {
       // 获取富文本组件实例
+        this.uploadImgLoading = false;
       let quill = this.editor;
       // 如果上传成功
       let url = this.ossUploadUrl + "/" + this.dataObj.key;