Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-htqd

src/router/officialWebsiteManagement/index.js

@@ -27,7 +27,7 @@ const officialWebsiteManagement  = {
     	name: 'newsAdd',
     	component: () => import('@/views/officialWebsiteManagement/newsAdd'),
     	meta: {
-    	    title: '新增',
+    	    title: '公告信息新增',
     	    icon: ''
     	},
     	hidden: true
@@ -37,7 +37,7 @@ const officialWebsiteManagement  = {
     	name: 'newsLook',
     	component: () => import('@/views/officialWebsiteManagement/newsLook'),
     	meta: {
-    	    title: '查看',
+    	    title: '公告信息查看',
     	    icon: ''
     	},
     	hidden: true
@@ -47,7 +47,7 @@ const officialWebsiteManagement  = {
     	name: 'newsEdit',
     	component: () => import('@/views/officialWebsiteManagement/newsEdit'),
     	meta: {
-    	    title: '编辑',
+    	    title: '公告信息编辑',
     	    icon: ''
     	},
     	hidden: true
@@ -66,7 +66,7 @@ const officialWebsiteManagement  = {
     	name: 'noticeAdd',
     	component: () => import('@/views/officialWebsiteManagement/noticeAdd'),
     	meta: {
-    	    title: '新增',
+    	    title: '处理公示新增',
     	    icon: ''
     	},
     	hidden: true
@@ -76,7 +76,7 @@ const officialWebsiteManagement  = {
     	name: 'noticeLook',
     	component: () => import('@/views/officialWebsiteManagement/noticeLook'),
     	meta: {
-    	    title: '查看',
+    	    title: '处理公示查看',
     	    icon: ''
     	},
     	hidden: true
@@ -86,7 +86,7 @@ const officialWebsiteManagement  = {
     	name: 'noticeEdit',
     	component: () => import('@/views/officialWebsiteManagement/noticeEdit'),
     	meta: {
-    	    title: '编辑',
+    	    title: '处理公示编辑',
     	    icon: ''
     	},
     	hidden: true
@@ -106,7 +106,7 @@ const officialWebsiteManagement  = {
     	name: 'publicityAdd',
     	component: () => import('@/views/officialWebsiteManagement/publicityAdd'),
     	meta: {
-    	    title: '新增',
+    	    title: '行业资讯新增',
     	    icon: ''
     	},
     	hidden: true
@@ -116,7 +116,7 @@ const officialWebsiteManagement  = {
     	name: 'publicityLook',
     	component: () => import('@/views/officialWebsiteManagement/publicityLook'),
     	meta: {
-    	    title: '查看',
+    	    title: '行业资讯查看',
     	    icon: ''
     	},
     	hidden: true
@@ -126,7 +126,7 @@ const officialWebsiteManagement  = {
     	name: 'publicityEdit',
     	component: () => import('@/views/officialWebsiteManagement/publicityEdit'),
     	meta: {
-    	    title: '编辑',
+    	    title: '行业资讯编辑',
     	    icon: ''
     	},
     	hidden: true

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -74,6 +74,15 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column prop="chargeProportion" label="收费比例(%)" width="100px">
+          <template slot-scope="scope">
+            <div class="advancePayment-style">
+              <el-input placeholder="0" v-model="scope.row.chargeProportion"></el-input>
+              <i class="el-icon-edit" style="margin-top: 8px" @click="editchargeProportion(scope.row)"></i>
+              <!-- <span class="btn_css" @click="userSee(scope.row)">查看</span> -->
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="账户" min-width="180">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click" @show="getBillList(scope.row.commonId)">
@@ -318,6 +327,14 @@
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
+            // 收费比例/100
+          if(val.chargeProportion){
+             val.chargeProportion = (val.chargeProportion/100).toFixed(2)
+          }
+          //垫付比例
+          if(val.advancePayment){
+             val.advancePayment = (val.advancePayment/100).toFixed(2)
+          }
           this.listLoading = true;
           editInfo(val)
             .then((response) => {
@@ -335,6 +352,38 @@
             });
         });
       },
+      editchargeProportion(val){
+         this.$confirm("确定修改该货主的收费比例？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          // 收费比例/100
+          if(val.chargeProportion){
+             val.chargeProportion = (val.chargeProportion/100).toFixed(2)
+          }
+          //垫付比例
+          if(val.advancePayment){
+             val.advancePayment = (val.advancePayment/100).toFixed(2)
+          }
+          this.listLoading = true;
+          editInfo(val)
+            .then((response) => {
+              if (response.code == 200) {
+                this.$notify({
+                  title: "成功",
+                  message: "修改成功！",
+                  type: "success",
+                });
+                this.getList();
+              }
+            })
+            .catch(() => {
+              this.listLoading = false;
+            });
+        });
+
+      },
       getBillList(id) {
         let _obj = {
           commonId: id,
@@ -359,6 +408,14 @@
         getList(_obj)
           .then((response) => {
             this.tableData = response.data.records;
+            for(let i = 0 ;i<this.tableData.length;i++){
+              if(this.tableData[i].advancePayment){
+                this.tableData[i].advancePayment = this.tableData[i].advancePayment*100
+              }
+              if(this.tableData[i].chargeProportion){
+                this.tableData[i].chargeProportion = this.tableData[i].chargeProportion*100
+              }
+            }
             this.deptBudgetTotal = response.data.total;
             this.listLoading = false;
           })

src/views/driverManagement/identityExamine.vue

@@ -595,6 +595,7 @@
           var _examine = {};
           _examine.id = row.id;
           _examine.flag = 1;
+          _examine.numberCard = row.numberCard;
           toExamine(_examine)
             .then((response) => {
               this.$notify({

src/views/driverManagement/vehicleExamine.vue

@@ -308,8 +308,10 @@
           .then(() => {
             this.listLoading = true
             var _examine = {}
-            _examine.id = row.id
-            _examine.flag = 1
+            _examine.id = row.id,
+            _examine.flag = 1,
+            _examine.carNumber = row.carNumber,
+            _examine.carNumberColour = row.carNumberColour,
             toCarExamine(_examine).then(response => {
                 this.$notify({
                   title: '成功',

src/views/officialWebsiteManagement/newsEdit.vue

@@ -23,7 +23,7 @@
               @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @ready="onEditorReady($event)"
               ref="QuillEditor">
             </quill-editor>
-            <div v-html="form.releaseContent" />
+            <!-- <div v-html="form.releaseContent" /> -->
           </div>
           <!--            <quill-editor v-model="form.releaseContent" res="myQuillEditor" :options="editorOption" id="editor">
             </quill-editor> -->
@@ -115,7 +115,7 @@
         },
         regulations: {},
         version: [],
-        count: ""
+        count: ''
       }
     },
     created() {

src/views/officialWebsiteManagement/publicityAdd.vue

@@ -146,7 +146,6 @@ export default {
     },
 
     uploadSuccess(res) {
-      debugger
       // 获取富文本组件实例
       let quill = this.$refs.QuillEditor.quill
       // 如果上传成功

src/views/orderManagement/orderAudit.vue

@@ -73,13 +73,13 @@
         <el-table-column prop="advanceCharge" label="预付运费(元)"></el-table-column>
 
         <el-table-column prop="amountMoney" label="司机费用结算">
-          <el-table-column prop="driverServiceCharge" label="服务费(元)"></el-table-column>
+          <!-- <el-table-column prop="driverServiceCharge" label="服务费(元)"></el-table-column> -->
           <el-table-column prop="payable" label="应付(元)"></el-table-column>
           <el-table-column prop="payabled" label="已付(元)"></el-table-column>
           <el-table-column prop="nopayable" label="未付(元)"></el-table-column>
         </el-table-column>
         <el-table-column prop="amountMoney" label="货主费用结算">
-          <el-table-column prop="ownerServiceCharge" label="服务费(元)"></el-table-column>
+          <el-table-column prop="ownerServiceCharge" label="工本费(元)"></el-table-column>
           <el-table-column prop="overdueFee" label="超期费(元)">
             <template slot-scope="scope">
               <span class="btn_css" @click="costLook(scope.row)">{{scope.row.overdueFee }}</span>