基础资料

src/api/fleet/carManage.js

@@ -31,3 +31,10 @@ export function preservation(data) {
     data: data
   })
 }
+// 删除
+export function deleted(fId) {
+  return request({
+    url: '/fleet/carManage/' + fId,
+    method: 'delete'
+  })
+}

src/api/fleet/driverMsg.js

@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 查询订单主列表
+export function listFtmsorderbills(query) {
+  return request({
+    url: 'fleet/driverMsg/qurey',
+    method: 'get',
+    params: query
+  })
+}
+// 查询详情
+export function lookOver(fId) {
+  return request({
+    url: '/fleet/carManage/' + fId,
+    method: 'get'
+  })
+}
+// 模糊查询车队名称
+export function company(companyName) {
+  return request({
+    url: '/fleet/companyMsg/list',
+    method: 'get',
+    params: companyName
+  })
+}
+// 新增
+export function preservation(data) {
+  return request({
+    url: '/fleet/carManage/add',
+    method: 'post',
+    data: data
+  })
+}
+// 删除
+export function deleted(fId) {
+  return request({
+    url: '/fleet/carManage/' + fId,
+    method: 'delete'
+  })
+}

src/views/basicdata/fleet/carManage-add-or-update.vue

@@ -29,7 +29,7 @@
         <el-input v-model="dataFormD.carNum" style="width: 200px" placeholder="车牌号"></el-input>
       </el-form-item>
       <el-form-item label="驾驶员" prop="carNum" style="width: 325px">
-        <el-input v-model="dataFormD.carNum" style="width: 200px" placeholder="驾驶员"></el-input>
+        <el-input v-model="dataFormD.driverName" style="width: 200px" placeholder="驾驶员"></el-input>
       </el-form-item>
       <el-form-item label="挂号" prop="hangNum" style="width: 325px">
         <el-input v-model="dataFormD.hangNum" style="width: 200px" placeholder="挂号"></el-input>
@@ -117,26 +117,163 @@
       </el-form-item>
     </el-form>
     <el-collapse accordion>
-      <el-form label-width="125px">
+      <el-form label-width="200px">
         <el-collapse-item title="图片上传">
-          <el-upload
-            :action="uploadImgUrl"
-            list-type="picture-card"
-            :limit="1"
-            :on-success="success"
-            :on-preview="handlePictureCardPreview"
-            :on-remove="handleRemove">
-            <i class="el-icon-plus"></i>
-          </el-upload>
-          <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
-          </el-dialog>
+          <div style="width: 50%;float: left;">
+            <el-form-item label="行驶证头图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px;float:left;"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(0,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(1,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[0].attachUrl" @click="preview(0)">预览</el-button>
+              </el-upload>
+              </el-form-item>
+            <el-form-item label="运营证头图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(2,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(3,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[2].attachUrl" @click="preview(2)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="营运挂载图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(4,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(5,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[4].attachUrl" @click="preview(4)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="二级维护图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(6,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(7,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[6].attachUrl" @click="preview(6)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="承运人保险图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(8,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(9,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[8].attachUrl" @click="preview(8)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+          </div>
+          <div style="width: 50%;float: left;">
+            <el-form-item label="行驶证挂件图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(1,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(2,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[1].attachUrl" @click="preview(1)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="技术评定证书图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(3,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(4,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[3].attachUrl" @click="preview(3)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="二级维护图片" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(5,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(6,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[5].attachUrl" @click="preview(5)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="商业保险图片1" style="width: 100%;">
+              <el-upload
+                style="width: 300px"
+                :action="uploadImgUrl"
+                :on-preview="handlePreview"
+                :on-remove="(res,file)=>{handleRemove(7,res,file)}"
+                :before-remove="beforeRemove"
+                :on-success="(res,file)=>{handleAvatarSuccess(8,res,file)}"
+                multiple
+                :limit="1"
+                :headers="headers"
+                :on-exceed="handleExceed">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary" v-if="fTmsorderbillsattachs[7].attachUrl" @click="preview(7)">预览</el-button>
+              </el-upload>
+            </el-form-item>
+          </div>
         </el-collapse-item>
       </el-form>
     </el-collapse>
     <span slot="footer" class="dialog-footer">
+      <el-button type="info">修改</el-button>
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button type="primary" @click="dataFormSubmit">确定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -154,11 +291,20 @@ export default {
   },
   data() {
     return {
-      disabled: false,
+      fTmsorderbillsattachs:[
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+        {attachUrl:'',attachName:'',actId:''},
+      ],
       imageUrl: '',
       dataFormD: {},
       visible: false,
-      loading: false,
       msg: '',
       uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
       headers: {
@@ -173,31 +319,94 @@ export default {
         ]
       },
       optionsProjectTypeItem: [],
-      fileList: [],
-      dialogImageUrl: '',
-      dialogVisible: false
     }
   },
   methods: {
-    success(response, file, fileList){
-      console.log(response, file, fileList)
+    handleAvatarSuccess(actid,res, file) {
+      console.log(actid)
+      switch (actid){
+        case 1:
+          this.$set(this.fTmsorderbillsattachs[0], 'actId', actid)
+          this.$set(this.fTmsorderbillsattachs[0], 'attachUrl', res.url)
+          this.$set(this.fTmsorderbillsattachs[0], 'attachName', res.fileName)
+          console.log(this.fTmsorderbillsattachs)
+          break
+        case 2:
+          this.fTmsorderbillsattachs[1].actId = actid
+          this.fTmsorderbillsattachs[1].attachUrl = res.url
+          this.fTmsorderbillsattachs[1].attachName = res.fileName
+          break
+        case 3:
+          this.fTmsorderbillsattachs[2].actId = actid
+          this.fTmsorderbillsattachs[2].attachUrl = res.url
+          this.fTmsorderbillsattachs[2].attachName = res.fileName
+          break
+        case 4:
+          this.fTmsorderbillsattachs[3].actId = actid
+          this.fTmsorderbillsattachs[3].attachUrl = res.url
+          this.fTmsorderbillsattachs[3].attachName = res.fileName
+          break
+        case 5:
+          this.fTmsorderbillsattachs[4].actId = actid
+          this.fTmsorderbillsattachs[4].attachUrl = res.url
+          this.fTmsorderbillsattachs[4].attachName = res.fileName
+          break
+        case 6:
+          this.fTmsorderbillsattachs[5].actId = actid
+          this.fTmsorderbillsattachs[5].attachUrl = res.url
+          this.fTmsorderbillsattachs[5].attachName = res.fileName
+          break
+        case 7:
+          this.fTmsorderbillsattachs[6].actId = actid
+          this.fTmsorderbillsattachs[6].attachUrl = res.url
+          this.fTmsorderbillsattachs[6].attachName = res.fileName
+          break
+        case 8:
+          this.fTmsorderbillsattachs[7].actId = actid
+          this.fTmsorderbillsattachs[7].attachUrl = res.url
+          this.fTmsorderbillsattachs[7].attachName = res.fileName
+          break
+        case 9:
+          this.fTmsorderbillsattachs[8].actId = actid
+          this.fTmsorderbillsattachs[8].attachUrl = res.url
+          this.fTmsorderbillsattachs[8].attachName = res.fileName
+          break
+        default:
+          this.$message.error('未知错误，请稍后再试');
+      }
+    },
+    handleRemove(actid,file, fileList) {
+      this.fTmsorderbillsattachs[actid].attachUrl = ''
+      this.fTmsorderbillsattachs[actid].attachName = ''
+      this.fTmsorderbillsattachs[actid].actId = ''
     },
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
+    handlePreview(file) {
+      this.$message.success('如需预览请点击预览');
     },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件件`);
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${ file.name }？`);
     },
     init() {
       this.visible = true
       if (this.dataForm.Id) {
         lookOver(this.dataForm.Id).then(data => {
           console.log(data)
-          this.dataFormD = data.data
+          this.dataFormD = data.data.fleetCarManage
+          this.fTmsorderbillsattachs = data.data.fTmsorderbillsattachs
+          this.optionsProjectTypeItem = data.data.fleetCompanyMsg
+          if (data.data.fleetCompanyMsg){
+            this.handleSelect()
+          }
         })
       }
     },
+    preview(actid){
+      console.log(this.fTmsorderbillsattachs)
+      window.open(this.fTmsorderbillsattachs[actid].attachUrl)
+    },
     handleSelect(query) {
       company(query).then(data => {
         console.log(data)
@@ -206,9 +415,12 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs['dataFormD'].validate((valid) => {
         if (valid) {
-          preservation(this.dataForm).then(data => {
+          let formDatae = new window.FormData()
+          formDatae.append('fTmsorderbillsattachs', JSON.stringify(this.fTmsorderbillsattachs))
+          formDatae.append('fleetCarManage', JSON.stringify(this.dataFormD))
+          preservation(formDatae).then(data => {
             if (data && data.code === 200) {
               this.$message({
                 message: '操作成功',

src/views/basicdata/fleet/carManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-carManage app-container">
-<!--    卡片 视图区域-->
+    <!--    卡片 视图区域-->
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
         <el-input v-model="dataForm.fleetCompanyId" placeholder="车队id" clearable></el-input>
@@ -19,12 +19,14 @@
       border
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
-      style="width: 100%;">
+      style="width: 100%;"
+    >
       <el-table-column
         type="selection"
         header-align="center"
         align="center"
-        width="50">
+        width="50"
+      >
       </el-table-column>
       <el-table-column
         prop="fleetCompanyName"
@@ -32,48 +34,55 @@
         align="center"
         width="120"
         :show-overflow-tooltip="true"
-        label="车队名称">
+        label="车队名称"
+      >
       </el-table-column>
       <el-table-column
         prop="carNum"
         header-align="center"
         align="center"
         width="130"
-        label="车牌号">
+        label="车牌号"
+      >
       </el-table-column>
       <el-table-column
         prop="hangNum"
         header-align="center"
         align="center"
-        label="挂号">
+        label="挂号"
+      >
       </el-table-column>
       <el-table-column
         prop="fuelType"
         header-align="center"
         align="center"
         width="130"
-        label="燃油类型">
+        label="燃油类型"
+      >
       </el-table-column>
       <el-table-column
         prop="carType"
         header-align="center"
         align="center"
         width="130"
-        label="车辆类型">
+        label="车辆类型"
+      >
       </el-table-column>
       <el-table-column
         prop="carName"
         header-align="center"
         align="center"
         width="130"
-        label="车辆名称">
+        label="车辆名称"
+      >
       </el-table-column>
       <el-table-column
         prop="carBrand"
         header-align="center"
         align="center"
         width="130"
-        label="车辆品牌">
+        label="车辆品牌"
+      >
       </el-table-column>
       <!--<el-table-column
         prop="manufactureUnit"
@@ -178,28 +187,32 @@
         header-align="center"
         align="center"
         width="130"
-        label="挂车型号">
+        label="挂车型号"
+      >
       </el-table-column>
       <el-table-column
         prop="mountCarNum"
         header-align="center"
         align="center"
         width="130"
-        label="挂车车架号">
+        label="挂车车架号"
+      >
       </el-table-column>
       <el-table-column
         prop="engine"
         header-align="center"
         align="center"
         width="130"
-        label="发动机型号">
+        label="发动机型号"
+      >
       </el-table-column>
       <el-table-column
         prop="carLoadPersion"
         header-align="center"
         align="center"
         width="130"
-        label="核载人数">
+        label="核载人数"
+      >
       </el-table-column>
 
 
@@ -208,27 +221,31 @@
         header-align="center"
         align="center"
         width="130"
-        label="外阔尺寸mm">
+        label="外阔尺寸mm"
+      >
       </el-table-column>
       <el-table-column
         prop="sumWeight"
         header-align="center"
         align="center"
-        label="总重量kg">
+        label="总重量kg"
+      >
       </el-table-column>
       <el-table-column
         prop="vouchWeight"
         header-align="center"
         align="center"
         width="150"
-        label="核定重量kg">
+        label="核定重量kg"
+      >
       </el-table-column>
       <el-table-column
         prop="equipWeight"
         header-align="center"
         align="center"
         width="150"
-        label="装备质量kg">
+        label="装备质量kg"
+      >
       </el-table-column>
 
       <el-table-column
@@ -236,44 +253,68 @@
         header-align="center"
         align="center"
         width="130"
-        label="注册日期">
+        label="注册日期"
+      >
       </el-table-column>
       <el-table-column
         prop="abandonDate"
         header-align="center"
         align="center"
         width="130"
-        label="报废日期">
+        label="报废日期"
+      >
       </el-table-column>
       <el-table-column
         prop="creatTime"
         header-align="center"
         align="center"
-        label="添加时间">
+        label="添加时间"
+      >
       </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
         align="center"
         width="130"
-        label="操作">
+        label="操作"
+      >
+<!--        <template slot-scope="scope">-->
+<!--          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">-->
+<!--            <el-button-->
+<!--              v-hasPermi="['fleet:carManage:edit']"-->
+<!--              type="primary"-->
+<!--              icon="el-icon-edit"-->
+<!--              content="修改"-->
+<!--              size="mini"-->
+<!--              circle @click="addOrUpdateHandle(scope.row)"-->
+<!--            ></el-button>-->
+<!--          </el-tooltip>-->
+<!--          <el-tooltip class="item" effect="dark" content="删除" :enterable="false" placement="top">-->
+<!--            <el-button v-hasPermi="['fleet:carManage:delete']"-->
+<!--                       icon="el-icon-delete"-->
+<!--                       type="danger"-->
+<!--                       circle-->
+<!--                       size="mini" @click="deleteHandle(scope.row.Id)"-->
+<!--            ></el-button>-->
+<!--          </el-tooltip>-->
+<!--        </template>-->
         <template slot-scope="scope">
-          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">
-            <el-button
-              v-hasPermi="['fleet:carManage:edit']"
-              type="primary"
-              icon="el-icon-edit"
-              content="修改"
-              size="mini"
-              circle @click="addOrUpdateHandle(scope.row)"></el-button>
-          </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="删除" :enterable="false" placement="top">
-            <el-button v-hasPermi="['fleet:carManage:delete']"
-                       icon="el-icon-delete"
-                       type="danger"
-                       circle
-                       size="mini" @click="deleteHandle(scope.row.id)"></el-button>
-          </el-tooltip>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="addOrUpdateHandle(scope.row)"
+            v-hasPermi="['fleet:companyMsg:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="deleteHandle(scope.row.Id)"
+            v-hasPermi="['fleet:companyMsg:remove']"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -284,148 +325,148 @@
       :page-sizes="[10, 20, 50, 100]"
       :page-size="dataForm.pageSize"
       :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
+      layout="total, sizes, prev, pager, next, jumper"
+    >
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :dataForm="editModel"></add-or-update>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :dataForm="editModel"
+    ></add-or-update>
 
   </div>
 </template>
 
 <script>
-import {listFtmsorderbills} from "@/api/fleet/carManage"
-  import AddOrUpdate from './carManage-add-or-update'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          pageNum: 1,
-          pageSize: 10
-        },
-        editModel: {},
-        dataList: [],
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
+import { listFtmsorderbills ,deleted} from '@/api/fleet/carManage'
+import AddOrUpdate from './carManage-add-or-update'
+
+export default {
+  data() {
+    return {
+      dataForm: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      editModel: {},
+      dataList: [],
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  activated() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = false
+      listFtmsorderbills(this.dataForm).then(data => {
+        console.log(data)
+        if (data && data.code === 200) {
+          this.dataList = data.rows
+          this.totalPage = data.total
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
     },
-    components: {
-      AddOrUpdate
+    // 每页数
+    sizeChangeHandle(val) {
+      this.dataForm.pageSize = val
+      console.log(val)
+      this.pageIndex = 1
+      this.getDataList()
     },
-    activated () {
+    // 当前页
+    currentChangeHandle(val) {
+      console.log(val)
+      this.dataForm.pageNum = val
       this.getDataList()
     },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = false
-        listFtmsorderbills(this.dataForm).then(data =>{
-          console.log(data)
-            if (data && data.code === 200) {
-              this.dataList = data.rows
-              this.totalPage = data.total
-            } else {
-              this.dataList = []
-              this.totalPage = 0
-            }
-            this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.dataForm.pageSize = val
-        console.log(val)
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        console.log(val)
-        this.dataForm.pageNum = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (row) {
-        this.addOrUpdateVisible = true
-        if (row) {
-          this.editModel = row
-        } else {
-          this.editModel = {
-            id: null,
-            fleetCompanyId: null,
-            carNum: null,
-            hangNum: null,
-            fuelType: null,
-            carType: null,
-            carName: null,
-            carBrand: null,
-            manufactureUnit: null,
-            officeOfCertificate: null,
-            pullCarType: null,
-            pullCarShelfNum: null,
-            mountCarType: null,
-            mountCarNum: null,
-            engine: null,
-            carLoadPersion: null,
-            buyCarDate: null,
-            regiestDate: null,
-            abandonDate: null,
-            outerSize: null,
-            sumWeight: null,
-            vouchWeight: null,
-            equipWeight: null,
-            drivingLicenseSrc: null,
-            drivingPendantSrc: null,
-            operationLicenseSrc: null,
-            technologySrc: null,
-            drivingLoadSrc: null,
-            secondLvMaintainSrc: null,
-            tafficConstranintInsuranceSrc: null,
-            businessInsuranceSrc: null,
-            accpetCarrageInsuranceSrc: null,
-            creatTime: null,
-            modificationTime: null
-          }
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(row) {
+      this.addOrUpdateVisible = true
+      if (row) {
+        this.editModel = row
+      } else {
+        this.editModel = {
+          id: null,
+          fleetCompanyId: null,
+          carNum: null,
+          hangNum: null,
+          fuelType: null,
+          carType: null,
+          carName: null,
+          carBrand: null,
+          manufactureUnit: null,
+          officeOfCertificate: null,
+          pullCarType: null,
+          pullCarShelfNum: null,
+          mountCarType: null,
+          mountCarNum: null,
+          engine: null,
+          carLoadPersion: null,
+          buyCarDate: null,
+          regiestDate: null,
+          abandonDate: null,
+          outerSize: null,
+          sumWeight: null,
+          vouchWeight: null,
+          equipWeight: null,
+          drivingLicenseSrc: null,
+          drivingPendantSrc: null,
+          operationLicenseSrc: null,
+          technologySrc: null,
+          drivingLoadSrc: null,
+          secondLvMaintainSrc: null,
+          tafficConstranintInsuranceSrc: null,
+          businessInsuranceSrc: null,
+          accpetCarrageInsuranceSrc: null,
+          creatTime: null,
+          modificationTime: null
         }
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init()
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var carManageIds = id ? [id] : this.dataListSelections.map(item => {
-          return item.userId
-        })
-        this.$confirm(`确定对[id=${carManageIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/fleet/carManage/delete'),
-            method: 'post',
-            data: this.$http.adornData(carManageIds, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
       }
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init()
+      })
+    },
+    // 删除
+    deleteHandle(id) {
+      let carManageIds = id ? [id] : this.dataListSelections.map(item => {
+        return item.userId
+      })
+      this.$confirm(`确定对[id=${carManageIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleted(carManageIds).then(data=>{
+          if (data && data.code === 200) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getDataList()
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      }).catch(() => {
+      })
     }
   }
+}
 </script>

src/views/basicdata/fleet/driverMsg.vue

@@ -1,317 +1,312 @@
-<template>
-  <div class="mod-driverMsg">
-    <!-- 面包屑导航区域 -->
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>驾驶员信息管理</el-breadcrumb-item>
-      <!--      <el-breadcrumb-item>车队列表</el-breadcrumb-item>-->
-    </el-breadcrumb>
-    <!-- 卡片视图区域 -->
-    <el-card style="margin-top:10px;">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-            <el-form-item>
-                <el-input v-model="dataForm.name" placeholder="驾驶员姓名" clearable></el-input>
-            </el-form-item>
-            <el-form-item>
-                <el-input v-model="dataForm.tel" placeholder="联系电话" clearable></el-input>
-            </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button v-if="isAuth('fleet:driverMsg:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-<!--        <el-button v-if="isAuth('fleet:driverMsg:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;"
-      height=650>
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        prop="companyName"
-        header-align="center"
-        align="center"
-        :show-overflow-tooltip="true"
-        width="150"
-        label="所属公司">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        header-align="center"
-        align="center"
-        width="150"
-        label="驾驶员姓名">
-      </el-table-column>
-      <el-table-column
-        prop="sex"
-        header-align="center"
-        align="center"
-        width="150"
-        :formatter="formatSex"
-        label="性别">
-      </el-table-column>
-      <el-table-column
-        prop="birthday"
-        header-align="center"
-        align="center"
-        :show-overflow-tooltip="true"
-        width="160"
-        :formatter="timestampToTime"
-        label="出生日期">
-      </el-table-column>
-      <el-table-column
-        prop="allowDriverCar"
-        header-align="center"
-        align="center"
-        label="准驾车型">
-      </el-table-column>
-      <el-table-column
-        prop="firstCertificateDate"
-        header-align="center"
-        align="center"
-        :show-overflow-tooltip="true"
-        :formatter="dateFormat"
-        width="160"
-        label="初次领证日期">
-      </el-table-column>
-      <el-table-column
-        prop="idcarNum"
-        header-align="center"
-        align="center"
-        :show-overflow-tooltip="true"
-        width="170"
-        label="身份证号">
-      </el-table-column>
-      <el-table-column
-        prop="tel"
-        header-align="center"
-        align="center"
-        width="150"
-        label="联系电话">
-      </el-table-column>
-      <el-table-column
-        prop="address"
-        header-align="center"
-        align="center"
-        :show-overflow-tooltip="true"
-        label="家庭住址">
-      </el-table-column>
-      <el-table-column
-        header-align="center"
-        align="center"
-        width="150"
-        label="个人照片">
-        <template slot-scope="scope">
-          　　　　<img v-if="scope.row.resumePic? 'true':''" :src="scope.row.resumePic" width="80" height="60" class="head_pic"/>
-          　　</template>
-      </el-table-column>
-      <el-table-column
-        prop="drivingPic"
-        header-align="center"
-        align="center"
-        width="150"
-        label="驾驶证照片">
-        <template slot-scope="scope">
-          　　　　<img v-if="scope.row.drivingPic? 'true':''" :src="scope.row.drivingPic" width="80" height="60" class="head_pic"/>
-          　　</template>
-      </el-table-column>
-      <el-table-column
-        prop="creatTime"
-        header-align="center"
-        align="center"
-        width="160"
-        :show-overflow-tooltip="true"
-        label="注册时间">
-      </el-table-column>
-
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">
-          <el-button type="primary"
-                     v-if="isAuth('fleet:driverMsg:edit')"
-                     icon="el-icon-edit"
-                     content="修改"
-                     size="mini"
-                     circle @click="addOrUpdateHandle(scope.row)"></el-button>
-          </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="删除" :enterable="false" placement="top">
-          <el-button type="danger"
-                     v-if="isAuth('fleet:driverMsg:delete')"
-                     icon="el-icon-delete"
-                     size="mini"
-                     circle @click="deleteHandle(scope.row.id)"></el-button>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="dataForm.current"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="dataForm.size"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :dataForm="editModel"></add-or-update>
-      </el-card>
-  </div>
-</template>
-
-<script>
-  import AddOrUpdate from './driverMsg-add-or-update'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          name: null,
-          tel: null,
-          current: 1,
-          size: 10
-        },
-        editModel: {},
-        dataList: [],
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
-    },
-    components: {
-      AddOrUpdate
-    },
-    activated () {
-      this.getDataList()
-    },
-    methods: {
-      timestampToTime (row, column) {
-        const daterc = row[column.property]
-        if (daterc != null) {
-          const date = new Date(row.birthday)
-          const Y = date.getFullYear() + '-'
-          const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
-          const D = date.getDate() + ' '
-          return Y + M + D
-        }
-      },
-      dateFormat (row, column, cellValue, index) {
-        const daterc = row[column.property]
-        if (daterc != null) {
-          const dateMat = new Date(row.firstCertificateDate)
-          const year = dateMat.getFullYear()
-          const month = dateMat.getMonth() + 1
-          const day = dateMat.getDate()
-          const timeFormat = year + '-' + month + '-' + day
-          return timeFormat
-        }
-      },
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/fleet/driverMsg/page'),
-          method: 'get',
-          params: this.$http.adornParams(this.dataForm)
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.records
-            this.totalPage = data.page.total
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.dataForm.current = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (row) {
-        this.addOrUpdateVisible = true
-        if (row) {
-          this.editModel = row
-        } else {
-          this.editModel = {
-            id: null,
-            fleetCompanyId: null,
-            name: null,
-            sex: null,
-            birthday: null,
-            allowDriverCar: null,
-            firstCertificateDate: null,
-            idcarNum: null,
-            tel: null,
-            address: null,
-            resumePic: null,
-            drivingPic: null,
-            creatTime: null,
-            modificationTime: null,
-            updateType: null
-          }
-        }
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init()
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var driverMsgIds = id ? [id] : this.dataListSelections.map(item => {
-          return item.userId
-        })
-        this.$confirm(`确定对[id=${driverMsgIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/fleet/driverMsg/delete'),
-            method: 'post',
-            data: this.$http.adornData(driverMsgIds, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      },
-      formatSex: function (row, column) {
-        return row.sex === 0 ? '男' : row.sex === 1 ? '女' : '未知'
-      }
-    }
-  }
-</script>
+<template>
+  <div class="mod-driverMsg app-container">
+    <!-- 卡片视图区域 -->
+
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item>
+        <el-input v-model="dataForm.name" placeholder="驾驶员姓名" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="dataForm.tel" placeholder="联系电话" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button
+          v-hasPermi="['fleet:driverMsg:add']"
+          type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <!--        <el-button v-if="isAuth('fleet:driverMsg:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="companyName"
+        header-align="center"
+        align="center"
+        :show-overflow-tooltip="true"
+        width="150"
+        label="所属公司">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        header-align="center"
+        align="center"
+        width="150"
+        label="驾驶员姓名">
+      </el-table-column>
+      <el-table-column
+        prop="sex"
+        header-align="center"
+        align="center"
+        width="150"
+        :formatter="formatSex"
+        label="性别">
+      </el-table-column>
+      <el-table-column
+        prop="birthday"
+        header-align="center"
+        align="center"
+        :show-overflow-tooltip="true"
+        width="160"
+        :formatter="timestampToTime"
+        label="出生日期">
+      </el-table-column>
+      <el-table-column
+        prop="allowDriverCar"
+        header-align="center"
+        align="center"
+        label="准驾车型">
+      </el-table-column>
+      <el-table-column
+        prop="firstCertificateDate"
+        header-align="center"
+        align="center"
+        :show-overflow-tooltip="true"
+        :formatter="dateFormat"
+        width="160"
+        label="初次领证日期">
+      </el-table-column>
+      <el-table-column
+        prop="idcarNum"
+        header-align="center"
+        align="center"
+        :show-overflow-tooltip="true"
+        width="170"
+        label="身份证号">
+      </el-table-column>
+      <el-table-column
+        prop="tel"
+        header-align="center"
+        align="center"
+        width="150"
+        label="联系电话">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        header-align="center"
+        align="center"
+        :show-overflow-tooltip="true"
+        label="家庭住址">
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        width="150"
+        label="个人照片">
+        <template slot-scope="scope">
+          　　　　<img v-if="scope.row.resumePic? 'true':''" :src="scope.row.resumePic" width="80" height="60" class="head_pic"/>
+          　　</template>
+      </el-table-column>
+      <el-table-column
+        prop="drivingPic"
+        header-align="center"
+        align="center"
+        width="150"
+        label="驾驶证照片">
+        <template slot-scope="scope">
+          　　　　<img v-if="scope.row.drivingPic? 'true':''" :src="scope.row.drivingPic" width="80" height="60" class="head_pic"/>
+          　　</template>
+      </el-table-column>
+      <el-table-column
+        prop="creatTime"
+        header-align="center"
+        align="center"
+        width="160"
+        :show-overflow-tooltip="true"
+        label="注册时间">
+      </el-table-column>
+
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">
+            <el-button type="primary"
+                       v-hasPermi="['fleet:driverMsg:edit']"
+                       icon="el-icon-edit"
+                       content="修改"
+                       size="mini"
+                       circle @click="addOrUpdateHandle(scope.row)"></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="删除" :enterable="false" placement="top">
+            <el-button type="danger"
+                       v-hasPermi="['fleet:driverMsg:delete']"
+                       icon="el-icon-delete"
+                       size="mini"
+                       circle @click="deleteHandle(scope.row.id)"></el-button>
+          </el-tooltip>
+        </template>
+
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="dataForm.pageNum"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="dataForm.pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :dataForm="editModel"></add-or-update>
+
+  </div>
+</template>
+
+<script>
+import {listFtmsorderbills} from '@/api/fleet/driverMsg'
+  import AddOrUpdate from './driverMsg-add-or-update'
+  export default {
+    data () {
+      return {
+        dataForm: {
+          name: null,
+          tel: null,
+          pageNum: 1,
+          pageSize: 10
+        },
+        editModel: {},
+        dataList: [],
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: [],
+        addOrUpdateVisible: false
+      }
+    },
+    components: {
+      AddOrUpdate
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      timestampToTime (row, column) {
+        const daterc = row[column.property]
+        if (daterc != null) {
+          const date = new Date(row.birthday)
+          const Y = date.getFullYear() + '-'
+          const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+          const D = date.getDate() + ' '
+          return Y + M + D
+        }
+      },
+      dateFormat (row, column, cellValue, index) {
+        const daterc = row[column.property]
+        if (daterc != null) {
+          const dateMat = new Date(row.firstCertificateDate)
+          const year = dateMat.getFullYear()
+          const month = dateMat.getMonth() + 1
+          const day = dateMat.getDate()
+          const timeFormat = year + '-' + month + '-' + day
+          return timeFormat
+        }
+      },
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        listFtmsorderbills(this.dataForm).then(data=>{
+          console.log(data)
+          if (data && data.code === 200) {
+            this.dataList = data.rows
+            this.totalPage = data.total
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        console.log(val)
+        this.dataForm.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.dataForm.current = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (row) {
+        this.addOrUpdateVisible = true
+        if (row) {
+          this.editModel = row
+        } else {
+          this.editModel = {
+            id: null,
+            fleetCompanyId: null,
+            name: null,
+            sex: null,
+            birthday: null,
+            allowDriverCar: null,
+            firstCertificateDate: null,
+            idcarNum: null,
+            tel: null,
+            address: null,
+            resumePic: null,
+            drivingPic: null,
+            creatTime: null,
+            modificationTime: null,
+            updateType: null
+          }
+        }
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init()
+        })
+      },
+      // 删除
+      deleteHandle (id) {
+        var driverMsgIds = id ? [id] : this.dataListSelections.map(item => {
+          return item.userId
+        })
+        this.$confirm(`确定对[id=${driverMsgIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/fleet/driverMsg/delete'),
+            method: 'post',
+            data: this.$http.adornData(driverMsgIds, false)
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
+      },
+      formatSex: function (row, column) {
+        return row.sex === 0 ? '男' : row.sex === 1 ? '女' : '未知'
+      }
+    }
+  }
+</script>