bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突合并

This commit is contained in:
BianLzhaoMin 2024-10-12 13:27:16 +08:00
parent 3557a3976f fffec2d96e
commit 6a9486e478
8 changed files with 59 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
View File

@ -219,16 +219,16 @@
label="设备所属" label="设备所属"
prop="deviceAscription" prop="deviceAscription"
/> />
<el-table-column label="预领数量1" align="center"> <el-table-column
<template slot-scope="scope"> label="预领数量"
<span>{{ props.row.deviceNum }}</span> prop="deviceNum"
</template> align="center"
</el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
label="库存数量" label="库存数量"
prop="num" prop="num"
/> />
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>
@ -237,22 +237,17 @@
align="center" align="center"
label="抱杆设备名称" label="抱杆设备名称"
/> />
<el-table-column align="center" label="抱杆设备数量" width="260">
<el-table-column label="预领数量" align="center"> <template slot-scope="scope">
<template slot-scope="scope"> <el-input-number
<el-input :min="1"
v-model.number="scope.row.deviceNum" :max="1000"
placeholder="请输入预领数量" @change="onChangeInput($event, scope.$index)"
type="number" v-model="scope.row.wholeTypeNum"
min="1" />
@input="checkNum(scope.row)" </template>
clearable </el-table-column>
style="width: 40%" <el-table-column align="center" label="操作" width="180">
/>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -1158,10 +1153,14 @@ export default {
const wholeTypeNameData = { const wholeTypeNameData = {
id: val, id: val,
wholeTypeName: selLable.wholeTypeName, wholeTypeName: selLable.wholeTypeName,
wholeTypeNum: 1,
childrenList: [], childrenList: [],
} }
queryCompleteSetToolsApi(wholeTypeNameData).then((res) => { queryCompleteSetToolsApi(wholeTypeNameData).then((res) => {
wholeTypeNameData.childrenList = res.data wholeTypeNameData.childrenList = res.data
wholeTypeNameData.childrenList.forEach(
(e) => (e.initNum = e.deviceNum),
)
const isREpeat = this.wholeTypeNameList.find( const isREpeat = this.wholeTypeNameList.find(
(e) => e.id === val, (e) => e.id === val,
) )
@ -1183,6 +1182,13 @@ export default {
onHandelDelete(index) { onHandelDelete(index) {
this.wholeTypeNameList.splice(index, 1) this.wholeTypeNameList.splice(index, 1)
}, },
/* 更改数量 */
onChangeInput(val, v) {
this.wholeTypeNameList[v].childrenList.forEach(
(e) => (e.deviceNum = e.initNum * val),
)
},
}, },
} }
</script> </script>

2
src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -691,7 +691,7 @@ export default {
outQuery: { outQuery: {
//编码出库-搜索条件 //编码出库-搜索条件
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 10,
maCode: undefined, maCode: undefined,
}, },
outTotal: 0, //编码弹窗分页-总数 outTotal: 0, //编码弹窗分页-总数

14
src/views/cost/csotSettlement/component/other-cost.vue
View File

@ -117,10 +117,12 @@ export default {
/* 求和 */ /* 求和 */
getSumTotalPrice() { getSumTotalPrice() {
if (this.addOtherCostList.length > 0) { if (this.addOtherCostList.length > 0) {
this.totalPrice = this.addOtherCostList.reduce( this.totalPrice =
(sum, e) => sum + e.addCost * 1, this.addOtherCostList.reduce((sum, e) => {
0, const cost = parseFloat(e.addCost)
) // 检查 cost 是否为数字且不是 NaN
return !isNaN(cost) ? sum + Math.round(cost * 100) : sum
}, 0) / 100
} else { } else {
this.totalPrice = 0 this.totalPrice = 0
} }
@ -147,11 +149,11 @@ export default {
this.activeIndexCostRemark = '' this.activeIndexCostRemark = ''
} }
const regex_2 = const regex_2 =
/^(?!\s*$)(?:[1-9][0-9]{0,7}|100000000)$/ /^(?!\s*$)(?:(?:[1-9][0-9]{0,7}|100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
if (!regex_2.test(e.addCost)) { if (!regex_2.test(e.addCost)) {
this.$modal.msgError( this.$modal.msgError(
'金额不能为空，不能为小数，不能以0开头，不能大于1亿', '金额不能为空，只能为数字，如果是小数，则小数点后最多两位，不能以0开头，不能大于1亿',
) )
this.activeIndex = index this.activeIndex = index
this.$refs[`addCost_${index}`].focus() this.$refs[`addCost_${index}`].focus()

6
src/views/store/poleConfig/poleConfig.vue
View File

@ -379,7 +379,7 @@ export default {
// 查询 // 查询
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
const keyWord = this.formData.keyWord?.trim() || '' const keyWord = this.formData.wholeTypeName?.trim() || ''
this.getList({ keyWord }) this.getList({ keyWord })
}, },
handleSearch() { handleSearch() {
@ -388,11 +388,11 @@ export default {
}, },
// 重置 // 重置
resetQuery() { resetQuery() {
this.formData.keyWord = '' this.formData.wholeTypeName = ''
this.getList() this.getList()
}, },
resetSearch() { resetSearch() {
this.dialogForm.keyWord = '' this.dialogForm.wholeTypeName = ''
this.getDetail({ id: this.rowId }) this.getDetail({ id: this.rowId })
}, },
// 新增 // 新增

4
src/views/stquery/deviceStatusRecord.vue
View File

@ -190,13 +190,13 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="报废数量" label="已报废数量"
align="center" align="center"
prop="scrapNum" prop="scrapNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="预报废数量" label="待报废数量"
align="center" align="center"
prop="preScrapNum" prop="preScrapNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"

12
src/views/stquery/outboundPreview/components/outbound-form.vue
View File

@ -68,10 +68,18 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="mini" plain @click="handleQuery" <el-button
size="mini"
type="primary"
@click="handleQuery"
icon="el-icon-search"
>查询</el-button >查询</el-button
> >
<el-button size="mini" type="warning" @click="handleReset" <el-button
size="mini"
type="warning"
@click="handleReset"
icon="el-icon-refresh"
>重置</el-button >重置</el-button
> >
<el-button size="mini" type="primary" @click="handleExport" <el-button size="mini" type="primary" @click="handleExport"

4
src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
View File

@ -619,9 +619,9 @@ export default {
getAccessoryTree().then((response) => { getAccessoryTree().then((response) => {
this.equipmentTypeList = response.data this.equipmentTypeList = response.data
this.equipmentTypeList.forEach((item, index) => { this.equipmentTypeList.forEach((item, index) => {
if (item.children.length > 0) { if (item.children && item.children.length > 0) {
item.children.forEach((item2, index2) => { item.children.forEach((item2, index2) => {
if (item2.children.length > 0) { if (item2.children && item2.children.length > 0) {
item2.children.forEach((item3) => { item2.children.forEach((item3) => {
item3.machineTypeName = item2.label item3.machineTypeName = item2.label
item3.specificationType = item3.label item3.specificationType = item3.label

2
vue.config.js
View File

@ -42,7 +42,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
target: `http://192.168.2.158:49080`, //超 target: `http://192.168.2.127:39080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://192.168.2.74:49080`, //旭/ // target: `http://192.168.2.74:49080`, //旭/
// target: `http://192.168.2.17:39080`, //帅 // target: `http://192.168.2.17:39080`, //帅