Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
commit
0c481ae7f5
  1. 4
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  2. 7
      anrui-scm/anrui-scm-ui/src/styles/index.scss
  3. 9
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  4. 6
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  5. 3
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
  6. 16
      anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue
  7. 23
      anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
  8. 57
      anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
  9. 7
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
  10. 3
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  11. 3
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

4
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@ -163,13 +163,13 @@ const codemenu = [
component: Layout,
redirect: '/hegezheng/hegezhengtaizhang',
meta: {
title: '合格证台账'
title: '合格证管理'
},
children: [{
path: '/hegezheng/hegezhengtaizhang',
component: () => import('@/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue'),
name: 'hegezhengtaizhang',
meta: { title: '合格证台账', noCache: true }
meta: { title: '合格证管理', noCache: true }
}]
},

7
anrui-scm/anrui-scm-ui/src/styles/index.scss

@ -332,10 +332,11 @@ div:focus {
padding: 10px 40px 0 40px;
font-size: 16px;
.title {
padding: 10px;font-weight: bold;
font-size: 20px;
padding: 12px;
font-weight: bold;
font-size: 16px;
background-color: $header-bg;
text-align: center;
text-align: left;
color: #ffffff;
}
.el-row {

9
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -75,7 +75,6 @@
<el-table-column prop="freight" width="130" label="运费" align="center" />
<el-table-column prop="guidedPrice" width="130" label="销售指导价" align="center" />
<el-table-column prop="insideCode" width="160" label="内部编码" align="center" />
<el-table-column prop="locationName" width="130" label="存放地点名称" align="center" />
<el-table-column prop="lockedStateValue" width="130" label="锁定状态" align="center" />
<el-table-column prop="manPurOrderTypeValue" width="160" label="厂家采购订单类型" align="center" />
<el-table-column prop="orderingNo" width="160" label="厂家订单编号" align="center" />
@ -85,8 +84,8 @@
<el-table-column prop="returnDate" width="130" label="退库日期" align="center" />
<el-table-column prop="salePrice" width="130" label="成交价" align="center" />
<el-table-column prop="salesDate" width="130" label="销售日期" align="center" />
<el-table-column prop="settlementStatus" width="110" label="结算状态" align="center" />
<el-table-column prop="solidDate" width="130" label="实销日期" align="center" />
<el-table-column prop="settlementStatus" width="110" label="买断状态" align="center" />
<el-table-column prop="solidDate" width="130" label="买断日期" align="center" />
<!-- <el-table-column prop="specialInstructions" width="150" label="特殊或差异说明" align="left" header-align="center" />-->
<!-- <el-table-column prop="useOrgName" width="130" label="使用组织名称" align="center" />-->
<el-table-column prop="witPinState" width="100" label="调车状态" align="center" />
@ -345,10 +344,10 @@ export default {
response.data.total > 0
) {
this.list = response.data.records
this.total = response.data.total // 012
this.total = response.data.total // 012
for (var i=0; i<this.list.length; i++){
if (this.list[i].settlementStatus == '0'){
this.list[i].settlementStatus = '买断'
this.list[i].settlementStatus = '买断'
}
if (this.list[i].settlementStatus == '1'){
this.list[i].settlementStatus = '预买断'

6
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@ -276,7 +276,7 @@ export default {
org_list: {},//
modelConfig_list: [], //
settlementStatus_list: [{
value: '买断',
value: '买断',
key: '0'
}, {
value: '预买断',
@ -310,7 +310,7 @@ export default {
priced: '',//
returnDate: '',// 退
salesDate: '',//
settlementStatus: '',//012
settlementStatus: '',//012
settlementStatusValue:'',
solidDate: '',//
specialInstructions: '',//
@ -768,7 +768,7 @@ export default {
priced: '',//
returnDate: '',// 退
salesDate: '',//
settlementStatus: '',//012
settlementStatus: '',//012
solidDate: '',//
specialInstructions: '',//
useOrg: '',// 使sid

3
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@ -233,7 +233,7 @@ export default {
if (response.code === '200') {
this.temp = response.data
if (this.temp.settlementStatus == '0'){
this.temp.settlementStatus = '买断'
this.temp.settlementStatus = '买断'
} else if (this.temp.settlementStatus == '1'){
this.temp.settlementStatus = '预买断'
} else {
@ -258,7 +258,6 @@ export default {
}
.listconadd {
width: 100%;
padding: 0 48px !important;
}
/deep/ .el-form-item{
padding-top: 5px;

16
anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue

@ -1,14 +1,14 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>合格证台账详情信息</div>
<div>合格证信息</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="forminfo" :rules="rules">
<div class="title">合格证台账详情信息</div>
<div class="title">合格证基础信息</div>
<el-row>
<el-col :span="4" class="trightb">合格证编号</el-col>
<el-col :span="8" class="tleft"> {{ temp.certificationNo }}</el-col>
@ -28,17 +28,17 @@
<el-col :span="8"> {{ temp.receiver }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">合格证情况</el-col>
<el-col :span="8" class="tleft"> {{ temp.certificateSituationValue }}</el-col>
<el-col :span="4" class="trightb">移交状态</el-col>
<el-col :span="8" class="tleft"> {{ temp.transferStateValue }}</el-col>
<!-- <el-col :span="4" class="trightb">合格证情况</el-col>-->
<!-- <el-col :span="8" class="tleft"> {{ temp.certificateSituationValue }}</el-col>-->
<el-col :span="4" class="trightb" v-show="temp.certificateStateValue == '正式'">公告型号</el-col>
<el-col :span="8" class="tleft" v-show="temp.certificateStateValue == '正式'"> {{temp.noticeModel}} </el-col>
<el-col :span="8" class="tleft" v-show="temp.certificateStateValue == '正式'"> {{ temp.noticeModel }}</el-col>
<el-col :span="12" v-show="temp.certificateStateValue == '虚拟'"/>
</el-row>
<el-row>
<el-col :span="4" class="trightb">移交状态</el-col>
<el-col :span="8" class="tleft"> {{ temp.transferStateValue }}</el-col>
<el-col :span="4" class="trightb">备注</el-col>
<el-col :span="8"> {{ temp.remarks }}</el-col>
<el-col :span="20"> {{ temp.remarks }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">合格证照片</el-col>

23
anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue

@ -13,7 +13,7 @@
</el-form-item>
<el-form-item label="发证日期">
<el-date-picker
v-model="listQuery.params.certificateStartDate "
v-model="listQuery.params.certificateStartDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@ -54,7 +54,7 @@
</div>
</div>
<div class="listtop">
<div class="tit">合格证管理信息列表</div>
<div class="tit">合格证信息列表</div>
<pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
class="pagination" @pagination="getList"/>
</div>
@ -612,23 +612,4 @@ export default {
/deep/ .el-collapse-item__header {
border-bottom: 0px solid #e6ebf5;
}
.searchli {
padding: 5px 100px;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
</style>

57
anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue

@ -11,7 +11,7 @@
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<div class="title">合格证台账信息</div>
<div class="title">合格证基础信息</div>
<el-row>
<el-col :span="12">
<el-form-item prop="certificationNo">
@ -30,7 +30,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="">
<el-form-item prop="certificateStateValue">
<span slot="label">合格证状态</span>
<el-input v-model="temp.certificateStateValue" placeholder="请输入内容" :disabled="true" class="addinputw">
</el-input>
@ -68,14 +68,22 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="certificateSituation">
<span slot="label">合格证情况</span>
<el-select v-model="temp.certificateSituation" class="addinputw" placeholder="请选择合格证情况"
@change="getQingkuang">
<el-option v-for="item in qingkuang_list" :key="item.dictKey" :label="item.dictValue"
<el-form-item prop="remarks">
<span slot="label">移交状态</span>
<el-select v-model="temp.transferStateKey" class="addinputw" clearable
placeholder="请选择移交状态" @change="transferStateChange">
<el-option v-for="item in transferState_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<!-- <el-form-item prop="certificateSituation">-->
<!-- <span slot="label">合格证情况</span>-->
<!-- <el-select v-model="temp.certificateSituation" class="addinputw" placeholder="请选择合格证情况"-->
<!-- @change="getQingkuang">-->
<!-- <el-option v-for="item in qingkuang_list" :key="item.dictKey" :label="item.dictValue"-->
<!-- :value="item.dictKey"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item prop="receiver" v-show="temp.certificateState == '0002'">
@ -85,21 +93,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="remarks">
<span slot="label">移交状态</span>
<el-select v-model="temp.transferStateKey" class="addinputw" clearable
placeholder="请选择移交状态" @change="transferStateChange">
<el-option v-for="item in transferState_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">-->
<!-- </el-col>-->
<el-col :span="24">
<el-form-item prop="remarks">
<span slot="label">备注</span>
<el-input v-model="temp.remarks" type="textarea" :rows="3" maxlength="125" placeholder=""
class="addinputw" clearable/>
class="addinputw addinputw_remarks" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -392,15 +393,18 @@ export default {
certificateDate: [
{ required: true, message: '请选择发证日期', trigger: 'blur' }
],
certificateSituation: [
{ required: true, message: '请选择合格证情况', trigger: 'change' }
],
// certificateSituation: [
// { required: true, message: '', trigger: 'change' }
// ],
toCardDate: [
{ required: true, message: '请选择到证日期', trigger: 'blur' }
],
certificateState: [
{ required: true, message: '请选择合格证状态', trigger: 'change' }
],
certificateStateValue: [
{ required: true, message: '请选择合格证状态', trigger: 'change' }
],
// certificatePhoto: [
// { required: true, message: '', trigger: 'blur' },
// ],
@ -451,14 +455,14 @@ export default {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'add'
this.viewTitle = '【新增】合格证台账信息'
this.viewTitle = '【新增】合格证信息'
},
showEdit(sid, row) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.viewTitle = '【编辑】车型详细信息'
this.viewTitle = '【编辑】合格证信息'
this.dialogStatus = 'update'
details(sid).then(resp => {
const data = resp.data
@ -821,8 +825,11 @@ export default {
}
}
</script>
<style lang="scss" scoped>
<style scoped>
.addinputwda {
width: 600px;
}
.formadd .el-row .el-col /deep/ .el-form-item .addinputw_remarks{
width: 92%;
}
</style>

7
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue

@ -10,7 +10,7 @@
<el-form class="formadd">
<div>
<el-table :data="tableData" border style="width: 100%; margin-top: 20px" max-height="600">
<el-table-column label="序号" width="50" align="center">
<el-table-column label="序号" width="70" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sortNo }}</span>
</template>
@ -80,8 +80,9 @@ export default {
handleReturn() {
this.$emit('doback')
},
showCheck() {
getVehinspectItemInfo('a595bd5b-1df1-4465-916d-285d98af2039').then((resp) => {
showCheck(inspectedSid) {
const vehInspectSid = inspectedSid
getVehinspectItemInfo(vehInspectSid).then((resp) => {
if (resp.success) {
this.tableData = resp.data
}

3
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -193,6 +193,7 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
console.log('点击验车跳转页面',row)
this.dialogStatus = 'add'
this.viewTitle = '验车单'
const data = {
@ -256,7 +257,7 @@ export default {
// },
handleChecklist(){
this.isCheck = false
this.$refs['divchecklist'].showCheck()
this.$refs['divchecklist'].showCheck(this.temp.inspectedSid)
},
resetState(){
this.isCheck = true

3
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@ -120,7 +120,6 @@
import { getCarInspected } from '@/api/supplychain/yancheguanli'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
export default {
name: 'yancheguanliInfo',
components:{
@ -169,7 +168,7 @@ export default {
},
handleChecklist(){
this.isCheck = false
this.$refs['divchecklist'].showCheck()
this.$refs['divchecklist'].showCheck(this.temp.inspectedSid)
},
resetState(){
this.isCheck = true

Loading…
Cancel
Save