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

问题修复

This commit is contained in:
hongchao 2026-01-16 16:26:04 +08:00
parent 609b442b4c
commit 701030849a
7 changed files with 28 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,21 +68,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -170,12 +155,6 @@
prop="unit"
:show-overflow-tooltip="true"
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
width="100px"
/>
<el-table-column
label="在库数量"
align="center"
@ -302,17 +281,10 @@ export default {
},
created() {
this.getList()
this.getPropData()
/* this.getUnitList();
this.getProList(); */
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true

8
src/views/warehouseManage/machinery/coding-nw/index.vue
View File

@ -205,7 +205,7 @@
</template>
</el-table-column>
<el-table-column
label="固定资产编号"
label="资产编号"
align="center"
prop="assetsCode"
/>
@ -348,7 +348,6 @@
<el-input
v-model="form.maCode"
placeholder="请输入设备编号"
disabled
/>
</el-form-item>
</el-col>
@ -388,10 +387,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="固定资产编号" prop="assetsCode">
<el-form-item label="资产编号" prop="assetsCode">
<el-input
v-model="form.assetsCode"
placeholder="请输入固定资产编号"
placeholder="请输入资产编号"
maxlength="50"
/>
</el-form-item>
@ -558,6 +557,7 @@
<div class="maCode">规格型号：{{ rowObj.specificationType }}</div>
<div class="maCode">设备编号：{{ rowObj.maCode }}</div>
<div class="maCode">二维码编号：{{ rowObj.qrCode }}</div>
<div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
</div>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center">

19
src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
View File

@ -82,7 +82,6 @@
v-model="maForm.arrivalTime"
style="width: 240px"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
type="date"
placeholder="请选择到货日期"
></el-date-picker>
@ -489,15 +488,15 @@ export default {
}
},
computed: {
pickerOptions() {
return {
disabledDate(time) {
const currentDate = new Date()
currentDate.setHours(0, 0, 0, 0)
return time.getTime() < currentDate.getTime()
},
}
},
// pickerOptions() {
// return {
// disabledDate(time) {
// const currentDate = new Date()
// currentDate.setHours(0, 0, 0, 0)
// return time.getTime() < currentDate.getTime()
// },
// }
// },
},
watch: {
'maForm.purchaseTime'() {

10
src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools-cq.vue
View File

@ -346,7 +346,8 @@ export default {
if (isCode) return
const codeListParams = JSON.parse(JSON.stringify(this.codeList))
codeListParams.forEach((e) => {
e.maCode = e.specificationType + e.tempCode
// 修复问题1：添加+号到提交的编码中
e.maCode = e.specificationType + '+' + e.tempCode
e.fixCode ? (e.fixCode = '0') : (e.fixCode = '1')
return e
})
@ -399,10 +400,9 @@ export default {
/* 向下填充事件 */
onFillDownwards(index, code) {
const codeNumList = this.extractNumber(code)
let newStr = code
codeNumList.forEach((e) => {
newStr = newStr.replace(e, e * 1 + 1)
// 修复问题2：只对最后一个数字部分加1
const newStr = code.replace(/(\d+)(?!.*\d)/g, (match) => {
return parseInt(match) + 1
})
this.codeList[index + 1].tempCode = newStr
},

9
src/views/warehouseManage/tagBind/bind/index.vue
View File

@ -236,7 +236,7 @@
width="180"
/>
<el-table-column
label="固定资产编号"
label="资产编号"
align="center"
prop="assetsCode"
width="180"
@ -366,10 +366,10 @@
:disable-branch-nodes="true"
/>
</el-form-item>
<el-form-item label="固定资产编号" prop="assetsCode">
<el-form-item label="资产编号" prop="assetsCode">
<el-input
v-model="form.assetsCode"
placeholder="请输入固定（财务）资产编号"
placeholder="请输入资产编号"
:clearable="true"
maxlength="50"
/>
@ -456,6 +456,7 @@
<div class="maCode">规格型号：{{ rowObj.typeName }}</div>
<div class="maCode">设备编号：{{ rowObj.maCode }}</div>
<div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
<div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
</div>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center">
@ -596,7 +597,7 @@ export default {
assetsCode: [
{
required: true,
message: '固定（财务）资产编号不能为空',
message: '资产编号不能为空',
trigger: 'blur',
},
],

1
src/views/warehouseManage/tagBind/history/index.vue
View File

@ -176,6 +176,7 @@
<div class="maCode">规格型号：{{ rowObj.typeName }}</div>
<div class="maCode">设备编号：{{ rowObj.maCode }}</div>
<div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
<div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
</div>
</div>
</el-dialog>

8
src/views/warehouseManage/warehousing/newTools/index.vue
View File

@ -146,13 +146,13 @@
size="mini"
type="primary"
v-if="scope.row.taskStatus == '28'"
>已审核</el-tag
>已入库</el-tag
>
<el-tag
size="mini"
type="warning"
v-if="scope.row.taskStatus == '105'"
>待审核</el-tag
>待入库</el-tag
>
<el-tag
size="mini"
@ -184,7 +184,7 @@
"
@click="handleUpdate(scope.row)"
v-hasPermi="['warehousing:newTools:auditing']"
>审核</el-button
>入库</el-button
>
<el-button
size="mini"
@ -705,7 +705,7 @@ export default {
this.getDialogTable()
this.open = true
this.showHandle = true
this.title = '审核'
this.title = '入库'
},
//通过