Merge branches 'gyq' and 'dwb' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

This commit is contained in:
gyq 2024-07-06 16:12:58 +08:00
commit 10e3af1cb3
2 changed files with 20 additions and 9 deletions

View File

@ -103,7 +103,7 @@
<el-button type="primary" @click="informationdialogshow = true">去选择耗材信息</el-button> <el-button type="primary" @click="informationdialogshow = true">去选择耗材信息</el-button>
</el-form-item> </el-form-item>
<el-form-item label="单位耗材值"> <el-form-item label="单位耗材值">
<el-input v-model="addSelect[0].surplusStock" placeholder="请输入单位耗材值"></el-input> <el-input v-model="addSelect[0].surplusStock" type=number @input="limitInput($event, 'monthOutputValue')" placeholder="请输入单位耗材值"></el-input>
</el-form-item> </el-form-item>
</template> </template>
<template v-else> <template v-else>
@ -123,7 +123,7 @@
<el-button type="primary" @click="selecthaocai(i)">去选择耗材信息</el-button> <el-button type="primary" @click="selecthaocai(i)">去选择耗材信息</el-button>
</el-form-item> </el-form-item>
<el-form-item label="单位耗材值"> <el-form-item label="单位耗材值">
<el-input v-model="item.surplusStock" placeholder="请输入单位耗材值"></el-input> <el-input v-model="item.surplusStock" type=number @input="limitInput($event, 'monthOutputValue')" placeholder="请输入单位耗材值"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</template> </template>
@ -183,7 +183,8 @@
<el-dialog title="编辑" :visible.sync="informationdialogshowedit" width="20%"> <el-dialog title="编辑" :visible.sync="informationdialogshowedit" width="20%">
<el-form ref="addSelect" :inline="true"> <el-form ref="addSelect" :inline="true">
<el-form-item label="单位耗材值"> <el-form-item label="单位耗材值">
<el-input v-model="surplusStocks.surplusStock" placeholder="请输入单位耗材值"></el-input> <el-input v-model="surplusStocks.surplusStock" type=number
@input="limitInput($event, 'monthOutputValue')" placeholder="请输入单位耗材值"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="display: flex;justify-content: flex-end;"> <el-form-item style="display: flex;justify-content: flex-end;">
<el-button @click="informationdialogshowedit = false"> </el-button> <el-button @click="informationdialogshowedit = false"> </el-button>
@ -293,12 +294,22 @@ export default {
this.getTableDatainformation() this.getTableDatainformation()
this.$nextTick(() => { this.$nextTick(() => {
// this.tableDrag() // this.tableDrag()
this.$refs.shopList.isselectEvent() // this.$refs.shopList.isselectEvent()
}) })
}, },
methods: { methods: {
limitInput(value, name) {
this.surplusStocks.surplusStock = ('' + value) //
// .replace(/[^\d^\.]+/g, '') //
.replace(/^0+(\d)/, '$1') // 00
.replace(/^\./, '0.') // 0.
.match(/^\d*(\.?\d{0,2})/g)[0] || ''
},
selectShop(res) { selectShop(res) {
console.log(res, '调试1') // console.log(res, '1')
this.addSelect = res this.addSelect = res
res[0]['specSnap'] = res[0].name res[0]['specSnap'] = res[0].name
this.clickdialogframe('add') this.clickdialogframe('add')
@ -413,8 +424,8 @@ export default {
ele.conName = item.conName ele.conName = item.conName
if (this.ALLisDistribute != null) { if (this.ALLisDistribute != null) {
// this.addSelect.forEach((ele, i) => { // this.addSelect.forEach((ele, i) => {
ele.skuList[this.ALLisDistribute].conInfoId = item.id ele.skuList[this.ALLisDistribute].conInfoId = item.id
ele.skuList[this.ALLisDistribute].conName = item.conName ele.skuList[this.ALLisDistribute].conName = item.conName
// }) // })
console.log(ele.skuList[this.ALLisDistribute], "打印"); console.log(ele.skuList[this.ALLisDistribute], "打印");
} }

View File

@ -143,7 +143,7 @@ export default {
mounted() { mounted() {
this.getTableData() this.getTableData()
this.$nextTick(() => { this.$nextTick(() => {
this.tableDrag() // this.tableDrag()
}) })
}, },
methods: { methods: {
@ -291,4 +291,4 @@ export default {
} }
} }
} }
</style> </style>