Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/fleet/carManage.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询订单主列表
+export function listFtmsorderbills(query) {
+  return request({
+    url: '/fleet/carManage/query',
+    method: 'get',
+    params: query
+  })
+}

src/api/fleet/companyMsg.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+// 查询订单主列表
+export function listFtmsorderbills(query) {
+  return request({
+    url: '/fleet/companyMsg/query',
+    method: 'get',
+    params: query
+  })
+}
+// 查询详情
+export function lookOver(fId) {
+  return request({
+    url: '/fleet/companyMsg/' + fId,
+    method: 'get'
+  })
+}
+// 新增
+export function preservation(data) {
+  return request({
+    url: '/fleet/companyMsg/add',
+    method: 'post',
+    data: data
+  })
+}
+// 删除
+export function deleted(fId) {
+  return request({
+    url: '/fleet/companyMsg/' + fId,
+    method: 'delete'
+  })
+}
+

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

@@ -3,7 +3,7 @@
   <el-dialog
     :title="!dataForm.id ? '车辆注册' : '修改'"
     :close-on-click-modal="false"
-    :visible.sync="visible" width="70%">
+    :visible.sync="visible" width="80%">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="125px">
           <el-form-item label="车队名称" prop="fleetCompanyId" style="width: 325px">
 <!--            <el-input v-model="dataForm.fleetCompanyId" placeholder="车队id"></el-input>-->

src/views/basicdata/fleet/carManage.vue

@@ -280,9 +280,9 @@
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
-      :current-page="dataForm.current"
+      :current-page="dataForm.pageNum"
       :page-sizes="[10, 20, 50, 100]"
-      :page-size="dataForm.size"
+      :page-size="dataForm.pageSize"
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
@@ -293,13 +293,14 @@
 </template>
 
 <script>
+import {listFtmsorderbills} from "@/api/fleet/carManage"
   import AddOrUpdate from './carManage-add-or-update'
   export default {
     data () {
       return {
         dataForm: {
-          current: 1,
-          size: 10
+          pageNum: 1,
+          pageSize: 10
         },
         editModel: {},
         dataList: [],
@@ -319,30 +320,29 @@
       // 获取数据列表
       getDataList () {
         this.dataListLoading = false
-        // this.$http({
-        //   url: this.$http.adornUrl('/fleet/carManage/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
-        // })
+        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.pageSize = val
+        this.dataForm.pageSize = val
+        console.log(val)
         this.pageIndex = 1
         this.getDataList()
       },
       // 当前页
       currentChangeHandle (val) {
-        this.dataForm.current = val
+        console.log(val)
+        this.dataForm.pageNum = val
         this.getDataList()
       },
       // 多选

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

@@ -1,227 +1,276 @@
-
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '车队注册' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible" width="70%">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="200px">
-          <el-form-item label="公司名称" prop="companyName">
-            <el-input v-model="dataForm.companyName" placeholder="公司名称"></el-input>
-          </el-form-item>
-          <el-form-item label="公司地址" prop="companyAddress">
-            <el-input v-model="dataForm.companyAddress" placeholder="公司地址"></el-input>
-          </el-form-item>
-          <el-form-item label="公司开户行" prop="openingBank">
-            <el-input v-model="dataForm.openingBank" placeholder="公司开户行"></el-input>
-          </el-form-item>
-          <el-form-item label="银行账号" prop="bankAccount">
-            <el-input v-model="dataForm.bankAccount" placeholder="银行账号"></el-input>
-          </el-form-item>
-          <el-form-item label="登录账号" prop="loginAccount">
-            <el-input v-model="dataForm.loginAccount" :disabled="dataForm.id ? edit:false" placeholder="登录账号"></el-input>
-          </el-form-item>
-          <el-form-item label="登录密码" prop="pwd" v-if="dataForm.id ? false:true">
-            <el-input v-model="dataForm.pwd" placeholder="登录密码" type="password"></el-input>
-          </el-form-item>
-
-          <el-form-item label="信用等级" prop="creditLv">
-            <el-input v-model="dataForm.creditLv" placeholder="信用等级"></el-input>
-          </el-form-item>
-          <el-form-item label="账期天数(最迟结款天数)" prop="paymentDays">
-            <el-input v-model="dataForm.paymentDays" placeholder="账期天数(最迟结款天数)"></el-input>
-          </el-form-item>
-          <el-form-item label="联系人" prop="linkMan">
-            <el-input v-model="dataForm.linkMan" placeholder="联系人"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" prop="linkPhone">
-            <el-input v-model="dataForm.linkPhone" placeholder="联系电话"></el-input>
-          </el-form-item>
-          <el-form-item label="传真" prop="fax">
-            <el-input v-model="dataForm.fax" placeholder="传真"></el-input>
-          </el-form-item>
-          <el-form-item label="email" prop="email">
-            <el-input v-model="dataForm.email" placeholder="email"></el-input>
-          </el-form-item>
-          <el-form-item label="总公司" prop="headOffice">
-            <el-input v-model="dataForm.headOffice" placeholder="总公司"></el-input>
-          </el-form-item>
-          <el-form-item label="注册资本" prop="registerdCapital">
-            <el-input v-model="dataForm.registerdCapital" placeholder="注册资本"></el-input>
-          </el-form-item>
-          <el-form-item label="法人" prop="legalPerson">
-            <el-input v-model="dataForm.legalPerson" placeholder="法人"></el-input>
-          </el-form-item>
-          <el-form-item label="所属行业" prop="insdustry">
-            <el-input v-model="dataForm.insdustry" placeholder="所属行业"></el-input>
-          </el-form-item>
-          <el-form-item label="社会统一信用代码" prop="creditNum">
-            <el-input v-model="dataForm.creditNum" placeholder="社会统一信用代码"></el-input>
-          </el-form-item>
-          <el-form-item label="纳税人识别号" prop="taxpayerNum">
-            <el-input v-model="dataForm.taxpayerNum" placeholder="纳税人识别号"></el-input>
-          </el-form-item>
-          <el-form-item label="工商注册号" prop="industryCommerceNum">
-            <el-input v-model="dataForm.industryCommerceNum" placeholder="工商注册号"></el-input>
-          </el-form-item>
-          <el-form-item label="组织机构代码" prop="organizationNum">
-            <el-input v-model="dataForm.organizationNum" placeholder="组织机构代码"></el-input>
-          </el-form-item>
-          <el-form-item label="登记机关" prop="registerOrganization">
-            <el-input v-model="dataForm.registerOrganization" placeholder="登记机关"></el-input>
-          </el-form-item>
-          <el-form-item label="成立日期" prop="dateOfEstablishment">
-<!--            <el-input v-model="dataForm.dateOfEstablishment" placeholder="成立日期"></el-input>-->
-            <el-date-picker
-              style="width: 100%"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              v-model="dataForm.dateOfEstablishment"
-              type="date"
-              placeholder="创建时间">
-            </el-date-picker>
-
-          </el-form-item>
-          <el-form-item label="企业类型" prop="companyType">
-            <el-input v-model="dataForm.companyType" placeholder="企业类型"></el-input>
-          </el-form-item>
-          <el-form-item label="营业期限" prop="businessDeadline">
-            <el-input v-model="dataForm.businessDeadline" placeholder="营业期限"></el-input>
-          </el-form-item>
-          <el-form-item label="营业区域" prop="businessArea">
-            <el-input v-model="dataForm.businessArea" placeholder="营业区域"></el-input>
-          </el-form-item>
-          <el-form-item label="审核年检日期" prop="annualDate">
-<!--            <el-input v-model="dataForm.annualDate" placeholder="审核年检日期"></el-input>-->
-            <el-date-picker
-              style="width: 100%"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              v-model="dataForm.annualDate"
-              type="date"
-              placeholder="创建时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="注册地址" prop="registerdAddress">
-            <el-input v-model="dataForm.registerdAddress" placeholder="注册地址"></el-input>
-          </el-form-item>
-          <el-form-item label="经营范围" prop="manageScope">
-            <el-input v-model="dataForm.manageScope" placeholder="经营范围"></el-input>
-          </el-form-item>
-
-          <el-form-item label="登录密码确认" prop="pwd2" v-if="dataForm.id ? false:true">
-            <el-input v-model="dataForm.pwd2" placeholder="登录密码确认" type="password"></el-input>
-          </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    props: {
-      dataForm: {
-        type: Object,
-        require: false
-      }
-    },
-    data () {
-      return {
-        visible: false,
-        edit: true,
-        login: this.dataForm.id,
-        dataRule: {
-          companyName: [
-            {required: true, message: '请输入公司名称', trigger: 'blur'}
-          ],
-          companyAddress: [
-            {required: true, message: '请输入公司地址', trigger: 'blur'}
-          ],
-          loginAccount: [
-            {required: true, message: '请输入登录账号', trigger: 'blur'}
-          ],
-          pwd: [
-            {required: true, message: '请输入登录密码', trigger: 'blur'}
-          ],
-          openingBank: [
-            {required: true, message: '请输入开户行', trigger: 'blur'}
-          ],
-          bankAccount: [
-            {required: true, message: '请输入银行账号', trigger: 'blur'}
-          ],
-          paymentDays: [
-            {required: true, message: '请输入账期天数', trigger: 'blur'}
-          ],
-          pwd2: [
-            {required: true, message: '请输入登录密码', trigger: 'blur'}
-          ],
-          linkPhone: [
-            {required: true, message: '请输入联系人电话', trigger: 'blur'}
-          ]
-        }
-      }
-    },
-    methods: {
-      init () {
-        this.visible = true
-      },
-      // 表单提交
-      dataFormSubmit () {
-        // eslint-disable-next-line eqeqeq
-        if (this.dataForm.pwd != this.dataForm.pwd2) {
-          this.$message.error('前后输入密码不一致!')
-          return
-        }
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/fleet/companyMsg/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData(this.dataForm)
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
-      }
-    },
-    handlePreview (file) {
-    },
-    handleExceed (files, fileList) {
-      this.$message.warning(
-        `当前限制选择 3 个文件，本次选择了 ${
-          files.length
-        } 个文件，共选择了 ${files.length + fileList.length} 个文件`
-      )
-    },
-    beforeRemove (file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`)
-    }
-  }
-</script>
-<style scoped>
-
-.el-form-item {
-  width: 49%;
-  margin-bottom: 20px;
-  display: inline-block;
-}
-.el-select {
-  display: block;
-}
-.upload-demo {
-  margin-left: 50px;
-}
-</style>
+
+<template>
+  <el-dialog
+    :title="!dataForm.id ? '车队注册' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible" width="70%" :before-close="handleClose">
+    <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="公司名称"></el-input>
+      </el-form-item>
+      <el-form-item label="公司地址" prop="companyAddress">
+        <el-input v-model="dataForm_s.companyAddress" placeholder="公司地址"></el-input>
+      </el-form-item>
+      <el-form-item label="公司开户行" prop="openingBank">
+        <el-input v-model="dataForm_s.openingBank" placeholder="公司开户行"></el-input>
+      </el-form-item>
+      <el-form-item label="银行账号" prop="bankAccount">
+        <el-input v-model="dataForm_s.bankAccount" placeholder="银行账号"></el-input>
+      </el-form-item>
+      <el-form-item label="登录账号" prop="loginAccount">
+        <el-input v-model="dataForm_s.loginAccount" :disabled="dataForm.id ? edit:false" placeholder="登录账号"></el-input>
+      </el-form-item>
+      <el-form-item label="登录密码" prop="pwd" v-if="dataForm_s.id ? false:true">
+        <el-input v-model="dataForm_s.pwd" placeholder="登录密码" type="password"></el-input>
+      </el-form-item>
+
+      <el-form-item label="信用等级" prop="creditLv">
+        <el-input v-model="dataForm_s.creditLv" placeholder="信用等级"></el-input>
+      </el-form-item>
+      <el-form-item label="账期天数(最迟结款天数)" prop="paymentDays">
+        <el-input v-model="dataForm_s.paymentDays" placeholder="账期天数(最迟结款天数)"></el-input>
+      </el-form-item>
+      <el-form-item label="联系人" prop="linkMan">
+        <el-input v-model="dataForm_s.linkMan" placeholder="联系人"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="linkPhone">
+        <el-input v-model="dataForm_s.linkPhone" placeholder="联系电话"></el-input>
+      </el-form-item>
+      <el-form-item label="传真" prop="fax">
+        <el-input v-model="dataForm_s.fax" placeholder="传真"></el-input>
+      </el-form-item>
+      <el-form-item label="email" prop="email">
+        <el-input v-model="dataForm_s.email" placeholder="email"></el-input>
+      </el-form-item>
+      <el-form-item label="总公司" prop="headOffice">
+        <el-input v-model="dataForm_s.headOffice" placeholder="总公司"></el-input>
+      </el-form-item>
+      <el-form-item label="注册资本" prop="registerdCapital">
+        <el-input v-model="dataForm_s.registerdCapital" placeholder="注册资本"></el-input>
+      </el-form-item>
+      <el-form-item label="法人" prop="legalPerson">
+        <el-input v-model="dataForm_s.legalPerson" placeholder="法人"></el-input>
+      </el-form-item>
+      <el-form-item label="所属行业" prop="insdustry">
+        <el-input v-model="dataForm_s.insdustry" placeholder="所属行业"></el-input>
+      </el-form-item>
+      <el-form-item label="社会统一信用代码" prop="creditNum">
+        <el-input v-model="dataForm_s.creditNum" placeholder="社会统一信用代码"></el-input>
+      </el-form-item>
+      <el-form-item label="纳税人识别号" prop="taxpayerNum">
+        <el-input v-model="dataForm_s.taxpayerNum" placeholder="纳税人识别号"></el-input>
+      </el-form-item>
+      <el-form-item label="工商注册号" prop="industryCommerceNum">
+        <el-input v-model="dataForm_s.industryCommerceNum" placeholder="工商注册号"></el-input>
+      </el-form-item>
+      <el-form-item label="组织机构代码" prop="organizationNum">
+        <el-input v-model="dataForm_s.organizationNum" placeholder="组织机构代码"></el-input>
+      </el-form-item>
+      <el-form-item label="登记机关" prop="registerOrganization">
+        <el-input v-model="dataForm_s.registerOrganization" placeholder="登记机关"></el-input>
+      </el-form-item>
+      <el-form-item label="成立日期" prop="dateOfEstablishment">
+        <!--            <el-input v-model="dataForm.dateOfEstablishment" placeholder="成立日期"></el-input>-->
+        <el-date-picker
+          style="width: 100%"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="dataForm_s.dateOfEstablishment"
+          type="date"
+          placeholder="创建时间">
+        </el-date-picker>
+
+      </el-form-item>
+      <el-form-item label="企业类型" prop="companyType">
+        <el-input v-model="dataForm_s.companyType" placeholder="企业类型"></el-input>
+      </el-form-item>
+      <el-form-item label="营业期限" prop="businessDeadline">
+        <el-input v-model="dataForm_s.businessDeadline" placeholder="营业期限"></el-input>
+      </el-form-item>
+      <el-form-item label="营业区域" prop="businessArea">
+        <el-input v-model="dataForm_s.businessArea" placeholder="营业区域"></el-input>
+      </el-form-item>
+      <el-form-item label="审核年检日期" prop="annualDate">
+        <!--            <el-input v-model="dataForm.annualDate" placeholder="审核年检日期"></el-input>-->
+        <el-date-picker
+          style="width: 100%"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="dataForm_s.annualDate"
+          type="date"
+          placeholder="创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="注册地址" prop="registerdAddress">
+        <el-input v-model="dataForm_s.registerdAddress" placeholder="注册地址"></el-input>
+      </el-form-item>
+      <el-form-item label="经营范围" prop="manageScope">
+        <el-input v-model="dataForm_s.manageScope" placeholder="经营范围"></el-input>
+      </el-form-item>
+
+      <el-form-item label="登录密码确认" prop="pwd2" v-if="dataForm_s.id ? false:true">
+        <el-input v-model="dataForm_s.pwd2" placeholder="登录密码确认" type="password"></el-input>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import {preservation,lookOver} from "@/api/fleet/companyMsg"
+export default {
+  props: {
+    dataForm: {
+      type: Object,
+      require: false,
+    }
+  },
+  data () {
+    return {
+      dataForm_s:{
+        annualDate: '',
+        bankAccount: '',
+        billStatus: '',
+        businessArea: '',
+        businessDeadline: '',
+        carNum: '',
+        companyAddress:'',
+        companyName: '',
+        companyType: '',
+        creatTime: '',
+        createBy: '',
+        createTime: '',
+        creditLv: '',
+        creditNum: '',
+        dateOfEstablishment: '',
+        delFlag: '',
+        email: '',
+        fax: '',
+        headOffice: '',
+        id: '',
+        industryCommerceNum: '',
+        insdustry: '',
+        legalPerson: '',
+        linkMan: '',
+        linkPhone:'',
+        loginAccount: '',
+        manageScope: '',
+        modificationTime: '',
+        openingBank: '',
+        organizationNum: '',
+        params: '',
+        paymentDays: '',
+        registerOrganization: '',
+        registerdAddress: '',
+        registerdCapital: '',
+        remark: '',
+        searchValue: '',
+        taxpayerNum: '',
+        updateBy: '',
+        updateTime: '',
+      },
+      visible: false,
+      edit: true,
+      login: this.dataForm.id,
+      dataRule: {
+        companyName: [
+          {required: true, message: '请输入公司名称', trigger: 'blur'}
+        ],
+        companyAddress: [
+          {required: true, message: '请输入公司地址', trigger: 'blur'}
+        ],
+        loginAccount: [
+          {required: true, message: '请输入登录账号', trigger: 'blur'}
+        ],
+        pwd: [
+          {required: true, message: '请输入登录密码', trigger: 'blur'}
+        ],
+        openingBank: [
+          {required: true, message: '请输入开户行', trigger: 'blur'}
+        ],
+        bankAccount: [
+          {required: true, message: '请输入银行账号', trigger: 'blur'}
+        ],
+        paymentDays: [
+          {required: true, message: '请输入账期天数', trigger: 'blur'}
+        ],
+        pwd2: [
+          {required: true, message: '请输入登录密码', trigger: 'blur'}
+        ],
+        linkPhone: [
+          {required: true, message: '请输入联系人电话', trigger: 'blur'}
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel(){
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.visible = false
+          this.dataForm_s = {}
+        })
+        .catch(_ => {});
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+          this.visible = false
+          this.dataForm_s = {}
+        })
+        .catch(_ => {});
+    },
+    init () {
+      this.visible = true
+        if (this.dataForm.id !== null){
+          lookOver(this.dataForm.id).then(data=>{
+            this.dataForm_s = data.data
+          })
+        }
+    },
+    // 表单提交
+    dataFormSubmit () {
+      if (this.dataForm_s.pwd != this.dataForm_s.pwd2) {
+        this.$message.error('前后输入密码不一致!')
+        return
+      }
+      this.$refs['dataForm_s'].validate((valid) => {
+        if (valid) {
+          console.log(valid)
+          preservation(this.dataForm_s).then(data=>{
+            console.log(data)
+          })
+        }
+      })
+    }
+  },
+  handlePreview (file) {
+  },
+  handleExceed (files, fileList) {
+    this.$message.warning(
+      `当前限制选择 3 个文件，本次选择了 ${
+        files.length
+      } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+    )
+  },
+  beforeRemove (file, fileList) {
+    return this.$confirm(`确定移除 ${file.name}？`)
+  }
+}
+</script>
+<style scoped>
+
+.el-form-item {
+  width: 49%;
+  margin-bottom: 20px;
+  display: inline-block;
+}
+.el-select {
+  display: block;
+}
+.upload-demo {
+  margin-left: 50px;
+}
+</style>

src/views/basicdata/fleet/companyMsg.vue

@@ -1,22 +1,60 @@
 <template>
   <div class="mod-companyMsg app-container">
-    <!-- 卡片视图区域 -->
-    <el-card style="margin-top:10px;">
-    <el-form :inline="true" :model="dataForm"  @keyup.enter.native="getDataList()">
-            <el-form-item>
-                <el-input v-model="dataForm.companyName" placeholder="公司名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-input v-model="dataForm.linkMan" placeholder="联系人" clearable></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-input v-model="dataForm.linkPhone" placeholder="联系电话" clearable></el-input>
-            </el-form-item>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button v-hasPermi="['fleet:companyMsg:save']" type="primary" @click="addOrUpdateHandle()">车队注册</el-button>
-<!--        <el-button v-if="isAuth('fleet:companyMsg:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+        <el-input v-model="dataForm.companyName" placeholder="公司名称" clearable></el-input>
       </el-form-item>
+      <el-form-item>
+        <el-input v-model="dataForm.linkMan" placeholder="联系人" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="dataForm.linkPhone" placeholder="联系电话" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="getDataList">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click="addOrUpdateHandle()"
+            v-hasPermi="['fleet:companyMsg:add']"
+          >新增</el-button>
+        </el-col>
+<!--        <el-col :span="1.5">-->
+<!--          <el-button-->
+<!--            type="success"-->
+<!--            icon="el-icon-edit"-->
+<!--            size="mini"-->
+<!--            :disabled="single"-->
+<!--            @click="handleUpdate"-->
+<!--            v-hasPermi="['basicdata:corps:edit']"-->
+<!--          >修改</el-button>-->
+<!--        </el-col>-->
+<!--        <el-col :span="1.5">-->
+<!--          <el-button-->
+<!--            type="danger"-->
+<!--            icon="el-icon-delete"-->
+<!--            size="mini"-->
+<!--            :disabled="multiple"-->
+<!--            @click="handleDelete"-->
+<!--            v-hasPermi="['basicdata:corps:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </el-col>-->
+<!--        <el-col :span="1.5">-->
+<!--          <el-button-->
+<!--            type="warning"-->
+<!--            icon="el-icon-download"-->
+<!--            size="mini"-->
+<!--            @click="handleExport"-->
+<!--            v-hasPermi="['basicdata:corps:export']"-->
+<!--          >导出</el-button>-->
+<!--        </el-col>-->
+<!--        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+      </el-row>
     </el-form>
     <el-table
       :data="dataList"
@@ -24,13 +62,13 @@
       stripe
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
-      style="width: 100%;"
-      height=650>
+    >
       <el-table-column
         type="selection"
         header-align="center"
         align="center"
-        width="50">
+        width="50"
+      >
       </el-table-column>
       <el-table-column
         prop="companyName"
@@ -38,7 +76,8 @@
         align="center"
         width="120"
         :show-overflow-tooltip="true"
-        label="公司名称">
+        label="公司名称"
+      >
       </el-table-column>
       <el-table-column
         prop="companyAddress"
@@ -46,14 +85,16 @@
         align="center"
         width="150"
         :show-overflow-tooltip="true"
-        label="公司地址">
+        label="公司地址"
+      >
       </el-table-column>
       <el-table-column
         prop="openingBank"
         header-align="center"
         align="center"
         width="150"
-        label="公司开户行">
+        label="公司开户行"
+      >
       </el-table-column>
       <el-table-column
         prop="bankAccount"
@@ -61,78 +102,85 @@
         align="center"
         width="150"
         :show-overflow-tooltip="true"
-        label="银行账号">
+        label="银行账号"
+      >
       </el-table-column>
       <el-table-column
         prop="creditLv"
         header-align="center"
         align="center"
         width="150"
-        label="信用等级">
+        label="信用等级"
+      >
       </el-table-column>
       <el-table-column
         prop="paymentDays"
         header-align="center"
         align="center"
-        label="账期天数">
+        label="账期天数"
+      >
       </el-table-column>
       <el-table-column
         prop="linkMan"
         header-align="center"
         align="center"
-        label="联系人">
+        label="联系人"
+      >
       </el-table-column>
       <el-table-column
         prop="linkPhone"
         header-align="center"
         align="center"
         width="150"
-        label="联系电话">
+        label="联系电话"
+      >
       </el-table-column>
       <el-table-column
         prop="fax"
         header-align="center"
         align="center"
-        label="传真">
+        label="传真"
+      >
       </el-table-column>
       <el-table-column
         prop="email"
         header-align="center"
         align="center"
-        label="email">
+        label="email"
+      >
       </el-table-column>
       <el-table-column
         prop="headOffice"
         header-align="center"
         align="center"
         width="150"
-        label="总公司名称">
+        label="总公司名称"
+      >
       </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
         align="center"
         width="130"
-        label="操作">
+        label="操作"
+      >
         <template slot-scope="scope">
-<!--          v-if="isAuth('fleet:companyMsg:edit')"-->
-<!--          v-if="isAuth('fleet:companyMsg:delete')"-->
-          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">
-            <el-button  type="primary"
-                        v-if="isAuth('fleet:companyMsg: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:companyMsg:delete')"
-                      icon="el-icon-delete"
-                      size="mini"
-                      circle @click="deleteHandle(scope.row.id)"></el-button>
-          </el-tooltip>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="addOrUpdateHandle(scope.row,2)"
+            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>
     <el-pagination
@@ -142,150 +190,163 @@
       :page-sizes="[10, 20, 50, 100]"
       :page-size="dataForm.size"
       :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>
-    </el-card>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :dataForm="editModel"
+    ></add-or-update>
+
   </div>
 </template>
 
 <script>
-  import AddOrUpdate from './companyMsg-add-or-update'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          companyName: '',
-          linkMan: '',
-          linkPhone: '',
-          current: 1,
-          size: 10
-        },
-        editModel: {},
-        dataList: [],
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
+import {listFtmsorderbills,deleted} from "@/api/fleet/companyMsg"
+import AddOrUpdate from './companyMsg-add-or-update'
+export default {
+  data() {
+    return {
+      dataForm: {
+        companyName: '',
+        linkMan: '',
+        linkPhone: '',
+        current: 1,
+        size: 10
+      },
+      editModel: {},
+      dataList: [],
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  activated() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    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
+      })
+
+      // this.$http({
+      //   url: this.$http.adornUrl('/fleet/companyMsg/page'),
+      //   method: 'get',
+      //   params: this.$http.adornParams(this.dataForm)
+      // }).then(({ data }) => {
+      //
+      // })
+    },
+    resetQuery(){
+      this.dataForm = {
+        companyName:'',
+        linkMan:'',
+        linkPhone:''
       }
     },
-    components: {
-      AddOrUpdate
+    // 每页数
+    sizeChangeHandle(val) {
+      this.dataForm.pagesize = val
+      // this.pageIndex = 1
+      this.getDataList()
     },
-    activated () {
+    // 当前页
+    currentChangeHandle(val) {
+      this.dataForm.current = val
       this.getDataList()
     },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/fleet/companyMsg/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
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(row,count) {
+      this.addOrUpdateVisible = true
+      if (row) {
+        this.editModel = row
+      } else {
+        this.editModel = {
+          id: null,
+          companyName: null,
+          companyAddress: null,
+          openingBank: null,
+          bankAccount: null,
+          creditLv: null,
+          paymentDays: null,
+          carNum: null,
+          linkMan: null,
+          linkPhone: null,
+          fax: null,
+          email: null,
+          headOffice: null,
+          registerdCapital: null,
+          legalPerson: null,
+          insdustry: null,
+          creditNum: null,
+          taxpayerNum: null,
+          industryCommerceNum: null,
+          organizationNum: null,
+          registerOrganization: null,
+          dateOfEstablishment: null,
+          companyType: null,
+          businessDeadline: null,
+          businessArea: null,
+          annualDate: null,
+          registerdAddress: null,
+          manageScope: null,
+          creatTime: null,
+          modificationTime: null,
+          pwd: null,
+          loginAccount: null,
+          pwd2: null
+        }
+      }
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init()
+      })
+    },
+    // 删除
+    deleteHandle(id) {
+      var companyMsgIds = id ? [id] : this.dataListSelections.map(item => {
+        return item.userId
+      })
+      this.$confirm(`确定对[id=${companyMsgIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleted(companyMsgIds).then(data=>{
+          console.log(data)
+          if (data && data.code === 200) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getDataList()
+              }
+            })
           } else {
-            this.dataList = []
-            this.totalPage = 0
+            this.$message.error(data.msg)
           }
-          this.dataListLoading = false
         })
-      },
-      // 每页数
-      sizeChangeHandle (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,
-            companyName: null,
-            companyAddress: null,
-            openingBank: null,
-            bankAccount: null,
-            creditLv: null,
-            paymentDays: null,
-            carNum: null,
-            linkMan: null,
-            linkPhone: null,
-            fax: null,
-            email: null,
-            headOffice: null,
-            registerdCapital: null,
-            legalPerson: null,
-            insdustry: null,
-            creditNum: null,
-            taxpayerNum: null,
-            industryCommerceNum: null,
-            organizationNum: null,
-            registerOrganization: null,
-            dateOfEstablishment: null,
-            companyType: null,
-            businessDeadline: null,
-            businessArea: null,
-            annualDate: null,
-            registerdAddress: null,
-            manageScope: null,
-            creatTime: null,
-            modificationTime: null,
-            pwd: null,
-            loginAccount: null,
-            pwd2: null
-          }
-        }
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init()
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var companyMsgIds = id ? [id] : this.dataListSelections.map(item => {
-          return item.userId
-        })
-        this.$confirm(`确定对[id=${companyMsgIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/fleet/companyMsg/delete'),
-            method: 'post',
-            data: this.$http.adornData(companyMsgIds, 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(() => {})
-      }
+      }).catch(() => {
+      })
     }
   }
+}
 </script>