UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 设备变更、设备入库

Browse Source
dev_ksck2.0
chenhc 11 months ago
parent 1bacd26f51
commit 38332f992f
5 changed files with 125 additions and 97 deletions
Show Stats Download Patch File Download Diff File

202
src/views/dev/DialogDeviceSelectAdd.vue
Unescape Escape View File

@ -3,57 +3,50 @@
<el-card>
<el-form :model="filterQuery" size="mini" label-width="100px" v-if="showSearch">
<el-row>
<el-col :span="6">
<el-form-item label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"></el-input>
<el-col :span="8">
<el-form-item label="设备编码:">
<el-input v-model="filterQuery.deviceCode" style="width: 90%" placeholder="请输入设备编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"></el-input>
<el-col :span="8">
<el-form-item label="设备名称:">
<el-input v-model="filterQuery.productName" style="width: 90%" placeholder="请输入设备名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="规格型号:">
<el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号"></el-input>
<el-col :span="8">
<el-form-item label="设备状态">
<el-select v-model="filterQuery.status"
style="width: 90%"
clearable>
<el-option
v-for="item in deviceStatus"
:key="item.key"
:label="item.desc"
:value="item.key">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="批次号:">
<el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="请输入批次号"></el-input>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="最小销售标识:">
<el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入最小销售标识"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="filterQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
clearable="true"
<el-col :span="8">
<el-form-item label="生产企业:" >
<el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物资分类:" class="query-form-item">
<el-input v-model="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
clearable="true"
<el-col :span="8">
<el-form-item label="注册/备案号:" >
<el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册/备案号"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
<el-input v-model="filterQuery.basicPrductRemak1" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle1"
clearable="true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
<el-input v-model="filterQuery.basicPrductRemak2" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle2"
clearable="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -73,27 +66,34 @@
@current-change="handleChange" @selection-change="handleSelectionChange"
ref="multipleTable"
>
<el-table-column label width="45" v-if="type==3 ">
<el-table-column type="selection" width="55" ></el-table-column>
<!-- <el-table-column label="科室" width="150" prop="deptName"/>-->
<el-table-column label="设备编码" width="150" prop="deviceCode"/>
<el-table-column label="最小销售标识" width="150" prop="nameCode"/>
<el-table-column label="名称" width="150" prop="productName"/>
<el-table-column label="规格型号" width="160" prop="ggxh"/>
<el-table-column label="状态" width="120" prop="statusName">
<template slot-scope="scope">
<el-tag :type="deviceStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="巡检锁定" width="120">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
<el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
</template>
</el-table-column>
<el-table-column type="selection" width="55" v-if="type!=3"></el-table-column>
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
<el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
<el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="90"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<el-table-column label="供应商" prop="supName" width="180"></el-table-column>
<el-table-column label="变更次数" width="100" prop="changeCount"/>
<el-table-column label="维修次数" width="100" prop="repairCount"/>
<el-table-column label="巡检次数" width="100" prop="checkCount"/>
<el-table-column label="计量单位" width="100" prop="measname"/>
<el-table-column label="生产企业" width="180" prop="manufactory"/>
<el-table-column label="批次号" width="100" prop="batchNo"/>
<el-table-column label="序列号" width="100" prop="serialNo"/>
<el-table-column label="生产日期" width="140" prop="productionDate"/>
<el-table-column label="过期时间" width="140" prop="expireDate"/>
<el-table-column label="供应商" width="100" prop="supName"/>
<el-table-column label="udi码" width="150" prop="udi"/>
<el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
</el-table>
</el-card>
@ -108,22 +108,51 @@
</template>
<script>
import {
getInvProduct, getInvProductStock, getProduct
} from '@/api/inventory/invPorduct'
import { addDetail } from '@/api/inout/receiveOrder'
import { addBizProduct } from '@/api/inout/orderDetailCode'
import { getInvPreInProduct, getInvPreInProductStock } from '@/api/inventory/invPreInSearch'
import { getInvPreProduct, getInvPreProductStock } from '@/api/inventory/invPreProduct'
import { finProductSet } from '@/api/param/systemParamConfig'
import { detailByDeptCodePage } from '@/api/dev/deviceInfoApi'
import {deviceChangeStatus, deviceChangeType, deviceStatus} from "@/utils/enum";
export default {
name: 'DialogDeviceInvProduct',
computed: {
deviceChangeType() {
return deviceChangeType
},
deviceStatus() {
return deviceStatus
},
deviceChangeStatus() {
return deviceChangeStatus
}
},
props: {
deptCode: {
type: Object,
required: true
},
closeDialog: {
type: Function,
required: true
},
invQueryData: {
type: Object,
required: true
},
codeArray: {
type: Object,
required: true
},
orderQuery: {},
type: { //1.领用选入，2：业务单据选入
type: Object,
required: true
},
listType: { //null:申购单产品选入；1：定量设置产品选入；2：设备入库产品选入
type: Object,
required: true,
},
chooseFunc: {
required: false, type: Function
}
},
data() {
@ -133,6 +162,12 @@ export default {
page: 1,
limit: 10,
deptCode: this.deptCode,
deviceCode: null,
nameCode: null,
productName: null,
status: deviceStatus.NORMAL.key,
manufactory: null,
zczbhhzbapzbh: null,
},
detailQuery: {
code: null,
@ -179,31 +214,15 @@ export default {
}
},
handleSelectionChange(val) {
if (this.listType != 2) {
this.lists = []
for (var i = 0; i < val.length; i++) {
this.tQuery = {}
this.tQuery.productId = val[i].id
this.tQuery.supId = val[i].customerId
this.tQuery.productName = val[i].cpmctymc
this.tQuery.count = 1
this.tQuery.orderIdFk = this.pId
this.tQuery.zczbhhzbapzbh = val[i].zczbhhzbapzbh
this.tQuery.manufactory = val[i].ylqxzcrbarmc
this.tQuery.serialNo = val[i].serialNo
this.tQuery.udi = val[i].udi
this.lists.push(this.tQuery)
}
} else {
this.lists = []
console.log(val)
for (var i = 0; i < val.length; i++) {
this.tQuery = val[i]
this.tQuery.manufactory = val[i].ylqxzcrbarmc
this.tQuery.cpmctymc = val[i].productName
this.tQuery.id = val[i].productId
this.lists.push(this.tQuery)
}
}
console.log(this.lists)
// console.log(this.lists)
},
onReset() {
@ -211,17 +230,15 @@ export default {
path: ''
})
this.filterQuery = {
cpmctymc: null,
invCode: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
supId: null,
attributeType: 1,
page: 1,
limit: 10
limit: 10,
deptCode: this.deptCode,
deviceCode: null,
nameCode: null,
productName: null,
status: deviceStatus.NORMAL.key,
manufactory: null,
zczbhhzbapzbh: null,
}
this.getList()
},
@ -348,7 +365,6 @@ export default {
}
,
created() {
this.findBasicProductSet()
// 加载表格数据
this.getList()
}

1
src/views/dev/DialogDeviceSelectInvProduct.vue
Unescape Escape View File

@ -223,6 +223,7 @@ export default {
this.lists.push(this.tQuery)
}
} else {
this.lists = []
for (var i = 0; i < val.length; i++) {
this.tQuery = val[i]
this.tQuery.manufactory = val[i].ylqxzcrbarmc

10
src/views/dev/deviceChangeOrder.vue
Unescape Escape View File

@ -191,7 +191,7 @@
label-width="auto">
<el-row>
<el-col :span="6">
<el-form-item label="操作部门: " prop="locDeptCode">
<el-form-item label="操作部门: " prop="deptCode">
<deptSelect class="width-full" :value.sync="createData.deptCode"/>
</el-form-item>
</el-col>
@ -199,7 +199,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="目标部门: " prop="toDeptCode" v-if="createData.type==deviceChangeType.CHANGE.key">
<deptSelect class="width-full" :notCode="locDeptCode" :value.sync="createData.toDeptCode"></deptSelect>
<deptSelect class="width-full" :notCode="createData.deptCode" :value.sync="createData.toDeptCode"></deptSelect>
</el-form-item>
</el-col>
<!-- <el-col>-->
@ -384,6 +384,12 @@
>
<dialogDeviceSelectAdd
:deptCode="this.createData.deptCode"
:closeDialog="closeDialogC2"
:invQueryData="invQueryData"
:orderQuery="thisData"
:listType="2"
:type="2"
:chooseFunc="chooseProduct"
></dialogDeviceSelectAdd>
</el-dialog>

8
src/views/dev/js/deviceChangeOrder.js
Unescape Escape View File

@ -110,7 +110,7 @@ export default {
tigger: 'change',
message: "目标部门不能为空"
}],
locDeptCode: [{
deptCode: [{
required: true,
validator: this.validDeptCode,
tigger: 'change',
@ -138,6 +138,7 @@ export default {
let adminId = this.$store.getters.adminId
this.cacheKey = "deviceChangeOrder" + this.type.key + adminId
this.locDeptCode = this.$store.getters.locDeptCode
this.createData.deptCode = this.$store.getters.locDeptCode
this.locDeptName = this.$store.getters.locDeptName
if (this.type == deviceChangeType.ADD) {
@ -432,7 +433,9 @@ export default {
for (let row of lists) {
let data = copyProperties(row, item)
data.editFlag = true
this.genCode(data)
if(!row.deviceCode){
this.genCode(data)
}
data.productName = row.cpmctymc
data.productId = row.id
data.sourceType = this.createData.sourceType
@ -442,6 +445,7 @@ export default {
}
this.chooseProductFlag = false
this.selectInvProductVisible = false
this.selectDeviceAddVisible = false
},
parseItemMap() {
this.$nextTick(() => {

1
src/views/purchase/purApply/purOrderSelectProduct.vue
Unescape Escape View File

@ -436,6 +436,7 @@ export default {
this.lists.push(this.tQuery)
}
} else {
this.lists = []
this.lists = val;
}

Write Preview
Loading…
Cancel
Save