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

Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter

Browse Source
20240912_adapter
qiuyt 4 months ago
parent 9376fff1b8 f251196ba1
commit 8a97484e5b
8 changed files with 111 additions and 71 deletions
Show Stats Download Patch File Download Diff File

6
.env.production
Unescape Escape View File

@ -11,12 +11,12 @@ ENV = 'production'
# 吴雨泽 # 吴雨泽
# VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/'
# 诏安总医院 # 诏安总医院
# VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:83/UDI_WMS_MC/'
# 平潭正式 # 平潭正式
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
@ -30,7 +30,7 @@ ENV = 'production'
# 平和县医院 # 平和县医院
# VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
# 长泰医院 # 长泰医院
# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
@ -70,7 +70,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/'
# 四川平武 # 四川平武
VUE_APP_BASE_API = 'http://192.168.20.3:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.20.3:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

19
src/api/collect/IoCollectCodeSelect.js
Unescape Escape View File

@ -9,6 +9,25 @@ export function ioCollectCodePage(query) {
} }
export function getCodeEndList(query) {
return axios({
url: "/udiwms/basic/collect/ioCollectCode/endList",
method: "get",
params: query
});
}
export function checkCode(query) {
return axios({
url: "/udiwms/basic/collect/ioCollectCode/checkCode",
method: "post",
data: query
});
}
// export function IoCollectCodePageList(query) { // export function IoCollectCodePageList(query) {
// return axios({ // return axios({
// url: "/udiwms/basic/collect/ioCollectCodeBackup/list", // url: "/udiwms/basic/collect/ioCollectCodeBackup/list",

7
src/api/inout/order.js
Unescape Escape View File

@ -684,10 +684,3 @@ export function batchUpdateCode(query) {
} }
export function checkCode(query) {
return axios({
url: "/warehouse/inout/checkCode",
method: "post",
data: query
});
}

56
src/views/basic/workplace/addBusTypeDialog.vue
Unescape Escape View File

@ -259,34 +259,34 @@
<el-divider></el-divider> <el-divider></el-divider>
<el-row :gutter="24" class="el-row"> <!-- <el-row :gutter="24" class="el-row">-->
<el-col :span="12" class="el-col"> <!-- <el-col :span="12" class="el-col">-->
<el-form-item label="回传系统:" prop="uploadIsMatching" class="query-form-item"> <!-- <el-form-item label="回传系统:" prop="uploadIsMatching" class="query-form-item">-->
<el-select v-model="formData.uploadIsMatching" style="width: 80%" placeholder="是否配套系统" <!-- <el-select v-model="formData.uploadIsMatching" style="width: 80%" placeholder="是否配套系统"-->
@change="changeUploadIsMatching" <!-- @change="changeUploadIsMatching"-->
> <!-- >-->
<el-option label="内部" :value="0"></el-option> <!-- <el-option label="内部" :value="0"></el-option>-->
<el-option label="外部" :value="1"></el-option> <!-- <el-option label="外部" :value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="el-col"> <!-- <el-col :span="12" class="el-col">-->
<el-form-item label="回传单据类型:" prop="uploadDocumentTypeCode" class="query-form-item"> <!-- <el-form-item label="回传单据类型:" prop="uploadDocumentTypeCode" class="query-form-item">-->
<el-select v-model="formData.uploadDocumentTypeCode" placeholder="请选择单据类型" <!-- <el-select v-model="formData.uploadDocumentTypeCode" placeholder="请选择单据类型"-->
style="width: 80%" <!-- style="width: 80%"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in uploadTypes" <!-- v-for="item in uploadTypes"-->
:key="item.name" <!-- :key="item.name"-->
:label="item.name" <!-- :label="item.name"-->
:value="item.code" <!-- :value="item.code"-->
> <!-- >-->
<span style="float: left">{{ item.name }}</span> <!-- <span style="float: left">{{ item.name }}</span>-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

2
src/views/collect/ConfirmDrugDealOrder.vue
Unescape Escape View File

@ -804,7 +804,7 @@ export default {
if (!this.parseString(this.filterQuery.code)) { if (!this.parseString(this.filterQuery.code)) {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
this.$message.error("非法产品编码"); this.$message.error("无效追溯码");
return; return;
} }
let tQuery = { let tQuery = {

26
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -631,14 +631,14 @@ export default {
}, },
findFromInvList(val) { findFromInvList(val) {
let cQuery = { let cQuery = {
corpType: this.formDataVisible.consignee, corpType: this.formDataVisible.consignee,
invCode: this.formData.invCode invCode: this.formData.invCode
}; };
findFromCorp(cQuery) findFromCorp(cQuery)
.then((response) => { .then((response) => {
if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2){ if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2) {
this.invList = response.data || []; this.invList = response.data || [];
}else { } else {
this.fromInvOptions = response.data || []; this.fromInvOptions = response.data || [];
} }
}) })
@ -810,7 +810,7 @@ export default {
if (!this.parseString(this.filterQuery.code)) { if (!this.parseString(this.filterQuery.code)) {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
this.$message.error("非法产品编码"); this.$message.error("无效追溯码");
return; return;
} }
let tQuery = { let tQuery = {
@ -1108,7 +1108,8 @@ export default {
this.loading = false this.loading = false
if (res.code == 20000) { if (res.code == 20000) {
this.reset() this.reset()
this.findCurOrder() if (this.formDataVisible.scanType != 1)
this.findCurOrder()
} else if (res.code == 502) { } else if (res.code == 502) {
this.$confirm(res.message, '提示', { this.$confirm(res.message, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -1274,7 +1275,7 @@ export default {
resultParts.push("层级标识: " + data.udi); resultParts.push("层级标识: " + data.udi);
} }
if (data.cpmctymc) { if (data.cpmctymc) {
resultParts.push( data.productType == 2 ? "药品通用名称" : "产品通用名称: " + data.cpmctymc); resultParts.push(data.productType == 2 ? "药品通用名称" : "产品通用名称: " + data.cpmctymc);
} }
if (data.batchNo) { if (data.batchNo) {
resultParts.push("批次号: " + data.batchNo); resultParts.push("批次号: " + data.batchNo);
@ -1288,11 +1289,11 @@ export default {
if (data.serialNo) { if (data.serialNo) {
resultParts.push("序列号: " + data.serialNo); resultParts.push("序列号: " + data.serialNo);
} }
if (data.productType == 2){ if (data.productType == 2) {
if (data.bzgg) { if (data.bzgg) {
resultParts.push("包装规格: " + data.bzgg); resultParts.push("包装规格: " + data.bzgg);
} }
}else { } else {
if (data.ggxh) { if (data.ggxh) {
resultParts.push("规格型号: " + data.ggxh); resultParts.push("规格型号: " + data.ggxh);
} }
@ -1392,6 +1393,9 @@ export default {
clearCode() { clearCode() {
this.originCode = ""; this.originCode = "";
this.formData.code = ""; this.formData.code = "";
this.formData.billNo = null;
this.formData.shipper = null;
this.formData.fromCorp = null;
this.scanCode = ""; this.scanCode = "";
this.scanTitle = "扫码结果："; this.scanTitle = "扫码结果：";
this.result = ""; this.result = "";
@ -1443,9 +1447,9 @@ export default {
} }
getInvListByUser(query) getInvListByUser(query)
.then((response) => { .then((response) => {
if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2){ if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2) {
this.fromInvOptions = response.data || []; this.fromInvOptions = response.data || [];
}else { } else {
this.invList = response.data || [] this.invList = response.data || []
} }
}) })

59
src/views/collect/DialogCheckCode.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :model="orderData" class="demo-form-inline" style="margin-top: 30px"> <el-form :model="orderData" class="demo-form-inline" style="margin-top: 30px" @submit.native.prevent>
<!--<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">--> <!--<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">-->
<el-row :gutter="0" style="margin-top: 5px"> <el-row :gutter="0" style="margin-top: 5px">
@ -79,14 +79,13 @@
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="追溯码" prop="code"></el-table-column> <el-table-column label="追溯码" prop="code"></el-table-column>
<el-table-column label="药品编码" prop="nameCode"></el-table-column> <el-table-column label="药品编码" prop="nameCode"></el-table-column>
<el-table-column label="药品通用名称" prop="productName" width="110"></el-table-column> <el-table-column label="药品通用名称" prop="cpmctymc" width="110"></el-table-column>
<el-table-column label="包装规格" prop="ggxh" width="110"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="produceDate"></el-table-column> <el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column> <el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="序列号" prop="serialNo"></el-table-column> <el-table-column label="序列号" prop="serialNo"></el-table-column>
<el-table-column label="扫码数量" prop="count"></el-table-column> <el-table-column label="扫码数量" prop="scanActCount"></el-table-column>
<el-table-column label="实际数量" prop="reCount"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column> <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
</el-table> </el-table>
@ -103,10 +102,8 @@
</template> </template>
<script> <script>
import { getCodeList } from '@/api/inout/code'
import { isBlank } from '@/utils/strUtil' import { isBlank } from '@/utils/strUtil'
import { checkCode, batchVailCode } from '@/api/inout/order' import { getCodeEndList,checkCode } from '@/api/collect/IoCollectCodeSelect'
import { orderbatchAddCode } from '@/api/inout/splitCode'
export default { export default {
name: 'DialogCheckCode', name: 'DialogCheckCode',
@ -131,7 +128,7 @@ export default {
errResult: '', errResult: '',
scanCode: '', scanCode: '',
codeQuery: { codeQuery: {
orderId: null, billNo:null,
code: null, code: null,
page: 1, page: 1,
limit: 10 limit: 10
@ -140,7 +137,6 @@ export default {
code: '', code: '',
billNo: null, billNo: null,
codeList: [], codeList: [],
orderId: null
} }
} }
}, },
@ -152,7 +148,7 @@ export default {
const codeArray = this.filterQuery.code.split(';') const codeArray = this.filterQuery.code.split(';')
this.filterQuery.codeList = codeArray this.filterQuery.codeList = codeArray
this.filterQuery.code = '' this.filterQuery.code = ''
this.filterQuery.orderId = this.orderData.billNo this.filterQuery.billNo = this.orderData.billNo
// 处理多码的情况 // 处理多码的情况
this.batchVailCode(this.filterQuery) this.batchVailCode(this.filterQuery)
return return
@ -161,12 +157,12 @@ export default {
if (!this.parseString(this.filterQuery.code)) { if (!this.parseString(this.filterQuery.code)) {
this.$refs.inputRef.focus() this.$refs.inputRef.focus()
this.$refs.inputRef.select() this.$refs.inputRef.select()
this.$message.error('非法产品编码') this.$message.error('无效追溯码')
return return
} }
} }
//单码校验 //单码校验
this.filterQuery.orderId = this.orderData.billNo this.filterQuery.billNo = this.orderData.billNo
this.verifyCode(this.filterQuery) this.verifyCode(this.filterQuery)
// this.getInputFocus() // this.getInputFocus()
}, },
@ -214,17 +210,38 @@ export default {
if (data.udi) { if (data.udi) {
resultParts.push('层级标识: ' + data.udi) resultParts.push('层级标识: ' + data.udi)
} }
if (data.cpmctymc) {
resultParts.push( data.productType == 2 ? "药品通用名称" : "产品通用名称: " + data.cpmctymc);
}
if (data.batchNo) { if (data.batchNo) {
resultParts.push('批次号: ' + data.batchNo) resultParts.push("批次号: " + data.batchNo);
} }
if (data.produceDate) { if (data.produceDate) {
resultParts.push('生产日期: ' + data.produceDate) resultParts.push("生产日期: " + data.produceDate);
} }
if (data.expireDate) { if (data.expireDate) {
resultParts.push('失效日期: ' + data.expireDate) resultParts.push("失效日期: " + data.expireDate);
} }
if (data.serialNo) { if (data.serialNo) {
resultParts.push('序列号: ' + data.serialNo) resultParts.push("序列号: " + data.serialNo);
}
if (data.productType == 2){
if (data.bzgg) {
resultParts.push("包装规格: " + data.bzgg);
}
}else {
if (data.ggxh) {
resultParts.push("规格型号: " + data.ggxh);
}
}
if (data.prepnSpec) {
resultParts.push("制剂规格: " + data.prepnSpec);
}
if (data.prepnUnit) {
resultParts.push("剂型: " + data.prepnUnit);
}
if (data.packUnit) {
resultParts.push("计量单位: " + data.packUnit);
} }
this.scanTitle = '扫码结果：' + data.code this.scanTitle = '扫码结果：' + data.code
this.result = resultParts.join(' , ') this.result = resultParts.join(' , ')
@ -283,8 +300,8 @@ export default {
return false return false
}, },
getResultDetailList() { getResultDetailList() {
this.codeQuery.orderId = this.orderData.billNo this.codeQuery.billNo = this.orderData.billNo
getCodeList(this.codeQuery).then((res) => { getCodeEndList(this.codeQuery).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.detailList = res.data.list || [] this.detailList = res.data.list || []
this.resultTotal = res.data.total || 0; this.resultTotal = res.data.total || 0;
@ -312,7 +329,7 @@ export default {
}, },
init() { init() {
this.codeQuery = { this.codeQuery = {
orderId: null, billNo: null,
code: null, code: null,
page: 1, page: 1,
limit: 10 limit: 10

7
src/views/collect/DialogScanCodeDetail.vue
Unescape Escape View File

@ -112,6 +112,13 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
<!--<pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :limit.sync="filterQuery.limit"-->
<!-- :page.sync="filterQuery.page"-->
<!-- @pagination="handleCurrentChange"-->
<!--&gt;</pagination>-->
<!-- <el-row v-if="viewType==7">--> <!-- <el-row v-if="viewType==7">-->
<!-- <el-col span="10">--> <!-- <el-col span="10">-->
<!-- <div style="float: left">--> <!-- <div style="float: left">-->

Write Preview
Loading…
Cancel
Save