Browse Source

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

18513069273 4 years ago
parent
commit
25967d6086

+ 2 - 0
src/api/V2/transport/index.js

@@ -0,0 +1,2 @@
+export const API_GET_TRAN_DRIVERINFO = '/driverViewInfo/selectDriverInfoPage'
+export const API_POST_TRAN_DRIVERINFOADD = '/driverViewInfo/api/addInfo'

+ 9 - 1
src/lang/zh.js

@@ -501,9 +501,12 @@
     warehouseManagementRecord:'记录',
     warehouseManagementNoComplete:'待完成',
     warehouseManagementPerfectput:'编辑',
+    //运输管理
+    tranManagement: '运输管理',
+    tranManagementDriver:'司机管理',
+    tranManagementDriverAdd:'添加司机',
     warehouseManagementPerfectDelivery:'编辑',
 
-
     // 采购模块
     procurement: '采购管理',
     sparepart: '备件采购',
@@ -4699,6 +4702,11 @@
     warehouseManagementPerfectDelivery:'编辑',
 
   },
+  //运输管理
+  tranManagement:{
+    tranManagementDriver:'司机管理',
+    tranManagementDriverAdd:'添加司机',
+  },
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

+ 11 - 0
src/model/transport/index.js

@@ -0,0 +1,11 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+
+import {
+    API_GET_TRAN_DRIVERINFO,
+    API_POST_TRAN_DRIVERINFOADD
+} from '@/api/V2/transport'
+// 司机列表
+export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
+// 添加司机信息
+export const addDriver = appRx.post(API_POST_TRAN_DRIVERINFOADD, errorCatcher, errorHandle, filter)

+ 49 - 0
src/views/tranManagement/component/routers/route.js

@@ -0,0 +1,49 @@
+import Layout from '@/layout/index';
+
+const tranManagementRouter = {
+  path: '/tranManagement',
+  component: Layout,
+  redirect: '/tranManagement',
+  name: 'tranManagement',
+  alwaysShow: true, // will always show the root menu
+  meta: {
+    title: 'tranManagement',
+    module: 'tranManagement',
+    icon: 'cg'
+  },
+  children: [
+      //司机管理
+    {
+      path: 'tranManagementDriver',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
+      name: 'tranManagementDriver',
+      meta: {
+        title: 'tranManagementDriver',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
+    //添加司机
+    {
+      path: 'tranManagementDriverAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
+      name: 'tranManagementDriverAdd',
+      meta: {
+        title: 'tranManagementDriverAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    
+  ],
+
+};
+
+export default tranManagementRouter;

+ 384 - 0
src/views/tranManagement/tranManagementDriver.vue

@@ -0,0 +1,384 @@
+<!--司机管理-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="20">
+      <template slot="right">
+        <ws-button
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >添加</ws-button
+        >
+      </template>
+      <template slot="left">
+        <!-- <ws-select
+          v-model="searchTypeText"
+          placeholder="请选择所在城市"
+          :value="searchType"
+          @change="selecttaskType"
+        >
+        <ws-option
+            v-for="item in options_"
+            :key="item.value"
+            :label="item.label"
+            :value="item.label"
+          />
+        </ws-select> -->
+        <el-cascader
+            :options="options_"
+            v-model="searchTypeText"
+            clearable
+            size="large"
+            placeholder="请选择所在城市"
+            style="width: 30%"
+            @change="selecttaskType"
+          />
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按司机姓名、手机号、车牌号、身份证号查找"
+          clearable
+          maxlength="200"
+          type="input"
+          class="findValue"
+        ></ws-input>
+         <ws-button
+          type="primary"
+          @click="handleLook()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >查找</ws-button
+        >
+      </template>
+    </BaseHeaderLayout>
+    <div class="connert">
+      <el-table
+        class="wenzi"
+        :data="driverList"
+        style="width: 100%; margin-top: 20px"
+        fit
+        height="780"
+      >
+        <el-table-column type="index" label="序号">
+            <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="driverName" label="姓名" width="100">
+        </el-table-column>
+        <el-table-column prop="numberCard" label="身份证号" width="200">
+        </el-table-column>
+         <el-table-column prop="driverPhone" label="手机号" width="120">
+        </el-table-column>
+         <el-table-column prop="carNumber" label="车牌号" width="80">
+        </el-table-column>
+         <el-table-column prop="binNumber" label="常驻城市" width="120">
+        </el-table-column>
+         <el-table-column prop="carModel" label="车型" width="80">
+        </el-table-column>
+         <el-table-column prop="carLength" label="车长" width="80">
+        </el-table-column>
+         <el-table-column prop="addressUrl" label="附件">
+        <template slot-scope="scope">
+          <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian(scope.row)"
+            alt=""
+          />
+          <span v-if="scope.row.addressUrlArray.length > 0">{{
+            scope.row.addressUrlArray.length
+          }}</span>
+        </template>
+      </el-table-column>
+        <el-table-column prop="address" label="操作" width="200">
+          <ws-button
+            type="primary"
+            @click="look()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >查看</ws-button
+          >
+          <ws-button
+            type="primary"
+            @click="edit()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >编辑</ws-button
+          >
+           <ws-button
+            type="primary"
+            @click="deletes()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >删除</ws-button
+          >
+          <ws-button
+            type="primary"
+            @click="stop()"
+            v-hasPermission="
+              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            "
+            >禁用</ws-button
+          >
+          <!-- </template> -->
+        </el-table-column>
+      </el-table>
+       <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  selectDriver,
+  billoperatehis,
+} from '@/model/transport/index'
+import Pagination from '@/components/Pagination'
+import { regionData,CodeToText } from 'element-china-area-data'
+import WsUpload from '@/components/WsUpload'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      options_: regionData,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      searchTypeText:'',
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      driverList: [],
+      deptBudgetList: {},
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    console.log(regionData)
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    //查找
+    handleLook() {
+      this.currentPage = 1
+      this.getList()
+    },
+    //添加
+    handleAdd() {
+      this.$router.push({ path: 'tranManagementDriverAdd' })
+    },
+    //编辑
+    handleEdit() {
+      this.$router.push({ path: 'warehouseManagementEdit' })
+    },
+    handleDelete() {
+      this.$router.push({ path: 'warehouseManagementDelete' })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加,必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    getList() {
+      selectDriver({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
+      })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            if (response.records[i].addressUrl != null) {
+              response.records[i].addressUrlArray = response.records[
+                i
+              ].addressUrl.split(',')
+            } else {
+              response.records[i].addressUrlArray = []
+            }
+          }
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+          this.driverList = response
+        })
+    },
+    editClick(row) {
+      var status = ''
+      if (row.status == '待执行' || row.status == '已完成') {
+        status = '执行中'
+      } else if (row.status == '执行中') {
+        status = '已完成'
+      }
+      //cancelButtonClass: "btn-custom-cancel"
+      this.$confirm(`是否将状态改为${status}`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          editstatus({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '状态修改成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    selecttaskType(e) {
+      this.selectedOptions = e
+    },
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: { id: row.id },
+      })
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+    find() {
+      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+      this.currentPage = 1
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.connert {
+  width: 90%;
+  margin: 0 auto;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.findValue {
+  margin: 0 10px;
+}
+</style>

+ 691 - 0
src/views/tranManagement/tranManagementDriverAdd.vue

@@ -0,0 +1,691 @@
+//添加司机
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">添加新司机</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+    <div class="flex">
+       <div class="driver">司机信息</div>
+      <ws-info-table>
+        
+        <!--司机姓名-->
+        <ws-form-item
+          label="姓名"
+          span="1"
+          prop="contractNo"
+          class="readonly bg-right"
+        >
+          <ws-input
+            v-model="deptBudgetList.warehouseName"
+            placeholder="请输入司机姓名"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--手机号-->
+        <ws-form-item label="手机号" span="1" prop="driverPhone" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.personCharge"
+            placeholder="请输入手机号"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--常驻城市-->
+        <ws-form-item label="常驻城市" span="1" prop="acceptanceMethod">
+          <el-cascader
+            :options="options_"
+            v-model="selectedOptions"
+            clearable
+            size="large"
+            placeholder="请选择常驻城市"
+            style="width: 200%"
+            class="el-cascader"
+            @change="handleChange"
+          />
+        </ws-form-item>
+
+        <!--身份证号-->
+        <ws-form-item label="身份证号" span="1" prop="driverNo" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.personCharge"
+            placeholder="请输入身份证号"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+      </ws-info-table>
+    </div>
+    </ws-form>
+
+<ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+     <div style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in freightspace"
+        >
+    <div class="flex">
+       <div class="driver">货车信息</div>
+      <ws-info-table class="el-table">
+        
+        <!--车牌号-->
+        <ws-form-item
+          label="车牌号"
+          span="1"
+          prop="carNumber"
+          class="forlist"
+          width="400px"
+        >
+          <ws-input
+            v-model="deptBudgetList.drivercarInfo.carNumber"
+            placeholder="请输入车牌号"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--车型-->
+        <ws-form-item label="车型" span="1" prop="carModel" class="forlist">
+          <ws-select
+            v-model="deptBudgetList.drivercarInfo.carModel"
+            placeholder=""
+            class="typeselect"
+            @change="selectcarModel"
+          >
+            <ws-option
+              v-for="item in carModelList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
+        </ws-form-item>
+        <!--车长-->
+        <ws-form-item label="不含车头车长(米)" span="1" prop="carLength" class="readonly">
+           <ws-select
+            v-model="deptBudgetList.drivercarInfo.carLength"
+            placeholder=""
+            class="typeselect"
+            @change="selectcarLength"
+          >
+            <ws-option
+              v-for="item in carLengthList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
+        </ws-form-item>
+        <!--载重-->
+        <ws-form-item label="载重" span="1" prop="carLoad" class="readonly" width="150px">
+          <ws-input
+            v-model="deptBudgetList.drivercarInfo.carLoad"
+            placeholder="请输入载重"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--出厂年份-->
+        <ws-form-item label="出厂年份" span="1" prop="yearManufacture" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.drivercarInfo.yearManufacture"
+            placeholder="请输入出厂年份"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+      </ws-info-table>
+        <img
+            width="22"
+            height="22"
+            class="add"
+            @click="add"
+            src="../../../public/img/add.png"
+            alt=""
+          />
+          <img
+            width="22"
+            height="22"
+            class="del"
+            @click="del(index)"
+            src="../../../public/img/del.png"
+            alt=""
+          />
+    </div>
+     </div>
+    </ws-form>
+    <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+     <div style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in freightspace1"
+        >
+    <div class="flex">
+       <div class="driver">收款人账户信息</div>
+      <ws-info-table class="el-table">
+        
+        <!--账户类型-->
+        <ws-form-item
+          label="账户类型"
+          span="1"
+          prop="contractNo"
+          class="readonly bg-right"
+        >
+          <el-radio v-model="radio" label="1">私人账号</el-radio>
+          <el-radio v-model="radio" label="2">企业账户</el-radio>
+        </ws-form-item>
+        <!--账号-->
+        <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
+          <ws-input
+            v-model="deptBudgetList.driverPayeeInfo.bankCard"
+            placeholder="请输入账号"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <!--开户行-->
+        <ws-form-item label="开户行" span="1" prop="bankDeposit" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.driverPayeeInfo.bankDeposit"
+            placeholder="请输入开户行"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <!--姓名-->
+        <ws-form-item label="姓名" v-if="radio==1" span="1" prop="payeeName" class="readonly" width="150px">
+          <ws-input
+            v-model="deptBudgetList.driverPayeeInfo.payeeName"
+            placeholder="请输入姓名"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <!--企业名称-->
+        <ws-form-item label="企业名称" v-else span="1" prop="compName" class="readonly" width="150px">
+          <ws-input
+            v-model="deptBudgetList.driverPayeeInfo.compName"
+            placeholder="请输入企业名称"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--身份证号-->
+        <ws-form-item label="身份证号" v-if="radio==1" span="1" prop="payeeNumberCard" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.driverPayeeInfo.payeeNumberCard"
+            placeholder="请输入身份证号"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <!--身份证附件-->
+        <ws-form-item label="身份证附件" v-if="radio==1" span="1" prop="cardAddressUrl" class="readonly">
+          <!-- <ws-input
+            v-model="deptBudgetList.driverPayeeInfo.personNo"
+            placeholder="请输入身份证附件"
+            maxlength="100"
+            size="small"
+          /> -->
+        </ws-form-item>
+      </ws-info-table>
+        <img
+            width="22"
+            height="22"
+            class="add"
+            @click="add1"
+            src="../../../public/img/add.png"
+            alt=""
+          />
+          <img
+            width="22"
+            height="22"
+            class="del"
+            @click="del1(index)"
+            src="../../../public/img/del.png"
+            alt=""
+          />
+    </div>
+     </div>
+    </ws-form>
+        <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+    <div class="flex">
+       <div class="driver">相关附件</div>
+     <ws-upload
+        ref="upload"
+        table-name="maintain_work_order"
+        oss-key="mainPlan"
+        :comp-id="compId"
+        :appendix-ids="appendixIdsAdd"
+        :vesselId="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @uploadSuccess="uploadSuccess"
+        @onChange="onChange"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+    </div>
+    </ws-form>
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import {
+  packList
+} from '@/model/contarct/index'
+import {
+  addDriver
+} from '@/model/transport/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    let self = this
+    return {
+      deptBudgetList: {
+        totalStorage: 0,
+        drivercarInfo: {
+          goodsName: '',
+        },
+        driverPayeeInfo: {},
+      },
+      radio: '1',
+      carModelList:[],
+      carLengthList:[],
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      district: null,
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      mainReportAdd: {},
+      appendixIdsAdd: '',
+      size: 10,
+      value1: '',
+      unitList: [],
+      freightspace: [{ carNumber: '', carModel: '', carLength: '', carLoad: '', yearManufacture: '' }],
+      freightspace1: [{account_type:''  }],
+      name: '',
+    }
+  },
+  activated() {
+    this.deptBudgetList.drivercarInfo.carModel = '高栏'
+    this.deptBudgetList.drivercarInfo.carLength = '13'
+    this.loaddata()
+    this.showType = this.isShow
+  },
+  computed: {
+  },
+  methods: {
+    loaddata() {
+      // 车型
+      packList({ constId: 'TRAN1' })
+        .toPromise()
+        .then((response) => {
+          this.carModelList = response
+        })
+        // 车长
+      packList({ constId: 'TRAN2' })
+        .toPromise()
+        .then((response) => {
+          this.carLengthList = response
+        })
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    add() {
+      this.freightspace.push({
+        carNumber: '',
+        carModel: '',
+        carLength: '',
+        carLoad: '',
+        yearManufacture: '',
+      })
+    },
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
+    },
+    add1() {
+      this.freightspace1.push({
+        binNumber: '',
+        maxStorage: '',
+        remark: '',
+      })
+    },
+    del1(index) {
+      if (this.freightspace1.length > 1) {
+        this.freightspace1.splice(index, 1)
+      }
+    },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.$router.push({ path: 'tranManagementDriver' })
+    },
+    // confirmPosition() {
+    //   this.draggable = false
+    // },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
+    selectcarModel(e) {
+      for (var i = 0; i < this.carModelList.length; i++) {
+        if (this.carModelList[i].constValue == e) {
+          this.deptBudgetList.carModelKey = this.carModelList[i].constKey
+        }
+      }
+    },
+    selectcarLength(e) {
+      for (var i = 0; i < this.carLengthList.length; i++) {
+        if (this.carLengthList[i].constValue == e) {
+          this.deptBudgetList.carLengthKey = this.carLengthList[i].constKey
+        }
+      }
+    },
+    onChange(files) {
+      this.fileNum = files
+      this.$refs.upload.handleSaveBill().then((res) => {
+        console.log(files)
+      })
+    },
+
+    submit() {
+      console.log(this.freightspace)
+
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.warehousePrivate =
+            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.warehouseCity =
+            CodeToText[this.selectedOptions[1]]
+          this.deptBudgetList.warehouseArea =
+            CodeToText[this.selectedOptions[2]]
+          this.deptBudgetList.warehousePositionInfoList = this.freightspace
+          this.deptBudgetList.totalStorage = this.totalStorage
+          addDriver(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'tranManagementDriver' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.position {
+  position: relative;
+}
+.add,
+.del {
+  position: absolute;
+  right: -38px;
+  top: 9px;
+  cursor: pointer;
+}
+.del {
+  right: -70px;
+}
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 10%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid #cdd2dc;
+  border-bottom: 1px solid #cdd2dc;
+}
+.readonly {
+  position: relative;
+}
+.title {
+  position: relative;
+}
+.el-car {
+  width:413px ;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid #cdd2dc;
+  background: #fafbfc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 140px;
+  text-align: center;
+  background: #f0f2f6;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.el-table {
+  width: 1240px;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+.driver {
+    width: 120px;
+    margin-top: 10px;
+    font-weight: bold;
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 80px;
+}
+/deep/.ws-info-table .el-form-item {
+  width: 25%;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+.el-cascader {
+  width: 145px;
+}
+.forlist {
+  width:20%;
+}
+</style>

+ 1 - 1
src/views/warehouse/warehouseManagementDelivery.vue

@@ -756,7 +756,7 @@ export default {
 }
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: left;
+  text-align: center;
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;