Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/api/V2/platformaudit/index.js

@@ -36,4 +36,6 @@ export const API_POST_EDIT_SETTLEDCOMPANY = '/settledCompanyInfo/api/editSettled
 export const API_POST_SETTLED_EXAMINE = '/settledCompanyInfo/api/examine'
 //粮脉企业审核删除
 export const API_POST_DELETE_SETTLED = '/settledCompanyInfo/api/deleteSettledCompanyInfo'
+//客服留言列表
+export const API_GET_OPENSERVICE_LIST = '/openServiceInfo/selectOpenServiceList'
 

src/lang/zh.js

@@ -647,6 +647,7 @@ export default {
     //平台审核
     platformaudit: '平台审核',
     grainmerchantreview: '粮商审核',
+    customerService :'客服留言',
     driverreview: '司机审核',
     transactioninformationreview: '采购信息审核',
     saletransactioninformationreview: '销售信息审核',
@@ -1098,7 +1099,7 @@ export default {
     weighingManagement: '检斤管理',
     qualityInspectionManagement: '质检管理',
     newQualityInspectionManagement: '质检管理',
-    outInspectRecord:"质检记录",
+    outInspectRecord:'质检记录',
     qualityInspection: '质检信息',
     weighingManagementrecord:'检斤记录',
     collectionManagement: '收款管理',
@@ -7530,7 +7531,7 @@ export default {
     weighingManagement: '检斤管理',
     qualityInspectionManagement: '质检管理',
     newQualityInspectionManagement: '质检管理',
-    outInspectRecord:"质检记录",
+    outInspectRecord:'质检记录',
     qualityInspection: '质检信息',
     weighingManagementrecord:'检斤记录',
     collectionManagement: '收款管理',

src/model/platformaudit/index.js

@@ -12,6 +12,7 @@ import {
     API_POST_DELETESALE,
     API_POST_SALEREVIEW,
     API_GET_DYNAMICS_LIST,
+    API_GET_OPENSERVICE_LIST,
     API_GET_DYNAMICS_LOOK,
     API_POST_DYNAMICS_DELETE,
     API_POST_DYNAMICS_EXAMINE,
@@ -60,3 +61,5 @@ export const editSettled = appRx.post(API_POST_EDIT_SETTLEDCOMPANY, errorCatcher
 export const settledExamine = appRx.post(API_POST_SETTLED_EXAMINE, errorCatcher, errorHandle, filter)
 //粮脉企业审核删除
 export const deleteSettled = appRx.post(API_POST_DELETE_SETTLED, errorCatcher, errorHandle, filter)
+//客服留言列表
+export const openServiceList = appRx.get(API_GET_OPENSERVICE_LIST,errorCatcher, errorHandle, filter)

src/views/platformAudit/component/routers/route.js

@@ -106,6 +106,21 @@ const platformauditRouter = {
                 _title: '粮脉动态审核'
             },
         },
+        // 客服留言
+        {
+            path: 'customerService',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/customerService'),
+            name: 'customerService',
+            meta: {
+                title: 'customerService',
+                shortcutEntrance: 'customerService',
+                module: 'audit.grainMerchant.grainMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '客服留言'
+            },
+        },
     ],
 };
 export default platformauditRouter;

src/views/platformAudit/customerService.vue

@@ -0,0 +1,142 @@
+<!--客服留言-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="16">
+      <template slot="right">
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按姓名、手机号查找"
+          clearable maxlength="500" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left:-8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <el-table :data="openList" style="width: 100%; margin-top: 20px" ref="openList" border height="calc(100% - 115px)">
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="姓名"> </el-table-column>
+        <el-table-column prop="mobilePhone" label="手机号"> </el-table-column>
+        <el-table-column prop="message" label="信息"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间"> </el-table-column>
+    </el-table>
+    <div style="text-align: center;">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    openServiceList,
+  } from '@/model/platformaudit/index'
+  export default {
+    data() {
+      return {
+        searchKeyWord: '',
+        openList: [],
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        deptCircularPage: {},
+      }
+    },
+    activated() {
+      this.getList()
+    },
+    methods: {
+      find() {
+        this.getList()
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        openServiceList({
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.openList = response.records
+            this.deptBudgetTotal = response.total
+          })
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .seach {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .find {
+      width: 32px;
+      margin-left: 10px;
+    }
+
+    .search-left {
+      display: flex;
+    }
+  }
+
+  .ws-info-table {
+    border: none;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //   /deep/.el-table--border{
+  //   height: calc(100vh - 600px) !important;
+  // }
+</style>

src/views/statisticalReport/autoSettlementList.vue

@@ -137,7 +137,32 @@
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png" @click="editdeductionAmount(scope.row)" alt="" />
           </template></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+            <template slot-scope="scope">
+            <span v-if="
+              !scope.row.serviceChargechange && scope.row.serviceCharge
+            ">{{ scope.row.serviceCharge }}</span>
+            <input v-if="scope.row.serviceChargechange" style="width: 60px" v-model="serviceCharge" type="text" />
+            <!--改服务费-->
+            <i @click="changeserviceCharge(scope.row)" v-if="
+              (scope.row.serviceChargechange &&
+                scope.row.status == '待请款') ||
+              (scope.row.serviceChargechange &&
+                scope.row.status == '已驳回')
+            " class="iconfont icon-dui"></i>
+            <img v-if="
+              (!scope.row.serviceChargechange &&
+                scope.row.status == '待请款') ||
+              (!scope.row.serviceChargechange &&
+                scope.row.status == '已驳回')
+            " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png" @click="editserviceCharge(scope.row)" alt="" />
+          </template>
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
         <el-table-column width="100" class="table_td" label="应付金额(元)" prop="amountIngPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
         <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable"><template
             slot-scope="scope">
             <div style="
@@ -395,6 +420,7 @@ export default {
       isHover: false,
       settlementWeightchange: false,
       deductionAmountchange: false,
+      serviceChargechange: false,
       isShow: !this.autohide,
       //弹出框
       dialogViewSpareMoney: false,
@@ -550,9 +576,9 @@ export default {
       var m = date.getMonth() + 1;
       var d = date.getDate();
 
-      m = m < 10 ? "0" + m : m;
-      d = d < 10 ? "0" + d : d;
-      return y + "-" + m + "-" + d;
+      m = m < 10 ? '0' + m : m;
+      d = d < 10 ? '0' + d : d;
+      return y + '-' + m + '-' + d;
     },
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
@@ -920,6 +946,48 @@ export default {
       this.deductionAmount = item.deductionAmount
       item.deductionAmountchange = true
     },
+    //修改服务费
+    changeserviceCharge(item) {
+      if (!this.serviceCharge) {
+        this.$message({
+          message: '服务费金额不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (this.serviceCharge &&
+          String(this.serviceCharge).indexOf('.') != -1 &&
+          String(this.serviceCharge).length -
+          (String(this.serviceCharge).indexOf('.') + 1) >
+          2) ||
+        (this.serviceCharge && this.serviceCharge > 100000) ||
+        (this.serviceCharge && this.serviceCharge < -100000)
+      ) {
+        this.$message({
+          message: '服务费输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      editauto({
+        serviceCharge: this.serviceCharge,
+        id: item.id,
+        flag: 4,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('修改服务费成功')
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('修改服务费失败')
+        })
+    },
+    editserviceCharge(item) {
+      this.serviceCharge = item.serviceCharge
+      item.serviceChargechange = true
+    },
     //装车磅单
     lookloadingImg(row) {
       if (row.loadingImg == null || row.loadingImg == '') {