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

Merge remote-tracking branch 'origin/master'

Browse Source
ywj_dev
anthonywj 3 years ago
parent e32822b5e7 88119a635e
commit ea783fe42b
13 changed files with 198 additions and 72 deletions
Show Stats Download Patch File Download Diff File

8
src/api/supplier/supProductsAddDi.js
Unescape Escape View File

@ -40,3 +40,11 @@ export function getDiProductDetail(query) {
})
}
export function gupdateDiProductDetail(query) {
return axios({
url: "/udiwms/thrsys/updateThrAddDiProductsList",
method: "post",
data: query
})
}

124
src/views/basic/product/UdiInfoSelectLocalUdi.vue
Unescape Escape View File

@ -163,7 +163,7 @@
/>
</div>
</el-card>
<el-card class="el-card" v-if="isImport">
<el-card class="el-card" >
<div>
<el-form label-width="120px">
<el-row :gutter="20">
@ -383,6 +383,7 @@ export default {
zczbhhzbapzbh: "",
isCheck: 1
},
cpmctymc1:"",
combineLoading: false,
combineQuery: {
idSpliUdi: false,
@ -525,6 +526,10 @@ export default {
return "";
},
handleErpChange(val) {
debugger
console.log("+++"+ this.data.cpmctymc)
this.cpmctymc1=val.cpmctymc;
this.currentRow = val;
},
intentBack() {
@ -532,52 +537,42 @@ export default {
},
checkCombine() {
let selectData = this.multipleUdiSelection;
let selected = null;
if (this.multipleUdiSelection.length == 0) {
if (this.relId != null) {
this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(this.currentRow.uuid);
if (this.currentRow.check) {
selected = this.currentRow;
}
} else
return;
this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称"+this.data.cpmctymc, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let selectData = this.multipleUdiSelection;
let selected = null;
if (this.multipleUdiSelection.length == 0) {
if (this.relId != null) {
this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(this.currentRow.uuid);
if (this.currentRow.check) {
selected = this.currentRow;
}
} else
return;
} else {
selectData.forEach((obj) => {
if (obj.check) {
selected = obj;
} else {
selectData.forEach((obj) => {
if (obj.check) {
selected = obj;
}
this.combineQuery.keys.push(obj.uuid);
});
}
this.combineQuery.keys.push(obj.uuid);
});
}
if (selected != null) {
this.$message.warning("UDI编码：" + selected.nameCode + "已被选入");
return;
}
this.combineLoading = true;
checkExitUdi(this.combineQuery)
.then((response) => {
this.combineLoading = false;
if (response.code == 20000) {
this.combine();
// combineUdi(this.combineQuery)
// .then((response) => {
// this.combineLoading = false;
// if (response.code == 20000) {
// this.$emit("closeUdi", true);
// } else {
// this.$emit("closeUdi", false);
// }
// })
// .catch(() => {
// this.combineLoading = false;
// this.$emit("closeUdi", false);
// });
} else if (response.code == 499) {
this.$confirm(response.message, {type: "warning"})
.then(_ => {
if (selected != null) {
this.$message.warning("UDI编码：" + selected.nameCode + "已被选入");
return;
}
this.combineLoading = true;
checkExitUdi(this.combineQuery)
.then((response) => {
this.combineLoading = false;
if (response.code == 20000) {
this.combine();
// combineUdi(this.combineQuery)
// .then((response) => {
@ -592,19 +587,36 @@ export default {
// this.combineLoading = false;
// this.$emit("closeUdi", false);
// });
})
.catch(_ => {
this.combineQuery.keys = [];
});
}
})
.catch(() => {
this.combineLoading = false;
this.$emit("closeUdi", false);
} else if (response.code == 499) {
this.$confirm(response.message, { type: "warning" })
.then(_ => {
this.combine();
// combineUdi(this.combineQuery)
// .then((response) => {
// this.combineLoading = false;
// if (response.code == 20000) {
// this.$emit("closeUdi", true);
// } else {
// this.$emit("closeUdi", false);
// }
// })
// .catch(() => {
// this.combineLoading = false;
// this.$emit("closeUdi", false);
// });
})
.catch(_ => {
this.combineQuery.keys = [];
});
}
})
.catch(() => {
this.combineLoading = false;
this.$emit("closeUdi", false);
});
});
},
combine() {

2
src/views/basic/product/product.vue
Unescape Escape View File

@ -204,7 +204,7 @@
</el-table-column>
</el-table>
<el-dialog
title="耗材字典-详情"
title="物资字典-详情"
:visible.sync="editDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

10
src/views/basic/product/productUdiType.vue
Unescape Escape View File

@ -13,7 +13,6 @@
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleSubForm( pCode, 'add')">新增</el-button>
</el-button-group>
</el-form-item>
</el-form>
@ -31,6 +30,7 @@
<el-table-column prop="code" label="编码"></el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" @click="handleSubForm( scope.row, 'add')">新增</el-button>
<el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
<el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleDelInv(scope.row)">删除</el-button>
<el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="addHospProduct( scope.row)">绑定</el-button>
@ -53,6 +53,7 @@
<el-col :span="12" class="el-col">
<el-form-item label="上级菜单" prop="parentCode">
<treeselect
:disabled="formName=='add'"
v-model="subData.parentCode"
:options="fromDeptOptions"
:normalizer="normalizer"
@ -154,8 +155,8 @@ export default {
isExpandAll: true,
total: 0,
formMap: {
add: "新增",
edit: "编辑"
add: "新增物资字典分类",
edit: "编辑物资字典分类"
},
formName: null,
configParms: {},
@ -220,8 +221,7 @@ export default {
if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data));
} else if (formName === "add") {
this.subData.parentCode = JSON.parse(JSON.stringify(this.pCode));
this.subData={};
this.subData.parentCode = JSON.parse(JSON.stringify(data)).code;
}
this.getTreeselect();
this.subFormVisible = true;

1
src/views/inout/DialogSelectProduct.vue
Unescape Escape View File

@ -301,6 +301,7 @@ export default {
},
combine() {
debugger
let data = {
relId: this.currentRow.rlId,
supId: this.currentRow.customerId,

1
src/views/purchase/cert/supCertAudit.vue
Unescape Escape View File

@ -562,6 +562,7 @@ export default {
supCompanyClick(row) {
this.filterManufacturerQuery.customerId = row.customerId;
this.registrationList=[];
this.onManufacturerReset();
},

2
src/views/purchase/company/supCompanyAduditDialog.vue
Unescape Escape View File

@ -656,7 +656,7 @@ export default {
,
printSupCert(row) {
var selectIds = [row.id];
let query = {moduleId: 8};
let query = {id: 1};
this.loading = true;
verifyTemplateFile(query).then((res) => {
if (res.code === 20000) {

2
src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
Unescape Escape View File

@ -801,7 +801,7 @@ export default {
},
printSupCert(row) {
var selectIds = [row.id];
let query = {moduleId: 9};
let query = {id: 2};
this.loading = true;
verifyTemplateFile(query).then((res) => {
if (res.code === 20000) {

2
src/views/purchase/product/supProductAuditDialog.vue
Unescape Escape View File

@ -775,7 +775,7 @@ export default {
},
printSupCert(row) {
var selectIds=[row.id];
let query = {moduleId: 10};
let query = {id: 3};
this.loading = true;
verifyTemplateFile(query).then((res) => {
if (res.code === 20000) {

53
src/views/supplier/company/basicCompanyproductDetail.vue
Unescape Escape View File

@ -37,10 +37,10 @@
</div>
<el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
@current-change="handleDetail">
<el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
<el-table-column label="包装单位" prop="bzcj" show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="操作" width="180px">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>-->
@ -1099,5 +1099,52 @@ export default {
</script>
<style scoped>
.itemTag {
float: left;
text-align: right;
margin-top: 5px;
padding-right: 10px;
width: 35%;
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;
flex-wrap: wrap;
margin-bottom: 0px;
}
.el-row {
display: flex;
flex-wrap: wrap;
margin-bottom: 6px;
}
.el-col {
border-radius: 4px;
flex-wrap: wrap;
}
.el-table .cell.el-tooltip {
white-space: pre-wrap;
}
.form-title {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
}
</style>

48
src/views/supplier/products/selectDIDetailDialog.vue
Unescape Escape View File

@ -18,6 +18,54 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="商品条码:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="医保编码:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.ybbm" @input="change($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="计量单位:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="生产企业:">
<el-input style="width: 90%" size="small" :disabled="true" v-model="editQuery.manufactory" splaceholder="请输入内容" @input="change($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="商品名称:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.spmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="产品描述:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="产品价格:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
<template slot="title">

14
src/views/supplier/products/supDiProductsCheck.vue
Unescape Escape View File

@ -64,6 +64,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
<el-button type="primary" icon="el-icon-search" @click="acts">全部审核</el-button>
</el-button-group>
</div>
@ -157,7 +158,7 @@ import {
getThrDiProducts,
delThrDiProducts,
getDiProductDetail,
updateDiProduct
updateDiProduct, gupdateDiProductDetail
} from '@/api/supplier/supProductsAddDi'
import selectDiDetail from '@/views/supplier/products/selectDIDetailDialog'
import ThrProductsAdd from '@/views/supplier/products/supProductsAdd'
@ -237,6 +238,15 @@ export default {
this.filterQuery.page = 1
this.getList()
},
acts(){
gupdateDiProductDetail().then((res) => {
if (res.code === 20000) {
} else {
this.$message.error('参数错误')
}
})
},
getList() {
this.loading = true
getThrDiProducts(this.filterQuery)
@ -286,7 +296,7 @@ export default {
if(type==1){
this.title="产品信息详情"
}else{
this.title="产品信息审核"
this.title="物资入院审核"
}
if(row.type==1){

3
src/views/system/user/authUser.vue
Unescape Escape View File

@ -481,12 +481,11 @@ export default {
this.$message.error("未指定角色！")
return;
}
debugger
this.$refs["dataForm"].validate(valid => {
if (valid) {
this.formLoading = true;
this.formData.locInvCode = this.formData.warehouseName
let data = Object.assign({}, this.formData);
debugger
authAdminSave(data, this.formName).then(response => {
this.formLoading = false;
if (response.code !== 20000) {

Write Preview
Loading…
Cancel
Save