4.30(优化排版

This commit is contained in:
Hong
2024-05-07 19:10:16 +08:00
parent 01278da4a8
commit 4b6e1d7688
13 changed files with 862 additions and 1559 deletions

View File

@@ -4,9 +4,9 @@ ENV = 'development'
# base api
# VUE_APP_BASE_API = '/dev-api'
# 正式
# VUE_APP_BASE_API = 'https://cms.diyouzhijia.com/car_admin_api'
VUE_APP_BASE_API = 'https://cms.diyouzhijia.com/car_admin_api'
# 薛磊
VUE_APP_BASE_API = 'http://192.168.31.226:8080/car_admin_api'
# VUE_APP_BASE_API = 'http://192.168.31.226:8080/car_admin_api'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
# It only does one thing by converting all import() to require().

View File

@@ -133,21 +133,21 @@
<!-- 新增 -->
<el-dialog v-if="dialogVisible" :title="title" :visible.sync="dialogVisible" width="100%"
:before-close="handleClose" class="showALL_dialog" :close-on-click-modal="false">
<el-form :model="addData" ref="addData" class="demo-ruleForm" v-loading="loading">
<el-form :model="addData" ref="addData" class="demo-ruleForm" v-loading="loading" label-width="100px">
<el-row>
<el-form-item label="盘点单号" prop="inventorySn" :rules="[{ required: true, trigger: 'blur' }]">
<el-input v-model.trim="addData.inventorySn" disabled></el-input>
<el-input v-model.trim="addData.inventorySn" disabled style="width: 400px;"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="8">
<el-form-item label="盘点时间" prop="inventoryTime" :rules="[{ required: true, trigger: 'blur' }]">
<el-date-picker v-model="addData.inventoryTime" type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-col :span="8">
<el-form-item label="盘点方式" prop="inventoryType" :rules="[{ required: true, trigger: 'blur' }]">
<el-select v-model="addData.inventoryType" placeholder="请选择" clearable class="filter-item selWidth">
<el-option label="全盘" :value="0" />
@@ -156,68 +156,70 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="8">
<el-form-item label="盘点参与人" prop="participant" :rules="[{ required: true, trigger: 'blur' }]">
<el-input v-model.trim="addData.participant" placeholder="请输入参与人"></el-input>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-col :span="10">
<el-form-item label="盘点备注" prop="remark" :rules="[{ required: true, trigger: 'blur' }]">
<el-input v-model.trim="addData.remark" type="textarea" :rows="2" placeholder="请输入备注"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item>
<div>
<div style="display: flex; width: 450px; align-items: center; margin-bottom: 10px">
<el-form-item label="配件名称">
<el-input style="width: 200px; margin: 0 8px" v-model="selfForm.keywords" placeholder="输入配件名称搜索" clearable
@clear="getselfId"></el-input>
<el-button type="primary" icon="el-icon-search" @click="getselfId">搜索</el-button>
</el-form-item>
</el-row>
<!-- <div style="display: flex; width: 450px; align-items: center; margin-bottom: 10px">
<p>配件名称</p>
<el-input style="width: 200px; margin: 0 8px" v-model="selfForm.keywords" placeholder="输入配件名称搜索"
clearable @clear="getselfId"></el-input>
<el-button type="primary" icon="el-icon-search" @click="getselfId">搜索</el-button>
</div>
<el-table :data="selfId" style="width: 100%" height="300px">
<el-table-column prop="id" label="配件id" />
<el-table-column prop="name" label="配件名称" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="accessorySn" label="配件编码"></el-table-column> -->
<el-table-column prop="procurePrice" label="采购价格"></el-table-column>
<!-- <el-table-column prop="price" label="零售价格"></el-table-column> -->
<!-- <el-table-column prop="overPrice" label="结算价格"></el-table-column> -->
<el-table-column prop="stock" label="库存"></el-table-column>
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addCailiao(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="selfForm.limit" :current-page="selfForm.page"
layout="total, sizes, prev, pager, next, jumper" :total="selfTotal" @size-change="selfSizeChange"
@current-change="selfpageChange" />
</div>
</div>
</div> -->
<div style="padding: 0 20px">
<el-table :data="selfId" style="width: 100%" height="300px">
<el-table-column prop="id" label="配件id" />
<el-table-column prop="name" label="配件名称" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="accessorySn" label="配件编码"></el-table-column> -->
<el-table-column prop="procurePrice" label="采购价格"></el-table-column>
<!-- <el-table-column prop="price" label="零售价格"></el-table-column> -->
<!-- <el-table-column prop="overPrice" label="结算价格"></el-table-column> -->
<el-table-column prop="stock" label="库存"></el-table-column>
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addCailiao(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="selfForm.limit" :current-page="selfForm.page"
layout="total, sizes, prev, pager, next, jumper" :total="selfTotal" @size-change="selfSizeChange"
@current-change="selfpageChange" />
</div>
<el-table :data="procureItemRequestList" style="width: 100%">
<el-table-column prop="accsssorySelfId" label="配件"> </el-table-column>
<el-table-column prop="name" label="配件"> </el-table-column>
<el-table-column prop="procurePrice" label="采购价格"> </el-table-column>
<el-table-column prop="num" label="库存"> </el-table-column>
<el-table-column prop="realNum" label="配件数量"> </el-table-column>
<!-- <el-table-column prop="notes" label="小记"> </el-table-column> -->
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editNumber(scope.row)">编辑数量</el-button>
<el-button @click.native.prevent="deleteRow(scope.$index, procureItemRequestList)" type="text"
size="small">
移除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<el-table :data="procureItemRequestList" style="width: 100%">
<el-table-column prop="accsssorySelfId" label="配件"> </el-table-column>
<el-table-column prop="name" label="配件"> </el-table-column>
<el-table-column prop="procurePrice" label="采购价格"> </el-table-column>
<el-table-column prop="num" label="库存"> </el-table-column>
<el-table-column prop="realNum" label="配件数量"> </el-table-column>
<!-- <el-table-column prop="notes" label="小记"> </el-table-column> -->
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editNumber(scope.row)">编辑数量</el-button>
<el-button @click.native.prevent="deleteRow(scope.$index, procureItemRequestList)" type="text"
size="small">
移除
</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose"> </el-button>

View File

@@ -6,16 +6,16 @@
width="800px"
:before-close="handleClose"
>
<el-form :model="user" :rules="rules" ref="user" class="demo-ruleForm" v-loading="loading">
<el-form :model="user" :rules="rules" ref="user" class="demo-ruleForm" v-loading="loading" label-width="120px">
<el-row>
<el-col :span="11">
<el-form-item label="品牌名称" prop="brandName">
<el-input v-model.trim="user.brandName" placeholder="请输入品牌名称"></el-input>
<el-input v-model.trim="user.brandName" placeholder="请输入品牌名称" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
<el-form-item label="品牌规格" prop="sku">
<el-input v-model.trim="user.sku" placeholder="请输入品牌规格"></el-input>
<el-input v-model.trim="user.sku" placeholder="请输入品牌规格" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -23,12 +23,12 @@
<el-row>
<el-col :span="11">
<el-form-item label="配件名称" prop="name">
<el-input v-model.trim="user.name" maxlength="120" placeholder="请输入配件名称"></el-input>
<el-input v-model.trim="user.name" maxlength="120" placeholder="请输入配件名称" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
<el-form-item label="分类" prop="cateId">
<el-select v-model="user.cateId" placeholder="请选择" filterable clearable>
<el-select v-model="user.cateId" placeholder="请选择" filterable clearable style="width: 200px;">
<el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select>
</el-form-item>
@@ -131,18 +131,18 @@
</el-row>
<el-row>
<el-form-item label="配件编码" prop="accessorySn">
<el-input v-model.trim="user.accessorySn" placeholder="例PEI-993171340925383349563"></el-input>
<el-input v-model.trim="user.accessorySn" placeholder="例PEI-993171340925383349563" style="width: 610px;"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="关键字" prop="keyword">
<el-input v-model.trim="user.keyword" placeholder="请输入关键字"></el-input>
<el-input v-model.trim="user.keyword" placeholder="请输入关键字" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
<el-form-item label="配件简介" prop="intro">
<el-input type="textarea" :rows="2" v-model.trim="user.intro" placeholder="请输入配件简介"></el-input>
<el-input type="textarea" :rows="2" v-model.trim="user.intro" placeholder="请输入配件简介" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
</el-row>

View File

@@ -1,14 +1,8 @@
<template>
<div>
<el-dialog
v-if="dialogVisible"
:title="title"
:visible.sync="dialogVisible"
width="70%"
:before-close="handleClose"
:close-on-click-modal="false"
>
<el-form :model="procureInfo" ref="procureInfo" class="demo-ruleForm" v-loading="loading">
<el-dialog v-if="dialogVisible" :title="title" :visible.sync="dialogVisible" width="70%" :before-close="handleClose"
:close-on-click-modal="false">
<el-form :model="procureInfo" ref="procureInfo" class="demo-ruleForm" v-loading="loading" label-width="80px">
<!-- <el-row>
<el-form-item label="采购单号" prop="procureSn">
<el-input v-model="procureInfo.procureSn" placeholder="采购单号" disabled></el-input>
@@ -16,24 +10,20 @@
</el-row> -->
<el-row>
<el-form-item label="供应商" prop="merName" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="procureInfo.merName" filterable clearable placeholder="请选择">
<el-select v-model="procureInfo.merName" filterable clearable placeholder="请选择" style="width: 200px">
<el-option v-for="item in supplierIdArr" :key="item.id" :label="item.name" :value="item.name">
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item
label="收货地址"
prop="address"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input v-model="procureInfo.address" placeholder="请输入收货地址"></el-input>
<el-form-item label="收货地址" prop="address" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="procureInfo.address" placeholder="请输入收货地址" style="width: 200px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备注" prop="remark" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="procureInfo.remark" placeholder="请输入备注"></el-input>
<el-input v-model="procureInfo.remark" placeholder="请输入备注" style="width: 200px"></el-input>
</el-form-item>
</el-row>
<!-- <el-row>
@@ -53,66 +43,55 @@
</el-form-item>
</el-col>
</el-row> -->
<el-row>
<!-- label="配件信息选择" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]" -->
<el-form-item>
<!-- <el-button type="primary" @click="addPeijian">加配件</el-button> -->
<div>
<div style="display: flex; width: 450px; align-items: center; margin-bottom: 10px">
<p>配件名称</p>
<el-input
style="width: 200px; margin: 0 8px"
v-model="selfForm.keywords"
placeholder="输入配件名称搜索"
></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="getselfId">搜索</el-button>
</div>
<el-table :data="selfId" style="width: 100%" height="200px">
<el-table-column prop="id" label="配件id" />
<el-table-column prop="name" label="配件名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="配件价格"></el-table-column>
<el-table-column prop="stock" label="库存"></el-table-column>
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.stock > 0" type="text" size="small" @click="addCailiao(scope.row)"
>选择</el-button
>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:page-sizes="[10, 20, 40, 60]"
:page-size="selfForm.limit"
:current-page="selfForm.page"
layout="total, sizes, prev, pager, next, jumper"
:total="selfTotal"
@size-change="selfSizeChange"
@current-change="selfpageChange"
/>
</div>
</div>
<el-table :data="procureItemRequestList" style="width: 100%">
<el-table-column prop="accsssorySelfId" label="自营配件"> </el-table-column>
<el-table-column prop="name" label="自营配件"> </el-table-column>
<el-table-column prop="procurePrice" label="采购价格"> </el-table-column>
<el-table-column prop="num" label="自营配件数量"> </el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editNumber(scope.row)">编辑数量</el-button>
<el-button
@click.native.prevent="deleteRow(scope.$index, procureItemRequestList)"
type="text"
size="small"
>
移除
</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-row>
<!-- <el-button type="primary" @click="addPeijian">加配件</el-button> -->
<el-form-item label="配件名称">
<el-input style="width: 200px;" v-model="selfForm.keywords" placeholder="输入配件名称搜索"></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="getselfId">搜索</el-button>
</el-form-item>
<!-- <div style="display: flex; width: 450px; align-items: center; margin-bottom: 10px">
<p>配件名称</p>
<el-input style="width: 200px; margin: 0 8px" v-model="selfForm.keywords"
placeholder="输入配件名称搜索"></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="getselfId">搜索</el-button>
</div> -->
<el-table :data="selfId" style="width: 100%" height="200px">
<el-table-column prop="id" label="配件id" />
<el-table-column prop="name" label="配件名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="配件价格"></el-table-column>
<el-table-column prop="stock" label="库存"></el-table-column>
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.stock > 0" type="text" size="small"
@click="addCailiao(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="selfForm.limit" :current-page="selfForm.page"
layout="total, sizes, prev, pager, next, jumper" :total="selfTotal" @size-change="selfSizeChange"
@current-change="selfpageChange" />
</div>
<el-table :data="procureItemRequestList" style="width: 100%">
<el-table-column prop="accsssorySelfId" label="自营配件"> </el-table-column>
<el-table-column prop="name" label="自营配件"> </el-table-column>
<el-table-column prop="procurePrice" label="采购价格"> </el-table-column>
<el-table-column prop="num" label="自营配件数量"> </el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editNumber(scope.row)">编辑数量</el-button>
<el-button @click.native.prevent="deleteRow(scope.$index, procureItemRequestList)" type="text"
size="small">
移除
</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose('procureInfo')"> </el-button>
@@ -130,23 +109,15 @@
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item
label="采购价格"
prop="procurePrice"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-form-item label="采购价格" prop="procurePrice"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="procureItemRequestListForm.procurePrice" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="配件数量" prop="num" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input-number
type="text"
step-strictly
v-model.trim="procureItemRequestListForm.num"
:min="0"
:max="999999"
></el-input-number>
<el-input-number type="text" step-strictly v-model.trim="procureItemRequestListForm.num" :min="0"
:max="999999"></el-input-number>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">

View File

@@ -1,12 +1,7 @@
<template>
<div>
<el-dialog
v-if="dialogVisible"
:title="title"
:visible.sync="dialogVisible"
width="80%"
:before-close="handleClose"
>
<el-dialog v-if="dialogVisible" :title="title" :visible.sync="dialogVisible" width="80%"
:before-close="handleClose">
<el-form :model="recordInfo" ref="recordInfo" class="demo-ruleForm" v-loading="loading">
<el-form-item label="入库配件列表">
<el-button type="primary" @click="addPeijian">加入库</el-button>
@@ -30,11 +25,8 @@
<el-table-column prop="intro" label="配件简介"> </el-table-column>
<el-table-column fixed="right" label="操作" width="80">
<template slot-scope="scope">
<el-button
@click.native.prevent="deleteRow(scope.$index, accessoryAddRequestList)"
type="text"
size="small"
>
<el-button @click.native.prevent="deleteRow(scope.$index, accessoryAddRequestList)" type="text"
size="small">
移除
</el-button>
</template>
@@ -48,27 +40,19 @@
</span>
</el-dialog>
<el-dialog title="加入库" :visible.sync="minidialogVisible" width="70%" :before-close="miniQuixao">
<el-form :model="accessoryAddRequestListForm">
<el-form :model="accessoryAddRequestListForm" label-width="80px">
<el-row>
<el-col :span="11">
<el-form-item
label="配件分类"
prop="cateId"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-select v-model="accessoryAddRequestListForm.cateId" filterable clearable placeholder="请选择">
<el-col :span="12">
<el-form-item label="配件分类" prop="cateId" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="accessoryAddRequestListForm.cateId" filterable clearable placeholder="请选择" style="width: 200px">
<el-option v-for="item in categoryIdArr" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-form-item
label="供应商"
prop="supplierId"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-select v-model="accessoryAddRequestListForm.supplierId" filterable clearable placeholder="请选择">
<el-col :span="12" >
<el-form-item label="供应商" prop="supplierId" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="accessoryAddRequestListForm.supplierId" filterable clearable placeholder="请选择" style="width: 200px">
<el-option v-for="item in supplierIdArr" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -76,135 +60,71 @@
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item
label="配件名称"
prop="name"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input v-model="accessoryAddRequestListForm.name" placeholder="请输入"></el-input>
<el-col :span="12">
<el-form-item label="配件名称" prop="name" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="accessoryAddRequestListForm.name" placeholder="请输入" style="width: 200px"></el-input>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-form-item
label="配件编码 (例PEI-999 888 000 111 222 333 666)"
prop="accessorySn"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input
v-model="accessoryAddRequestListForm.accessorySn"
placeholder="例PEI-993171340925383349563"
></el-input>
<el-col :span="12" >
<el-form-item label="配件编码 " prop="accessorySn"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="accessoryAddRequestListForm.accessorySn"
placeholder="例PEI-993171340925383349563" style="width: 200px"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item
label="品牌名称"
prop="brandName"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input v-model="accessoryAddRequestListForm.brandName" placeholder="请输入"></el-input>
<el-col :span="12">
<el-form-item label="品牌名称" prop="brandName" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="accessoryAddRequestListForm.brandName" placeholder="请输入" style="width: 200px"></el-input>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-col :span="12" >
<el-form-item label="品牌规格" prop="sku" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="accessoryAddRequestListForm.sku" placeholder="请输入"></el-input>
<el-input v-model="accessoryAddRequestListForm.sku" placeholder="请输入" style="width: 200px"> </el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item
label="进货价格"
prop="purchase_price"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input-number
type="text"
v-model.trim="accessoryAddRequestListForm.purchase_price"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-col :span="12">
<el-form-item label="进货价格" prop="purchase_price"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input-number type="text" v-model.trim="accessoryAddRequestListForm.purchase_price" :precision="2"
:step="0.1" :min="0" :max="999999" style="width: 200px"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-form-item
label="采购价格"
prop="procurePrice"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input-number
type="text"
v-model.trim="accessoryAddRequestListForm.procurePrice"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-col :span="12" >
<el-form-item label="采购价格" prop="procurePrice"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input-number type="text" v-model.trim="accessoryAddRequestListForm.procurePrice" :precision="2"
:step="0.1" :min="0" :max="999999" style="width: 200px"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item
label="零售价格"
prop="price"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input-number
type="text"
v-model.trim="accessoryAddRequestListForm.price"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-col :span="12">
<el-form-item label="零售价格" prop="price" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input-number type="text" v-model.trim="accessoryAddRequestListForm.price" :precision="2" :step="0.1"
:min="0" :max="999999"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-form-item
label="结算价格"
prop="overPrice"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input-number
type="text"
v-model.trim="accessoryAddRequestListForm.overPrice"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-col :span="12" >
<el-form-item label="结算价格" prop="overPrice" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input-number type="text" v-model.trim="accessoryAddRequestListForm.overPrice" :precision="2"
:step="0.1" :min="0" :max="999999"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item
label="入库数量"
prop="stock"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input-number
type="text"
step-strictly
v-model.trim="accessoryAddRequestListForm.stock"
:min="0"
:max="999999"
></el-input-number>
<el-col :span="12">
<el-form-item label="入库数量" prop="stock" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input-number type="text" step-strictly v-model.trim="accessoryAddRequestListForm.stock" :min="0"
:max="999999"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="10" :offset="2">
<el-form-item
label="配件图片"
prop="image"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-col :span="12" >
<el-form-item label="配件图片" prop="image" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<div class="upLoadPicBox" @click="modalPicTap('1', 'image')">
<div v-if="accessoryAddRequestListForm.image" class="pictrue">
<img :src="accessoryAddRequestListForm.image" />
@@ -219,12 +139,8 @@
</el-row>
<el-row>
<el-form-item label="配件简介" prop="intro" :rules="[{ required: true, trigger: 'blur' }]">
<el-input
v-model="accessoryAddRequestListForm.intro"
type="textarea"
:rows="2"
placeholder="请输入简介"
></el-input>
<el-input v-model="accessoryAddRequestListForm.intro" type="textarea" :rows="2"
placeholder="请输入简介"></el-input>
</el-form-item>
</el-row>
</el-form>

View File

@@ -40,14 +40,8 @@
<el-button type="primary" @click="addBtn" :disabled="isShow">批量收银</el-button>
</div>
<el-table
v-loading="listLoading"
:data="tableData.data"
style="width: 100%"
size="mini"
@selection-change="handleSelectionChange"
ref="multipleTable"
>
<el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini"
@selection-change="handleSelectionChange" ref="multipleTable">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="id" label="ID" min-width="60" />
<el-table-column prop="carNo" label="车牌号" />
@@ -62,16 +56,16 @@
<el-table-column label="维修类型">
<template slot-scope="scope">
{{
scope.row.repairType == 1
? '常规保养'
: scope.row.repairType == 2
scope.row.repairType == 1
? '常规保养'
: scope.row.repairType == 2
? '故障维修'
: scope.row.repairType == 3
? '事故维修'
: scope.row.repairType == 4
? '退车'
: ' '
}}
? '事故维修'
: scope.row.repairType == 4
? '退车'
: ' '
}}
</template>
</el-table-column>
<el-table-column prop="merName" label="服务门店" />
@@ -93,15 +87,9 @@
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:page-sizes="[20, 40, 60, 80]"
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
@current-change="pageChange" />
</div>
</el-card>
<!-- 收银详情 -->
@@ -112,9 +100,7 @@
<el-descriptions-item label="收银编号">{{ detailObj.cashDeskSn }}</el-descriptions-item>
<el-descriptions-item label="实际费用">{{ detailObj.price }}</el-descriptions-item>
<el-descriptions-item label="减免费用">{{ detailObj.derate }}</el-descriptions-item>
<el-descriptions-item label="收银方式">{{
detailObj.way == 0 ? '未收银' : detailObj.way == 1 ? '已收银' : ''
}}</el-descriptions-item>
<el-descriptions-item label="收银方式">{{ detailObj.wayName }}</el-descriptions-item>
<el-descriptions-item label="收银时间">{{ detailObj.cashDeskItme }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ detailObj.remark }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ detailObj.createTime }}</el-descriptions-item>
@@ -138,14 +124,14 @@
<el-table-column prop="repairType" label="维修类型">
<template v-slot="{ row }">
{{
row.repairType == 1
? '常规保养'
: row.repairType == 2
? '故障维修'
: row.repairType == 3
? '常规事故维修保养'
: '退车'
}}
row.repairType == 1
? '常规保养'
: row.repairType == 2
? '故障维修'
: row.repairType == 3
? '常规事故维修保养'
: '退车'
}}
</template>
</el-table-column>
<el-table-column prop="repairDescribe" label="维修描述"></el-table-column>
@@ -164,14 +150,8 @@
<el-dialog title="结算" :visible.sync="quickStockDialogVisible" width="30%" :before-close="quickStockClose">
<el-form label-width="80px" :model="rowData">
<el-form-item label="到账金额" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input-number
type="text"
v-model.trim="rowData.receivedAmount"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-input-number type="text" v-model.trim="rowData.receivedAmount" :precision="2" :step="0.1" :min="0"
:max="999999"></el-input-number>
</el-form-item>
<el-form-item label="到账情况" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="rowData.receivedRemark"></el-input>
@@ -197,16 +177,16 @@
<el-table-column label="维修类型">
<template slot-scope="scope">
{{
scope.row.repairType == 1
? '常规保养'
: scope.row.repairType == 2
? '故障维修'
: scope.row.repairType == 3
scope.row.repairType == 1
? '常规保养'
: scope.row.repairType == 2
? '故障维修'
: scope.row.repairType == 3
? '事故维修'
: scope.row.repairType == 4
? '退车'
: ' '
}}
? '退车'
: ' '
}}
</template>
</el-table-column>
<el-table-column prop="merName" label="服务门店" />
@@ -223,12 +203,8 @@
<span style="color: #888">:可选挂账现金公司承担</span>
</div>
<div class="titleBox">
<div
v-for="item in titleArr"
:key="item.id"
:class="item.id == selectedItemId ? 'isSelected' : 'titleItem'"
@click="selectWayBtn(item)"
>
<div v-for="item in titleArr" :key="item.id" :class="item.id == selectedItemId ? 'isSelected' : 'titleItem'"
@click="selectWayBtn(item)">
{{ item.name }}
</div>
</div>
@@ -251,13 +227,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="到账时间:">
<el-date-picker
v-model="formData.receiptTime"
type="date"
format="yyyy 年 MM 月 dd 日"
value-format="timestamp"
placeholder="选择日期"
>
<el-date-picker v-model="formData.receiptTime" type="date" format="yyyy 年 MM 月 dd 日"
value-format="timestamp" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -265,13 +236,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="收银时间:">
<el-date-picker
v-model="formData.cashDeskItme"
type="date"
format="yyyy 年 MM 月 dd 日"
value-format="timestamp"
placeholder="选择日期"
>
<el-date-picker v-model="formData.cashDeskItme" type="date" format="yyyy 年 MM 月 dd 日"
value-format="timestamp" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
@@ -334,9 +300,9 @@ export default {
dpCompany: '',
page: 1,
limit: 10,
orderType:'all',
accientOrderType:'all',
backOrderType:'all'
orderType: 'all',
accientOrderType: 'all',
backOrderType: 'all'
},
LogLoading: false,
dialogVisible: false,
@@ -425,7 +391,7 @@ export default {
selectWayBtn(item) {
// console.log(item, '收银方式--item');
this.formData.way = item.id;
this.selectedItemId = item.id;
this.selectedItemId = item.id;
// switch (item.id) {
// case 0:
// this.formData.way = item.id;
@@ -487,10 +453,13 @@ export default {
this.rowData.id = row.id;
this.quickStockDialogVisible = true;
},
selectableFn(e) {
console.log(e);
},
// 多选
handleSelectionChange(val) {
// console.log(val, '选择');
this.addTableList = val;
const filteredUsers = val.filter(user => user.isCashier == false );
this.addTableList = filteredUsers;
let multipleSelectionSet = new Set([]);
val.forEach((ele) => {
if (!multipleSelectionSet.has(ele.orderSn)) {
@@ -504,6 +473,10 @@ export default {
this.drawer = true;
cashInfoAPI(row.id).then((res) => {
console.log(res, '1111111111111');
//过滤收银方式
let user = this.titleArr.find(user => user.id == res.way)
res.wayName = user.name
this.detailObj = res;
});
},
@@ -548,6 +521,7 @@ export default {
justify-content: space-around;
// border: 1px solid red;
}
.titleItem {
width: 150px;
height: 100px;
@@ -558,6 +532,7 @@ export default {
line-height: 100px;
// margin-right: 10px;
}
.isSelected {
width: 150px;
height: 100px;
@@ -566,8 +541,10 @@ export default {
font-weight: bold;
text-align: center;
line-height: 100px;
box-shadow: 10px 10px 5px #cdc9c9; /* 水平偏移、垂直偏移、模糊距离、颜色 */
box-shadow: 10px 10px 5px #cdc9c9;
/* 水平偏移、垂直偏移、模糊距离、颜色 */
}
.spanBox {
display: flex;
align-items: center;
@@ -575,12 +552,14 @@ export default {
border-top: 1px solid #888;
padding: 10px;
}
.spanText {
display: flex;
justify-content: space-between;
font-size: 24px;
color: red;
}
.sureBtn {
padding: 15px 20px;
// width: 110px;
@@ -590,20 +569,25 @@ export default {
color: #000;
font-weight: bold;
}
.descriBOX {
padding: 30px;
}
.selWidth {
width: 300px;
}
.el-dropdown-link {
cursor: pointer;
color: #409eff;
font-size: 12px;
}
.el-icon-arrow-down {
font-size: 12px;
}
.tabBox_tit {
width: 60%;
font-size: 12px !important;
@@ -612,18 +596,22 @@ export default {
padding: 5px 0;
box-sizing: border-box;
}
.mt20 {
margin-top: 20px;
}
.demo-image__preview {
position: relative;
padding-left: 40px;
}
.demo-image__preview .el-image,
.el-image__error {
position: absolute;
left: 0;
}
.maxw180 {
display: inline-block;
max-width: 180px;

View File

@@ -1,6 +1,6 @@
<template>
<el-dialog v-if="dialogVisible" :title="title" :visible.sync="dialogVisible" width="70%" :before-close="handleClose">
<el-form :model="addForm" ref="addForm" class="demo-ruleForm" v-loading="loading">
<el-form :model="addForm" ref="addForm" class="demo-ruleForm" v-loading="loading" label-width="120px">
<el-row>
<!-- 添加无,编辑必有 -->
<el-form-item label="车辆型号id" prop="id">

View File

@@ -105,23 +105,23 @@
</el-card>
<!-- 定损 -->
<el-dialog title="定损" :visible.sync="dialogFormVisible" :before-close="damageQuxiaobtn">
<el-form :model="damageForm">
<el-form :model="damageForm" label-width="120px">
<el-row>
<el-col :span="11">
<el-form-item label="定损人员" :rules="[{ required: true, message: '请输入定损人员', trigger: 'blur' }]">
<el-input v-model="damageForm.damageStaff" placeholder="请输入定损人员"></el-input>
<el-input v-model="damageForm.damageStaff" placeholder="请输入定损人员" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="联系方式" :rules="[{ required: true, message: '请输入联系方式', trigger: 'blur' }]">
<el-input v-model="damageForm.damagePhone" maxlength="11" placeholder="请输入联系方式"></el-input>
<el-input v-model="damageForm.damagePhone" maxlength="11" placeholder="请输入联系方式" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="结算方式" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="damageForm.settlementMethod" placeholder="请选择结算方式">
<el-select v-model="damageForm.settlementMethod" placeholder="请选择结算方式" style="width: 200px;">
<el-option label="挂帐月结" :value="1"></el-option>
<el-option label="现金支付" :value="2"></el-option>
<el-option label="保险理赔" :value="3"></el-option>
@@ -132,7 +132,7 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="责任类型" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="damageForm.dutyCategoryId" placeholder="请选择" filterable clearable>
<el-select v-model="damageForm.dutyCategoryId" placeholder="请选择" filterable clearable style="width: 200px;">
<el-option
v-for="item in dutyCategoryList"
:key="item.id"
@@ -147,7 +147,7 @@
<el-row>
<el-col :span="11">
<el-form-item label="保险公司" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="damageForm.insuranceCompanyId" placeholder="请选择">
<el-select v-model="damageForm.insuranceCompanyId" placeholder="请选择" style="width: 200px;">
<el-option
v-for="item in insuranceCompanyList"
:key="item.id"
@@ -163,7 +163,7 @@
prop="entryDate"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-date-picker v-model="damageForm.entryDate" type="date" placeholder="选择日期"> </el-date-picker>
<el-date-picker v-model="damageForm.entryDate" type="date" placeholder="选择日期" style="width: 200px;"> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -278,7 +278,7 @@
<!-- 创建并接车 接车 -->
<!-- 暂缺维修店数据 -->
<el-dialog :title="pickCarTitle" :visible.sync="picupVisible" width="60%" :before-close="picupQuxiaobtn">
<el-form :model="picupForm">
<el-form :model="picupForm" label-width="120px">
<el-row v-if="picupForm.id">
<el-form-item label="工单号">
<el-input v-model="picupForm.id" disabled></el-input>
@@ -297,8 +297,8 @@
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="车牌号" prop="carNo" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-col :span="12">
<el-form-item label="车牌号" prop="carNo" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<!-- <el-select v-model="picupForm.carNo" placeholder="请选择">
<el-option v-for="item in carNooptions" :key="item.id" :label="item.carNo" :value="item.carNo">
</el-option>
@@ -311,13 +311,14 @@
placeholder="请输入关键词/数字,如浙A"
:remote-method="remoteMethod"
:loading="loading"
style="width: 200px"
>
<el-option v-for="item in carNooptions" :key="item.value" :label="item.carNo" :value="item.carNo">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="14" :offset="1">
<el-col :span="12">
<el-form-item label="维修类型:" prop="repairType" :rules="[{ required: true, trigger: 'blur' }]">
<el-radio-group v-model="picupForm.repairType">
<el-radio disabled :label="1">常规保养</el-radio>
@@ -329,37 +330,37 @@
</el-col>
</el-row>
<el-row v-if="picupForm.id == null">
<el-col :span="11">
<el-col :span="12">
<el-form-item
label="司机名称"
label="司机名称"
prop="name"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input v-model.trim="picupForm.name" />
<el-input v-model.trim="picupForm.name" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-col :span="12">
<el-form-item
label="联系方式"
label="联系方式"
prop="phone"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-input v-model.number="picupForm.phone" maxlength="11" />
<el-input v-model.number="picupForm.phone" maxlength="11" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="dp公司" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.dpCompanyId" placeholder="请选择dp公司" filterable clearable>
<el-col :span="12">
<el-form-item label="dp公司" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.dpCompanyId" placeholder="请选择dp公司" filterable clearable style="width: 200px">
<el-option v-for="item in dpCompanyList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item label="责任类型" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.dutyCategoryId" placeholder="请选择责任类型" filterable clearable>
<el-col :span="12" >
<el-form-item label="责任类型" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.dutyCategoryId" placeholder="请选择责任类型" filterable clearable style="width: 200px">
<el-option
v-for="item in dutyCategoryList"
:key="item.id"
@@ -369,9 +370,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item label="保险公司" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.insuranceCompanyId" placeholder="请选择保险公司" filterable clearable>
<el-col :span="12" >
<el-form-item label="保险公司" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.insuranceCompanyId" placeholder="请选择保险公司" filterable clearable style="width: 200px">
<el-option
v-for="item in insuranceCompanyList"
:key="item.id"
@@ -381,12 +382,9 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="拖车费用" :rules="[{ required: true, message: '请输入拖车费用', trigger: 'blur' }]">
<el-input-number
<el-col :span="12">
<el-form-item label="拖车费用:" :rules="[{ required: true, message: '请输入拖车费用', trigger: 'blur' }]">
<el-input-number style="width: 200px"
type="text"
step-strictly
v-model.trim="picupForm.truckingPrice"
@@ -395,25 +393,24 @@
></el-input-number>
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-col :span="12" >
<el-form-item
label="全方责信息"
label="全方责信息"
:rules="[{ required: true, message: '请输入全方责信息', trigger: 'blur' }]"
>
<el-input v-model="picupForm.responsibleInfo" placeholder="请输入全方责信息"></el-input>
<el-input v-model="picupForm.responsibleInfo" placeholder="请输入全方责信息" style="width: 200px"></el-input>
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item label="接车备注" :rules="[{ required: true, message: '请输入接车备注', trigger: 'blur' }]">
<el-input v-model="picupForm.picUpRemark" placeholder="请输入接车备注"></el-input>
<el-col :span="12" >
<el-form-item label="接车备注" :rules="[{ required: true, message: '请输入接车备注', trigger: 'blur' }]">
<el-input v-model="picupForm.picUpRemark" placeholder="请输入接车备注" style="width: 200px"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="结算方式" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.settlementMethod" placeholder="请选择结算方式">
<el-select v-model="picupForm.settlementMethod" placeholder="请选择结算方式" style="width: 200px">
<el-option label="挂帐月结" :value="1"></el-option>
<el-option label="现金支付" :value="2"></el-option>
<el-option label="保险理赔" :value="3"></el-option>
@@ -422,9 +419,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-col :span="12" >
<el-form-item label="事故日期" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-date-picker v-model="picupForm.accidentDate" type="date" placeholder="选择日期"> </el-date-picker>
<el-date-picker v-model="picupForm.accidentDate" type="date" placeholder="选择日期" style="width: 200px"> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -450,13 +447,12 @@
<!-- 交车 -->
<el-dialog title="交车" :visible.sync="undeliveryVisible" width="60%" :before-close="undeliveryQuxiaobtn">
<el-form :model="undeliveryForm">
<el-form :model="undeliveryForm" label-width="80px">
<el-row>
<el-form-item label="工单id">
<el-input v-model="undeliveryForm.carReservationOrderId" disabled></el-input>
</el-form-item>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="定损金额" :rules="[{ required: true, message: '请输入定损金额', trigger: 'blur' }]">

View File

@@ -11,14 +11,14 @@
:close-on-click-modal="false"
>
<div class="sketch_content">
<el-form :model="createAndBillForm">
<el-row>
<el-col :span="11">
<el-form :model="createAndBillForm" label-width="80px">
<el-row >
<el-col :span="6">
<el-form-item label="工单id" :rules="[{ required: true, trigger: 'blur' }]">
<el-input :disabled="true" v-model="createAndBillForm.carReservationOrderId"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-col :span="6" >
<el-form-item label="备注" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="createAndBillForm.remark"></el-input>
</el-form-item>

View File

@@ -32,14 +32,8 @@
</div>
</div>
<el-button type="primary" @click="openDialog(1, '创建工单并接车', null)">创建工单并接车</el-button>
<el-table
v-loading="listLoading"
:data="orderDataList"
style="width: 100%"
size="small"
highlight-current-row
class="switchTable"
>
<el-table v-loading="listLoading" :data="orderDataList" style="width: 100%" size="small" highlight-current-row
class="switchTable">
<el-table-column prop="id" label="ID" />
<el-table-column prop="carNo" label="车牌号"></el-table-column>
<el-table-column prop="merName" label="商户名称"></el-table-column>
@@ -54,14 +48,14 @@
<template v-slot="{ row }">
{{ row.auditStatus == 0 ? '待审核' : row.auditStatus == 1 ? '已处理' : row.auditStatus == 2 ? '驳回' : '' }}
</template>
</el-table-column>
<el-table-column prop="auditReason" label="预约预处驳回理由">
<template v-slot="{ row }">
</el-table-column>
<el-table-column prop="auditReason" label="预约预处驳回理由">
<template v-slot="{ row }">
{{ row.auditReason ? row.auditReason : '' }}
</template>
</el-table-column>
<el-table-column prop="billAuditStatus" label="开单审核">
<template v-slot="{ row }">
</el-table-column>
<el-table-column prop="billAuditStatus" label="开单审核">
<template v-slot="{ row }">
{{
row.billAuditStatus == 0
? '待审核'
@@ -72,27 +66,27 @@
: ''
}}
</template>
</el-table-column>
<el-table-column prop="billAuditReason" label="开单审核拒绝理由">
<template v-slot="{ row }">
</el-table-column>
<el-table-column prop="billAuditReason" label="开单审核拒绝理由">
<template v-slot="{ row }">
{{ row.billAuditReason ? row.billAuditReason : '' }}
</template>
</el-table-column>
<el-table-column prop="auditRepair" v-if="tabActive == 'refuse'" label="维修审核">
<template v-slot="{ row }">
</el-table-column>
<el-table-column prop="auditRepair" v-if="tabActive == 'refuse'" label="维修审核">
<template v-slot="{ row }">
{{ row.auditRepair == 0 ? '待审核' : row.auditRepair == 1 ? '同意' : row.auditRepair == 2 ? '拒绝' : '' }}
</template>
</el-table-column>
<el-table-column v-if="tabActive == 'refuse'" prop="auditRepairName" label="审核人姓名">
<template v-slot="{ row }">
</el-table-column>
<el-table-column v-if="tabActive == 'refuse'" prop="auditRepairName" label="审核人姓名">
<template v-slot="{ row }">
{{ row.auditRepairName ? row.auditRepairName : '' }}
</template>
</el-table-column>
<el-table-column v-if="tabActive == 'refuse'" prop="auditRepairReason" label="审核意见">
<template v-slot="{ row }">
</el-table-column>
<el-table-column v-if="tabActive == 'refuse'" prop="auditRepairReason" label="审核意见">
<template v-slot="{ row }">
{{ row.auditRepairReason ? row.auditRepairReason : '' }}
</template>
</el-table-column> -->
</el-table-column> -->
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
@@ -104,55 +98,33 @@
</el-button>
<!-- 待开单 -->
<el-button
v-if="scope.row.isPickUp == 1 && scope.row.isBilled == 0"
type="text"
@click="billingBtn(1, '开单', scope.row)"
>开单维修</el-button
>
<el-button
v-if="scope.row.isPickUp == 1 && scope.row.isBilled == 0"
type="text"
@click="noRepairBtn(scope.row)"
>开单不维修</el-button
>
<el-button v-if="scope.row.isPickUp == 1 && scope.row.isBilled == 0" type="text"
@click="billingBtn(1, '开单', scope.row)">开单维修</el-button>
<el-button v-if="scope.row.isPickUp == 1 && scope.row.isBilled == 0" type="text"
@click="noRepairBtn(scope.row)">开单不维修</el-button>
<!-- 维修中有 -->
<el-button v-if="scope.row.status == 1" type="text" @click="finishBtn(scope.row)">维修完成</el-button>
<!-- 待交车 -->
<el-button
v-if="scope.row.status == 2 && scope.row.isDelivery == false"
type="text"
@click="deliveryCarBtn(scope.row)"
>交车</el-button
>
<el-button v-if="scope.row.status == 2 && scope.row.isDelivery == false" type="text"
@click="deliveryCarBtn(scope.row)">交车</el-button>
<!-- 已拒绝 -->
<el-button
v-if="scope.row.billAuditStatus == 2 || scope.row.auditRepair == 2"
type="text"
@click="billingBtn(2, '重新开单', scope.row)"
>重新开单</el-button
>
<el-button v-if="scope.row.billAuditStatus == 2 || scope.row.auditRepair == 2" type="text"
@click="billingBtn(2, '重新开单', scope.row)">重新开单</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:page-sizes="[10, 20, 40, 60]"
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
@current-change="pageChange" />
</div>
</el-card>
<!-- 创建接车 -->
<el-dialog :title="picuptitle" :visible.sync="picupDialogVisible" width="100%" class="showALL_dialog">
<el-form :model="picupForm" ref="picupForm" class="demo-ruleForm" v-loading="loading">
<el-form :model="picupForm" ref="picupForm" class="demo-ruleForm" v-loading="loading" label-width='160px'>
<el-row v-if="picupForm.id == null">
<!-- <el-col :span="4">
<el-form-item
@@ -166,85 +138,55 @@
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4">
<el-col :span="8">
<el-form-item label="车牌号" prop="carNo" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<!-- <el-select v-model="picupForm.carNo" placeholder="请选择">
<el-option v-for="item in carNooptions" :key="item.id" :label="item.carNo" :value="item.carNo">
</el-option>
</el-select> -->
<el-select
v-model="picupForm.carNo"
filterable
remote
reserve-keyword
placeholder="请输入关键词/数字,如浙A"
:remote-method="remoteMethod"
:loading="loading"
>
<el-select v-model="picupForm.carNo" filterable remote reserve-keyword placeholder="请输入关键词/数字,如浙A"
:remote-method="remoteMethod" :loading="loading">
<el-option v-for="item in carNooptions" :key="item.value" :label="item.carNo" :value="item.carNo">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item
label="司机名称"
prop="name"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="司机名称" prop="name" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model.trim="picupForm.name" />
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item
label="联系方式"
prop="phone"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="联系方式" prop="phone" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model.number="picupForm.phone" maxlength="11" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" v-if="picupForm.id">
<el-col :span="8" v-if="picupForm.id">
<el-form-item label="工单号" prop="id">
<el-input v-model.number="picupForm.id" disabled />
</el-form-item>
</el-col>
<el-col :span="4" :offset="picupForm.id ? 1 : 0">
<el-form-item
label="dp公司"
prop="dpCompanyId"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="dp公司" prop="dpCompanyId"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="picupForm.dpCompanyId" placeholder="请选择" filterable clearable>
<el-option v-for="item in dpCompanyIdoptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-col :span="8">
<el-form-item label="接车日期" prop="returnDate">
<!-- :rules="[{ required: true, message: '请选择', trigger: 'blur' }]" -->
<el-date-picker
v-model="returnDate"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 100%"
/>
<el-date-picker v-model="returnDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item
label="维修类型:"
prop="repairType"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="维修类型" prop="repairType" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-radio-group v-model="picupForm.repairType">
<el-radio disabled :label="1">常规保养</el-radio>
<el-radio disabled :label="2">故障维修</el-radio>
@@ -253,12 +195,12 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item
label="退车类型:"
prop="returnCategory"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="退车类型" prop="returnCategory"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-radio-group v-model="picupForm.returnCategory">
<el-radio :label="1">到期退车</el-radio>
<el-radio :label="2">违约退车</el-radio>
@@ -266,8 +208,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item label="双证" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-col :span="8">
<el-form-item label="双证" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-radio-group v-model="picupForm.doubleCertificates">
<el-radio :label="1">双证齐全</el-radio>
<el-radio :label="2">缺行驶证</el-radio>
@@ -275,42 +217,27 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item
label="公里数"
prop="kilometer"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="公里数" prop="kilometer" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model.number="picupForm.kilometer" placeholder="请输入公里数" />
</el-form-item>
</el-col>
<el-col :span="4" :offset="1">
<el-form-item
label="续航里程"
prop="enduranceKilometer"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="续航里程" prop="enduranceKilometer"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model.number="picupForm.enduranceKilometer" placeholder="请输入续航里程" />
</el-form-item>
</el-col>
<el-col :span="6" :offset="1">
<el-form-item
label="退车接车备注"
prop="picUpRemark"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="退车接车备注" prop="picUpRemark"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input type="textarea" v-model="picupForm.picUpRemark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item
label="车损照片"
prop="damageImage"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="车损照片" prop="damageImage"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<div class="upLoadPicBox" @click="modalPicTap('1', 'damageImage')">
<div v-if="picupForm.damageImage" class="pictrue"><img :src="picupForm.damageImage" /></div>
<div v-else-if="formValidate.damageImage" class="pictrue"><img :src="formValidate.damageImage" /></div>
@@ -321,14 +248,9 @@
</el-form-item>
</el-col>
</el-row>
<!-- -->
<el-row>
<el-col :span="7">
<el-form-item
label="电池底盖璃损失情况:"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-col :span="8">
<el-form-item label="电池底盖璃损失情况" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-radio-group v-model="picupForm.batteryBottomCover">
<el-radio :label="1">完好</el-radio>
<el-radio :label="2">划痕</el-radio>
@@ -336,8 +258,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item label="后机盖损失情况" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-col :span="8" >
<el-form-item label="后机盖损失情况" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-radio-group v-model="picupForm.behindHood">
<el-radio :label="1">完好</el-radio>
<el-radio :label="2">划痕</el-radio>
@@ -345,8 +267,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item label="车顶损失情况" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-col :span="8" >
<el-form-item label="车顶损失情况" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-radio-group v-model="picupForm.carRoof">
<el-radio :label="1">完好</el-radio>
<el-radio :label="2">划痕</el-radio>
@@ -358,20 +280,17 @@
<el-row>
<el-col :span="7">
<el-form-item
label="电池底盖璃处理方案:"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-form-item label="电池底盖璃处理方案" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model.trim="picupForm.batteryBottomCoverStr" />
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item label="后机盖处理方案" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-form-item label="后机盖处理方案" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model.trim="picupForm.behindHoodStr" />
</el-form-item>
</el-col>
<el-col :span="7" :offset="1">
<el-form-item label="车顶处理方案" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-form-item label="车顶处理方案" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model.trim="picupForm.carRoofStr" />
</el-form-item>
</el-col>
@@ -808,11 +727,7 @@
<el-input v-model.number="deliveryCarForm.carReservationOrderId" disabled />
</el-form-item>
<el-form-item
label="交车图片"
prop="deliveryImage"
:rules="[{ required: true, message: '请选择', trigger: 'blur' }]"
>
<el-form-item label="交车图片" prop="deliveryImage" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<div class="upLoadPicBox" @click="modalPicTap('2', 'deliveryImage')">
<div v-if="deliveryCarForm.deliveryImage" class="pictrue">
<img :src="deliveryCarForm.deliveryImage" />
@@ -860,12 +775,12 @@
</el-dialog>
<!-- 不为修 -->
<el-dialog title="开单不维修" :visible.sync="noRepairVisible" width="30%" :before-close="noRepairClose">
<el-form :model="noRepairForm">
<el-form :model="noRepairForm" label-width="80px">
<el-form-item label="工单id" prop="carReservationOrderId" :rules="[{ required: true, trigger: 'blur' }]">
<el-input v-model.number="noRepairForm.carReservationOrderId" disabled />
<el-input v-model.number="noRepairForm.carReservationOrderId" disabled style="width: 200px;"/>
</el-form-item>
<el-form-item label="车库" prop="garageId" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select v-model="noRepairForm.garageId" placeholder="请选择">
<el-select v-model="noRepairForm.garageId" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in garageIdoptions" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select>
</el-form-item>
@@ -884,15 +799,9 @@
:billingNum="billingNum"
:optionsCarNo="optionsCarNo"
></creat-level> -->
<creat-level
:title="dialogTitle"
ref="grades"
v-if="createAndBillForm"
:billingNum="billingNum"
:createAndBillForm="createAndBillForm"
:projectList="createAndBillForm.projectList"
:optionsCarNo="optionsCarNo"
></creat-level>
<creat-level :title="dialogTitle" ref="grades" v-if="createAndBillForm" :billingNum="billingNum"
:createAndBillForm="createAndBillForm" :projectList="createAndBillForm.projectList"
:optionsCarNo="optionsCarNo"></creat-level>
</div>
</template>
@@ -1099,7 +1008,7 @@ export default {
finishOptions: [],
};
},
mounted() {},
mounted() { },
created() {
this.getList('all');
this.getCarList();
@@ -1354,10 +1263,12 @@ export default {
<style scoped lang="scss">
.showALL_dialog {
overflow: hidden;
::v-deep .el-dialog {
margin: 0 auto !important;
height: 100%;
overflow: hidden;
.el-dialog__body {
position: absolute;
left: 0;
@@ -1370,6 +1281,7 @@ export default {
overflow-y: auto;
}
}
.dialog-footer {
// border: 2px solid purple;
width: 100%;
@@ -1380,6 +1292,7 @@ export default {
display: flex;
justify-content: space-around;
}
.dialog-footer button {
width: 48%;
height: 50px;

View File

@@ -1,17 +1,10 @@
<template>
<div class="creatLevel">
<!-- 创建工单并开单 一层 -->
<el-dialog
v-if="createAndBillFormVisible"
:title="title"
:visible.sync="createAndBillFormVisible"
width="100%"
class="showALL_dialog"
@close="createAndBillremoveBtn"
:close-on-click-modal="false"
>
<el-dialog v-if="createAndBillFormVisible" :title="title" :visible.sync="createAndBillFormVisible" width="100%"
class="showALL_dialog" @close="createAndBillremoveBtn" :close-on-click-modal="false">
<div class="sketch_content">
<el-form :model="createAndBillForm">
<el-form :model="createAndBillForm" label-width="120px">
<el-row>
<div style="padding: 30px; border: 1px solid #888">
<div>
@@ -53,182 +46,135 @@
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:page-sizes="[10, 20, 40, 60]"
:page-size="carNoData.limit"
:current-page="carNoData.page"
layout="total, sizes, prev, pager, next, jumper"
:total="carNototal"
@size-change="carNoSizeChange"
@current-change="carNopageChange"
/>
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="carNoData.limit"
:current-page="carNoData.page" layout="total, sizes, prev, pager, next, jumper" :total="carNototal"
@size-change="carNoSizeChange" @current-change="carNopageChange" />
</div>
</div>
</el-row>
<div style="height: 30px"></div>
<el-row>
<el-form size="small">
<el-col :span="5">
<el-form-item label="车牌号:" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-input v-model.trim="carObj.carNo" disabled> </el-input>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item label="车架号:">
<el-input v-model.trim="carObj.vinId" disabled> </el-input>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item label="发动机号:">
<el-input v-model.trim="carObj.engineNo" disabled> </el-input>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item label="车辆型号:">
<el-input v-model.trim="carObj.modelName" disabled> </el-input>
</el-form-item>
</el-col>
</el-form>
<el-col :span="6">
<el-form-item label="车牌号:" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-input v-model.trim="carObj.carNo" disabled style="width: 200px;"> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车架号:">
<el-input v-model.trim="carObj.vinId" disabled style="width: 200px;"> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发动机号:">
<el-input v-model.trim="carObj.engineNo" disabled style="width: 200px;"> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车辆型号:">
<el-input v-model.trim="carObj.modelName" disabled style="width: 200px;"> </el-input>
</el-form-item>
</el-col>
</el-row>
<!-- -->
<el-row>
<el-col :span="5">
<el-form-item label="dp公司" prop="dpCompany">
<el-select v-model="createAndBillForm.dpCompany" placeholder="请选择" filterable clearable>
<el-col :span="6">
<el-form-item label="dp公司" prop="dpCompany">
<el-select v-model="createAndBillForm.dpCompany" placeholder="请选择" style="width: 200px;" filterable
clearable>
<el-option v-for="item in dpCompanyIdoptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item label="预计交付时间" prop="preseTime">
<el-date-picker
v-model="createAndBillForm.preseTime"
type="date"
format="yyyy 年 MM 月 dd 日"
value-format="timestamp"
placeholder="选择日期"
>
<el-col :span="6">
<el-form-item label="预计交付时间" prop="preseTime">
<el-date-picker v-model="createAndBillForm.preseTime" type="date" format="yyyy 年 MM 月 dd 日"
value-format="timestamp" placeholder="选择日期" style="width: 200px;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-form-item label="进店时间" prop="scheduLingTime">
<el-date-picker
v-model="createAndBillForm.scheduLingTime"
type="date"
format="yyyy 年 MM 月 dd 日"
value-format="timestamp"
placeholder="选择日期"
>
<el-col :span="6">
<el-form-item label="进店时间" prop="scheduLingTime">
<el-date-picker v-model="createAndBillForm.scheduLingTime" type="date" format="yyyy 年 MM 月 dd 日"
value-format="timestamp" placeholder="选择日期" style="width: 200px;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5" :offset="1">
<el-col :span="6">
<el-form-item label="服务顾问:">
<el-input v-model="createAndBillForm.counselorName" placeholder="请输入服务顾问"></el-input>
<el-input v-model="createAndBillForm.counselorName" placeholder="请输入服务顾问"
style="width: 200px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 第一行 -->
<el-row :gutter="10" type="flex" justify="space-between">
<!-- <el-col :span="3">
<el-form-item label="车牌:" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-select
v-model="createAndBillForm.carNo"
filterable
remote
reserve-keyword
placeholder="请输入关键词/数字,如浙A"
:remote-method="remoteMethod"
:loading="loading"
>
<el-option v-for="item in optionsCarNo" :key="item.value" :label="item.carNo" :value="item.carNo">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="5">
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item label="司机名称:" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="createAndBillForm.name" placeholder="请输入司机名称"></el-input>
<el-input v-model="createAndBillForm.name" placeholder="请输入司机名称" style="width: 200px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="联系方式:" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-input v-model="createAndBillForm.phone" maxlength="11" placeholder="请输入联系方式"></el-input>
<el-input v-model="createAndBillForm.phone" maxlength="11" placeholder="请输入联系方式"
style="width: 200px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="维修类型:" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
<el-radio-group v-model="createAndBillForm.repairType">
<el-radio-group v-model="createAndBillForm.repairType" style="width: 200px;">
<el-radio disabled :label="1">常规保养</el-radio>
<el-radio disabled :label="2">故障维修</el-radio>
<el-radio disabled :label="3">事故维修</el-radio>
<el-radio disabled :label="4">退车</el-radio>
<!-- <el-radio disabled :label="2">故障维修</el-radio> -->
<!-- <el-radio disabled :label="3">事故维修</el-radio> -->
<!-- <el-radio disabled :label="4">退车</el-radio> -->
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="公里数:" :rules="[{ required: true, message: '请输入公里数', trigger: 'blur' }]">
<!-- v-if="createAndBillForm.maintenance" -->
<el-input
v-model.number="createAndBillForm.maintenance.kilometer"
placeholder="请输入公里数"
></el-input>
<el-input v-model.number="createAndBillForm.maintenance.kilometer" placeholder="请输入公里数"
style="width: 200px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-show="currentBtnId == 2 || currentBtnId == 3">
<el-form-item label="工单号:">
<el-input :disabled="true" v-model="createAndBillForm.carReservationOrderId"
style="width: 200px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" v-show="currentBtnId == 2 || currentBtnId == 3">
<el-form-item label="工单号">
<el-input :disabled="true" v-model="createAndBillForm.carReservationOrderId"></el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="故障现象" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<el-row>
<el-col :span="11" v-for="(item, index) in faultList" :key="index" class="contentDiv">
<el-input v-model="item.content" type="textarea" autosize placeholder="请输入故障现象"></el-input>
<div class="con_btn_div">
<el-button icon="el-icon-plus" type="primary" @click="addContentInput" circle></el-button>
<el-button
icon="el-icon-minus"
v-if="index > 0"
@click="removeContentInput(item)"
circle
></el-button>
</div>
</el-col>
</el-row>
<el-col :span="8" v-for="(item, index) in faultList" :key="index">
<el-form-item :label="`故障现象${index + 1}`" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<div class="contentDiv">
<el-input v-model="item.content" type="textarea" autosize placeholder="请输入故障现象" style="width: 200px;">
</el-input>
<div class="con_btn_div">
<el-button icon="el-icon-plus" type="primary" @click="addContentInput" circle></el-button>
<el-button icon="el-icon-minus" v-if="index > 0" @click="removeContentInput(item)"
circle></el-button>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item
label="车头照片"
prop="headerImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]"
>
<el-col :span="6">
<el-form-item label="车头照片" prop="headerImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]">
<div class="upLoadPicBox" style="display: flex">
<div v-if="createAndBillForm.maintenance.headerImage" class="pictrue">
<imagePreview :src="createAndBillForm.maintenance.headerImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(6)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(6)" />
</div>
<div v-else-if="formValidate.headerImage" class="pictrue">
<imagePreview :src="formValidate.headerImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(6)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(6)" />
</div>
<div class="upLoad" @click="modalPicTap('6', 'headerImage')">
<i class="el-icon-camera cameraIconfont" />
@@ -236,28 +182,19 @@
</div>
</el-form-item>
</el-col>
<el-col :span="4" :offset="1">
<el-form-item
label="车架号照片"
prop="vinImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]"
>
<el-col :span="6">
<el-form-item label="车架号照片" prop="vinImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]">
<div class="upLoadPicBox" style="display: flex">
<div v-if="createAndBillForm.maintenance.vinImage" class="pictrue">
<imagePreview :src="createAndBillForm.maintenance.vinImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(7)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(7)" />
</div>
<div v-else-if="formValidate.vinImage" class="pictrue">
<imagePreview :src="formValidate.vinImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(7)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(7)" />
</div>
<div class="upLoad" @click="modalPicTap('7', 'vinImage')">
<i class="el-icon-camera cameraIconfont" />
@@ -266,28 +203,19 @@
</el-form-item>
</el-col>
<el-col :span="4" :offset="1">
<el-form-item
label="仪表盘照片"
prop="dashboardImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]"
>
<el-col :span="6">
<el-form-item label="仪表盘照片" prop="dashboardImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]">
<div class="upLoadPicBox" style="display: flex">
<div v-if="createAndBillForm.maintenance.dashboardImage" class="pictrue">
<imagePreview :src="createAndBillForm.maintenance.dashboardImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(1)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(1)" />
</div>
<div v-else-if="formValidate.dashboardImage" class="pictrue">
<imagePreview :src="formValidate.dashboardImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(1)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(1)" />
</div>
<div class="upLoad" @click="modalPicTap('1', 'dashboardImage')">
<i class="el-icon-camera cameraIconfont" />
@@ -296,28 +224,19 @@
</el-form-item>
</el-col>
<el-col :span="4" :offset="1">
<el-form-item
label="行驶证照片"
prop="drivingLicenseImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]"
>
<el-col :span="6">
<el-form-item label="行驶证照片" prop="drivingLicenseImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]">
<div class="upLoadPicBox" style="display: flex">
<div v-if="createAndBillForm.maintenance.drivingLicenseImage" class="pictrue">
<imagePreview :src="createAndBillForm.maintenance.drivingLicenseImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(3)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(3)" />
</div>
<div v-else-if="formValidate.drivingLicenseImage" class="pictrue">
<imagePreview :src="formValidate.drivingLicenseImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(3)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(3)" />
</div>
<div class="upLoad" @click="modalPicTap('3', 'drivingLicenseImage')">
<i class="el-icon-camera cameraIconfont" />
@@ -326,28 +245,19 @@
</el-form-item>
</el-col>
<el-col :span="4" :offset="1">
<el-form-item
label="驾驶证照片"
prop="driveLicenseImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]"
>
<el-col :span="6">
<el-form-item label="驾驶证照片" prop="driveLicenseImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]">
<div class="upLoadPicBox" style="display: flex">
<div v-if="createAndBillForm.maintenance.driveLicenseImage" class="pictrue">
<imagePreview :src="createAndBillForm.maintenance.driveLicenseImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(2)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(2)" />
</div>
<div v-else-if="formValidate.driveLicenseImage" class="pictrue">
<imagePreview :src="formValidate.driveLicenseImage" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(2)"
/>
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemove(2)" />
</div>
<div class="upLoad" @click="modalPicTap('2', 'driveLicenseImage')">
<i class="el-icon-camera cameraIconfont" />
@@ -355,77 +265,41 @@
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-form-item
label="故障照片"
prop="faultImage"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]"
>
<div class="upLoadPicBox" @click="modalPicTap('4', 'faultImage')">
<div v-if="createAndBillForm.maintenance.faultImage" class="pictrue">
<img :src="createAndBillForm.maintenance.faultImage" />
<el-col :span="6">
<el-form-item label="故障照片" prop="faultImage" :rules="{ required: true, message: '请添加', trigger: 'blur' }">
<div class="acea-row">
<div v-for="(item, index) in faultImageArr" :key="index" class="pictrue" style="position: relative"
draggable="true">
<imagePreview :src="item" />
<i class="el-icon-error btndel" style="position: absolute; top: -5px; right: -5px"
@click="handleRemoveArr(index, 1)" />
</div>
<div v-else-if="formValidate.faultImage" class="pictrue">
<img :src="formValidate.faultImage" />
<div v-if="faultImageArr.length < 10" class="upLoadPicBox" @click="modalPicTapArr('1')">
<div class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="故障视频" prop="faultVideo"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]">
<div class="upLoadPicBox" @click="modalPicTap('5', 'faultVideo')">
<div v-if="createAndBillForm.maintenance.faultVideo">
<video :src="createAndBillForm.maintenance.faultVideo" style="height: 150px; width: 200px"
controls="controls" />
</div>
<div v-else-if="formValidate.faultVideo">
<video :src="formValidate.faultVideo" controls="controls" />
</div>
<div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</el-form-item> -->
<el-form-item
label="故障照片"
prop="faultImage"
:rules="{ required: true, message: '请添加', trigger: 'blur' }"
>
<div class="acea-row">
<div
v-for="(item, index) in faultImageArr"
:key="index"
class="pictrue"
style="position: relative"
draggable="true"
>
<imagePreview :src="item" />
<i
class="el-icon-error btndel"
style="position: absolute; top: -5px; right: -5px"
@click="handleRemoveArr(index, 1)"
/>
</div>
<div v-if="faultImageArr.length < 10" class="upLoadPicBox" @click="modalPicTapArr('1')">
<div class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</div>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item
label="故障视频"
prop="faultVideo"
:rules="[{ required: true, message: '请添加', trigger: 'blur' }]"
>
<div class="upLoadPicBox" @click="modalPicTap('5', 'faultVideo')">
<div v-if="createAndBillForm.maintenance.faultVideo">
<video
:src="createAndBillForm.maintenance.faultVideo"
style="height: 150px; width: 200px"
controls="controls"
/>
</div>
<div v-else-if="formValidate.faultVideo">
<video :src="formValidate.faultVideo" controls="controls" />
</div>
<div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</el-form-item>
</el-row>
<!-- 维修项目 -->
<el-form-item label="维修项目">
<el-button @click="openTwoDialog" type="primary">添加维修项目</el-button>
@@ -449,11 +323,8 @@
<el-table-column prop="workingTotalPrice" label="工时总价格"> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
@click.native.prevent="projectListDeleteRow(scope.$index, projectList)"
type="text"
size="small"
>
<el-button @click.native.prevent="projectListDeleteRow(scope.$index, projectList)" type="text"
size="small">
移除
</el-button>
</template>
@@ -469,15 +340,8 @@
</el-dialog>
<!-- 维修项目弹窗 二层 -->
<el-dialog
width="80%"
title="维修项目"
:visible.sync="createAndBilltwoVisible"
append-to-body
@close="removeBtnTwo"
:close-on-click-modal="false"
class="showALL_dialogMini"
>
<el-dialog width="80%" title="维修项目" :visible.sync="createAndBilltwoVisible" append-to-body @close="removeBtnTwo"
:close-on-click-modal="false" class="showALL_dialogMini">
<!-- :inline="true" -->
<el-form :model="createAndBillFormTwo">
<el-row>
@@ -494,11 +358,7 @@
<!-- 套餐id -->
<div style="display: flex; width: 450px; align-items: center; margin-bottom: 10px">
<p>套餐名</p>
<el-input
style="width: 200px; margin: 0 8px"
v-model="formData.name"
placeholder="输入套餐名搜索"
></el-input>
<el-input style="width: 200px; margin: 0 8px" v-model="formData.name" placeholder="输入套餐名搜索"></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="search">搜索</el-button>
</div>
<el-table :data="tableDataList" style="width: 100%" height="300px">
@@ -507,26 +367,15 @@
<el-table-column prop="packageSn" label="套餐编码" width="240"></el-table-column>
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="addAccessory(scope.row)"
:disabled="taocanList.length !== 0"
>选择</el-button
>
<el-button type="text" size="small" @click="addAccessory(scope.row)"
:disabled="taocanList.length !== 0">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:page-sizes="[10, 20, 40, 60]"
:page-size="formData.limit"
:current-page="formData.page"
layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="formData.limit" :current-page="formData.page"
layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
@size-change="handleSizeChange" @current-change="pageChange" />
</div>
</div>
<!-- class="taocan_div_l" -->
@@ -536,11 +385,8 @@
<el-table-column prop="name" label="套餐名"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
@click.native.prevent="accessoryListDeleteRow(scope.$index, taocanList)"
type="text"
size="small"
>
<el-button @click.native.prevent="accessoryListDeleteRow(scope.$index, taocanList)" type="text"
size="small">
移除
</el-button>
</template>
@@ -569,40 +415,20 @@
</el-row>
<el-row>
<el-form-item label="材料价格:" :rules="[{ required: true, message: '请输入材料价格', trigger: 'blur' }]">
<el-input-number
type="text"
v-model.trim="createAndBillFormTwo.price"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-input-number type="text" v-model.trim="createAndBillFormTwo.price" :precision="2" :step="0.1" :min="0"
:max="999999"></el-input-number>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="工时数量:" :rules="[{ required: true, trigger: 'blur' }]">
<el-input-number
type="text"
step-strictly
v-model.trim="createAndBillFormTwo.workingHour"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-input-number type="text" step-strictly v-model.trim="createAndBillFormTwo.workingHour" :precision="2"
:step="0.1" :min="0" :max="999999"></el-input-number>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="工时单价:" :rules="[{ required: true, trigger: 'blur' }]">
<el-input-number
type="text"
step-strictly
v-model.trim="createAndBillFormTwo.workingPrice"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-input-number type="text" step-strictly v-model.trim="createAndBillFormTwo.workingPrice" :precision="2"
:step="0.1" :min="0" :max="999999"></el-input-number>
</el-form-item>
</el-row>
<el-row>
@@ -624,32 +450,19 @@
<el-row type="flex" class="row-bg" justify="end">
<el-col :span="8">
<el-row>
<el-form-item
label="项目名称:"
:rules="[{ required: true, message: '请输入项目名称', trigger: 'blur' }]"
>
<el-form-item label="项目名称:" :rules="[{ required: true, message: '请输入项目名称', trigger: 'blur' }]">
<el-input v-model="createAndBillFormTwo_two.name" placeholder="请输入项目名称"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item
label="工时单价"
label-width="80px"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-form-item label="工时单价" label-width="80px"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<div>
<el-cascader
v-model="createAndBillFormTwo_two.workingPrice"
:options="projectCategoryTreeList"
<el-cascader v-model="createAndBillFormTwo_two.workingPrice" :options="projectCategoryTreeList"
@change="handleChange"
:props="{ value: 'id', label: 'name', children: 'childList', emitPath: false }"
></el-cascader>
<el-input
style="width: 100px"
v-model="createAndBillFormTwo_two.workingPrice"
disabled
placeholder="请选择工时单价"
></el-input>
:props="{ value: 'id', label: 'name', children: 'childList', emitPath: false }"></el-cascader>
<el-input style="width: 100px" v-model="createAndBillFormTwo_two.workingPrice" disabled
placeholder="请选择工时单价"></el-input>
<span>/小时</span>
</div>
</el-form-item>
@@ -661,15 +474,8 @@
</el-row>
<el-row>
<el-form-item label="工时数量" :rules="[{ required: true, trigger: 'blur' }]">
<el-input-number
type="text"
step-strictly
v-model.trim="createAndBillFormTwo_two.workingHour"
:precision="2"
:step="0.1"
:min="0"
:max="999999"
></el-input-number>
<el-input-number type="text" step-strictly v-model.trim="createAndBillFormTwo_two.workingHour"
:precision="2" :step="0.1" :min="0" :max="999999"></el-input-number>
</el-form-item>
</el-row>
</el-col>
@@ -678,16 +484,9 @@
<div>
<div style="display: flex; width: 450px; align-items: center; margin-bottom: 10px">
<p>材料名称</p>
<el-input
style="width: 200px; margin: 0 8px"
v-model="accessoryData.keywords"
placeholder="输入材料名称搜索"
clearable
@clear="getAccessoryList"
></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="accessorysearch"
>搜索</el-button
>
<el-input style="width: 200px; margin: 0 8px" v-model="accessoryData.keywords"
placeholder="输入材料名称搜索" clearable @clear="getAccessoryList"></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="accessorysearch">搜索</el-button>
</div>
<el-table :data="accessoryIdarr" style="width: 100%" height="240px">
<el-table-column prop="id" label="材料id" />
@@ -696,26 +495,16 @@
<el-table-column prop="stock" label="库存"></el-table-column>
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
<el-button
v-if="scope.row.stock > 0"
type="text"
size="small"
@click="addCailiaoThree(scope.row)"
>选择</el-button
>
<el-button v-if="scope.row.stock > 0" type="text" size="small"
@click="addCailiaoThree(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:page-sizes="[10, 20, 40, 60]"
:page-size="accessoryData.limit"
:current-page="accessoryData.page"
layout="total, sizes, prev, pager, next, jumper"
:total="accessorytableData.total"
@size-change="accessoryhandleSizeChange"
@current-change="accessorypageChange"
/>
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="accessoryData.limit"
:current-page="accessoryData.page" layout="total, sizes, prev, pager, next, jumper"
:total="accessorytableData.total" @size-change="accessoryhandleSizeChange"
@current-change="accessorypageChange" />
</div>
</div>
<!-- 展示 材料表 class="workHour_table_div" -->
@@ -728,13 +517,9 @@
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editNumberThree(scope.row)">编辑数量</el-button>
<el-button
@click.native.prevent="
accessoryListDeleteRow(scope.$index, createAndBillFormTwo_two.accessoryList)
"
type="text"
size="small"
>
<el-button @click.native.prevent="
accessoryListDeleteRow(scope.$index, createAndBillFormTwo_two.accessoryList)
" type="text" size="small">
移除
</el-button>
</template>
@@ -755,32 +540,19 @@
</el-form-item>
</el-col>
<el-col :span="8" :offset="1">
<el-form-item
label="工时单价"
label-width="80px"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
>
<el-form-item label="工时单价" label-width="80px"
:rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
<div>
<el-cascader
v-model="taocanData.workingPrice"
:options="projectCategoryTreeList"
@change="handleChange"
:props="{
value: 'id',
label: 'name',
children: 'childList',
emitPath: false,
expandTrigger: 'hover',
}"
filterable
clearable
></el-cascader>
<el-input
style="width: 100px"
v-model="taocanData.workingPrice"
disabled
placeholder="请选择工时单价"
></el-input>
<el-cascader v-model="taocanData.workingPrice" :options="projectCategoryTreeList"
@change="handleChange" :props="{
value: 'id',
label: 'name',
children: 'childList',
emitPath: false,
expandTrigger: 'hover',
}" filterable clearable></el-cascader>
<el-input style="width: 100px" v-model="taocanData.workingPrice" disabled
placeholder="请选择工时单价"></el-input>
<span>/小时</span>
</div>
</el-form-item>
@@ -794,13 +566,8 @@
</el-col>
<el-col :span="4" :offset="1">
<el-form-item label="工时数量" :rules="[{ required: true, trigger: 'blur' }]">
<el-input-number
type="text"
step-strictly
v-model.trim="taocanData.workingHour"
:min="0"
:max="999999"
></el-input-number>
<el-input-number type="text" step-strictly v-model.trim="taocanData.workingHour" :min="0"
:max="999999"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -813,16 +580,9 @@
<div>
<div style="display: flex; width: 450px; align-items: center; margin-bottom: 10px">
<p>材料名称</p>
<el-input
style="width: 200px; margin: 0 8px"
v-model="accessoryData.keywords"
placeholder="输入材料名称搜索"
clearable
@clear="getAccessoryList"
></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="accessorysearch"
>搜索</el-button
>
<el-input style="width: 200px; margin: 0 8px" v-model="accessoryData.keywords"
placeholder="输入材料名称搜索" clearable @clear="getAccessoryList"></el-input>
<el-button type="primary" size="mini" icon="el-icon-search" @click="accessorysearch">搜索</el-button>
</div>
<el-table :data="accessoryIdarr" style="width: 100%" height="240px">
<el-table-column prop="id" label="材料id" />
@@ -831,22 +591,16 @@
<el-table-column prop="stock" label="库存"></el-table-column>
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.stock > 0" type="text" size="small" @click="addCailiao(scope.row)"
>选择</el-button
>
<el-button v-if="scope.row.stock > 0" type="text" size="small"
@click="addCailiao(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:page-sizes="[10, 20, 40, 60]"
:page-size="accessoryData.limit"
:current-page="accessoryData.page"
layout="total, sizes, prev, pager, next, jumper"
:total="accessorytableData.total"
@size-change="accessoryhandleSizeChange"
@current-change="accessorypageChange"
/>
<el-pagination :page-sizes="[10, 20, 40, 60]" :page-size="accessoryData.limit"
:current-page="accessoryData.page" layout="total, sizes, prev, pager, next, jumper"
:total="accessorytableData.total" @size-change="accessoryhandleSizeChange"
@current-change="accessorypageChange" />
</div>
</div>
<!-- 展示 材料表 class="workHour_table_div" -->
@@ -861,9 +615,7 @@
<el-button type="text" size="small" @click="editNumber(scope.row)">编辑数量</el-button>
<el-button
@click.native.prevent="accessoryListDeleteRow(scope.$index, taocanData.accessoryList)"
type="text"
size="small"
>
type="text" size="small">
移除
</el-button>
</template>
@@ -1476,38 +1228,45 @@ export default {
.all_div {
display: flex;
justify-content: space-between;
.workHour_table_div {
border: 1px #aab5cd solid;
width: 48%;
}
.workHour_form_div {
border: 1px #aab5cd solid;
width: 48%;
padding: 20px;
}
}
.taocan_div {
display: flex;
justify-content: space-between;
margin-bottom: 15px;
.taocan_div_l {
border: 1px #aab5cd solid;
width: 40%;
}
.taocan_div_r {
border: 1px #aab5cd solid;
width: 56%;
padding: 20px;
}
}
.workHour_form_div_btn {
text-align: center;
margin-top: 20px;
}
.contentDiv {
display: flex;
justify-content: space-between;
}
.con_btn_div {
display: flex;
justify-content: space-between;
@@ -1515,12 +1274,15 @@ export default {
height: 36px;
margin-left: 10px;
}
.showALL_dialog {
overflow: hidden;
::v-deep .el-dialog {
margin: 0 auto !important;
height: 100%;
overflow: hidden;
.el-dialog__body {
position: absolute;
left: 0;
@@ -1544,6 +1306,7 @@ export default {
display: flex;
justify-content: space-around;
}
.dialog-footer button {
width: 48%;
height: 50px;
@@ -1552,10 +1315,12 @@ export default {
.showALL_dialogMini {
overflow: hidden;
::v-deep .el-dialog {
margin: 0 auto !important;
height: 100%;
overflow: hidden;
.el-dialog__body {
position: absolute;
left: 0;
@@ -1579,6 +1344,7 @@ export default {
display: flex;
justify-content: space-around;
}
.dialog-footerMini button {
width: 48%;
height: 50px;
@@ -1588,10 +1354,12 @@ export default {
.descriBOX {
padding: 30px;
}
.dialogSpan {
font-size: 12px;
color: salmon;
}
.pic {
width: 60px;
height: 60px;

File diff suppressed because it is too large Load Diff

View File

@@ -1,55 +1,33 @@
<template>
<el-dialog
v-if="dialogVisible"
:title="title"
:visible.sync="dialogVisible"
width="600px"
:before-close="handleClose"
>
<el-form :model="user" :rules="rules" ref="user" class="demo-ruleForm" v-loading="loading">
<el-row>
<el-col :span="11">
<el-form-item label="供应商名称" prop="name">
<el-input v-model.trim="user.name" placeholder="请输入供应商名称"></el-input>
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
<el-form-item label="图片" prop="icon">
<div class="upLoadPicBox" @click="modalPicTap('1', 'icon')">
<div v-if="user.icon" class="pictrue"><img :src="user.icon" /></div>
<div v-else-if="formValidate.icon" class="pictrue"><img :src="formValidate.icon" /></div>
<div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
<!-- <p class="desc mt10">尺寸180*180px</p> -->
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="联系人" prop="contacts">
<el-input v-model.trim="user.contacts" placeholder="请输入联系人"></el-input>
</el-form-item>
</el-col>
<el-col :offset="2" :span="11">
<el-form-item label="联系方式" prop="mobile">
<el-input v-model="user.mobile" maxlength="11" placeholder="请输入联系方式"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="所在省/市/区/县:">
<el-cascader :options="options" v-model="selectedOptions" placeholder="请选择" @change="handleChange">
</el-cascader> </el-form-item
></el-col>
<el-col :offset="2" :span="11">
<el-form-item label="所在街道" prop="street">
<el-input v-model.trim="user.street" placeholder="请输入所在街道"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-dialog v-if="dialogVisible" :title="title" :visible.sync="dialogVisible" width="600px"
:before-close="handleClose">
<el-form :model="user" :rules="rules" ref="user" class="demo-ruleForm" v-loading="loading" label-width="120px">
<el-form-item label="供应商名称" prop="name">
<el-input v-model.trim="user.name" placeholder="请输入供应商名称"></el-input>
</el-form-item>
<el-form-item label="图片" prop="icon">
<div class="upLoadPicBox" @click="modalPicTap('1', 'icon')">
<div v-if="user.icon" class="pictrue"><img :src="user.icon" /></div>
<div v-else-if="formValidate.icon" class="pictrue"><img :src="formValidate.icon" /></div>
<div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
<!-- <p class="desc mt10">尺寸180*180px</p> -->
</div>
</el-form-item>
<el-form-item label="联系人" prop="contacts">
<el-input v-model.trim="user.contacts" placeholder="请输入联系人"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="mobile">
<el-input v-model="user.mobile" maxlength="11" placeholder="请输入联系方式"></el-input>
</el-form-item>
<el-form-item label="所在省/市/区/县:">
<el-cascader :options="options" v-model="selectedOptions" placeholder="请选择" @change="handleChange">
</el-cascader> </el-form-item>
<el-form-item label="所在街道" prop="street">
<el-input v-model.trim="user.street" placeholder="请输入所在街道"></el-input>
</el-form-item>
<el-form-item label="供应商详细地址" prop="detail">
<el-input type="textarea" :rows="2" v-model.trim="user.detail" placeholder="请输入供应商详细地址"></el-input>
</el-form-item>
@@ -228,28 +206,28 @@ export default {
};
this.user.id
? updateAPI(data)
.then((res) => {
this.$message.success('编辑成功');
this.loading = false;
this.handleClose();
this.formValidate = Object.assign({}, obj);
this.$parent.getList();
})
.catch(() => {
this.loading = false;
})
.then((res) => {
this.$message.success('编辑成功');
this.loading = false;
this.handleClose();
this.formValidate = Object.assign({}, obj);
this.$parent.getList();
})
.catch(() => {
this.loading = false;
})
: addAPI(this.user)
.then((res) => {
this.$message.success('添加成功');
this.loading = false;
this.handleClose();
this.formValidate = Object.assign({}, obj);
this.$parent.getList();
})
.catch(() => {
this.loading = false;
this.formValidate = Object.assign({}, obj);
});
.then((res) => {
this.$message.success('添加成功');
this.loading = false;
this.handleClose();
this.formValidate = Object.assign({}, obj);
this.$parent.getList();
})
.catch(() => {
this.loading = false;
this.formValidate = Object.assign({}, obj);
});
} else {
return false;
}