qukaidi 4 سال پیش
والد
کامیت
e47809f1de

+ 17 - 1
src/api/fleet/carManage.js

@@ -26,7 +26,7 @@ export function lookOver(fId) {
 // 模糊查询车队名称
 export function company(companyName) {
   return request({
-    url: '/fleet/companyMsg/list',
+    url: '/fleet/companyMsg/query',
     method: 'get',
     params: companyName
   })
@@ -39,3 +39,19 @@ export function preservation(data) {
     data: data
   })
 }
+
+export function driverMsglist(companyName) {
+  return request({
+    url: '/fleet/driverMsg/list',
+    method: 'get',
+    params: companyName
+  })
+}
+
+// 删除
+export function deleted(fId) {
+  return request({
+    url: '/fleet/carManage/' + fId,
+    method: 'delete'
+  })
+}

+ 3 - 3
src/api/fleet/driverMsg.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询订单主列表
 export function listFtmsorderbills(query) {
   return request({
-    url: 'fleet/driverMsg/qurey',
+    url: '/fleet/driverMsg/query',
     method: 'get',
     params: query
   })
@@ -18,7 +18,7 @@ export function lookOver(fId) {
 // 模糊查询车队名称
 export function company(companyName) {
   return request({
-    url: '/fleet/companyMsg/list',
+    url: '/fleet/companyMsg/query',
     method: 'get',
     params: companyName
   })
@@ -26,7 +26,7 @@ export function company(companyName) {
 // 新增
 export function preservation(data) {
   return request({
-    url: 'fleet/driverMsg',
+    url: 'fleet/driverMsg/add',
     method: 'post',
     data: data
   })

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 591 - 267
src/views/basicdata/fleet/carManage-add-or-update.vue


+ 3 - 5
src/views/basicdata/fleet/carManage.vue

@@ -10,7 +10,7 @@
         <!--车队可以加车辆-->
         <!--        个人照片改成身份证-->
         <el-button @click="getDataList()">查询</el-button>
-        <el-button v-hasPermi="['fleet:carManage:add']" type="primary" @click="addOrUpdateHandle()">添加车辆</el-button>
+        <el-button type="primary" @click="addOrUpdateHandle()">添加车辆</el-button>
         <!--        <el-button v-if="isAuth('fleet:carManage:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
       </el-form-item>
     </el-form>
@@ -317,7 +317,6 @@
             type="text"
             icon="el-icon-edit"
             @click="addOrUpdateHandle(scope.row)"
-            v-hasPermi="['fleet:carManage:edit']"
           >查看
           </el-button>
           <el-button
@@ -325,7 +324,6 @@
             type="text"
             icon="el-icon-delete"
             @click="deleteHandle(scope.row.Id)"
-            v-hasPermi="['fleet:carManage:remove']"
           >删除
           </el-button>
         </template>
@@ -456,9 +454,9 @@ export default {
     },
     // 删除
     deleteHandle(id) {
-      let carManageIds = id ? [id] : this.dataListSelections.map(item => {
+      let carManageIds = [id ? [id] : this.dataListSelections.map(item => {
         return item.userId
-      })
+      })]
       this.$confirm(`确定对[id=${carManageIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

+ 339 - 209
src/views/basicdata/fleet/companyMsg-add-or-update.vue

@@ -3,81 +3,189 @@
   <el-dialog
     v-dialogDrag
     :fullscreen="dialogFull"
-    :title="!dataForm.id ? '车队注册' : '修改'"
+    :title="!dataForm.fId ? '车队注册' : '修改'"
     :close-on-click-modal="false"
-    :visible.sync="visible" width="70%" :before-close="handleClose">
+    :visible.sync="visible"
+    width="70%"
+    :before-close="handleClose"
+  >
     <template slot="title">
       <div class="avue-crud__dialog__header">
-            <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
-            车队注册
-            </span>
+        <span class="el-dialog__title">
+          <span
+            style="
+              display: inline-block;
+              width: 3px;
+              height: 20px;
+              margin-right: 5px;
+              float: left;
+              margin-top: 2px;
+            "
+          ></span>
+          车队注册
+        </span>
         <div class="avue-crud__dialog__menu enlarge" @click="full">
-          <i  style="cursor: pointer;display: block;width:12px;height:12px;border:1px solid #909399;border-top:3px solid #909399;margin-top: -3px;"></i>
+          <i
+            style="
+              cursor: pointer;
+              display: block;
+              width: 12px;
+              height: 12px;
+              border: 1px solid #909399;
+              border-top: 3px solid #909399;
+              margin-top: -3px;
+            "
+          ></i>
         </div>
       </div>
     </template>
 
-    <el-form :model="dataForm_s" :rules="dataRule" ref="dataForm_s" @keyup.enter.native="dataFormSubmit()" label-width="200px">
-      <el-form-item label="公司名称" prop="companyName">
-        <el-input v-model="dataForm_s.companyName" placeholder="公司名称" :disabled="doNot"></el-input>
+    <el-form
+      :model="dataForm_s"
+      :rules="dataRule"
+      ref="dataForm_s"
+      @keyup.enter.native="dataFormSubmit()"
+      label-width="200px"
+    >
+      <el-form-item label="公司名称" prop="fName">
+        <el-input
+          v-model="dataForm_s.fName"
+          placeholder="公司名称"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="公司地址" prop="companyAddress">
-        <el-input v-model="dataForm_s.companyAddress" placeholder="公司地址" :disabled="doNot"></el-input>
+      <el-form-item label="公司地址" prop="fAddr">
+        <el-input
+          v-model="dataForm_s.fAddr"
+          placeholder="公司地址"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="公司开户行" prop="openingBank">
-        <el-input v-model="dataForm_s.openingBank" placeholder="公司开户行" :disabled="doNot"></el-input>
+      <el-form-item label="公司开户行" prop="fBankname">
+        <el-input
+          v-model="dataForm_s.fBankname"
+          placeholder="公司开户行"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="银行账号" prop="bankAccount">
-        <el-input v-model="dataForm_s.bankAccount" placeholder="银行账号" :disabled="doNot"></el-input>
+      <el-form-item label="银行账号" prop="fBankno">
+        <el-input
+          v-model="dataForm_s.fBankno"
+          placeholder="银行账号"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="登录账号" prop="loginAccount">
-        <el-input v-model="dataForm_s.loginAccount" :disabled="dataForm.id ? edit:false || doNot" placeholder="登录账号"></el-input>
+        <el-input
+          v-model="dataForm_s.loginAccount"
+          :disabled="dataForm.fId ? edit : false || doNot"
+          placeholder="登录账号"
+        ></el-input>
       </el-form-item>
       <el-form-item label="信用等级" prop="creditLv">
-        <el-input v-model="dataForm_s.creditLv" placeholder="信用等级" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.creditLv"
+          placeholder="信用等级"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="账期天数(最迟结款天数)" prop="paymentDays">
-        <el-input v-model="dataForm_s.paymentDays" placeholder="账期天数(最迟结款天数)" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.paymentDays"
+          placeholder="账期天数(最迟结款天数)"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="联系人" prop="linkMan">
-        <el-input v-model="dataForm_s.linkMan" placeholder="联系人" :disabled="doNot"></el-input>
+      <el-form-item label="联系人" prop="fManage">
+        <el-input
+          v-model="dataForm_s.fManage"
+          placeholder="联系人"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="联系电话" prop="linkPhone">
-        <el-input v-model="dataForm_s.linkPhone" placeholder="联系电话" :disabled="doNot"></el-input>
+      <el-form-item label="联系电话" prop="fTel">
+        <el-input
+          v-model="dataForm_s.fTel"
+          placeholder="联系电话"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="传真" prop="fax">
-        <el-input v-model="dataForm_s.fax" placeholder="传真" :disabled="doNot"></el-input>
+      <el-form-item label="传真" prop="fFax">
+        <el-input
+          v-model="dataForm_s.fFax"
+          placeholder="传真"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="email" prop="email">
-        <el-input v-model="dataForm_s.email" placeholder="email" :disabled="doNot"></el-input>
+      <el-form-item label="Email" prop="fEmail">
+        <el-input
+          v-model="dataForm_s.fEmail"
+          placeholder="fEmail"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="总公司" prop="headOffice">
-        <el-input v-model="dataForm_s.headOffice" placeholder="总公司" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.headOffice"
+          placeholder="总公司"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="注册资本" prop="registerdCapital">
-        <el-input v-model="dataForm_s.registerdCapital" placeholder="注册资本" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.registerdCapital"
+          placeholder="注册资本"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="法人" prop="legalPerson">
-        <el-input v-model="dataForm_s.legalPerson" placeholder="法人" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.legalPerson"
+          placeholder="法人"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="所属行业" prop="insdustry">
-        <el-input v-model="dataForm_s.insdustry" placeholder="所属行业" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.insdustry"
+          placeholder="所属行业"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="社会统一信用代码" prop="creditNum">
-        <el-input v-model="dataForm_s.creditNum" placeholder="社会统一信用代码" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.creditNum"
+          placeholder="社会统一信用代码"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="纳税人识别号" prop="taxpayerNum">
-        <el-input v-model="dataForm_s.taxpayerNum" placeholder="纳税人识别号" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.taxpayerNum"
+          placeholder="纳税人识别号"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="工商注册号" prop="industryCommerceNum">
-        <el-input v-model="dataForm_s.industryCommerceNum" placeholder="工商注册号" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.industryCommerceNum"
+          placeholder="工商注册号"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="组织机构代码" prop="organizationNum">
-        <el-input v-model="dataForm_s.organizationNum" placeholder="组织机构代码" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.organizationNum"
+          placeholder="组织机构代码"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="登记机关" prop="registerOrganization">
-        <el-input v-model="dataForm_s.registerOrganization" placeholder="登记机关" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.registerOrganization"
+          placeholder="登记机关"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="成立日期" prop="dateOfEstablishment">
         <!--            <el-input v-model="dataForm.dateOfEstablishment" placeholder="成立日期"></el-input>-->
@@ -87,18 +195,33 @@
           v-model="dataForm_s.dateOfEstablishment"
           type="date"
           :disabled="doNot"
-          placeholder="创建时间">
+          placeholder="创建时间"
+        >
         </el-date-picker>
-
       </el-form-item>
       <el-form-item label="企业类型" prop="companyType">
-        <el-input v-model="dataForm_s.companyType" placeholder="企业类型" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.companyType"
+          placeholder="企业类型"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="营业期限" prop="businessDeadline">
-        <el-input v-model="dataForm_s.businessDeadline" placeholder="营业期限" :disabled="doNot"></el-input>
+        <el-date-picker
+          style="width: 100%"
+          value-format="yyyy-MM-dd"
+          v-model="dataForm_s.businessDeadline"
+          type="date"
+          :disabled="doNot"
+          placeholder="营业期限"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="营业区域" prop="businessArea">
-        <el-input v-model="dataForm_s.businessArea" placeholder="营业区域" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.businessArea"
+          placeholder="营业区域"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="审核年检日期" prop="annualDate">
         <!--            <el-input v-model="dataForm.annualDate" placeholder="审核年检日期"></el-input>-->
@@ -108,103 +231,116 @@
           v-model="dataForm_s.annualDate"
           type="date"
           :disabled="doNot"
-          placeholder="创建时间">
+          placeholder="创建时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="注册地址" prop="registerdAddress">
-        <el-input v-model="dataForm_s.registerdAddress" placeholder="注册地址" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.registerdAddress"
+          placeholder="注册地址"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
       <el-form-item label="经营范围" prop="manageScope">
-        <el-input v-model="dataForm_s.manageScope" placeholder="经营范围" :disabled="doNot"></el-input>
+        <el-input
+          v-model="dataForm_s.manageScope"
+          placeholder="经营范围"
+          :disabled="doNot"
+        ></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button type="info" @click="handleUpdata" v-if="hide">修改</el-button>
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" :disabled="doNot">确定</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" :disabled="doNot"
+        >确定</el-button
+      >
     </span>
   </el-dialog>
 </template>
 
 <script>
-import {preservation,lookOver} from "@/api/fleet/companyMsg"
-import Vue from 'vue'
-Vue.directive('dialogDrag', {
+import { preservation, lookOver } from "@/api/fleet/companyMsg";
+import Vue from "vue";
+Vue.directive("dialogDrag", {
   bind(el, binding, vnode, oldVnode) {
-    const dialogHeaderEl = el.querySelector('.el-dialog__header')
-    const dragDom = el.querySelector('.el-dialog')
-    const enlarge = el.querySelector('.enlarge')
-    dialogHeaderEl.style.cursor = 'move'
+    const dialogHeaderEl = el.querySelector(".el-dialog__header");
+    const dragDom = el.querySelector(".el-dialog");
+    const enlarge = el.querySelector(".enlarge");
+    dialogHeaderEl.style.cursor = "move";
 
     // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
-    if(enlarge){
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+    if (enlarge) {
       enlarge.onclick = (e) => {
-        dragDom.style.top = '0px'
-        dragDom.style.left = '0px'
-      }
+        dragDom.style.top = "0px";
+        dragDom.style.left = "0px";
+      };
     }
     dialogHeaderEl.onmousedown = (e) => {
       // 鼠标按下,计算当前元素距离可视区的距离
-      const disX = e.clientX - dialogHeaderEl.offsetLeft
-      const disY = e.clientY - dialogHeaderEl.offsetTop
+      const disX = e.clientX - dialogHeaderEl.offsetLeft;
+      const disY = e.clientY - dialogHeaderEl.offsetTop;
 
       // 获取到的值带px 正则匹配替换
-      let styL, styT
+      let styL, styT;
 
       // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
-      if (sty.left.includes('%')) {
-        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100)
-        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100)
+      if (sty.left.includes("%")) {
+        styL =
+          +document.body.clientWidth * (+sty.left.replace(/\%/g, "") / 100);
+        styT =
+          +document.body.clientHeight * (+sty.top.replace(/\%/g, "") / 100);
       } else {
-        styL = +sty.left.replace(/\px/g, '')
-        styT = +sty.top.replace(/\px/g, '')
+        styL = +sty.left.replace(/\px/g, "");
+        styT = +sty.top.replace(/\px/g, "");
       }
 
-      document.onmousemove = function(e) {
+      document.onmousemove = function (e) {
         // 通过事件委托,计算移动的距离
-        const l = e.clientX - disX
-        const t = e.clientY - disY
+        const l = e.clientX - disX;
+        const t = e.clientY - disY;
 
         // 移动当前元素
 
-        if ((t + styT) >= 0){
-          dragDom.style.top = `${t + styT}px`
+        if (t + styT >= 0) {
+          dragDom.style.top = `${t + styT}px`;
         }
-        dragDom.style.left = `${l + styL}px`
+        dragDom.style.left = `${l + styL}px`;
         // 将此时的位置传出去
         // binding.value({x:e.pageX,y:e.pageY})
-      }
+      };
 
-      document.onmouseup = function(e) {
-        document.onmousemove = null
-        document.onmouseup = null
-      }
-    }
-  }
-})
+      document.onmouseup = function (e) {
+        document.onmousemove = null;
+        document.onmouseup = null;
+      };
+    };
+  },
+});
 
 export default {
   props: {
     dataForm: {
       type: Object,
       require: false,
-    }
+    },
   },
-  data () {
+  data() {
     return {
-      hide:false,
-      doNot:true,
-      dialogFull:false,
-      dataForm_s:{
-        annualDate:null,
-        bankAccount: null,
+      hide: false,
+      doNot: true,
+      dialogFull: false,
+      dataForm_s: {
+        annualDate: null,
+        fBankno: null,
         billStatus: null,
         businessArea: null,
         businessDeadline: null,
         carNum: null,
-        companyAddress:null,
-        companyName: null,
+        fAddr: null,
+        fName: null,
         companyType: null,
         creatTime: null,
         createBy: null,
@@ -213,19 +349,19 @@ export default {
         creditNum: null,
         dateOfEstablishment: null,
         delFlag: null,
-        email: null,
-        fax: null,
+        fEmail: null,
+        fFax: null,
         headOffice: null,
-        id: null,
+        fId: null,
         industryCommerceNum: null,
         insdustry: null,
         legalPerson: null,
-        linkMan: null,
-        linkPhone:null,
+        fManage: null,
+        fTel: null,
         loginAccount: null,
         manageScope: null,
         modificationTime: null,
-        openingBank: null,
+        fBankname: null,
         organizationNum: null,
         params: null,
         paymentDays: null,
@@ -240,146 +376,140 @@ export default {
       },
       visible: false,
       edit: true,
-      login: this.dataForm.id,
+      login: this.dataForm.fId,
       dataRule: {
-        companyName: [
-          {required: true, message: '请输入公司名称', trigger: 'blur'}
-        ],
-        companyAddress: [
-          {required: true, message: '请输入公司地址', trigger: 'blur'}
-        ],
+        fName: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
+        fAddr: [{ required: true, message: "请输入公司地址", trigger: "blur" }],
         loginAccount: [
-          {required: true, message: '请输入登录账号', trigger: 'blur'}
+          { required: true, message: "请输入登录账号", trigger: "blur" },
         ],
-        openingBank: [
-          {required: true, message: '请输入开户行', trigger: 'blur'}
+        fBankname: [
+          { required: true, message: "请输入开户行", trigger: "blur" },
         ],
-        bankAccount: [
-          {required: true, message: '请输入银行账号', trigger: 'blur'}
+        fBankno: [
+          { required: true, message: "请输入银行账号", trigger: "blur" },
         ],
         paymentDays: [
-          {required: true, message: '请输入账期天数', trigger: 'blur'}
+          { required: true, message: "请输入账期天数", trigger: "blur" },
         ],
-        linkPhone: [
-          {required: true, message: '请输入联系人电话', trigger: 'blur'}
-        ]
-      }
-    }
+        fTel: [
+          { required: true, message: "请输入联系人电话", trigger: "blur" },
+        ],
+      },
+    };
   },
   methods: {
-    full(){
-      this.dialogFull = !this.dialogFull
+    full() {
+      this.dialogFull = !this.dialogFull;
     },
-    handleUpdata(){
-      this.hide = true
-      this.doNot = false
+    handleUpdata() {
+      this.hide = true;
+      this.doNot = false;
     },
-    cancel(){
-      this.$confirm('确认关闭?')
-        .then(_ => {
-          this.visible = false
-          this.dataForm_s = {}
+    cancel() {
+      this.$confirm("确认关闭?")
+        .then((_) => {
+          this.visible = false;
+          this.dataForm_s = {};
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
     handleClose(done) {
-      this.$confirm('确认关闭?')
-        .then(_ => {
+      this.$confirm("确认关闭?")
+        .then((_) => {
           done();
-          this.visible = false
-          this.dataForm_s = {}
+          this.visible = false;
+          this.dataForm_s = {};
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
-    init () {
-      this.hide = true
-      this.visible = true
-        if (this.dataForm.id !== null){
-          lookOver(this.dataForm.id).then(data=>{
-            this.doNot = true
-            this.dataForm_s = data.data
-          })
-        }else{
-          this.dataForm_s = {
-            annualDate:null,
-            bankAccount: null,
-            billStatus: null,
-            businessArea: null,
-            businessDeadline: null,
-            carNum: null,
-            companyAddress:null,
-            companyName: null,
-            companyType: null,
-            creatTime: null,
-            createBy: null,
-            createTime: null,
-            creditLv: null,
-            creditNum: null,
-            dateOfEstablishment: null,
-            delFlag: null,
-            email: null,
-            fax: null,
-            headOffice: null,
-            id: null,
-            industryCommerceNum: null,
-            insdustry: null,
-            legalPerson: null,
-            linkMan: null,
-            linkPhone:null,
-            loginAccount: null,
-            manageScope: null,
-            modificationTime: null,
-            openingBank: null,
-            organizationNum: null,
-            params: null,
-            paymentDays: null,
-            registerOrganization: null,
-            registerdAddress: null,
-            registerdCapital: null,
-            remark: null,
-            searchValue: null,
-            taxpayerNum: null,
-            updateBy: null,
-            updateTime: null,
-          }
-          this.hide = false
-          this.doNot = false
-        }
+    init() {
+      this.hide = true;
+      this.visible = true;
+      if (this.dataForm.fId !== null) {
+        lookOver(this.dataForm.fId).then((data) => {
+          this.doNot = true;
+          this.dataForm_s = data.data;
+        });
+      } else {
+        this.dataForm_s = {
+          annualDate: null,
+          fBankno: null,
+          billStatus: null,
+          businessArea: null,
+          businessDeadline: null,
+          carNum: null,
+          fAddr: null,
+          fName: null,
+          companyType: null,
+          creatTime: null,
+          createBy: null,
+          createTime: null,
+          creditLv: null,
+          creditNum: null,
+          dateOfEstablishment: null,
+          delFlag: null,
+          fEmail: null,
+          fFax: null,
+          headOffice: null,
+          id: null,
+          industryCommerceNum: null,
+          insdustry: null,
+          legalPerson: null,
+          fManage: null,
+          fTel: null,
+          loginAccount: null,
+          manageScope: null,
+          modificationTime: null,
+          fBankname: null,
+          organizationNum: null,
+          params: null,
+          paymentDays: null,
+          registerOrganization: null,
+          registerdAddress: null,
+          registerdCapital: null,
+          remark: null,
+          searchValue: null,
+          taxpayerNum: null,
+          updateBy: null,
+          updateTime: null,
+        };
+        this.hide = false;
+        this.doNot = false;
+      }
     },
     // 表单提交
-    dataFormSubmit () {
-      this.$refs['dataForm_s'].validate((valid) => {
+    dataFormSubmit() {
+      this.$refs["dataForm_s"].validate((valid) => {
         if (valid) {
-          console.log(valid)
-          preservation(this.dataForm_s).then(data=>{
-            this.$message.success('操作成功')
-            this.closeDia()
-          })
+          console.log(valid);
+          preservation(this.dataForm_s).then((data) => {
+            this.$message.success("操作成功");
+            this.closeDia();
+          });
         }
-      })
-    }
-  },
-  handlePreview (file) {
+      });
+    },
+    closeDia() {
+      this.visible = false;
+      this.$emit("refreshDataList");
+      Object.assign(this.$data, this.$options.data.call(this));
+    },
   },
-  handleExceed (files, fileList) {
+  handlePreview(file) {},
+  handleExceed(files, fileList) {
     this.$message.warning(
-      `当前限制选择 3 个文件,本次选择了 ${
-        files.length
-      } 个文件,共选择了 ${files.length + fileList.length} 个文件`
-    )
+      `当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
+        files.length + fileList.length
+      } 个文件`
+    );
   },
-  closeDia () {
-    this.visible = false
-    this.$emit('refreshDataList')
-    Object.assign(this.$data, this.$options.data.call(this))
+  beforeRemove(file, fileList) {
+    return this.$confirm(`确定移除 ${file.name}?`);
   },
-  beforeRemove (file, fileList) {
-    return this.$confirm(`确定移除 ${file.name}?`)
-  }
-}
+};
 </script>
 <style scoped>
-
 .el-form-item {
   width: 49%;
   margin-bottom: 20px;
@@ -406,7 +536,7 @@ export default {
   justify-content: space-between;
 }
 .el-dialog__title {
-  color: rgba(0,0,0,.85);
+  color: rgba(0, 0, 0, 0.85);
   font-weight: 500;
   word-wrap: break-word;
 }

+ 31 - 33
src/views/basicdata/fleet/companyMsg.vue

@@ -2,13 +2,13 @@
   <div class="mod-companyMsg app-container">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-input v-model="dataForm.companyName" placeholder="公司名称" clearable></el-input>
+        <el-input v-model="dataForm.fName" placeholder="公司名称" clearable></el-input>
       </el-form-item>
       <el-form-item>
-        <el-input v-model="dataForm.linkMan" placeholder="联系人" clearable></el-input>
+        <el-input v-model="dataForm.fManage" placeholder="联系人" clearable></el-input>
       </el-form-item>
       <el-form-item>
-        <el-input v-model="dataForm.linkPhone" placeholder="联系电话" clearable></el-input>
+        <el-input v-model="dataForm.fTel" placeholder="联系电话" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="getDataList">搜索</el-button>
@@ -21,7 +21,6 @@
             icon="el-icon-plus"
             size="mini"
             @click="addOrUpdateHandle()"
-            v-hasPermi="['fleet:companyMsg:add']"
           >新增
           </el-button>
         </el-col>
@@ -72,7 +71,7 @@
       >
       </el-table-column>
       <el-table-column
-        prop="companyName"
+        prop="fName"
         header-align="center"
         align="center"
         width="120"
@@ -81,7 +80,7 @@
       >
       </el-table-column>
       <el-table-column
-        prop="companyAddress"
+        prop="fAddr"
         header-align="center"
         align="center"
         width="150"
@@ -90,7 +89,7 @@
       >
       </el-table-column>
       <el-table-column
-        prop="openingBank"
+        prop="fBankname"
         header-align="center"
         align="center"
         width="150"
@@ -98,7 +97,7 @@
       >
       </el-table-column>
       <el-table-column
-        prop="bankAccount"
+        prop="fBankno"
         header-align="center"
         align="center"
         width="150"
@@ -122,14 +121,14 @@
       >
       </el-table-column>
       <el-table-column
-        prop="linkMan"
+        prop="fManage"
         header-align="center"
         align="center"
         label="联系人"
       >
       </el-table-column>
       <el-table-column
-        prop="linkPhone"
+        prop="fTel"
         header-align="center"
         align="center"
         width="150"
@@ -137,17 +136,17 @@
       >
       </el-table-column>
       <el-table-column
-        prop="fax"
+        prop="fFax"
         header-align="center"
         align="center"
         label="传真"
       >
       </el-table-column>
       <el-table-column
-        prop="email"
+        prop="fEmail"
         header-align="center"
         align="center"
-        label="email"
+        label="Email"
       >
       </el-table-column>
       <el-table-column
@@ -170,16 +169,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="addOrUpdateHandle(scope.row,2)"
-            v-hasPermi="['fleet:companyMsg:edit']"
+            @click="addOrUpdateHandle(scope.row)"
           >查看
           </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="deleteHandle(scope.row.id)"
-            v-hasPermi="['fleet:companyMsg:remove']"
+            @click="deleteHandle(scope.row.fId)"
           >删除
           </el-button>
         </template>
@@ -215,9 +212,9 @@ export default {
   data() {
     return {
       dataForm: {
-        companyName: '',
-        linkMan: '',
-        linkPhone: '',
+        fName: '',
+        fManage: '',
+        fTel: '',
         current: 1,
         size: 10
       },
@@ -261,9 +258,9 @@ export default {
     },
     resetQuery() {
       this.dataForm = {
-        companyName: '',
-        linkMan: '',
-        linkPhone: ''
+        fName: '',
+        fManage: '',
+        fTel: ''
       }
     },
     // 每页数
@@ -282,24 +279,25 @@ export default {
       this.dataListSelections = val
     },
     // 新增 / 修改
-    addOrUpdateHandle(row, count) {
+    addOrUpdateHandle(row) {
       this.addOrUpdateVisible = true
+      console.log(row)
       if (row) {
         this.editModel = row
       } else {
         this.editModel = {
-          id: null,
-          companyName: null,
-          companyAddress: null,
-          openingBank: null,
-          bankAccount: null,
+          fId: null,
+          fName: null,
+          fAddr: null,
+          fBankname: null,
+          fBankno: null,
           creditLv: null,
           paymentDays: null,
           carNum: null,
-          linkMan: null,
-          linkPhone: null,
-          fax: null,
-          email: null,
+          fManage: null,
+          fTel: null,
+          fFax: null,
+          fEmail: null,
           headOffice: null,
           registerdCapital: null,
           legalPerson: null,

+ 372 - 272
src/views/basicdata/fleet/driverMsg-add-or-update.vue

@@ -4,332 +4,432 @@
     v-dialogDrag
     :fullscreen="dialogFull"
     :close-on-click-modal="false"
-    :visible.sync="visible" width="70%">
+    :visible.sync="visible"
+    width="70%"
+  >
     <template slot="title">
       <div class="avue-crud__dialog__header">
-            <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
-            {{!dataForm.id ? '新增' : this.hide ? '查看':'修改'}}
-            </span>
+        <span class="el-dialog__title">
+          <span
+            style="
+              display: inline-block;
+              width: 3px;
+              height: 20px;
+              margin-right: 5px;
+              float: left;
+              margin-top: 2px;
+            "
+          ></span>
+          {{ !dataForm.id ? "新增" : this.hide ? "查看" : "修改" }}
+        </span>
         <div class="avue-crud__dialog__menu enlarge" @click="full">
-          <i  style="cursor: pointer;display: block;width:12px;height:12px;border:1px solid #909399;border-top:3px solid #909399;margin-top: -3px;"></i>
+          <i
+            style="
+              cursor: pointer;
+              display: block;
+              width: 12px;
+              height: 12px;
+              border: 1px solid #909399;
+              border-top: 3px solid #909399;
+              margin-top: -3px;
+            "
+          ></i>
         </div>
       </div>
     </template>
 
-    <el-form :model="dataFormD" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="200px">
-      <el-form-item label="驾驶员所属公司" prop="fleetCompanyId">
-        <el-select v-model="dataFormD.fleetCompanyId" :disabled="doNot" placeholder="请选择">
+    <el-form
+      :model="dataFormD"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmit()"
+      label-width="200px"
+    >
+      <el-form-item label="驾驶员所属公司" prop="fPid">
+        <el-select
+          v-model="dataFormD.fPid"
+          :disabled="doNot"
+          placeholder="请选择"
+        >
           <el-option
             v-for="item in optionsProjectTypeItem"
-            :key="item.id"
-            :label="item.companyName"
-            :value="item.id">
+            :key="item.fId"
+            :label="item.fName"
+            :value="item.fId"
+          >
           </el-option>
         </el-select>
       </el-form-item>
-          <el-form-item label="驾驶员姓名" prop="name">
-            <el-input v-model="dataFormD.name" :disabled="doNot" placeholder="驾驶员姓名"></el-input>
-          </el-form-item>
-          <el-form-item label="性别" prop="sex">
-<!--            <el-input v-model="dataForm.sex" placeholder="性别(0男/1女)"></el-input>-->
-            <el-radio-group style="margin-left: 20px;" :disabled="doNot" v-model="dataFormD.sex">
-              <el-radio :label="0">男</el-radio>
-              <el-radio :label="1">女</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="出生日期" prop="birthday">
-<!--            <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>-->
-            <el-date-picker
-              style="width: 100%"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              v-model="dataFormD.birthday"
-              type="date"
-              :disabled="doNot"
-              placeholder="出生日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="准驾车型" prop="allowDriverCar">
-            <el-input v-model="dataFormD.allowDriverCar" :disabled="doNot" placeholder="准驾车型"></el-input>
-          </el-form-item>
-          <el-form-item label="初次领证日期" prop="firstCertificateDate">
-<!--            <el-input v-model="dataForm.firstCertificateDate" placeholder="初次领证日期"></el-input>-->
-            <el-date-picker
-              style="width: 100%"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              v-model="dataFormD.firstCertificateDate"
-              type="date"
-              :disabled="doNot"
-              placeholder="初次领证日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="身份证号" prop="idcarNum">
-            <el-input v-model="dataFormD.idcarNum" :disabled="doNot" placeholder="身份证号"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" prop="tel">
-            <el-input v-model="dataFormD.tel" :disabled="doNot" placeholder="联系电话"></el-input>
-          </el-form-item>
-          <el-form-item label="家庭住址" prop="address">
-            <el-input v-model="dataFormD.address" :disabled="doNot" placeholder="家庭住址"></el-input>
-          </el-form-item>
-      <br>
-          <el-form-item label="个人照片" prop="resumePic">
-            <el-upload
-              style="width: 300px"
-              :action="uploadImgUrl"
-              :before-remove="beforeRemove"
-              :on-remove="(res,file)=>{handleRemove(2,res,file)}"
-              :on-success="(res,file)=>{handleSuccess(1,res,file)}"
-              multiple
-              :disabled="doNot"
-              :limit="1"
-              :headers="headers"
-              :on-exceed="handleExceed">
-              <el-button size="small" type="primary" :disabled="doNot">点击上传</el-button>
-              <el-button size="small" type="primary" :disabled="doNot" v-if="dataFormD.resumePic" @click="preview(1)">预览</el-button>
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="驾驶证照片" prop="drivingPic">
-            <el-upload
-              style="width: 300px"
-              :action="uploadImgUrl"
-              :before-remove="beforeRemove"
-              :on-remove="(res,file)=>{handleRemove(2,res,file)}"
-              :on-success="(res,file)=>{handleSuccess(2,res,file)}"
-              multiple
-              :disabled="doNot"
-              :limit="1"
-              :headers="headers"
-              :on-exceed="handleExceed">
-              <el-button size="small" :disabled="doNot" type="primary">点击上传</el-button>
-              <el-button size="small" :disabled="doNot" type="primary" v-if="dataFormD.drivingPic" @click="preview(2)">预览</el-button>
-            </el-upload>
-          </el-form-item>
+      <el-form-item label="驾驶员姓名" prop="fName">
+        <el-input
+          v-model="dataFormD.fName"
+          :disabled="doNot"
+          placeholder="驾驶员姓名"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="fFax">
+        <!--            <el-input v-model="dataForm.fFax" placeholder="性别(0男/1女)"></el-input>-->
+        <el-radio-group
+          style="margin-left: 20px"
+          :disabled="doNot"
+          v-model="dataFormD.fFax"
+        >
+          <el-radio :label="0">男</el-radio>
+          <el-radio :label="1">女</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="fContractb">
+        <!--            <el-input v-model="dataForm.fContractb" placeholder="出生日期"></el-input>-->
+        <el-date-picker
+          style="width: 100%"
+          value-format="yyyy-MM-dd"
+          v-model="dataFormD.fContractb"
+          type="date"
+          :disabled="doNot"
+          placeholder="出生日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="准驾车型" prop="fEaddr">
+        <el-input
+          v-model="dataFormD.fEaddr"
+          :disabled="doNot"
+          placeholder="准驾车型"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="初次领证日期" prop="fContracte">
+        <!--            <el-input v-model="dataForm.fContracte" placeholder="初次领证日期"></el-input>-->
+        <el-date-picker
+          style="width: 100%"
+          value-format="yyyy-MM-dd"
+          v-model="dataFormD.fContracte"
+          type="date"
+          :disabled="doNot"
+          placeholder="初次领证日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="身份证号" prop="fScale">
+        <el-input
+          v-model="dataFormD.fScale"
+          :disabled="doNot"
+          placeholder="身份证号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="fTel">
+        <el-input
+          v-model="dataFormD.fTel"
+          :disabled="doNot"
+          placeholder="联系电话"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="家庭住址" prop="fAddr">
+        <el-input
+          v-model="dataFormD.fAddr"
+          :disabled="doNot"
+          placeholder="家庭住址"
+        ></el-input>
+      </el-form-item>
+      <br />
+      <el-form-item label="个人照片" prop="registerdAddress">
+        <el-upload
+          style="width: 300px"
+          :action="uploadImgUrl"
+          :before-remove="beforeRemove"
+          :on-remove="
+            (res, file) => {
+              handleRemove(2, res, file);
+            }
+          "
+          :on-success="
+            (res, file) => {
+              handleSuccess(1, res, file);
+            }
+          "
+          multiple
+          :disabled="doNot"
+          :limit="1"
+          :headers="headers"
+          :on-exceed="handleExceed"
+        >
+          <el-button size="small" type="primary" :disabled="doNot"
+            >点击上传</el-button
+          >
+          <el-button
+            size="small"
+            type="primary"
+            :disabled="doNot"
+            v-if="dataFormD.registerdAddress"
+            @click="preview(1)"
+            >预览</el-button
+          >
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="驾驶证照片" prop="manageScope">
+        <el-upload
+          style="width: 300px"
+          :action="uploadImgUrl"
+          :before-remove="beforeRemove"
+          :on-remove="
+            (res, file) => {
+              handleRemove(2, res, file);
+            }
+          "
+          :on-success="
+            (res, file) => {
+              handleSuccess(2, res, file);
+            }
+          "
+          multiple
+          :disabled="doNot"
+          :limit="1"
+          :headers="headers"
+          :on-exceed="handleExceed"
+        >
+          <el-button size="small" :disabled="doNot" type="primary"
+            >点击上传</el-button
+          >
+          <el-button
+            size="small"
+            :disabled="doNot"
+            type="primary"
+            v-if="dataFormD.manageScope"
+            @click="preview(2)"
+            >预览</el-button
+          >
+        </el-upload>
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button type="info" @click="handleUpdata" v-if="hide">修改</el-button>
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" :disabled="doNot" @click="dataFormSubmit()">确定</el-button>
+      <el-button type="primary" :disabled="doNot" @click="dataFormSubmit()"
+        >确定</el-button
+      >
     </span>
   </el-dialog>
 </template>
 
 <script>
-import { company, lookOver, preservation } from '@/api/fleet/driverMsg'
-import { getToken } from '@/utils/auth'
-import Vue from 'vue'
-Vue.directive('dialogDrag', {
+import { company, lookOver, preservation } from "@/api/fleet/driverMsg";
+import { getToken } from "@/utils/auth";
+import Vue from "vue";
+Vue.directive("dialogDrag", {
   bind(el, binding, vnode, oldVnode) {
-    const dialogHeaderEl = el.querySelector('.el-dialog__header')
-    const dragDom = el.querySelector('.el-dialog')
-    const enlarge = el.querySelector('.enlarge')
-    dialogHeaderEl.style.cursor = 'move'
+    const dialogHeaderEl = el.querySelector(".el-dialog__header");
+    const dragDom = el.querySelector(".el-dialog");
+    const enlarge = el.querySelector(".enlarge");
+    dialogHeaderEl.style.cursor = "move";
 
     // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
-    if(enlarge){
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+    if (enlarge) {
       enlarge.onclick = (e) => {
-        dragDom.style.top = '0px'
-        dragDom.style.left = '0px'
-      }
+        dragDom.style.top = "0px";
+        dragDom.style.left = "0px";
+      };
     }
     dialogHeaderEl.onmousedown = (e) => {
       // 鼠标按下,计算当前元素距离可视区的距离
-      const disX = e.clientX - dialogHeaderEl.offsetLeft
-      const disY = e.clientY - dialogHeaderEl.offsetTop
+      const disX = e.clientX - dialogHeaderEl.offsetLeft;
+      const disY = e.clientY - dialogHeaderEl.offsetTop;
 
       // 获取到的值带px 正则匹配替换
-      let styL, styT
+      let styL, styT;
 
       // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
-      if (sty.left.includes('%')) {
-        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100)
-        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100)
+      if (sty.left.includes("%")) {
+        styL =
+          +document.body.clientWidth * (+sty.left.replace(/\%/g, "") / 100);
+        styT =
+          +document.body.clientHeight * (+sty.top.replace(/\%/g, "") / 100);
       } else {
-        styL = +sty.left.replace(/\px/g, '')
-        styT = +sty.top.replace(/\px/g, '')
+        styL = +sty.left.replace(/\px/g, "");
+        styT = +sty.top.replace(/\px/g, "");
       }
 
-      document.onmousemove = function(e) {
+      document.onmousemove = function (e) {
         // 通过事件委托,计算移动的距离
-        const l = e.clientX - disX
-        const t = e.clientY - disY
+        const l = e.clientX - disX;
+        const t = e.clientY - disY;
 
         // 移动当前元素
 
-        if ((t + styT) >= 0){
-          dragDom.style.top = `${t + styT}px`
+        if (t + styT >= 0) {
+          dragDom.style.top = `${t + styT}px`;
         }
-        dragDom.style.left = `${l + styL}px`
+        dragDom.style.left = `${l + styL}px`;
         // 将此时的位置传出去
         // binding.value({x:e.pageX,y:e.pageY})
-      }
+      };
 
-      document.onmouseup = function(e) {
-        document.onmousemove = null
-        document.onmouseup = null
-      }
-    }
-  }
-})
-  export default {
-    props: {
-      dataForm: {
-        type: Object,
-        require: false
-      }
-    },
-    data () {
-      return {
-        dialogFull:false,
-        hide:false,
-        doNot:true,
-        visible: false,
-        dataFormD:{},
-        uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
-        headers: {
-          Authorization: 'Bearer ' + getToken()
-        },
-        dataRule: {
-          fleetCompanyId: [
-            {required: true, message: '请选择驾驶员所属公司id', trigger: 'blur'}
-          ],
-          name: [
-            {required: true, message: '请输入驾驶员姓名', trigger: 'blur'}
-          ],
-          idcarNum: [
-            {required: true, message: '请输入身份证号', trigger: 'blur'}
-          ],
-          tel: [
-            {required: true, message: '请输入联系电话', trigger: 'blur'}
-          ]
-        },
-        optionsProjectTypeItem: [],
-        fileList: [],
-        uploadHeaders: {
-          // localStorage.setItem('token', data.token)
-          token: localStorage.getItem('token')
-        },
-        uploadURL: 'http://test.echepei.com/api/admin/fleet/carManage/uplodaImgForDrivingLicense'
-      }
+      document.onmouseup = function (e) {
+        document.onmousemove = null;
+        document.onmouseup = null;
+      };
+    };
+  },
+});
+export default {
+  props: {
+    dataForm: {
+      type: Object,
+      require: false,
     },
-    methods: {
-      full(){
-        this.dialogFull = !this.dialogFull
+  },
+  data() {
+    return {
+      dialogFull: false,
+      hide: false,
+      doNot: true,
+      visible: false,
+      dataFormD: {},
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
       },
-      handleUpdata(){
-        this.hide = false
-        this.doNot = false
+      dataRule: {
+        fPid: [
+          {
+            required: true,
+            message: "请选择驾驶员所属公司id",
+            trigger: "blur",
+          },
+        ],
+        fName: [
+          { required: true, message: "请输入驾驶员姓名", trigger: "blur" },
+        ],
+        fScale: [
+          { required: true, message: "请输入身份证号", trigger: "blur" },
+        ],
+        fTel: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
       },
-      preview(actid){
-        if (actid === 1){
-          window.open(this.dataFormD.resumePic)
-        }else {
-          window.open(this.dataFormD.drivingPic)
-        }
-      },
-      handlePreview(file) {
-        this.$message.success('如需预览请点击预览');
-      },
-      handleExceed(files, fileList) {
-        this.$message.warning(`当前限制选择 1 个文件件`);
+      optionsProjectTypeItem: [],
+      fileList: [],
+      uploadHeaders: {
+        // localStorage.setItem('token', data.token)
+        token: localStorage.getItem("token"),
       },
-      beforeRemove(file, fileList) {
-        return this.$confirm(`确定移除 ${ file.name }?`);
-      },
-      init () {
-        this.hide = true
-        this.visible = true
-        this.needCondition()
-        console.log(this.dataForm)
-        if (this.dataForm.id) {
-          lookOver(this.dataForm.id).then(data => {
-            this.doNot = true
-            console.log(data)
-            this.dataFormD = data.data
-            this.fTmsorderbillsattachs = data.data.fTmsorderbillsattachs
-            this.optionsProjectTypeItem = data.data.fleetCompanyMsg
-            if (data.data.fleetCompanyMsg){
-              this.handleSelect()
-            }
-          })
-        }else {
-          this.dataFormD = {
-            fleetCompanyId:'',
-            name:'',
-            sex:'',
-            birthday:'',
-            allowDriverCar:'',
-            firstCertificateDate:'',
-            idcarNum:'',
-            tel:'',
-            address:'',
-            resumePic:'',
-            drivingPic:'',
+      uploadURL:
+        "http://test.echepei.com/api/admin/fleet/carManage/uplodaImgForDrivingLicense",
+    };
+  },
+  methods: {
+    full() {
+      this.dialogFull = !this.dialogFull;
+    },
+    handleUpdata() {
+      this.hide = false;
+      this.doNot = false;
+    },
+    preview(actid) {
+      if (actid === 1) {
+        window.open(this.dataFormD.registerdAddress);
+      } else {
+        window.open(this.dataFormD.manageScope);
+      }
+    },
+    handlePreview(file) {
+      this.$message.success("如需预览请点击预览");
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件件`);
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.fName}?`);
+    },
+    init() {
+      this.hide = true;
+      this.visible = true;
+      this.needCondition();
+      console.log(this.dataForm);
+      if (this.dataForm.id) {
+        lookOver(this.dataForm.id).then((data) => {
+          this.doNot = true;
+          this.dataFormD = data.data;
+          this.dataFormD.fFax=Number(data.data.fFax);
+          this.fTmsorderbillsattachs = data.data.fTmsorderbillsattachs;
+          this.optionsProjectTypeItem = data.data.fleetCompanyMsg;
+          if (data.data.fleetCompanyMsg) {
+            this.handleSelect();
           }
-          this.hide = false
-          this.doNot = false
+        });
+      } else {
+        this.dataFormD = {
+          fPid: "",
+          fName: "",
+          fFax: "",
+          fContractb: "",
+          fEaddr: "",
+          fContracte: "",
+          fScale: "",
+          fTel: "",
+          fAddr: "",
+          registerdAddress: "",
+          manageScope: "",
+        };
+        this.hide = false;
+        this.doNot = false;
+      }
+    },
+    // 获取下拉选项
+    needCondition() {
+      company().then((data) => {
+        console.log(data);
+        if (data && data.code === 200) {
+          this.optionsProjectTypeItem = data.rows;
+        } else {
+          this.$message.error(data.msg);
         }
-      },
-      // 获取下拉选项
-      needCondition () {
-        company().then(data => {
-          console.log(data)
+      });
+    },
+    // 图片上传回调
+    handleSuccess(response, res, file) {
+      console.log(response);
+      if (response === 2) {
+        console.log("22222");
+        this.dataFormD.manageScope = res.url;
+        console.log(this.dataFormD.manageScope);
+      } else {
+        console.log("11111");
+        this.dataFormD.registerdAddress = res.url;
+      }
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(actid, file, fileList) {
+      if (actid === 1) {
+        this.dataForm.registerdAddress = "";
+      } else {
+        this.dataForm.manageScope = "";
+      }
+    },
+    // 表单提交
+    dataFormSubmit() {
+      console.log(this.dataFormD);
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          preservation(this.dataFormD).then((data) => {
             if (data && data.code === 200) {
-              this.optionsProjectTypeItem = data.rows
+              this.$message({
+                message: "操作成功",
+                type: "success",
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false;
+                  this.$emit("refreshDataList");
+                },
+              });
             } else {
-              this.$message.error(data.msg)
+              this.$message.error(data.msg);
             }
-        })
-      },
-      // 图片上传回调
-      handleSuccess (response,res,file) {
-        console.log(response)
-        if (response === 2){
-          console.log("22222")
-          this.dataFormD.drivingPic = res.url
-          console.log(this.dataFormD.drivingPic)
-        }else {
-          console.log("11111")
-          this.dataFormD.resumePic = res.url
-        }
-      },
-      // 文件列表移除文件时的钩子
-      handleRemove (actid,file, fileList) {
-        if (actid === 1){
-          this.dataForm.resumePic = ''
-        }else {
-          this.dataForm.drivingPic = ''
+          });
         }
-      },
-      // 表单提交
-      dataFormSubmit () {
-        console.log(this.dataFormD)
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            preservation(this.dataFormD).then(data=>{
-              if (data && data.code === 200) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
+      });
+    },
+  },
+};
 </script>
 <style scoped>
-
 .el-form-item {
   width: 49%;
   margin-bottom: 20px;
@@ -353,7 +453,7 @@ Vue.directive('dialogDrag', {
   justify-content: space-between;
 }
 .el-dialog__title {
-  color: rgba(0,0,0,.85);
+  color: rgba(0, 0, 0, 0.85);
   font-weight: 500;
   word-wrap: break-word;
 }

+ 24 - 27
src/views/basicdata/fleet/driverMsg.vue

@@ -7,12 +7,11 @@
         <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-input v-model="dataForm.fTel" 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>
@@ -45,7 +44,7 @@
         label="驾驶员姓名">
       </el-table-column>
       <el-table-column
-        prop="sex"
+        prop="fFax"
         header-align="center"
         align="center"
         width="150"
@@ -53,7 +52,7 @@
         label="性别">
       </el-table-column>
       <el-table-column
-        prop="birthday"
+        prop="fContractb"
         header-align="center"
         align="center"
         :show-overflow-tooltip="true"
@@ -62,13 +61,13 @@
         label="出生日期">
       </el-table-column>
       <el-table-column
-        prop="allowDriverCar"
+        prop="fEaddr"
         header-align="center"
         align="center"
         label="准驾车型">
       </el-table-column>
       <el-table-column
-        prop="firstCertificateDate"
+        prop="fContracte"
         header-align="center"
         align="center"
         :show-overflow-tooltip="true"
@@ -77,7 +76,7 @@
         label="初次领证日期">
       </el-table-column>
       <el-table-column
-        prop="idcarNum"
+        prop="fScale"
         header-align="center"
         align="center"
         :show-overflow-tooltip="true"
@@ -85,14 +84,14 @@
         label="身份证号">
       </el-table-column>
       <el-table-column
-        prop="tel"
+        prop="fTel"
         header-align="center"
         align="center"
         width="150"
         label="联系电话">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="fAddr"
         header-align="center"
         align="center"
         :show-overflow-tooltip="true"
@@ -104,17 +103,17 @@
         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"/>
+              <img v-if="scope.row.registerdAddress? 'true':''" :src="scope.row.registerdAddress" width="80" height="60" class="head_pic"/>
             </template>
       </el-table-column>
       <el-table-column
-        prop="drivingPic"
+        prop="manageScope"
         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"/>
+              <img v-if="scope.row.manageScope? 'true':''" :src="scope.row.manageScope" width="80" height="60" class="head_pic"/>
             </template>
       </el-table-column>
       <el-table-column
@@ -146,12 +145,10 @@
             type="text"
             icon="el-icon-edit"
             @click="addOrUpdateHandle(scope.row)"
-            v-hasPermi="['fleet:driverMsg:edit']"
           >查看
           </el-button>
             <el-button
               type="text"
-              v-hasPermi="['fleet:driverMsg:delete']"
               icon="el-icon-delete"
               size="mini"
               circle @click="deleteHandle(scope.row.id)">删除</el-button>
@@ -181,7 +178,7 @@ import {listFtmsorderbills} from '@/api/fleet/driverMsg'
       return {
         dataForm: {
           name: null,
-          tel: null,
+          fTel: null,
           pageNum: 1,
           pageSize: 10
         },
@@ -203,7 +200,7 @@ import {listFtmsorderbills} from '@/api/fleet/driverMsg'
       timestampToTime (row, column) {
         const daterc = row[column.property]
         if (daterc != null) {
-          const date = new Date(row.birthday)
+          const date = new Date(row.fContractb)
           const Y = date.getFullYear() + '-'
           const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
           const D = date.getDate() + ' '
@@ -213,7 +210,7 @@ import {listFtmsorderbills} from '@/api/fleet/driverMsg'
       dateFormat (row, column, cellValue, index) {
         const daterc = row[column.property]
         if (daterc != null) {
-          const dateMat = new Date(row.firstCertificateDate)
+          const dateMat = new Date(row.fContracte)
           const year = dateMat.getFullYear()
           const month = dateMat.getMonth() + 1
           const day = dateMat.getDate()
@@ -262,15 +259,15 @@ import {listFtmsorderbills} from '@/api/fleet/driverMsg'
             id: null,
             fleetCompanyId: null,
             name: null,
-            sex: null,
-            birthday: null,
-            allowDriverCar: null,
-            firstCertificateDate: null,
-            idcarNum: null,
-            tel: null,
-            address: null,
-            resumePic: null,
-            drivingPic: null,
+            fFax: null,
+            fContractb: null,
+            fEaddr: null,
+            fContracte: null,
+            fScale: null,
+            fTel: null,
+            fAddr: null,
+            registerdAddress: null,
+            manageScope: null,
             creatTime: null,
             modificationTime: null,
             updateType: null
@@ -311,7 +308,7 @@ import {listFtmsorderbills} from '@/api/fleet/driverMsg'
         }).catch(() => {})
       },
       formatSex: function (row, column) {
-        return row.sex === 0 ? '男' : row.sex === 1 ? '女' : '未知'
+        return row.fFax == 0 ? '男' : row.fFax == 1 ? '女' : '未知'
       }
     }
   }

+ 4 - 5
src/views/fleet/scheduling/AddOrUpdate.vue

@@ -653,9 +653,9 @@
                     >
                       <el-option
                         v-for="(dict, index) in companyList"
-                        :key="index.id"
-                        :label="dict.companyName"
-                        :value="dict.id"
+                        :key="index.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
                       />
                     </el-select>
                   </template>
@@ -1478,8 +1478,7 @@ export default {
       this.fWbuOptions = response.rows;
     });
     company({
-      delFlag: "0",
-      billStatus: 6,
+      fStatus:1
     }).then((response) => {
       this.companyList = response.rows;
     });

+ 9 - 6
src/views/fleet/sendcar/AddOrUpdate.vue

@@ -491,9 +491,9 @@
                     >
                       <el-option
                         v-for="(dict, index) in companyList"
-                        :key="index.id"
-                        :label="dict.companyName"
-                        :value="dict.id"
+                        :key="index.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
                       />
                     </el-select>
                   </template>
@@ -755,7 +755,9 @@
                       @click.native.prevent="
                         revokescarsRow(scope.$index, vehicleList, scope.row)
                       "
-                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
+                      :disabled="
+                        scope.row.billStatus < 6 || !scope.row.billStatus
+                      "
                       >撤销</el-button
                     >
                     <el-button
@@ -763,7 +765,9 @@
                       type="text"
                       icon="el-icon-document-delete"
                       @click.native.prevent="changescarsRow(scope.row)"
-                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
+                      :disabled="
+                        scope.row.billStatus < 6 || !scope.row.billStatus
+                      "
                       >变更</el-button
                     >
                   </template>
@@ -1758,7 +1762,6 @@ export default {
       //   this.$emit("fixDisabled", "false");
       //   this.msgSuccess("允许修改");
       // }
-
       // const id = this.form.id;
       // allowChangesFtmsorderbills(id).then((response) => {
       //   if (response == false) {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است