Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 3 years ago
parent
commit
d2bda34a2a
  1. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  2. 44
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
  3. 16
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuInfo.vue
  4. 18
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue
  5. 47
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue
  6. 18
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue

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

@ -94,7 +94,7 @@
<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="witPinStateValue" width="100" label="调车状态" align="center"/>
<!-- <el-table-column prop="witPinStateValue" width="100" label="调车状态" align="center"/>-->
<el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
</el-table>
</div>

44
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue

@ -46,15 +46,15 @@
</el-row>
<el-row class="rowStyle">
<el-col :span="4" class="tleftb colStyle">
<span>退库费用:</span>
<span>退库费用合计:</span>
</el-col>
<el-col :span="4" class="colStyle">
<el-form-item>
<el-input v-model="formobj.money" placeholder="请输入退库费用" clearable @keyup.native="formobj.money = oninput(formobj.money,2)"/>
<span>{{ formobj.money }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb colStyle">
<span>费用说明:</span>
<span>备注:</span>
</el-col>
<el-col :span="12" class="colStyle">
<el-form-item>
@ -74,7 +74,7 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="300">
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
@ -89,6 +89,16 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="退库费用" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.returnStockCost" @input="inputReturnStockCost" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column label="费用说明" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.costRemarks" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>
@ -153,20 +163,16 @@ export default {
}
})
},
oninput(val, limit = 0) {
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0'); // 0
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
inputReturnStockCost() {
var sum = 0
if (this.list.length > 0) {
for (var i = 0; i < this.list.length; i++) {
if (this.list[i].returnStockCost !== '') {
sum = parseFloat(sum) + parseFloat(this.list[i].returnStockCost)
}
}
}
return val
this.formobj.money = sum
},
//
handleyudingcheliang() {
@ -187,7 +193,9 @@ export default {
configSid: depositVehicleList[i].configSid,
inboundDate: depositVehicleList[i].priceDate,
modelName: depositVehicleList[i].vehicleAlias,
vinNo: depositVehicleList[i].vinNo
vinNo: depositVehicleList[i].vinNo,
returnStockCost: '',
costRemarks: ''
})
}
console.log('车辆表数据', this.list)

16
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuInfo.vue

@ -42,7 +42,7 @@
</el-row>
<el-row class="rowStyle">
<el-col :span="4" class="tleftb colStyle">
<span>退库费用:</span>
<span>退库费用合计:</span>
</el-col>
<el-col :span="4" class="colStyle">
<el-form-item>
@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb colStyle">
<span>费用说明:</span>
<span>备注:</span>
</el-col>
<el-col :span="12" class="colStyle">
<el-form-item>
@ -63,7 +63,7 @@
</div>
<el-table :data="list" border style="width: 100%" :index="index">
<el-table-column align="center" label="序号" type="index" width="60"/>
<el-table-column label="车架号" align="center" width="300">
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
@ -78,6 +78,16 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="退库费用" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.returnStockCost }}</span>
</template>
</el-table-column>
<el-table-column label="费用说明" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.costRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>

18
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue

@ -44,7 +44,7 @@
</el-row>
<el-row class="rowStyle">
<el-col :span="4" class="tleftb colStyle">
<span>退库费用:</span>
<span>退库费用合计:</span>
</el-col>
<el-col :span="4" class="colStyle">
<el-form-item>
@ -52,7 +52,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb colStyle">
<span>费用说明:</span>
<span>备注:</span>
</el-col>
<el-col :span="12" class="colStyle">
<el-form-item>
@ -65,12 +65,12 @@
</div>
<el-table :data="list" border style="width: 100%" :index="index">
<el-table-column align="center" label="序号" type="index" width="60"/>
<el-table-column label="车架号" align="center" width="300">
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="300">
<el-table-column label="车型" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
@ -80,6 +80,16 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="退库费用" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.returnStockCost }}</span>
</template>
</el-table-column>
<el-table-column label="费用说明" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.costRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>

47
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue

@ -45,15 +45,15 @@
</el-row>
<el-row class="rowStyle">
<el-col :span="4" class="tleftb colStyle">
<span>退库费用:</span>
<span>退库费用合计:</span>
</el-col>
<el-col :span="4" class="colStyle">
<el-form-item>
<el-input v-model="formobj.money" placeholder="请输入退库费用" clearable @keyup.native="formobj.money = oninput(formobj.money,2)"/>
<span>{{ formobj.money }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb colStyle">
<span>费用说明:</span>
<span>备注:</span>
</el-col>
<el-col :span="12" class="colStyle">
<el-form-item>
@ -73,12 +73,12 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="300">
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="300">
<el-table-column label="车型" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
@ -88,6 +88,16 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="退库费用" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.returnStockCost" @input="inputReturnStockCost" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column label="费用说明" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.costRemarks" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>
@ -156,21 +166,16 @@ export default {
}, '*')
},
methods: {
//
oninput(val, limit = 0) {
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0'); // 0
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
inputReturnStockCost() {
var sum = 0
if (this.list.length > 0) {
for (var i = 0; i < this.list.length; i++) {
if (this.list[i].returnStockCost !== '') {
sum = parseFloat(sum) + parseFloat(this.list[i].returnStockCost)
}
}
}
return val
this.formobj.money = sum
},
//
handleyudingcheliang() {
@ -191,7 +196,9 @@ export default {
configSid: depositVehicleList[i].configSid,
inboundDate: depositVehicleList[i].priceDate,
modelName: depositVehicleList[i].vehicleAlias,
vinNo: depositVehicleList[i].vinNo
vinNo: depositVehicleList[i].vinNo,
returnStockCost: '',
costRemarks: ''
})
}
console.log('车辆表数据', this.list)

18
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue

@ -42,7 +42,7 @@
</el-row>
<el-row class="rowStyle">
<el-col :span="4" class="tleftb colStyle">
<span>退库费用:</span>
<span>退库费用合计:</span>
</el-col>
<el-col :span="4" class="colStyle">
<el-form-item>
@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb colStyle">
<span>费用说明:</span>
<span>备注:</span>
</el-col>
<el-col :span="12" class="colStyle">
<el-form-item>
@ -63,12 +63,12 @@
</div>
<el-table :data="list" border style="width: 100%" :index="index">
<el-table-column align="center" label="序号" type="index" width="60"/>
<el-table-column label="车架号" align="center" width="300">
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="300">
<el-table-column label="车型" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
@ -78,6 +78,16 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="退库费用" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.returnStockCost }}</span>
</template>
</el-table-column>
<el-table-column label="费用说明" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.costRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>

Loading…
Cancel
Save