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

单据处理问题

Browse Source
20240912_adapter
yewj 4 months ago
parent fc8c1eaf34
commit f251196ba1
5 changed files with 48 additions and 44 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.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://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/'
@ -30,7 +30,7 @@ ENV = 'production'
# 平和县医院
# 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/'
@ -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.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/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

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

@ -259,34 +259,34 @@
<el-divider></el-divider>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="回传系统:" prop="uploadIsMatching" class="query-form-item">
<el-select v-model="formData.uploadIsMatching" style="width: 80%" placeholder="是否配套系统"
@change="changeUploadIsMatching"
>
<el-option label="内部" :value="0"></el-option>
<el-option label="外部" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="回传单据类型:" prop="uploadDocumentTypeCode" class="query-form-item">
<el-select v-model="formData.uploadDocumentTypeCode" placeholder="请选择单据类型"
style="width: 80%"
>
<el-option
v-for="item in uploadTypes"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="24" class="el-row">-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="回传系统:" prop="uploadIsMatching" class="query-form-item">-->
<!-- <el-select v-model="formData.uploadIsMatching" style="width: 80%" placeholder="是否配套系统"-->
<!-- @change="changeUploadIsMatching"-->
<!-- >-->
<!-- <el-option label="内部" :value="0"></el-option>-->
<!-- <el-option label="外部" :value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="回传单据类型:" prop="uploadDocumentTypeCode" class="query-form-item">-->
<!-- <el-select v-model="formData.uploadDocumentTypeCode" placeholder="请选择单据类型"-->
<!-- style="width: 80%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in uploadTypes"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
<!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<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)) {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
this.$message.error("非法产品编码");
this.$message.error("无效追溯码");
return;
}
let tQuery = {

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

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

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

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

Write Preview
Loading…
Cancel
Save