yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
e8d8b3df1b be397e3929
commit
3747a08ebf
5 changed files with 144 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-scm/anrui-scm-ui/src/styles/index.scss
  2. 5
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
  3. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
  4. 225
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  5. 22
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

2
anrui-scm/anrui-scm-ui/src/styles/index.scss
View File

@ -305,7 +305,7 @@ div:focus {
line-height: 42px;
.addinputw {
//padding: 5px 0;
width: 65%;
width: calc(100% - 70px);
margin-left: 80px;
line-height: 42px;
}

5
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
View File

@ -1049,11 +1049,10 @@ export default {
line-height: 40px !important;
font-weight: 600;
}
.addinputw02{
width: 52% !important;
.formaddcopy02 .el-row /deep/ .el-col {
padding:0 8px;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw{
width: 60%;
margin-left: 65px;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputwTwo{

2
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
View File

@ -80,7 +80,7 @@ export default {
handleReturn() {
this.$emit('doback')
},
showEdit() {
showCheck() {
getVehinspectItemInfo('a595bd5b-1df1-4465-916d-285d98af2039').then((resp) => {
if (resp.success) {
this.tableData = resp.data

225
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
View File

@ -1,121 +1,124 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="success" size="small" @click="handlePass()">通过</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
<div v-show="isCheck">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="success" size="small" @click="handlePass()">通过</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
</div>
<div class="listconadd">
<div class="titwu">验车单</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="vin" label="车架号：">
<el-input
v-model="temp.vin"
placeholder="请输入车架号"
class="addinputw"
:readonly="temp.purchaseKey !== '01'"
/>
</el-form-item>
</el-col>
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="model" label="车型：">
<el-input
v-model="temp.model"
placeholder="请输入车型"
class="addinputw"
readonly
/>
</el-form-item>
<div class="listconadd">
<div class="titwu">验车单</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="vin" label="车架号：">
<el-input
v-model="temp.vin"
placeholder="请输入车架号"
class="addinputw"
:readonly="temp.purchaseKey !== '01'"
/>
</el-form-item>
</el-col>
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="model" label="车型：">
<el-input
v-model="temp.model"
placeholder="请输入车型"
class="addinputw"
readonly
/>
</el-form-item>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="config" label="配置：">
<el-input
v-model="temp.config"
type="textarea"
autosize
placeholder="请输入配置"
class="addinputw addinputw_copy"
readonly/>
</el-form-item>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="modelDifferenceExplain" label="车型配置差异说明：">
<el-input
v-model="temp.modelDifferenceExplain"
type="textarea"
autosize
placeholder="请输入车型配置差异说明"
class="addinputw addinputw_copy"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="guaranteeCardNo" label="保修卡号：">
<el-input
v-model="temp.guaranteeCardNo"
placeholder="请输入保修卡号"
class="addinputw"
clearable
@keyup.native="temp.guaranteeCardNo = oninput(temp.guaranteeCardNo,2)"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="price" label="洗车费：">
<el-input
v-model="temp.price"
placeholder="请输入洗车费"
class="addinputw"
clearable
@keyup.native="temp.price = oninput(temp.price,2)"
/>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="title">验车相关照片</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="imgList01" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="config" label="配置：">
<el-input
v-model="temp.config"
type="textarea"
autosize
placeholder="请输入配置"
class="addinputw addinputw_copy"
readonly/>
</el-form-item>
<el-row>
<el-col :span="3">
<span>厂家验车单照片</span>
</el-col>
</el-row>
<el-row class="yancheAdd-bor">
<el-col :span="24" class="yancheAdd-bor">
<el-form-item prop="modelDifferenceExplain" label="车型配置差异说明：">
<el-input
v-model="temp.modelDifferenceExplain"
type="textarea"
autosize
placeholder="请输入车型配置差异说明"
class="addinputw addinputw_copy"/>
</el-form-item>
<el-col :span="21">
<upload ref="uploadImg" v-model="imgList02" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="guaranteeCardNo" label="保修卡号：">
<el-input
v-model="temp.guaranteeCardNo"
placeholder="请输入保修卡号"
class="addinputw"
clearable
@keyup.native="temp.guaranteeCardNo = oninput(temp.guaranteeCardNo,2)"
/>
</el-form-item>
<el-col :span="3">
<span>验车情况说明</span>
</el-col>
<el-col :span="12">
<el-form-item prop="price" label="洗车费：">
<el-input
v-model="temp.price"
placeholder="请输入洗车费"
class="addinputw"
clearable
@keyup.native="temp.price = oninput(temp.price,2)"
/>
</el-form-item>
<el-col :span="21">
<el-input
type="textarea"
autosize
placeholder="请输入说明"
v-model="temp.remarks">
</el-input>
</el-col>
</el-row>
</div>
<div class="title">验车相关照片</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="imgList01" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>厂家验车单照片</span>
</el-col>
<el-col :span="21">
<upload ref="uploadImg" v-model="imgList02" :limit="1" bucket="map" :upload-data="{type:'0001'}"></upload>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>验车情况说明</span>
</el-col>
<el-col :span="21">
<el-input
type="textarea"
autosize
placeholder="请输入说明"
v-model="temp.remarks">
</el-input>
</el-col>
</el-row>
<!-- <el-row class="last_btn">-->
<!-- <el-button type="primary" size="small" @click="handleCreate()">车辆检查表</el-button>-->
<!-- </el-row>-->
</el-form>
<el-row class="last_btn">
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-row>
</el-form>
</div>
</div>
<vehiclechecklist ref="divchecklist" v-show="!isCheck" @doback="resetState"/>
</div>
</template>
@ -124,15 +127,18 @@ import { getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
import { getCarInspectedInfo, saveCarInspectedInfo, submitCarInspectedInfo } from '@/api/supplychain/yancheguanli'
import { getUseOrgByUserSid } from '@/api/cheliang/basevehicle'
import Upload from '@/components/uploadFile/uploadImg.vue'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
export default {
name: 'yancheguanliAdd',
components: {
Upload
Upload,
vehiclechecklist
},
data() {
return {
viewTitle: '',
isCheck:false,
// --按钮菜单-------
sid: '',
datas: null,
@ -248,6 +254,13 @@ export default {
// this.getZuZhi()
// this.getUseOrg()
// },
handleChecklist(){
this.isCheck = false
this.$refs['divchecklist'].showCheck()
},
resetState(){
this.isCheck = true
},
// 获得使用组织
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')

22
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div>
<div v-show="isCheck">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
@ -92,12 +92,16 @@
</el-form-item>
</el-col>
</el-row>
<el-row class="last_btn">
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-row>
</el-form>
</div>
</div>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<vehiclechecklist ref="divchecklist" v-show="!isCheck" @doback="resetState" />
<!-- <el-dialog :visible.sync="dialogVisible" width="1000px"-->
<!-- :close-on-click-modal="false">-->
<!-- <div class="result-cont">-->
@ -109,16 +113,20 @@
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
<script>
import { getCarInspected } from '@/api/supplychain/yancheguanli'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
export default {
name: 'yancheguanliInfo',
data() {
return {
viewTitle: '',
isCheck:true,
// --按钮菜单-------
sid: '',
dialogVisible: false,
@ -156,6 +164,13 @@ export default {
}
})
},
handleChecklist(){
this.isCheck = false
this.$refs['divchecklist'].showCheck()
},
resetState(){
this.isCheck = true
},
open(val, index) {
this.dialogVisible = true
this.dialogUrl = val
@ -186,4 +201,9 @@ export default {
line-height: 40px !important;
font-weight: 600;
}
.formadd .last_btn {
float: right;
top: 30px;
}
</style>

Write Preview
Loading…
Cancel
Save