设置字段修改

20231126-yw
郑明梁 2 years ago
parent fa5c5a60be
commit b86029a981

@ -68,8 +68,8 @@
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="产品通用名称:">
<el-input v-model="filterQuery.deviceName" placeholder="请输入产品通用名称" style="width: 90%"
<el-form-item class="query-form-item" label="设备名称:">
<el-input v-model="filterQuery.deviceName" placeholder="请输入设备名称" style="width: 90%"
clearable></el-input>
</el-form-item>
</el-col>
@ -131,7 +131,7 @@
@row-click="listClick"
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="deviceName" width="200"></el-table-column>
<el-table-column label="设备名称" prop="deviceName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="物资编码" prop="code" width="180"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="200" show-overflow-tooltip></el-table-column>

@ -14,7 +14,7 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" prop="deviceName" label="产品通用名称:">
<el-form-item class="query-form-item" prop="deviceName" label="设备名称:">
<el-input v-model="formData.deviceName" disabled style="width: 90%" clearable></el-input>
</el-form-item>
</el-col>

@ -115,7 +115,7 @@
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;" border>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="200"></el-table-column>
<el-table-column label="设备名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="200"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>

@ -3,7 +3,7 @@
<el-form :model="formData" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px" v-if="formName == 'audit'">
<el-button type="primary" @click.native="AuditSubmit(2)">审核通过</el-button>
<el-button type="primary" @click.native="AuditSubmit(3)">审核拒绝</el-button>
<el-button type="primary" @click.native="AuditSubmit(0)">测回草稿</el-button>
</el-button-group>
<el-row>
@ -58,7 +58,7 @@
height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<!-- <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>-->
<el-table-column width="150" label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="设备名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="DI/物资编码" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>

@ -98,7 +98,7 @@
<el-card>
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;" border>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="200"></el-table-column>
<el-table-column label="设备名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label=DI/ prop="nameCode" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="200"></el-table-column>

@ -77,20 +77,47 @@
</el-col>
</el-row>
<el-row type="flex" justify="end">
<el-button-group style="display: flex;margin-right: 10px">
<el-button type="primary" @click.native.stop="selectInvProduct(true)" :loading="loading">选入设备
<el-row>
<el-col :span="15">
<el-form-item class="query-form-item" label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="formData.code"
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button
type="primary"
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
>扫码添加
</el-button>
</el-button-group>
</el-col >
<el-col :span="4">
<el-button-group style="display: flex;margin-right: 20px;float: right;">
<el-button type="primary" @click.native.stop="selectInvProduct(true)" :loading="loading">选入设备
</el-button>
</el-button-group>
</el-col>
</el-row>
<el-table v-loading="loading" :data="detailList" style="width: 100%;margin-top: 20px;"
highlight-current-row
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<!-- <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>-->
<el-table-column width="150" label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="设备名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="DI/物资编码" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column width="120" label="批次号">
@ -128,7 +155,7 @@
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click.stop="true"
@click.native="deleteOrderDetail(scope.$index, scope.row)">减一
@click.native="deleteOrderDetail(scope.$index, scope.row)">删除
</el-button>
<el-button type="text" size="small" v-if="scope.row.id == selectedIndex && paramValue == 1"
@click.stop="true" @click.native="updateOrderDetail(scope.row)">保存
@ -154,20 +181,6 @@
:append-to-body='true'
>
<el-form label-width="100px" :model="filterQuery" size="mini" v-show="showSearch">
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码录入:">
<el-input
id="inputer"
placeholder="请输入UDI码"
@focus="getInputFocus($event)"
@keypress.enter.native="addCode($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="filterQuery.code"
></el-input>
</el-form-item>
</el-col>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="DI/物资编码:">
@ -175,8 +188,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="产品通用名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名称" clearable></el-input>
<el-form-item class="query-form-item" label="设备名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入设备名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -219,7 +232,7 @@
ref="multipleTable">
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="200"></el-table-column>
<el-table-column label="设备名称" prop="cpmctymc" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="120"></el-table-column>
<el-table-column label="UDI码" prop="code" width="350"></el-table-column>
@ -251,19 +264,6 @@
:append-to-body='true'
>
<el-form label-width="100px" :model="filterProductQuery" size="mini" v-show="showSearch">
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码录入:">
<el-input
id="inputer1"
placeholder="请输入UDI码"
@focus="getInputFocus($event)"
@keypress.enter.native="addCode($event)"
ref='inputRef'
type="tel"
v-model="filterProductQuery.code"
></el-input>
</el-form-item>
</el-col>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="DI/物资编码:">
@ -271,8 +271,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="产品通用名称:">
<el-input v-model="filterProductQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名称" clearable></el-input>
<el-form-item class="query-form-item" label="设备名称:">
<el-input v-model="filterProductQuery.cpmctymc" style="width: 90%" placeholder="请输入设备名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -314,7 +314,7 @@
<el-table-column type="selection" :reserve-selection="true" width="55">
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="300"></el-table-column>
<el-table-column label="设备名称" prop="cpmctymc" width="300"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"width="300"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"width="300"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="300"></el-table-column>
@ -539,12 +539,23 @@ export default {
this.$refs.inputRef.select();
},
addCode() {
let message = this.verifyOrder(1);
if (!isBlank(message)) {
this.$message.warning(message);
return;
}
if (isBlank(this.formData.code)) {
this.$message.warning("请扫描或输入UDI码");
return;
}
this.queryInvProductsList()
this.queryProductsList()
if (isBlank(this.formData.orderId)) {
this.saveOrder(this.formData.code);
} else {
this.addScanCode();
}
},
verifyOrder(obj) {
if (isBlank(this.formData.fromDeptCode)) {
@ -624,7 +635,7 @@ export default {
},
deleteOrderDetail(index, row) {
if (row.count === 1) {
this.$confirm('此产品登记数量为1减一后将删除此产品登记记录,是否继续?', '提示', {
this.$confirm('此操作将删除此产品登记记录,是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

@ -109,7 +109,7 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="200"></el-table-column>
<el-table-column label="设备名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="200"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>

Loading…
Cancel
Save