Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-htqd

# Conflicts:
#	src/views/enterpriseManagement/enterpriseAudit.vue

src/App.vue

@@ -9,3 +9,11 @@ export default {
   name: 'App'
 }
 </script>
+<style  lang="scss">
+.el-button--primary {
+    color: #FFF;
+    background-color: #2f53eb;
+    border-color: #2f53eb;
+}
+
+</style>

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="!item.hidden">
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
+      <app-link v-if="onlyOneChild.meta" @click.native="flushCom" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
           <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
         </el-menu-item>
@@ -61,6 +61,9 @@ export default {
     return {}
   },
   methods: {
+    flushCom:function(){
+　　　　　　this.$router.go(0);  
+　　　},
     hasOneShowingChild(children = [], parent) {
       const showingChildren = children.filter(item => {
         if (item.hidden) {

src/router/cargoOwnerManagement/index.js

@@ -6,6 +6,7 @@ const cargoOwnerManagementRouter = {
     path: '/cargoOwnerManagement',
     component: Layout,
     redirect: 'noRedirect',
+    t:new Date(),
     name: 'cargoOwnerManagement',
     meta: {
         title: '货主管理',
@@ -14,6 +15,7 @@ const cargoOwnerManagementRouter = {
     children: [{
         path: 'empowerExamine',
         name: 'empowerExamine',
+        t:new Date(),
         component: () => import('@/views/cargoOwnerManagement/empowerExamine'),
         meta: {
             title: '货主信息',
@@ -23,6 +25,7 @@ const cargoOwnerManagementRouter = {
     {
         path: 'merchantVerification',
         name: 'merchantVerification',
+        t:new Date(),
         component: () => import('@/views/cargoOwnerManagement/merchantVerification'),
         meta: {
             title: '授权审核',
@@ -32,6 +35,7 @@ const cargoOwnerManagementRouter = {
     {
         path: 'taskAudit',
         name: 'taskAudit',
+        t:new Date(),
         component: () => import('@/views/cargoOwnerManagement/taskAudit'),
         meta: {
             title: '任务审核',

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" @keyup.enter.native="find" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button>
             </div>
@@ -96,8 +96,8 @@
               <!-- <el-button slot="reference">账单</el-button> -->
               <span slot="reference" class="btn_css" style="margin-right:20px">账单</span>
             </el-popover>
-            <!-- <el-button @click="seeInfo(scope.row)">信息</el-button> -->
-            <span class="btn_css">信息</span>
+            <el-button @click="seeInfo(scope.row)">信息</el-button>
+            <!-- <span class="btn_css">信息</span> -->
           </template>
         </el-table-column>
         <el-table-column prop="authenticationStatus" label="身份证">
@@ -615,7 +615,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按货主姓名、账号和企业名称查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+							<el-input placeholder="可按货主姓名、账号和企业名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -292,7 +292,7 @@
 			.search {
 				width: 40px;
 				height: 40px;
-				background: #f7f8fa;
+				background: #2f53eb;
 				border-radius: 0px 2px 2px 0px;
 				border: 1px solid #f0f1f2;
 			}

src/views/cargoOwnerManagement/taskAudit.vue

@@ -317,7 +317,7 @@
 			.search {
 				width: 40px;
 				height: 40px;
-				background: #f7f8fa;
+				background: #2f53eb;
 				border-radius: 0px 2px 2px 0px;
 				border: 1px solid #f0f1f2;
 			}

src/views/contractManagement/contractModel.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、身份证号查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按司机姓名、账号、身份证号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -194,7 +194,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }
@@ -233,7 +233,11 @@
       }
     }
   }
-
+.el-button--primary {
+    color: #FFF;
+    background-color: #2f53eb;
+    border-color: #2f53eb;
+}
   .tips {
     color: #999999;
     font-size: 14px;

src/views/driverManagement/fleetInfo.vue

@@ -7,7 +7,7 @@
           <el-col :span="14" style="height: 45px"> </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按队长姓名、账号、车队名称查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input placeholder="可按队长姓名、账号、车队名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -325,7 +325,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/driverManagement/identityExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、身份证号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input placeholder="可按司机姓名、账号、身份证号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -728,7 +728,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/driverManagement/vehicleExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" @keyup.enter.native="find" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -450,7 +450,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按法人姓名、账号、企业名称查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input placeholder="可按法人姓名、账号、企业名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -46,7 +46,7 @@
         <el-table-column prop="accountNumber" label="账号" min-width="107"></el-table-column>
         <el-table-column prop="accountBalance" label="可用余额（元）" min-width="133"></el-table-column>
         <el-table-column prop="frozenAmount" label="冻结金额（元）" min-width="133"></el-table-column>
-        <el-table-column label="账单">
+        <el-table-column label="账户"  min-width="153">
           <template slot-scope="scope">
             <el-popover
               placement="right"
@@ -72,6 +72,7 @@
               </div>
               <el-button slot="reference">账单</el-button>
             </el-popover>
+            <el-button style='margin-left:10px;' @click='seemessage(scope.row)'>信息</el-button>
           </template>
         </el-table-column>
         <!-- 	<el-table-column prop="registeredPaidAmount" label="实缴金额（万元）" min-width="133"></el-table-column>
@@ -120,6 +121,32 @@
 				</div>
 			</div>
 		</el-dialog> -->
+    <el-dialog :close-on-click-modal="false" title="账户信息" :visible.sync="messageshow" width="500px"
+      :before-close="payClose">
+      <div class="pay">
+        <div class="pay_css">
+          <div class="title_css">对公账户：</div>
+          <div class="name_css">{{ message.corporateAccount }}</div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">账号：</div>
+          <div class="id_css">{{ message.bankCard }}</div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">开户行：</div>
+          <div class="pay_name">{{ message.bankDeposit }}</div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">开户支行：</div>
+          <div class="pay_name">{{ message.bankDepositBranch }}</div>
+        </div>
+      </div>
+      <!-- <img
+          :src="paySee.payeeAddressUrl"
+          class="user_item"
+          @click="enlarge(paySee.payeeAddressUrl)"
+        /> -->
+    </el-dialog>
     <el-drawer title="企业详情" :visible.sync="rightSee">
       <div class="right_css">
         <div class="right_title">企业名称</div>
@@ -183,8 +210,8 @@
   } from '@/api/enterpriseManagement'
   export default {
      components: {
-      "el-image-viewer": () =>
-        import("element-ui/packages/image/src/image-viewer"),
+      'el-image-viewer': () =>
+        import('element-ui/packages/image/src/image-viewer'),
     },
     data() {
       return {
@@ -196,7 +223,8 @@
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        search: '',
+        message:{},
+        search: '5',
         addressUrl: [],
         disabled: false,
         rejectInfo: false,
@@ -209,37 +237,12 @@
         infoData: {},
           //图片预览
         srcList: [],
+        messageshow:false,
         imgsVisible: false,
       };
     },
     mounted() {
-      this.getList()
-    },
-    methods: {
-       closeImgViewer() {
-        this.srcList = []
-        this.imgsVisible = false;
-      },
-      enlarge(url) {
-        this.imgsVisible = true;
-        this.srcList.push(url)
-      },
-      getBillList(id) {
-        console.log('查看账单')
-        let _obj = {
-          companyId:id,
-          pageSize:999,
-          currentPage:1
-        }
-        getBillList(_obj).then(response => {
-            this.billList = response.data.records
-          })
-          .catch(() => {
-            this.loading = false
-          })
-      },
-      getList() {
-        this.loading = true
+      this.loading = true
        let _obj = {}
         let start_obj = {}
         start_obj.currentPage = this.currentPage
@@ -282,6 +285,53 @@
           .catch(() => {
             this.loading = false
           })
+    },
+    methods: {
+       closeImgViewer() {
+        this.srcList = []
+        this.imgsVisible = false;
+      },
+      enlarge(url) {
+        this.imgsVisible = true;
+        this.srcList.push(url)
+      },
+      getBillList(id) {
+        console.log('查看账单')
+        let _obj = {
+          companyId:id,
+          pageSize:999,
+          currentPage:1
+        }
+        getBillList(_obj).then(response => {
+            this.billList = response.data.records
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      },
+      seemessage(item){
+        this.message=item
+        this.messageshow=true
+      },
+      payClose() {
+        this.messageshow = false;
+      },
+      getList() {
+        this.loading = true
+       let _obj = {}
+ 
+            _obj.currentPage = this.currentPage
+            _obj.pageSize = this.pageSize
+            _obj.searchKeyWord = this.searchkeyWord
+            _obj.searchType = this.search
+            getList(_obj).then(response => {
+              this.tableData = response.data.records
+              this.deptBudgetTotal = response.data.total
+              this.listLoading = false
+            })
+              .catch(() => {
+            this.loading = false
+          })
       },
       submit(num) {
         var _allowObj = {}
@@ -413,7 +463,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/feedbackManagement/userFeedback.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按工单编号、姓名、账号和反馈信息查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input placeholder="可按工单编号、姓名、账号和反馈信息查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -297,7 +297,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/officialWebsiteManagement/news.vue

@@ -7,7 +7,7 @@
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
             <div class="screen">
-              <el-input v-model="searchkeyWord" placeholder="可按编号和标题内容查找" clearable />
+              <el-input v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png"></el-button>
             </div>
@@ -198,7 +198,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/officialWebsiteManagement/notice.vue

@@ -7,7 +7,7 @@
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
             <div class="screen">
-              <el-input v-model="searchkeyWord" placeholder="可按编号和标题内容查找" clearable />
+              <el-input v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png"></el-button>
             </div>
@@ -198,7 +198,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/officialWebsiteManagement/publicity.vue

@@ -7,7 +7,7 @@
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
             <div class="screen">
-              <el-input v-model="searchkeyWord" placeholder="可按编号和标题内容查找" clearable />
+              <el-input v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png"></el-button>
             </div>
@@ -198,7 +198,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }

src/views/officialWebsiteManagement/publicityAdd.vue

@@ -14,10 +14,16 @@
           <el-form-item label="发布机构">
             <el-input v-model="form.issuingAgency" clearable placeholder=""></el-input>
           </el-form-item>
+          <el-form-item label="封面图片">
+            <el-upload class="avatar-uploader1" :action="uploadPath"
+              :show-file-list="false" :on-success="handleAvatarSuccess">
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </el-form-item>
           <div class="quill-editor">
             <!-- 图片上传组件辅助，组件内添加v-show=“false”属性，把该组件隐藏起来。-->
-            <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
-              :on-success="uploadSuccess">
+            <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false" :on-success="uploadSuccess">
             </el-upload>
             <!--富文本编辑器组件-->
             <quill-editor v-model="form.releaseContent" :content="form.releaseContent" :options="editorOption"
@@ -38,181 +44,202 @@
 </template>
 
 <script>
-  import {
-    addFormData,
-    uploadPath
-  } from '@/api/officialWebsiteManagement'
-  import quillEditor from 'vue-quill-editor';
-  const toolbarOptions = [
-    ['bold', 'italic', 'underline', 'strike'], // 加粗，斜体，下划线，删除线
-    ['blockquote', 'code-block'], //引用，代码块
-    [{
-      'header': 1
-    }, {
-      'header': 2
-    }], // 几级标题
-    [{
-      'list': 'ordered'
-    }, {
-      'list': 'bullet'
-    }], // 有序列表，无序列表
-    [{
-      'script': 'sub'
-    }, {
-      'script': 'super'
-    }], // 下角标，上角标
-    [{
-      'indent': '-1'
-    }, {
-      'indent': '+1'
-    }], // 缩进
-    [{
-      'direction': 'rtl'
-    }], // 文字输入方向
-    [{
-      'size': ['small', false, 'large', 'huge']
-    }], // 字体大小
-    [{
-      'header': [1, 2, 3, 4, 5, 6, false]
-    }], // 标题
-    [{
-      'color': []
-    }, {
-      'background': []
-    }], // 颜色选择
-    [{
-      'font': ['SimSun', 'SimHei', 'Microsoft-YaHei', 'KaiTi', 'FangSong', 'Arial']
-    }], // 字体
-    [{
-      'align': []
-    }], // 居中
-    ['clean'], // 清除样式,
-    ['link', 'image'], // 上传图片、上传视频
-  ]
-  export default {
-    data() {
-      return {
-        uploadPath,
-        editorOption: {
-          modules: {
-            toolbar: {
-              container: toolbarOptions,
-              handlers: {
-                image: function(value) {
-                  if (value) {
-                    // 调用element的图片上传组件
-                    document.querySelector('.avatar-uploader input').click()
-                  } else {
-                    this.quill.format('image', false)
-                  }
+import {
+  addFormData,
+  uploadPath
+} from '@/api/officialWebsiteManagement'
+const toolbarOptions = [
+  ['bold', 'italic', 'underline', 'strike'], // 加粗，斜体，下划线，删除线
+  ['blockquote', 'code-block'], //引用，代码块
+  [{
+    'header': 1
+  }, {
+    'header': 2
+  }], // 几级标题
+  [{
+    'list': 'ordered'
+  }, {
+    'list': 'bullet'
+  }], // 有序列表，无序列表
+  [{
+    'script': 'sub'
+  }, {
+    'script': 'super'
+  }], // 下角标，上角标
+  [{
+    'indent': '-1'
+  }, {
+    'indent': '+1'
+  }], // 缩进
+  [{
+    'direction': 'rtl'
+  }], // 文字输入方向
+  [{
+    'size': ['small', false, 'large', 'huge']
+  }], // 字体大小
+  [{
+    'header': [1, 2, 3, 4, 5, 6, false]
+  }], // 标题
+  [{
+    'color': []
+  }, {
+    'background': []
+  }], // 颜色选择
+  [{
+    'font': ['SimSun', 'SimHei', 'Microsoft-YaHei', 'KaiTi', 'FangSong', 'Arial']
+  }], // 字体
+  [{
+    'align': []
+  }], // 居中
+  ['clean'], // 清除样式,
+  ['link', 'image'], // 上传图片、上传视频
+]
+export default {
+  data() {
+    return {
+      imageUrl: '',
+      uploadPath,
+      editorOption: {
+        modules: {
+          toolbar: {
+            container: toolbarOptions,
+            handlers: {
+              image: function (value) {
+                if (value) {
+                  // 调用element的图片上传组件
+                  document.querySelector('.avatar-uploader input').click()
+                } else {
+                  this.quill.format('image', false)
                 }
               }
             }
           }
-        },
-        form: {
-          issuingAgency: '畅运通信息部'
-        },
-        regulations: {},
-        version: [],
-        count: ""
-      }
-    },
-    created() {
-      this.form.makeUser = JSON.parse(localStorage.getItem('UserInfo')).deptName
-    },
-    methods: {
-      // 失去焦点
-      onEditorBlur(editor) {},
-      // 获得焦点
-      onEditorFocus(editor) {},
-      // 开始
-      onEditorReady(editor) {},
-      // 值发生变化
-      onEditorChange(editor) {
-        this.form.releaseContent = editor.html;
-        console.log(editor);
-      },
-      beforeUpload(file) {
-        const isIMAGE =''
-          file.type === 'image/jpeg' || 'image/gif' || 'image/png' || 'image/jpg'
-        const isLt1M = file.size / 1024 / 1024 < 1
-
-        if (!isIMAGE) {
-          this.$message.error('上传文件只能是图片格式!')
-        }
-        if (!isLt1M) {
-          this.$message.error('上传文件大小不能超过 1MB!')
         }
-        return isIMAGE && isLt1M
       },
-      uploadSuccess(res) {
-        // 获取富文本组件实例
-        let quill = this.$refs.QuillEditor.quill
-        // 如果上传成功
-        if (res.data.errno = 200 && res.data.url) {
-          // 获取光标所在位置
-          let length = quill.getSelection().index;
-          // 插入图片，res为服务器返回的图片链接地址
-          quill.insertEmbed(length, 'image', res.data.url)
-          // 调整光标到最后
-          quill.setSelection(length + 1)
-        } else {
-          // 提示信息，需引入Message
-          this.$message.error('图片插入失败！')
-        }
+      form: {
+        issuingAgency: '畅运通信息部'
       },
+      regulations: {},
+      version: [],
+      count: ''
+    }
+  },
+  created() {
+    this.form.makeUser = JSON.parse(localStorage.getItem('UserInfo')).deptName
+  },
+  methods: {
+    handleAvatarSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+      this.form.cover =  res.data.url
+    },
+
+    // 失去焦点
+    onEditorBlur(editor) { },
+    // 获得焦点
+    onEditorFocus(editor) { },
+    // 开始
+    onEditorReady(editor) { },
+    // 值发生变化
+    onEditorChange(editor) {
+      this.form.releaseContent = editor.html;
+      console.log(editor);
+    },
 
-      submit() {
-        this.listLoading = true
-        this.form.contentType = '资讯'
-        addFormData(this.form).then(response => {
-            this.$notify({
-              title: '成功',
-              message: '添加成功！',
-              type: 'success'
-            });
-            this.listLoading = false
-            this.$router.go(-1)
-          })
-          .catch(() => {
-            this.loading = false
-          })
+    uploadSuccess(res) {
+      debugger
+      // 获取富文本组件实例
+      let quill = this.$refs.QuillEditor.quill
+      // 如果上传成功
+      if (res.data.errno = 200 && res.data.url) {
+        // 获取光标所在位置
+        let length = quill.getSelection().index;
+        // 插入图片，res为服务器返回的图片链接地址
+        quill.insertEmbed(length, 'image', res.data.url)
+        // 调整光标到最后
+        quill.setSelection(length + 1)
+      } else {
+        // 提示信息，需引入Message
+        this.$message.error('图片插入失败！')
       }
+    },
+
+    submit() {
+      this.listLoading = true
+      this.form.contentType = '资讯'
+      addFormData(this.form).then(response => {
+        this.$notify({
+          title: '成功',
+          message: '添加成功！',
+          type: 'success'
+        });
+        this.listLoading = false
+        this.$router.go(-1)
+      })
+        .catch(() => {
+          this.loading = false
+        })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .center {
-    background: #F5F6F7;
-    height: calc(100vh - 4.5vh);
-    padding-top: 20px;
+.center {
+  background: #F5F6F7;
+  height: calc(100vh - 4.5vh);
+  padding-top: 20px;
 
-  }
+}
 
-  .main_css {
-    width: 96%;
-    height: 90vh;
-    overflow-y: scroll;
-    background: #FFFFFF;
-    margin: 20px auto;
-    padding-top: 20px;
-  }
+.main_css {
+  width: 96%;
+  height: 90vh;
+  overflow-y: scroll;
+  background: #FFFFFF;
+  margin: 20px auto;
+  padding-top: 20px;
+}
 
-  .formData {
-    width: 50%;
-    margin: 20px 0 0 140px;
-  }
+.formData {
+  width: 50%;
+  margin: 20px 0 0 140px;
+}
 
-  .btn {
-    text-align: right;
-    position: absolute;
-    right: 200px;
-    bottom: 100px;
-  }
+.btn {
+  text-align: right;
+  position: absolute;
+  right: 200px;
+  bottom: 100px;
+}
 
-  .ql-editor {
-    height: 400px !important;
-  }
+.ql-editor {
+  height: 400px !important;
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>

src/views/officialWebsiteManagement/publicityEdit.vue

@@ -14,6 +14,13 @@
           <el-form-item label="发布机构">
             <el-input v-model="form.issuingAgency" clearable placeholder=""></el-input>
           </el-form-item>
+          <el-form-item label="封面图片">
+            <el-upload class="avatar-uploader1" :action="uploadPath"
+              :show-file-list="false" :on-success="handleAvatarSuccess">
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </el-form-item>
           <div class="quill-editor">
             <!-- 图片上传组件辅助，组件内添加v-show=“false”属性，把该组件隐藏起来。-->
             <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false" :on-success="uploadSuccess">
@@ -92,6 +99,7 @@
   export default {
     data() {
       return {
+         imageUrl: '',
         uploadPath,
         editorOption: {
           modules: {
@@ -115,7 +123,7 @@
         },
         regulations: {},
         version: [],
-        count: ""
+        count: ''
       }
     },
     created() {
@@ -126,12 +134,17 @@
       this.getList()
     },
     methods: {
+         handleAvatarSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+      this.form.cover =  res.data.url
+    },
       getList() {
         this.listLoading = true
         var _obj = {}
         _obj.id = this.id
         seeData(_obj).then(response => {
             this.form = response.data
+            this.imageUrl =  response.data.cover
             console.log(this.form)
             this.listLoading = false
           })
@@ -238,4 +251,27 @@
   .ql-editor {
     height: 400px !important;
   }
+    .avatar-uploader1 .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader1 .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
 </style>

src/views/orderManagement/orderAudit.vue

@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按订单编号、姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input placeholder="可按订单编号、姓名、账号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -674,7 +674,7 @@
       .search {
         width: 40px;
         height: 40px;
-        background: #f7f8fa;
+        background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
         border: 1px solid #f0f1f2;
       }
@@ -709,7 +709,11 @@
       }
     }
   }
-
+.el-button--primary {
+    color: #FFF;
+    background-color: #2f53eb;
+    border-color: #2f53eb;
+}
   .cost_css {
     .cost_item {
       width: 100%;

src/views/platformManagement/specifiedRecords.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input v-model="searchkeyWord" placeholder="可按版本号、编写单位、编撰人员查找" clearable @change="find" />
+              <el-input v-model="searchkeyWord" placeholder="可按版本号、编写单位、编撰人员查找" @keyup.enter.native="find" clearable @change="find" />
               <el-button class="search" @click="find"><img
                 width="16"
                 height="16"
@@ -349,7 +349,7 @@ export default {
 			.search {
 				width: 40px;
 				height: 40px;
-				background: #f7f8fa;
+				background: #2f53eb;
 				border-radius: 0px 2px 2px 0px;
 				border: 1px solid #f0f1f2;
 			}
@@ -384,7 +384,11 @@ export default {
 			}
 		}
 	}
-
+.el-button--primary {
+    color: #FFF;
+    background-color: #2f53eb;
+    border-color: #2f53eb;
+}
 	.car_css {
 		width: 50%;
 		display: inline-block;