前端

src/api/cargoOwnerManagement.js

@@ -23,6 +23,14 @@ export function postNews(data) {
      data: data,
   })
 }
+// 货主批量消息发送
+export function batchPostNews(data) {
+  return request({
+    url: '/newsInfo/api/batchSendNews',
+    method: 'post',
+     data: data,
+  })
+}
 // 货主任务列表
 export function getListLook(data) {
   return request({

src/api/driverManagement.js

@@ -23,6 +23,14 @@ export function postNews(data) {
      data: data,
   })
 }
+// 司机批量消息发送
+export function batchPostNews(data) {
+  return request({
+    url: '/newsInfo/api/batchSendNews',
+    method: 'post',
+     data: data,
+  })
+}
 // 车辆审核列表
 export function getCarList(data) {
   return request({

src/api/parkReportManagement.js

@@ -110,4 +110,28 @@ export function dailyReportBatchEscalation(data) {
     method: 'post',
     data: data,
   })
+}
+//运单查询上报结果
+export function reportResults(data) {
+  return request({
+    url: '/orderInfo/api/queryOrderResult',
+    method: 'post',
+    data: data,
+  })
+}
+//司机运单查询上报结果
+export function driverReportResults(data) {
+  return request({
+    url: '/driverInfo/api/queryDriverResult',
+    method: 'post',
+    data: data,
+  })
+}
+//车辆运单查询上报结果
+export function carReportResults(data) {
+  return request({
+    url: '/driverCarInfo/api/queryCarResult',
+    method: 'post',
+    data: data,
+  })
 }

src/components/mapdrag/indexMap.vue

@@ -61,8 +61,9 @@ export default {
       // this.loadmap();
     },
   },
+
   methods: {
-    paging(value1,value2){
+    paging(value1, value2) {
       this.currentPage = value1
       this.pageSize = value2
       this.infoList()
@@ -73,18 +74,25 @@ export default {
         travelpathbd({ orderId: that.orderid })
           .then((response) => {
             that.path1 = [];
-            var patharr = JSON.parse(response.data.longitudeLatitude) 
+            var patharr = JSON.parse(response.data.longitudeLatitude)
             // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
             for (let i = 0; i < patharr.length; i++) {
-              that.path1.push([patharr[i].lon, patharr[i].lat]);
+              if (patharr[i].lon && patharr[i].lat) {
+                that.path1.push([patharr[i].lon, patharr[i].lat]);
+              }
             }
             that.path = that.path1;
+            if (that.path.length == 0) {
+              that.$notify({
+                title: '提示',
+                message: '未获取到北斗轨迹',
+                type: 'warning'
+              });
+            }
             that.loadmap();
           })
           .catch(() => {
-            // console.log(121212)
           });
-        // this.path = this.path1
       } else {
         travelpath({
           orderId: that.orderid,
@@ -101,6 +109,13 @@ export default {
               }
             }
             that.path = that.path2;
+            if (that.path.length == 0) {
+              that.$notify({
+                title: '提示',
+                message: '未获取到平台轨迹',
+                type: 'warning'
+              });
+            }
             that.loadmap();
           })
           .catch(() => {
@@ -184,14 +199,15 @@ export default {
             path: this.path,
           },
         ]);
-
         //对第一条线路（即索引 0）创建一个巡航器
-        let trajectory = pathSimplifierIns.createPathNavigator(0, {
-          loop: true, //循环播放
-          speed: 100, //巡航速度，单位千米/小时
-        });
+        if (this.path.length > 0) {
+          let trajectory = pathSimplifierIns.createPathNavigator(0, {
+            loop: true, //循环播放
+            speed: 100, //巡航速度，单位千米/小时
+          });
+          trajectory.start();
+        }
 
-        trajectory.start();
       });
     },
   },
@@ -201,17 +217,24 @@ export default {
     this.$nextTick(function () {
       travelpathbd({ orderId: that.orderid })
         .then((response) => {
+          console.log("data",response)
           that.path1 = [];
           if (response.data) {
             var patharr = JSON.parse(response.data.longitudeLatitude);
-            // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
             for (let i = 0; i < patharr.length; i++) {
-              that.path1.push([patharr[i].longitude, patharr[i].latitude]);
+              if (patharr[i].lon && patharr[i].lat) {
+                that.path1.push([patharr[i].lon, patharr[i].lat]);
+              }
             }
-
             that.path = that.path1;
           }
-
+          if (that.path.length == 0) {
+            that.$notify({
+              title: '提示',
+              message: '未获取到北斗轨迹',
+              type: 'warning'
+            });
+          }
           that.loadmap();
         })
         .catch(() => {

src/views/administrationManagement/dailyReport.vue

@@ -257,7 +257,9 @@ export default {
                   that.modification = []
                   that.getList()
                 }
-              })
+              }).catch(() => {
+                that.modification = []
+              });
           })
       } else {
         this.$message.error('至少选中一条可上报的条目！')

src/views/administrationManagement/waybillReporting.vue

@@ -238,7 +238,10 @@ export default {
                 }
                 that.getList()
                 that.modification = []
-              })
+              }).catch(() => {
+                that.modification = []
+              });
+              
           })
       } else {
         this.$message.error('至少选中一条可上报的条目！')

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -5,7 +5,7 @@
       <div class="top_css">
         <el-row>
           <el-col :span="14" style="height: 45px">
-            <!-- <el-button type="primary">添加</el-button> -->
+            <el-button type="primary" @click="sendInfoClick">批量发送消息</el-button>
           </el-col>
           <el-col :span="10">
             <div class="screen">
@@ -19,8 +19,7 @@
         <el-row>
           <el-col>
             <div class="search_btn">
-              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
-                @click="searchBtn('')">
+              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block" @click="searchBtn('')">
                 全部
               </div>
               <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
@@ -49,12 +48,14 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border
-        highlight-current-row>
-        <el-table-column type="index" width="60"  label="序号" align="center">
-            <template scope="scope">
-                <span>{{scope.$index + 1}}</span>
-                <!-- <span v-else>{{scope.$index}}</span> -->
-            </template>
+        highlight-current-row @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" :selectable="selectInit">
+        </el-table-column>
+        <el-table-column type="index" width="60" label="序号" align="center">
+          <template scope="scope">
+            <span>{{ scope.$index + 1 }}</span>
+            <!-- <span v-else>{{scope.$index}}</span> -->
+          </template>
         </el-table-column>
         <el-table-column prop="name" label="货主姓名" min-width="130"></el-table-column>
         <el-table-column prop="phone" label="账号" min-width="110"></el-table-column>
@@ -65,7 +66,8 @@
         <el-table-column prop="amountMoney" label="代理身份">
           <template slot-scope="scope">
             <el-popover placement="top-start" title="" width="200" trigger="hover">
-              <div style="white-space: pre-wrap;word-break: break-all;">{{scope.row.proxyIdentity? scope.row.proxyIdentity: '暂无代理企业'}}</div>
+              <div style="white-space: pre-wrap;word-break: break-all;">{{ scope.row.proxyIdentity ?
+                scope.row.proxyIdentity : '暂无代理企业' }}</div>
               <span class="btn_css" slot="reference">企业</span>
             </el-popover>
           </template>
@@ -91,7 +93,7 @@
         <el-table-column label="账户" min-width="180">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click" @show="getBillList(scope.row.commonId)">
-              <div v-if='billList.length>0' class="bill-content">
+              <div v-if='billList.length > 0' class="bill-content">
                 <div class="bill-item" v-for="(item, index) in billList" :key="index">
                   <div class="row1">
                     <div class="left">
@@ -101,16 +103,18 @@
                   </div>
                   <div class="row1">
                     <div class="left">
-                      <img v-if='item.rechargeUrl' style='width:20px;height:20px;' @click="enlarge(item.rechargeUrl)" :src="item.rechargeUrl" alt="">
+                      <img v-if='item.rechargeUrl' style='width:20px;height:20px;' @click="enlarge(item.rechargeUrl)"
+                        :src="item.rechargeUrl" alt="">
+                      <div>{{ item.orderNo }}</div>
                     </div>
                     <div class="right">{{ item.createDate }}</div>
                   </div>
                   <!-- <div class="row2">
-                    <div class="left">
-                      支付预付款
-                    </div>
-                    <div class="right">-1000</div>
-                  </div> -->
+                      <div class="left">
+                        支付预付款
+                      </div>
+                      <div class="right">-1000</div>
+                    </div> -->
                 </div>
               </div>
               <div v-else>暂无数据</div>
@@ -191,12 +195,12 @@
         <div class="form_css">
           <el-form ref="form" :model="form" label-width="80px">
             <!-- <el-checkbox-group v-model="form.checkList">
-							<el-checkbox label="证件照片不清晰"></el-checkbox>
-							<el-checkbox label="证件照片上传错误"></el-checkbox>
-							<el-checkbox label="身份信息填写错误"></el-checkbox>
-							<el-checkbox label="证件信息填写错误"></el-checkbox>
-							<el-checkbox label="其他"></el-checkbox>
-						</el-checkbox-group> -->
+  							<el-checkbox label="证件照片不清晰"></el-checkbox>
+  							<el-checkbox label="证件照片上传错误"></el-checkbox>
+  							<el-checkbox label="身份信息填写错误"></el-checkbox>
+  							<el-checkbox label="证件信息填写错误"></el-checkbox>
+  							<el-checkbox label="其他"></el-checkbox>
+  						</el-checkbox-group> -->
             <div style="margin-bottom: 20px">驳回原因描述（必填）</div>
             <el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，6-100个字" maxlength="100"
               v-model="form.rejectReasonDescription"></el-input>
@@ -222,7 +226,7 @@
         </div>
         <div class="Info_btn">
           <el-button @click="sendInfoClose">取消</el-button>
-          <el-button @click="submitInfo" type="primary">确定</el-button>
+          <el-button @click="submitInfo" type="primary" :loading="btnLoading">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -274,8 +278,7 @@
       </div>
     </el-dialog>
     <!-- 账户信息 -->
-    <el-dialog :close-on-click-modal="false" title="账户信息" :visible.sync="payInfo" width="500px"
-      :before-close="payClose">
+    <el-dialog :close-on-click-modal="false" title="账户信息" :visible.sync="payInfo" width="500px" :before-close="payClose">
       <div v-if='paySee' class="pay">
         <div class="pay_css">
           <div class="title_css">收款人：</div>
@@ -295,24 +298,25 @@
         </div>
       </div>
       <!-- <img
-          :src="paySee.payeeAddressUrl"
-          class="user_item"
-          @click="enlarge(paySee.payeeAddressUrl)"
-        /> -->
+            :src="paySee.payeeAddressUrl"
+            class="user_item"
+            @click="enlarge(paySee.payeeAddressUrl)"
+          /> -->
     </el-dialog>
-    <el-dialog title="禁用天数" :close-on-click-modal='false' :visible.sync="forbiddenshow" width="400px" :before-close="forbiddenshowClose">
-       <el-form ref="form" label-width="80px">
-            <el-form-item label="禁用天数">
-              <el-input placeholder="输入禁用天数，当天起算" v-model="disabledDays"></el-input>
-            </el-form-item>
-            <div class="form_btn">
-              <el-button @click="forbiddenshowClose">取消</el-button>
-              <el-button @click="submitforbidden" type="primary">确定</el-button>
-            </div>
-          </el-form>
+    <el-dialog title="禁用天数" :close-on-click-modal='false' :visible.sync="forbiddenshow" width="400px"
+      :before-close="forbiddenshowClose">
+      <el-form ref="form" label-width="80px">
+        <el-form-item label="禁用天数">
+          <el-input placeholder="输入禁用天数，当天起算" v-model="disabledDays"></el-input>
+        </el-form-item>
+        <div class="form_btn">
+          <el-button @click="forbiddenshowClose">取消</el-button>
+          <el-button @click="submitforbidden" type="primary">确定</el-button>
+        </div>
+      </el-form>
     </el-dialog>
     <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index: 9999" />
-  </div>
+</div>
 </template>
 <script>
 import {
@@ -323,12 +327,13 @@ import {
   editInfo,
   getInfo,
   theRecharge,
-  forbidden
+  forbidden,
+  batchPostNews,
 } from '@/api/cargoOwnerManagement';
 
- import {
-    uploadPath
-  } from '@/api/officialWebsiteManagement'
+import {
+  uploadPath
+} from '@/api/officialWebsiteManagement'
 export default {
   components: {
     'el-image-viewer': () =>
@@ -362,20 +367,32 @@ export default {
       paySee: {},
       rechargeShow: false,
       imageUrl: '',
-      rechargeData: {bankCard:''},
-      forbiddenshow:false,
-      disabledDays:'',
-      forbiddendata:{},
+      rechargeData: { bankCard: '' },
+      forbiddenshow: false,
+      disabledDays: '',
+      forbiddendata: {},
+      batchTips: false,//批量发送标识
+      btnLoading: false
     };
   },
   mounted() {
     this.getList();
   },
   methods: {
-    forbiddenshowClose(){
-        this.disabledDays=''
-        this.forbiddenshow=false
-      },
+    sendInfoClick() {
+      this.batchTips = true
+      this.sendInfo = true;
+    },
+    selectInit() {
+      return true;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    forbiddenshowClose() {
+      this.disabledDays = ''
+      this.forbiddenshow = false
+    },
     seeInfo(val) {
       this.listLoading = true;
       getInfo({
@@ -389,7 +406,7 @@ export default {
               return
             }
             this.payInfo = true;
-            
+
           }
         })
         .catch(() => {
@@ -516,21 +533,21 @@ export default {
         });
     },
     switchChange(row, num) {
-        console.log(1111111)
-        this.forbiddendata=row
-        var _examine = {};
-        _examine.id = row.commonId;
-        let title;
-        if (num == 1) {
-          // _examine.flag = 3;
-          // title = "禁用后客户将无法使用所有功能，是否确定禁用？";
-          this.forbiddenshow=true
-          
-        } else if (num == 2) {
-          title = '确定重新启用该用户？';
-          _examine.disableFlag = 2;
-          _examine.identityFlag = 1;
-          this.$confirm(title, '提示', {
+      console.log(1111111)
+      this.forbiddendata = row
+      var _examine = {};
+      _examine.id = row.commonId;
+      let title;
+      if (num == 1) {
+        // _examine.flag = 3;
+        // title = "禁用后客户将无法使用所有功能，是否确定禁用？";
+        this.forbiddenshow = true
+
+      } else if (num == 2) {
+        title = '确定重新启用该用户？';
+        _examine.disableFlag = 2;
+        _examine.identityFlag = 1;
+        this.$confirm(title, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
@@ -538,11 +555,11 @@ export default {
           this.listLoading = true;
           forbidden(_examine)
             .then((response) => {
-                this.$notify({
-                  title: '成功',
-                  message: '启用成功！',
-                  type: 'success',
-                });
+              this.$notify({
+                title: '成功',
+                message: '启用成功！',
+                type: 'success',
+              });
               this.getList();
               this.listLoading = false;
             })
@@ -550,37 +567,37 @@ export default {
               this.listLoading = false;
             });
         });
-        }
-      },
-      submitforbidden(){
-          if(!this.disabledDays){
-            this.$message.error('禁用天数不能为空');
-            return
-          }if(this.disabledDays<2){
-            this.$message.error('禁用天数输入错误');
-            return
-          }
-          var _examine={}
-          _examine.id = this.forbiddendata.commonId
-          _examine.disableFlag = 1;
-          _examine.identityFlag = 1;
-          _examine.disabledDays = this.disabledDays;
-          this.listLoading = true;
-          forbidden(_examine)
-            .then((response) => {
-                this.$notify({
-                  title: '成功',
-                  message: '禁用成功！',
-                  type: 'success',
-                });
-                this.forbiddenshow=false
-              this.getList();
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
-      },
+      }
+    },
+    submitforbidden() {
+      if (!this.disabledDays) {
+        this.$message.error('禁用天数不能为空');
+        return
+      } if (this.disabledDays < 2) {
+        this.$message.error('禁用天数输入错误');
+        return
+      }
+      var _examine = {}
+      _examine.id = this.forbiddendata.commonId
+      _examine.disableFlag = 1;
+      _examine.identityFlag = 1;
+      _examine.disabledDays = this.disabledDays;
+      this.listLoading = true;
+      forbidden(_examine)
+        .then((response) => {
+          this.$notify({
+            title: '成功',
+            message: '禁用成功！',
+            type: 'success',
+          });
+          this.forbiddenshow = false
+          this.getList();
+          this.listLoading = false;
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     newInfo(row) {
       this.Info.newsTypeKey = 1;
       this.Info.newsType = '系统消息';
@@ -663,9 +680,9 @@ export default {
     },
     recharge(item) {
       // this.rechargeData = item
-      this.rechargeData.bankCard=item.bankCard
-      this.rechargeData.bankDeposit=item.bankDeposit
-      this.rechargeData.bankDepositBranch=item.bankDepositBranch
+      this.rechargeData.bankCard = item.bankCard
+      this.rechargeData.bankDeposit = item.bankDeposit
+      this.rechargeData.bankDepositBranch = item.bankDepositBranch
       this.rechargeData.name = item.name
       this.rechargeData.rechargeId = item.id;
       this.rechargeData.flag = 1;
@@ -736,20 +753,46 @@ export default {
         this.$message.error('消息内容字数应在10-100之间');
         return;
       }
-      this.listLoading = true;
-      postNews(this.Info)
-        .then((response) => {
-          this.$notify({
-            title: '成功',
-            message: '发送成功！',
-            type: 'success',
+      this.btnLoading = true
+        this.listLoading = true;
+        if(this.batchTips){//批量发送
+          let arr = []
+          for(let i = 0;i<this.multipleSelection.length;i++){
+            arr.push({reCommonId:this.multipleSelection[i].commonId,newsTitle:this.Info.newsTitle,newsContent:this.Info.newsContent})
+          }
+          batchPostNews({newsInfoList:arr})
+          .then((response) => {
+            this.$notify({
+              title: "成功",
+              message: "发送成功！",
+              type: "success",
+            });
+            this.sendInfoClose();
+            this.batchTips = false
+            this.btnLoading = false
+            this.listLoading = false;
+          })
+          .catch(() => {
+            this.listLoading = false;
+            this.btnLoading = false
           });
-          this.sendInfoClose();
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+        }else{
+          postNews(this.Info)
+          .then((response) => {
+            this.$notify({
+              title: "成功",
+              message: "发送成功！",
+              type: "success",
+            });
+            this.sendInfoClose();
+            this.btnLoading = false
+            this.listLoading = false;
+          })
+          .catch(() => {
+            this.listLoading = false;
+            this.btnLoading = false
+          });
+        }
     },
     userSee(row) {
       this.idSee.cardAddressUrl = row.cardAddressUrl;
@@ -1052,16 +1095,18 @@ export default {
 .find::v-deep input.el-input__inner {
   border-radius: 0;
 }
-.bill-item{
-  border-bottom:1px solid #ccc;
+
+.bill-item {
+  border-bottom: 1px solid #ccc;
 }
-.bill-item:last-child{
-  border-bottom:1px solid transparent;
+
+.bill-item:last-child {
+  border-bottom: 1px solid transparent;
 }
-.row1{
+
+.row1 {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding:5px;
-}
-</style>
+  padding: 5px;
+}</style>

src/views/driverManagement/identityExamine.vue

@@ -5,7 +5,7 @@
       <div class="top_css">
         <el-row>
           <el-col :span="14" style="height: 45px">
-            <!-- <el-button type="primary">添加</el-button> -->
+            <el-button type="primary" @click="sendInfoClick">批量发送消息</el-button>
           </el-col>
           <el-col :span="10">
             <div class="screen">
@@ -51,7 +51,9 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="68vh" border highlight-current-row  @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" :selectable="selectInit">
+        </el-table-column>
         <el-table-column type="index" width="60"  label="序号" align="center">
             <template scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -307,7 +309,7 @@
         </div>
         <div class="Info_btn">
           <el-button @click="sendInfoClose">取消</el-button>
-          <el-button @click="submitInfo" type="primary">确定</el-button>
+          <el-button @click="submitInfo" type="primary" :loading="btnLoading">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -318,7 +320,7 @@
             </el-form-item>
             <div class="form_btn">
               <el-button @click="forbiddenshowClose">取消</el-button>
-              <el-button @click="submitforbidden" type="primary">确定</el-button>
+              <el-button @click="submitforbidden" type="primary" >确定</el-button>
             </div>
           </el-form>
     </el-dialog>
@@ -332,7 +334,8 @@
     postNews,
     billSee,
     editInfo,
-    forbidden
+    forbidden,
+    batchPostNews,
   } from "@/api/driverManagement";
   export default {
     data() {
@@ -374,7 +377,10 @@
         srcList: [],
         forbiddenshow:false,
         imgsVisible: false,
-        disabledDays:''
+        disabledDays:'',
+        multipleSelection:[],
+        batchTips:false,//批量发送标识
+        btnLoading:false
       };
     },
 
@@ -386,7 +392,16 @@
         import("element-ui/packages/image/src/image-viewer"),
     },
     methods: {
-      
+      sendInfoClick(){
+        this.batchTips = true
+        this.sendInfo = true;
+      },
+      selectInit() {
+      return true;
+    },
+    handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
       closeImgViewer() {
          this.srcList = []
         this.imgsVisible = false;
@@ -542,8 +557,14 @@
           this.$message.error("消息内容字数应在10-100之间");
           return;
         }
+        this.btnLoading = true
         this.listLoading = true;
-        postNews(this.Info)
+        if(this.batchTips){//批量发送
+          let arr = []
+          for(let i = 0;i<this.multipleSelection.length;i++){
+            arr.push({reCommonId:this.multipleSelection[i].commonId,newsTitle:this.Info.newsTitle,newsContent:this.Info.newsContent})
+          }
+          batchPostNews({newsInfoList:arr})
           .then((response) => {
             this.$notify({
               title: "成功",
@@ -551,11 +572,31 @@
               type: "success",
             });
             this.sendInfoClose();
+            this.batchTips = false
+            this.btnLoading = false
             this.listLoading = false;
           })
           .catch(() => {
             this.listLoading = false;
+            this.btnLoading = false
           });
+        }else{
+          postNews(this.Info)
+          .then((response) => {
+            this.$notify({
+              title: "成功",
+              message: "发送成功！",
+              type: "success",
+            });
+            this.sendInfoClose();
+            this.btnLoading = false
+            this.listLoading = false;
+          })
+          .catch(() => {
+            this.listLoading = false;
+            this.btnLoading = false
+          });
+        }
       },
       switchChange(row, num) {
         console.log(1111111)
@@ -756,7 +797,6 @@
         background: linear-gradient(#fafbfb, #ffffff);
         display: flex;
         margin-top: 20px;
-
         .search_block {
           margin-left: 20px;
         }

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -70,6 +70,7 @@
                   <div class="row1">
                     <div class="left">
                       <img v-if='item.rechargeUrl' style='width:20px;height:20px;' @click="enlarge(item.rechargeUrl)" :src="item.rechargeUrl" alt="">
+                      <div >{{item.orderNo}}</div>
                     </div>
                     <div class="right">{{ item.createDate }}</div>
                   </div>

src/views/officialWebsiteManagement/newsAdd.vue

@@ -4,7 +4,7 @@
       <div class="formData">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="公告标题">
-            <el-input v-model="form.title" clearable placeholder="请输入标题"></el-input>
+            <el-input v-model="form.title" clearable placeholder="请输入标题" maxlength="50"></el-input>
           </el-form-item>
           <el-form-item label="公告日期">
             <el-date-picker v-model="form.issuingDate" type="date" value-format="yyyy-MM-dd" style='width: 100%;'
@@ -12,12 +12,11 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="发布机构">
-            <el-input v-model="form.issuingAgency" clearable placeholder=""></el-input>
+            <el-input v-model="form.issuingAgency" clearable placeholder="请输入发布机构" maxlength="20"></el-input>
           </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,180 +37,197 @@
 </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'
+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)
                 }
               }
             }
           }
-        },
-        form: {
-          issuingAgency: '畅运通信息部'
-        },
-        regulations: {},
-        version: [],
-        count: ""
+        }
+      },
+      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
     },
-    created() {
-      this.form.makeUser = JSON.parse(localStorage.getItem('UserInfo')).deptName
+    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('图片插入失败！')
+      }
     },
-    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('图片插入失败！')
-        }
-      },
+    submit() {
+      if (!this.form.title) {
+        this.$message.error("公告标题不能为空！")
+        return
+      }
+      if (!this.form.issuingDate) {
+        this.$message.error("公告日期不能为空！")
+        return
+      }
 
-      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
-          })
+      if (!this.form.issuingAgency) {
+        this.$message.error("发布机构不能为空！")
+        return
+      }
+      if (!this.form.releaseContent) {
+        this.$message.error("发布内容不能为空！")
+        return
       }
+      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;
-    min-height: calc(100vh - 50px);
-    padding-top: 20px;
+.center {
+  background: #F5F6F7;
+  min-height: calc(100vh - 50px);
+  padding-top: 20px;
 
-  }
+}
 
-  .main_css {
-    width: 96%;
-    height: 90vh;
-    background: #FFFFFF;
-    margin: 20px auto;
-    padding-top: 20px;
-  }
+.main_css {
+  width: 96%;
+  height: 90vh;
+  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;
+}
 </style>

src/views/officialWebsiteManagement/newsEdit.vue

@@ -25,7 +25,7 @@
             </quill-editor>
             <!-- <div v-html="form.releaseContent" /> -->
           </div>
-          <!--            <quill-editor v-model="form.releaseContent" res="myQuillEditor" :options="editorOption" id="editor">
+          <!--<quill-editor v-model="form.releaseContent" res="myQuillEditor" :options="editorOption" id="editor">
             </quill-editor> -->
         </el-form>
       </div>
@@ -37,205 +37,222 @@
 </template>
 
 <script>
-  import {
-    seeData,
-    editFormData,
-    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 {
+  seeData,
+  editFormData,
+  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)
                 }
               }
             }
           }
-        },
-        form: {
-          issuingAgency: ''
-        },
-        regulations: {},
-        version: [],
-        count: ''
-      }
+        }
+      },
+      form: {
+        issuingAgency: ''
+      },
+      regulations: {},
+      version: [],
+      count: ''
+    }
+  },
+  created() {
+    this.form.makeUser = JSON.parse(localStorage.getItem('UserInfo')).deptName
+  },
+  mounted() {
+    this.id = this.$route.query.id
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      var _obj = {}
+      _obj.id = this.id
+      seeData(_obj).then(response => {
+        this.form = response.data
+        console.log(this.form)
+        this.listLoading = false
+      })
+        .catch(() => {
+          this.loading = false
+        })
     },
-    created() {
-      this.form.makeUser = JSON.parse(localStorage.getItem('UserInfo')).deptName
+    // 失去焦点
+    onEditorBlur(editor) { },
+    // 获得焦点
+    onEditorFocus(editor) { },
+    // 开始
+    onEditorReady(editor) { },
+    // 值发生变化
+    onEditorChange(editor) {
+      this.form.releaseContent = editor.html;
+      console.log(editor);
     },
-    mounted() {
-      this.id = this.$route.query.id
-      this.getList()
+    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('图片插入失败！')
+      }
     },
-    methods: {
-      getList() {
-        this.listLoading = true
-        var _obj = {}
-        _obj.id = this.id
-        seeData(_obj).then(response => {
-            this.form = response.data
-            console.log(this.form)
-            this.listLoading = false
-          })
-          .catch(() => {
-            this.loading = false
-          })
-      },
-      // 失去焦点
-      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('图片插入失败！')
-        }
-      },
+    submit() {
+      if (!this.form.title) {
+        this.$message.error("公告标题不能为空！")
+        return
+      }
+      if (!this.form.issuingDate) {
+        this.$message.error("公告日期不能为空！")
+        return
+      }
 
-      submit() {
-        this.listLoading = true
-        this.form.contentType = '公告'
-        this.form.id = this.id
-        delete this.form.createDate
-        delete this.form.createUserId
-        delete this.form.updateDate
-        delete this.form.deleteFlag
-        delete this.form.number
-        editFormData(this.form).then(response => {
-            this.$notify({
-              title: '成功',
-              message: '添加成功！',
-              type: 'success'
-            });
-            this.listLoading = false
-            this.$router.go(-1)
-          })
-          .catch(() => {
-            this.loading = false
-          })
+      if (!this.form.issuingAgency) {
+        this.$message.error("发布机构不能为空！")
+        return
       }
+      if (!this.form.releaseContent) {
+        this.$message.error("发布内容不能为空！")
+        return
+      }
+      this.listLoading = true
+      this.form.contentType = '公告'
+      this.form.id = this.id
+      delete this.form.createDate
+      delete this.form.createUserId
+      delete this.form.updateDate
+      delete this.form.deleteFlag
+      delete this.form.number
+      editFormData(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;
-    min-height: calc(100vh - 50px);
-    padding-top: 20px;
+.center {
+  background: #F5F6F7;
+  min-height: calc(100vh - 50px);
+  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;
+}
 </style>

src/views/officialWebsiteManagement/noticeAdd.vue

@@ -4,7 +4,7 @@
       <div class="formData">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="公示标题">
-            <el-input v-model="form.title" clearable placeholder="请输入标题"></el-input>
+            <el-input v-model="form.title" clearable placeholder="请输入标题" maxlength="50"></el-input>
           </el-form-item>
           <el-form-item label="公示日期">
             <el-date-picker v-model="form.issuingDate" type="date" value-format="yyyy-MM-dd" style='width: 100%;'
@@ -12,12 +12,11 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="发布机构">
-            <el-input v-model="form.issuingAgency" clearable placeholder=""></el-input>
+            <el-input v-model="form.issuingAgency" clearable placeholder="请输入发布机构" maxlength="20"></el-input>
           </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 +37,198 @@
 </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'
+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)
                 }
               }
             }
           }
-        },
-        form: {
-          issuingAgency: '畅运通信息部'
-        },
-        regulations: {},
-        version: [],
-        count: ""
+        }
+      },
+      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
     },
-    created() {
-      this.form.makeUser = JSON.parse(localStorage.getItem('UserInfo')).deptName
+    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('图片插入失败！')
+      }
     },
-    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('图片插入失败！')
-        }
-      },
+    submit() {
+      if (!this.form.title) {
+        this.$message.error("公示标题不能为空！")
+        return
+      }
+      if (!this.form.issuingDate) {
+        this.$message.error("公示日期不能为空！")
+        return
+      }
 
-      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
-          })
+      if (!this.form.issuingAgency) {
+        this.$message.error("发布机构不能为空！")
+        return
+      }
+      if (!this.form.releaseContent) {
+        this.$message.error("公示内容不能为空！")
+        return
       }
+      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;
-    min-height: calc(100vh - 50px);
-    padding-top: 20px;
+.center {
+  background: #F5F6F7;
+  min-height: calc(100vh - 50px);
+  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;
+}
 </style>

src/views/officialWebsiteManagement/noticeEdit.vue

@@ -4,7 +4,7 @@
       <div class="formData">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="公示标题">
-            <el-input v-model="form.title" clearable placeholder="请输入标题"></el-input>
+            <el-input v-model="form.title" clearable placeholder="请输入标题" maxlength="50"></el-input>
           </el-form-item>
           <el-form-item label="公示日期">
             <el-date-picker v-model="form.issuingDate" type="date" value-format="yyyy-MM-dd" style='width: 100%;'
@@ -12,7 +12,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="发布机构">
-            <el-input v-model="form.issuingAgency" clearable placeholder=""></el-input>
+            <el-input v-model="form.issuingAgency" clearable placeholder="请输入发布机构" maxlength="20"></el-input>
           </el-form-item>
           <div class="quill-editor">
             <!-- 图片上传组件辅助，组件内添加v-show=“false”属性，把该组件隐藏起来。-->
@@ -181,6 +181,23 @@
       },
 
       submit() {
+        if (!this.form.title) {
+        this.$message.error("公示标题不能为空！")
+        return
+      }
+      if (!this.form.issuingDate) {
+        this.$message.error("公示日期不能为空！")
+        return
+      }
+
+      if (!this.form.issuingAgency) {
+        this.$message.error("发布机构不能为空！")
+        return
+      }
+      if (!this.form.releaseContent) {
+        this.$message.error("公示内容不能为空！")
+        return
+      }
         this.listLoading = true
         this.form.contentType = '公示'
         this.form.id = this.id

src/views/officialWebsiteManagement/publicityAdd.vue

@@ -4,7 +4,7 @@
       <div class="formData">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="资讯标题">
-            <el-input v-model="form.title" clearable placeholder="请输入标题"></el-input>
+            <el-input v-model="form.title" clearable placeholder="请输入标题" maxlength="50"></el-input>
           </el-form-item>
           <el-form-item label="资讯日期">
             <el-date-picker v-model="form.issuingDate" type="date" value-format="yyyy-MM-dd" style='width: 100%;'
@@ -12,7 +12,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="发布机构">
-            <el-input v-model="form.issuingAgency" clearable placeholder=""></el-input>
+            <el-input v-model="form.issuingAgency" clearable placeholder="请输入发布机构" maxlength="20"></el-input>
           </el-form-item>
           <el-form-item label="封面图片">
             <el-upload class="avatar-uploader1" :action="uploadPath"
@@ -163,8 +163,26 @@ export default {
     },
 
     submit() {
-      if(!this.form.cover){
-        this.$message.error('请上传封面图片！')
+      if (!this.form.title) {
+        this.$message.error("资讯标题不能为空！")
+        return
+      }
+      if (!this.form.issuingDate) {
+        this.$message.error("资讯日期不能为空！")
+        return
+      }
+
+      if (!this.form.issuingAgency) {
+        this.$message.error("发布机构不能为空！")
+        return
+      }
+      // 
+      if (!this.form.cover) {
+        this.$message.error("请上传封面图片！")
+        return
+      }
+      if (!this.form.releaseContent) {
+        this.$message.error("资讯内容不能为空！")
         return
       }
       this.listLoading = true

src/views/officialWebsiteManagement/publicityEdit.vue

@@ -4,7 +4,7 @@
       <div class="formData">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="资讯标题">
-            <el-input v-model="form.title" clearable placeholder="请输入标题"></el-input>
+            <el-input v-model="form.title" clearable placeholder="请输入标题" maxlength="50"></el-input>
           </el-form-item>
           <el-form-item label="资讯日期">
             <el-date-picker v-model="form.issuingDate" type="date" value-format="yyyy-MM-dd" style='width: 100%;'
@@ -12,7 +12,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="发布机构">
-            <el-input v-model="form.issuingAgency" clearable placeholder=""></el-input>
+            <el-input v-model="form.issuingAgency" clearable placeholder="请输入发布机构" maxlength="20"></el-input>
           </el-form-item>
           <el-form-item label="封面图片">
             <el-upload class="avatar-uploader1" :action="uploadPath"
@@ -194,6 +194,28 @@
       },
 
       submit() {
+        if (!this.form.title) {
+        this.$message.error("资讯标题不能为空！")
+        return
+      }
+      if (!this.form.issuingDate) {
+        this.$message.error("资讯日期不能为空！")
+        return
+      }
+
+      if (!this.form.issuingAgency) {
+        this.$message.error("发布机构不能为空！")
+        return
+      }
+      // 
+      if (!this.form.cover) {
+        this.$message.error("请上传封面图片！")
+        return
+      }
+      if (!this.form.releaseContent) {
+        this.$message.error("资讯内容不能为空！")
+        return
+      }
         this.listLoading = true
         this.form.contentType = '资讯'
         this.form.id = this.id

src/views/parkReportManagement/dailyReport.vue

@@ -261,7 +261,9 @@ export default {
                   that.modification = []
                   that.getList()
                 }
-              })
+              }).catch(() => {
+                that.modification = []
+              });
           })
       } else {
         this.$message.error('至少选中一条可上报的条目！')

src/views/parkReportManagement/driverInformationReporting.vue

@@ -116,6 +116,8 @@
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="reportInfo(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.escalationStatus != '未上报' && scope.row.escalationStatus != '未通过'">上报</el-link>
+              <el-divider direction="vertical" />
+            <el-link target="_blank" @click="resultClick(scope.row)" type="primary" :underline="false">上报结果</el-link>
             <!-- <el-divider direction="vertical"></el-divider> -->
             <!-- <el-dropdown>
               <span class="btn_css">•••</span>
@@ -221,7 +223,8 @@
 import {
   getList,
   report,
-  getInfo
+  getInfo,
+  driverReportResults
 } from "@/api/parkReportManagement";
 export default {
   components: {
@@ -283,6 +286,25 @@ export default {
     this.getList();
   },
   methods: {
+    resultClick(row) {
+      driverReportResults(row)
+        .then(response => {
+          if (response.code == 200) {
+            this.$notify({
+              title: '成功',
+              message: '操作成功！',
+              type: 'success'
+            })
+            this.getList()
+          }
+        }).catch(() => {
+          this.$notify({
+              title: '失败',
+              message: response.message,
+              type: 'error'
+            })
+          })
+    },
     //上报
     escalation() {
       let that = this

src/views/parkReportManagement/vehicleInformationReporting.vue

@@ -121,17 +121,19 @@
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="reportInfo(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.escalationStatus != '未上报' && scope.row.escalationStatus != '未通过'">上报</el-link>
+            <el-divider direction="vertical" />
+            <el-link target="_blank" @click="resultClick(scope.row)" type="primary" :underline="false">上报结果</el-link>
             <!-- <el-divider direction="vertical"></el-divider> -->
             <!-- <el-dropdown>
-              <span class="btn_css">•••</span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :disabled="
-                    scope.row.authenticationStatus == '已禁用' &&
-                    scope.row.authenticationStatus != '审核中'
-                  "><span @click="switchChange(scope.row, '1')">禁用</span>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown> -->
+                <span class="btn_css">•••</span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :disabled="
+                      scope.row.authenticationStatus == '已禁用' &&
+                      scope.row.authenticationStatus != '审核中'
+                    "><span @click="switchChange(scope.row, '1')">禁用</span>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown> -->
           </template>
         </el-table-column>
       </el-table>
@@ -145,17 +147,17 @@
       <div class="file">
         <div class="fujian_css">
           <!-- <div class="fujian_item" :class="count == 1 ? 'file_btn' : ''" @click="btnChange(1)">
-            身份证
-          </div> -->
+              身份证
+            </div> -->
           <!-- <div class="fujian_item" :class="count == 2 ? 'file_btn' : ''" @click="btnChange(2)">
-            驾驶证
-          </div> -->
+              驾驶证
+            </div> -->
           <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
             行驶证
           </div>
           <!-- <div class="fujian_item" :class="count == 4 ? 'file_btn' : ''" @click="btnChange(4)">
-            从业资格证
-          </div> -->
+              从业资格证
+            </div> -->
           <div class="fujian_item" :class="count == 5 ? 'file_btn' : ''" @click="btnChange(5)">
             挂车行驶证
           </div>
@@ -192,7 +194,7 @@
         <div class="right_title">使用性质</div>
         <div class="right_item">{{ costData.useNature }} </div>
         <!-- <div class="right_title">车辆识别代号</div>
-        <div class="right_item">{{costData.useNature}} </div> -->
+          <div class="right_item">{{costData.useNature}} </div> -->
         <div class="right_title">发证机关</div>
         <div class="right_item">{{ costData.lssuingAuthority }} </div>
         <div class="right_title">车长(毫米)</div>
@@ -222,8 +224,7 @@
         <img :src="costData.drivingLicenseBackPage" alt="" class="img_css"
           @click="enlarge(costData.drivingLicenseBackPage)">
         <div class="right_title">道路运输证照片</div>
-        <img :src="costData.operationCertificate" alt="" class="img_css"
-          @click="enlarge(costData.operationCertificate)">
+        <img :src="costData.operationCertificate" alt="" class="img_css" @click="enlarge(costData.operationCertificate)">
         <div class="right_title">挂车道路运输证照片</div>
         <img :src="costData.trailerOperationCertificate" alt="" class="img_css"
           @click="enlarge(costData.trailerOperationCertificate)">
@@ -238,7 +239,8 @@
 import {
   carGetList,
   carReport,
-  carGetInfo
+  carGetInfo,
+  carReportResults
 } from "@/api/parkReportManagement";
 export default {
   components: {
@@ -300,6 +302,25 @@ export default {
     this.getList();
   },
   methods: {
+    resultClick(row) {
+      carReportResults(row)
+        .then(response => {
+          if (response.code == 200) {
+            this.$notify({
+              title: '成功',
+              message: '操作成功！',
+              type: 'success'
+            })
+            this.getList()
+          }
+        }).catch(() => {
+          this.$notify({
+            title: '失败',
+            message: response.message,
+            type: 'error'
+          })
+        })
+    },
     //上报
     escalation() {
       let that = this

src/views/parkReportManagement/waybillReporting.vue

@@ -58,13 +58,14 @@
         <el-table-column prop="cargoOwnerPhone" label="发运人账号" />
         <el-table-column prop="driverName" label="承运人" />
         <el-table-column prop="driverPhone" label="承运人账号" />
-        <el-table-column prop="orderEndDate" label="订单完结时间" min-width="110"/>
+        <el-table-column prop="orderEndDate" label="订单完结时间" min-width="110" />
         <el-table-column prop="escalationStatus" label="状态">
           <template slot-scope="scope1">
-            <span>{{scope1.row.escalationStatus}}</span>
-              <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top" v-if="scope1.row.escalationStatus == '未通过'">
-                 <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
-              </el-tooltip>
+            <span>{{ scope1.row.escalationStatus }}</span>
+            <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top"
+              v-if="scope1.row.escalationStatus == '未通过'">
+              <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
+            </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="200">
@@ -74,6 +75,8 @@
             <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)"
               :disabled="scope.row.escalationStatus != '未上报' && scope.row.escalationStatus != '未通过' && scope.row.escalationStatus != '暂缓中'">
               上报</el-link>
+            <el-divider direction="vertical" />
+            <el-link target="_blank" @click="resultClick(scope.row)" type="primary" :underline="false">上报结果</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -94,14 +97,14 @@
         <div class="right_title">托运方证件号或信用代码</div>
         <div class="right_item" v-if="orderData.cargoOwnerIdCard">{{ orderData.cargoOwnerIdCard }}</div>
         <div class="right_item" v-else>{{ orderData.hyCompanyInfo ? orderData.hyCompanyInfo.unifiedSocialCreditCode :
-            "暂无"
+          "暂无"
         }}
         </div>
         <div class="right_title">收货联系人</div>
         <div class="right_item">{{ orderData.publishTaskInfo.receiver }}</div>
         <div class="right_title">收货方证件号或信用代码</div>
         <div class="right_item">{{ orderData.publishTaskInfo.receiverIdcard ? orderData.publishTaskInfo.receiverIdcard :
-            orderData.publishTaskInfo.receiverCreditCode
+          orderData.publishTaskInfo.receiverCreditCode
         }}</div>
         <div class="right_title">运费</div>
         <div class="right_item">{{ orderData.freight }}</div>
@@ -112,13 +115,13 @@
         <div class="right_title">发货地址</div>
         <div class="right_item">
           {{ orderData.sendPrivate }}{{ orderData.sendCity }}{{ orderData.sendArea }}{{
-              orderData.sendDetailedAddress
+            orderData.sendDetailedAddress
           }}
         </div>
         <div class="right_title">收货地址</div>
         <div class="right_item">
           {{ orderData.unloadPrivate }}{{ orderData.unloadCity }}{{ orderData.unloadArea }}{{
-              orderData.unloadDetailedAddress
+            orderData.unloadDetailedAddress
           }}
         </div>
         <div class="right_title">司机姓名</div>
@@ -130,7 +133,7 @@
         <div class="right_title">货名</div>
         <div class="right_item">{{ orderData.goodsName }}</div>
         <div class="right_title">重量(kg)</div>
-        <div class="right_item">{{orderData.hyCarrierInfo.unloadingWeight}}</div>
+        <div class="right_item">{{ orderData.hyCarrierInfo.unloadingWeight }}</div>
         <div class="right_btn">
           <el-button @click="rightSee = false">关闭</el-button>
         </div>
@@ -143,7 +146,8 @@ import {
   waybillGetList,
   waybillGetInfo,
   deferEscalation,
-  batchEscalation
+  batchEscalation,
+  reportResults
 } from '@/api/parkReportManagement'
 export default {
   data() {
@@ -178,6 +182,25 @@ export default {
     this.getList()
   },
   methods: {
+    resultClick(row) {
+      reportResults(row)
+        .then(response => {
+          if (response.code == 200) {
+            this.$notify({
+              title: '成功',
+              message: '操作成功！',
+              type: 'success'
+            })
+            this.getList()
+          }
+        }).catch(() => {
+          this.$notify({
+            title: '失败',
+            message: response.message,
+            type: 'error'
+          })
+        })
+    },
     handleSelectionChange(val) {
       this.modification = val;
     },
@@ -235,10 +258,13 @@ export default {
                     message: '上报成功！',
                     type: 'success'
                   })
+                  // this.modification = 
                 }
                 that.getList()
                 that.modification = []
-              })
+              }).catch(() => {
+                that.modification = []
+              });
           })
       } else {
         this.$message.error('至少选中一条可上报的条目！')
@@ -630,6 +656,7 @@ export default {
     margin-top: 10px;
   }
 }
+
 .find::v-deep input.el-input__inner {
   border-radius: 0;
 }

vue.config.js

@@ -56,7 +56,7 @@ module.exports = {
         },
         proxy: {
             '/pb': {
-                // target: 'https://api.changyuntong56.com',
+                // target: 'https://api.changyuntong56.com'
                 // target: 'http://192.168.110.9:8099/',       
                 target: 'http://192.168.110.138:8999/', 
                 // target: 'https://apitest.changyuntong56.com',