Browse Source

Merge remote-tracking branch 'origin/master'

master
God 11 months ago
parent
commit
e08d9712c9
  1. 166
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
  2. 2
      yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
  3. 10
      yxt-as-ui/src/views/client/customermanagement/customermanagementAdd.vue
  4. 45
      yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
  5. 32
      yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue

166
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue

@ -15,13 +15,13 @@
</el-select>
</el-form-item>
<el-form-item label="名称">
<el-input v-model="queryParams.params.warehouseName" placeholder="请输入名称" clearable/>
<el-input v-model="queryParams.params.warehouseName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="详细地址">
<el-input v-model="queryParams.params.warehouseAttribute" placeholder="请输入存放地点属性" clearable/>
<el-input v-model="queryParams.params.warehouseAttribute" placeholder="" clearable/>
</el-form-item>
<el-form-item label="负责人及电话">
<el-input v-model="queryParams.params.warehouseContract" placeholder="请输入负责人" clearable/>
<el-input v-model="queryParams.params.warehouseContract" placeholder="" clearable/>
</el-form-item>
<el-form-item label="分组">
<el-select v-model="queryParams.params.warehouseGroupKey" placeholder="请选择" clearable class="addinputw">
@ -44,18 +44,18 @@
<!--Start 项目列表-->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="240" prop="gressionCode" label="编码" align="center"/>
<el-table-column width="200" prop="warehouseName" label="名称" align="center">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" :index="indexMethod" align="center" width="60" />
<el-table-column prop="gressionCode" label="编码" align="center" width="120" />
<el-table-column prop="warehouseName" label="名称" align="center" min-width="200">
<template slot-scope="scope">
<span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.warehouseName }}</span>
</template>
</el-table-column>
<el-table-column width="240" prop="useOrg" label="使用组织" align="center"/>
<el-table-column prop="warehouseAttribute" label="详细地址" align="center"/>
<el-table-column width="200" prop="warehouseContract" label="负责人及电话" align="center"/>
<el-table-column width="140" prop="warehouseGroupValue" label="分组" align="center"/>
<el-table-column prop="useOrg" label="使用组织" align="center" width="150" />
<el-table-column prop="warehouseAttribute" label="详细地址" align="left" header-align="center" min-width="200" />
<el-table-column prop="warehouseContract" label="负责人及电话" align="center" width="200" />
<el-table-column prop="warehouseGroupValue" label="分组" align="center" width="140" />
</el-table>
</div>
<!--End 项目列表-->
@ -68,9 +68,9 @@
</div>
<!--End 查询和其列表部分-->
<!--新增修改部分组件-->
<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getUseOrg"/>
<div-add v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getUseOrg"/>
<!--详情部分组件-->
<div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
<div-info v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
</div>
</template>
@ -106,7 +106,6 @@ export default {
size: 10,
total: 0,
params: {
sids: [], // SID
useOrgSid: '', // 使sid
warehouseName: '', //
warehouseAttribute: '', //
@ -178,86 +177,38 @@ export default {
break
}
},
toAdd(row) {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit() {
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
return
}
if (this.multipleSelection.length > 1) {
this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
return
}
this.viewState = 3
const row = this.multipleSelection[0]
this.$refs['divadd'].showEdit(row)
},
doDel(row) {
if (this.multipleSelection.length === 0) {
this.$message({showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作'})
return
}
const sids = []
this.multipleSelection.forEach(row => {
sids.push(row.sid)
})
const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.delBySids(sids).then(resp => {
loading.close()
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.loadList()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
toInfo(row) {
this.$refs['divinfo'].showInfo(row)
console.log('详情回显', row)
this.viewState = 4
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams.params = {
sids: [], // SID
useOrgSid: '',
warehouseName: '', //
warehouseAttribute: '', //
warehouseContract: '', //
warehouseGroup: '' //
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
useOrgSid: '', // 使sid
warehouseName: '', //
warehouseAttribute: '', //
warehouseContract: '', //
warehouseGroup: '' //
}
}
this.queryParams.params.sid = '' // sid
this.queryParams.params.name = '' //
this.dosearch()
},
loadList() {
const _this = this
this.tableLoading = true
req.listPage(this.queryParams).then(resp => {
_this.tableLoading = false
const data = resp.data
_this.queryParams.total = data.total
_this.dataList = data.records
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
this.queryParams.total = resp.data.total
this.dataList = resp.data.records
} else {
this.queryParams.total = 0
this.dataList = []
}
}).catch(() => {
_this.tableLoading = false
this.tableLoading = false
})
},
handleSelectionChange(val) {
@ -294,6 +245,55 @@ export default {
var pageindex = index + 1 + pagestart
return pageindex
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
toEdit() {
if (this.multipleSelection.length === 1) {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.multipleSelection[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
}
},
doDel() {
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
const sids = []
this.multipleSelection.forEach(row => {
sids.push(row.sid)
})
const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.delBySids(sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.loadList()
}
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)

2
yxt-as-ui/src/views/client/customermanagement/customermanagement.vue

@ -27,7 +27,7 @@
</el-form-item>
<el-form-item label="提醒日期">
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.remindStartDay" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
<div class="line"></div>
<div style="padding: 0 8px"></div>
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.remindEndDay" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
</el-form-item>
</el-form>

10
yxt-as-ui/src/views/client/customermanagement/customermanagementAdd.vue

@ -12,8 +12,8 @@
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="12">
<div class="span-sty"><span>*</span>客户名称</div>
<el-form-item prop="name"><el-input class="addinputInfo" :disabled="formobj.sid !== ''" style="width: 30%" v-model="formobj.name" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>客户名称</div>
<el-form-item prop="name"><el-input class="addinputInfo addinputw" :disabled="formobj.sid !== ''" v-model="formobj.name" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">客户类型</div>
@ -22,7 +22,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty"><span>*</span>联系电话</div>
<div class="span-sty"><span class="icon">*</span>联系电话</div>
<el-form-item prop="mobile"><el-input class="addinputInfo" :disabled="formobj.sid !== ''" style="width: 30%" v-model="formobj.mobile" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -34,7 +34,7 @@
<el-col :span="24">
<div class="span-sty">公司名称</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.customerOrgSid" filterable clearable placeholder="" @change="customerOrgChange">
<el-select class="addinputInfo" style="width: 40%" v-model="formobj.customerOrgSid" filterable clearable placeholder="" @change="customerOrgChange">
<el-option v-for="item in customerOrg_list" :key="item.sid" :label="item.orgName" :value="item.sid"/>
</el-select>
</el-form-item>
@ -110,7 +110,7 @@
</el-col>
<el-col :span="12">
<div class="span-sty">证件号码</div>
<el-form-item><el-input class="addinputInfo addinputw" style="width: 30%" v-model="formobj.idnumber" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.idnumber" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>

45
yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue

@ -13,12 +13,12 @@
<div class="title">车辆信息</div>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="12">
<div class="span-sty">车牌号</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.vehMark" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>车牌号</div>
<el-form-item prop="vehMark"><el-input class="addinputInfo" style="width: 40%" v-model="formobj.vehMark" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">车架号</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.vinNo" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>车架号</div>
<el-form-item prop="vinNo"><el-input class="addinputInfo" style="width: 40%" v-model="formobj.vinNo" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
@ -37,13 +37,13 @@
<el-form-item> <el-date-picker class="addinputInfo" value-format="yyyy-MM-dd" v-model="formobj.buyDate" clearable type="date" placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">行驶里程</div>
<div class="span-sty">行驶里程(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.mileage = getNumber(formobj.mileage, 2)" v-model="formobj.mileage" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">上次保养里程</div>
<div class="span-sty">上次保养里程(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.lastMileage = getNumber(formobj.lastMileage, 2)" v-model="formobj.lastMileage" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -64,23 +64,23 @@
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.carRemarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title">保养到期明细</div>
<el-row>
<el-col :span="12">
<div class="span-sty">行驶里程</div>
<div class="span-sty">行驶里程(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.currentMileage = getNumber(formobj.currentMileage, 2)" v-model="formobj.currentMileage" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">每月公里</div>
<div class="span-sty">每月公里(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.monthKm = getNumber(formobj.monthKm, 2)" v-model="formobj.monthKm" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">滤芯到期公里</div>
<div class="span-sty">滤芯到期公里(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.filter_km = getNumber(formobj.filter_km, 2)" v-model="formobj.filter_km" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -90,7 +90,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">机油到期公里</div>
<div class="span-sty">机油到期公里(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.engineoil_km = getNumber(formobj.engineoil_km, 2)" v-model="formobj.engineoil_km" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -100,7 +100,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">齿轮油到期公里</div>
<div class="span-sty">齿轮油到期公里(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.gearoil_km = getNumber(formobj.gearoil_km, 2)" v-model="formobj.gearoil_km" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -110,7 +110,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">宝轮到期公里</div>
<div class="span-sty">宝轮到期公里(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.treasurewheel_km = getNumber(formobj.treasurewheel_km, 2)" v-model="formobj.treasurewheel_km" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -120,7 +120,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">风扇皮带到期公里</div>
<div class="span-sty">风扇皮带到期公里(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.fanbelt_km = getNumber(formobj.fanbelt_km, 2)" v-model="formobj.fanbelt_km" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -130,7 +130,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">刹车片带到期公里</div>
<div class="span-sty">刹车片带到期公里(Km)</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" @keyup.native="formobj.brakepads_km = getNumber(formobj.brakepads_km, 2)" v-model="formobj.brakepads_km" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
@ -141,7 +141,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.byRemarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
</el-form>
@ -187,9 +187,14 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
brakepads_date: ''
brakepads_date: '',
carRemarks: '',
byRemarks: ''
},
rules: {}
rules: {
vehMark: [{ required: true, message: '车牌号不能为空', trigger: 'blur' }],
vinNo: [{ required: true, message: '车架号不能为空', trigger: 'blur' }]
}
}
},
methods: {
@ -276,7 +281,9 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
brakepads_date: ''
brakepads_date: '',
carRemarks: '',
byRemarks: ''
}
this.submitdisabled = false
this.$emit('doback')

32
yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue

@ -36,13 +36,13 @@
<el-form-item><span class="addinputInfo">{{ formobj.buyDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">行驶里程</div>
<div class="span-sty">行驶里程(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.mileage }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">上次保养里程</div>
<div class="span-sty">上次保养里程(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.lastMileage }}</span></el-form-item>
</el-col>
<el-col :span="12">
@ -63,23 +63,23 @@
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.carRemarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">保养到期明细</div>
<el-row>
<el-col :span="12">
<div class="span-sty">行驶里程</div>
<div class="span-sty">行驶里程(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.currentMileage }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">每月公里</div>
<div class="span-sty">每月公里(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.monthKm }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">滤芯到期公里</div>
<div class="span-sty">滤芯到期公里(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.filter_km }}</span></el-form-item>
</el-col>
<el-col :span="12">
@ -89,7 +89,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">机油到期公里</div>
<div class="span-sty">机油到期公里(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.engineoil_km }}</span></el-form-item>
</el-col>
<el-col :span="12">
@ -99,7 +99,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">齿轮油到期公里</div>
<div class="span-sty">齿轮油到期公里(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gearoil_km }}</span></el-form-item>
</el-col>
<el-col :span="12">
@ -109,7 +109,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">宝轮到期公里</div>
<div class="span-sty">宝轮到期公里(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.treasurewheel_km }}</span></el-form-item>
</el-col>
<el-col :span="12">
@ -119,7 +119,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">风扇皮带到期公里</div>
<div class="span-sty">风扇皮带到期公里(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.fanbelt_km }}</span></el-form-item>
</el-col>
<el-col :span="12">
@ -129,7 +129,7 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">刹车片带到期公里</div>
<div class="span-sty">刹车片带到期公里(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.brakepads_km }}</span></el-form-item>
</el-col>
<el-col :span="12">
@ -140,7 +140,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.byRemarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -185,7 +185,9 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
brakepads_date: ''
brakepads_date: '',
carRemarks: '',
byRemarks: ''
},
rules: {}
}
@ -227,7 +229,9 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
brakepads_date: ''
brakepads_date: '',
carRemarks: '',
byRemarks: ''
}
this.$emit('doback')
}

Loading…
Cancel
Save