Merge remote-tracking branch 'origin/dev2.0' into dev2.0

dev2.0.1
anthonywj 1 year ago
commit 9d8294938f

@ -209,7 +209,13 @@ export function getGgxhList(params) {
});
}
export function getYbHcflDetail(query) {
return axios({
url: "/udi/udirel/ybHcflDetail",
method: "post",
data: query
});
}

@ -1072,6 +1072,67 @@
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>一级分类:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
:disabled="true"
splaceholder="请输入内容"
v-model="editQuery.catalogname1"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>二级分类:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname2"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>三级分类:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
:disabled="true"
splaceholder="请输入内容"
v-model="editQuery.catalogname3"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>耗材材质:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.matrial"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
@ -1780,6 +1841,10 @@ export default {
packUnit: null,
measname: null,
nameCode: null,
catalogname1: "",
catalogname2: "",
catalogname3: "",
matrial: "",
},
groupBuyMap: {
true: "集采",
@ -2317,7 +2382,9 @@ export default {
}
});
},
closeHandler(){
// this.visible = false;
},
// selectSysParam() {
// let query = {
// paramKey: "smp_isUploadProuct",

@ -120,10 +120,62 @@
size="small"
splaceholder="请输入内容"
v-model="editQuery.ybbm"
v-debounce-input:500ms="getYbHcData"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="一级分类名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname1"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="二级分类名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname2"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="三级分类名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname3"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="耗材材质:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.matrial"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="库存积压预警数量:">
@ -653,7 +705,7 @@
</template>
<script>
import {disableUdi, removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from "@/api/basic/product/udiRelevance";
import {getYbHcflDetail,disableUdi, removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from "@/api/basic/product/udiRelevance";
import {isBlank} from "@/utils/strUtil";
import {filterByUuid} from "@/api/basic/product/udiInfo";
import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
@ -705,6 +757,7 @@ export default {
return {
isUseDyCheck: true,
useNumEnable: true,
ybHcflDetail: {},
sysList: [],
detailList: [],
fromDeptOptions: [],
@ -749,6 +802,32 @@ export default {
}
},
methods: {
getYbHcData(){
let query = {
specificationCode: this.editQuery.ybbm
};
getYbHcflDetail(query).then((response) => {
if (response.code == 20000) {
this.ybHcflDetail = response.data
this.editQuery.catalogname1 = this.ybHcflDetail.catalogname1
this.editQuery.catalogname2 = this.ybHcflDetail.catalogname2
this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
this.editQuery.matrial = this.ybHcflDetail.matrial
this.$forceUpdate();
}else {
this.editQuery.catalogname1 = ""
this.editQuery.catalogname2 = ""
this.editQuery.catalogname3 = ""
this.editQuery.matrial = ""
this.$forceUpdate();
}
}).catch(() => {
})
},
onClose(){
this.$emit("onClose")
},
diableChange() {
let query = {
relId: this.pId
@ -994,7 +1073,19 @@ export default {
this.loading = false;
});
},
},
directives: {
'debounce-input': {
inserted(el, binding) {
let timeout
el.addEventListener('input', () => {
clearTimeout(timeout)
timeout = setTimeout(() => {
binding.value()
}, parseInt(binding.arg) || 300)
})
}
}
}
}
</script>

@ -330,21 +330,77 @@
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="医保编码:">
<el-input style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.ybbm"
v-debounce-input:500ms="getYbHcData"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>医保编码:&nbsp;</span>
<span>一级分类名称:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.ybbm"
v-model="repEditQuery.catalogname1"
disabled
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="二级分类名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.catalogname2"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>三级分类名称:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.catalogname3"
disabled
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="耗材材质:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.matrial"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
@ -597,6 +653,7 @@
</template>
<script>
import {getYbHcflDetail} from '@/api/basic/product/udiRelevance'
import {updateErpProduct, thirdSysDetail, getSmUdiInfos} from "../../../api/basic/udiRelevance";
import {udiUpload} from "../../../api/thrsys/smp"
import {finProductSet, selectSysParamByKey} from "../../../api/param/systemParamConfig";
@ -620,6 +677,7 @@ export default {
},
data() {
return {
ybHcflDetail: {},
showSearch: true,
radioCheck: null,
filterQuery: {
@ -661,6 +719,10 @@ export default {
basicPrductRemak6: null,
basicPrductRemak7: null,
basicPrductRemak8: null,
catalogname1: null,
catalogname2: null,
catalogname3: null,
matrial: null,
},
relevanceEdit: {
@ -703,6 +765,32 @@ export default {
},
methods: {
getYbHcData(){
let query = {
specificationCode: this.repEditQuery.ybbm
};
getYbHcflDetail(query).then((response) => {
if (response.code == 20000) {
this.ybHcflDetail = response.data
this.repEditQuery.catalogname1 = this.ybHcflDetail.catalogname1
this.repEditQuery.catalogname2 = this.ybHcflDetail.catalogname2
this.repEditQuery.catalogname3 = this.ybHcflDetail.catalogname3
this.repEditQuery.matrial = this.ybHcflDetail.matrial
this.$forceUpdate();
}else {
this.repEditQuery.catalogname1 = ""
this.repEditQuery.catalogname2 = ""
this.repEditQuery.catalogname3 = ""
this.repEditQuery.matrial = ""
this.$forceUpdate();
}
}).catch(() => {
})
},
onClose(){
this.$emit("onClose")
},
onReset() {
this.radioCheck = null;
this.$router.push({
@ -873,7 +961,7 @@ export default {
this.repEditQuery.manufactory = this.currentRow.manufactory;
this.repEditQuery.spmc = this.currentRow.spmc;
this.repEditQuery.cpms = this.currentRow.cpms;
this.getYbHcData()
// if (isBlank(this.relevanceEdit.cpms)) {
// this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh
// }
@ -1036,6 +1124,19 @@ export default {
// if (this.editQuery.basicPrductRemak7 != null) {
this.findThrTypeMethod(this.repEditQuery.basicPrductRemak7);
},
directives: {
'debounce-input': {
inserted(el, binding) {
let timeout
el.addEventListener('input', () => {
clearTimeout(timeout)
timeout = setTimeout(() => {
binding.value()
}, parseInt(binding.arg) || 300)
})
}
}
}
};
</script>
<style scoped>

@ -429,6 +429,66 @@
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>一级分类名称:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small" :disabled="true"
splaceholder="请输入内容"
v-model="editQuery.catalogname1"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>二级分类名称:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname2"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>三级分类名称:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small" :disabled="true"
splaceholder="请输入内容"
v-model="editQuery.catalogname3"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>耗材材质:&nbsp;</span>
</div>
<el-input
style="width: 65%"
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.matrial"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">

@ -71,7 +71,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="产品价格:">
<el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.price"></el-input>
@ -79,9 +79,67 @@
</el-col>
<el-col :span="12">
<el-form-item label="医保编码:">
<el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
<el-input style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.ybbm"
v-debounce-input:500ms="getYbHcData"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="一级分类名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname1"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="二级分类名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname2"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="三级分类名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname3"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="耗材材质:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.matrial"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="采购类型">
<el-select
@ -110,6 +168,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'">
<el-input
@ -130,6 +190,8 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3+':'">
<el-input
@ -150,6 +212,8 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5+':'">
<el-input
@ -173,6 +237,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'">
<el-select
@ -221,6 +287,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="产品描述:">
<el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
@ -238,15 +306,15 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row class="edit-row">
<el-button-group style="display: flex">
<el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
:loading="loading"
>提交
</el-button>
</el-button-group>
</el-row>
</el-form>
</el-card>
@ -275,7 +343,7 @@
</template>
<script>
import {disableUdi, removeDiRl, removeRl, thirdSysDetail} from '@/api/basic/product/udiRelevance'
import {getYbHcflDetail,disableUdi, removeDiRl, removeRl, thirdSysDetail} from '@/api/basic/product/udiRelevance'
import {updateById} from '@/api/basic/udiRelevance'
import {filterByUuid} from '@/api/basic/udiInfo'
import selectErp from "./udiInfoselectErpUdi";
@ -301,6 +369,7 @@ export default {
data() {
return {
ybHcflDetail: {},
isUseDyCheck: false,
useNumEnable: true,
editDialogVisible: false,
@ -323,7 +392,6 @@ export default {
sptm: null,
packUnit: null,
measname: null,
nameCode: null
},
editSingleDiDialogVisible: false,
selectErpDialogVisible: false, //ERP
@ -333,6 +401,32 @@ export default {
},
methods: {
getYbHcData(){
let query = {
specificationCode: this.editQuery.ybbm
};
getYbHcflDetail(query).then((response) => {
if (response.code == 20000) {
this.ybHcflDetail = response.data
this.editQuery.catalogname1 = this.ybHcflDetail.catalogname1
this.editQuery.catalogname2 = this.ybHcflDetail.catalogname2
this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
this.editQuery.matrial = this.ybHcflDetail.matrial
this.$forceUpdate();
}else {
this.editQuery.catalogname1 = ""
this.editQuery.catalogname2 = ""
this.editQuery.catalogname3 = ""
this.editQuery.matrial = ""
this.$forceUpdate();
}
}).catch(() => {
})
},
onClose(){
this.$emit("onClose")
},
submitUpload() {
var data = {
id: this.editQuery.prid,
@ -361,6 +455,10 @@ export default {
basicPrductRemak6: this.editQuery.basicPrductRemak6,
basicPrductRemak7: this.editQuery.basicPrductRemak7,
basicPrductRemak8: this.editQuery.basicPrductRemak8,
catalogname1: this.editQuery.catalogname1,
catalogname2: this.editQuery.catalogname2,
catalogname3: this.editQuery.catalogname3,
matrial: this.editQuery.matrial,
}
updateById(data).then(res => {
@ -524,7 +622,19 @@ export default {
this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
// }
},
}, directives: {
'debounce-input': {
inserted(el, binding) {
let timeout
el.addEventListener('input', () => {
clearTimeout(timeout)
timeout = setTimeout(() => {
binding.value()
}, parseInt(binding.arg) || 300)
})
}
}
}
}
</script>

@ -337,6 +337,48 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>一级分类名称:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.catalogname1"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>二级分类名称:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容"
v-model="editQuery.catalogname2"></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>三级分类名称:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.catalogname3"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>耗材材质:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容"
v-model="editQuery.matrial"></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">

@ -158,11 +158,63 @@
<el-col :span="12" class="el-col">
<el-form-item label="医保编码:">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"
@input="change($event)"></el-input>
@input="change($event)"
v-debounce-input:500ms="getYbHcData"
></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: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname1"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="二级分类名称:">
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname2"
disabled
></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: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.catalogname3"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="耗材材质:">
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.matrial"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="计量单位:">
@ -370,6 +422,7 @@
</template>
<script>
import {getYbHcflDetail} from '@/api/basic/product/udiRelevance'
import {getUdiInfos, filterCompany, superSearch} from '../../../api/basic/udiInfo'
import {combineUdi} from '../../../api/basic/udiRelevance'
import {addDiProduct} from '@/api/supplier/supProductsAddDi'
@ -410,6 +463,7 @@ export default {
data() {
return {
ybHcflDetail: {},
showSearch: true,
unionQuery: {
page: 1,
@ -452,7 +506,11 @@ export default {
sptm: null,
uuids: null,
devKeys: [],
customerId: store.getters.customerId
customerId: store.getters.customerId,
catalogname1: null,
catalogname2: null,
catalogname3: null,
matrial: null,
},
thirdSys: [],
@ -464,6 +522,32 @@ export default {
}
},
methods: {
getYbHcData(){
let query = {
specificationCode: this.editQuery.ybbm
};
getYbHcflDetail(query).then((response) => {
if (response.code == 20000) {
this.ybHcflDetail = response.data
this.editQuery.catalogname1 = this.ybHcflDetail.catalogname1
this.editQuery.catalogname2 = this.ybHcflDetail.catalogname2
this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
this.editQuery.matrial = this.ybHcflDetail.matrial
this.$forceUpdate();
}else {
this.editQuery.catalogname1 = ""
this.editQuery.catalogname2 = ""
this.editQuery.catalogname3 = ""
this.editQuery.matrial = ""
this.$forceUpdate();
}
}).catch(() => {
})
},
onClose(){
this.$emit("onClose")
},
change(e) {
this.$forceUpdate(e);
},
@ -723,6 +807,19 @@ export default {
},
components: {
selectDiDetail
},
directives: {
'debounce-input': {
inserted(el, binding) {
let timeout
el.addEventListener('input', () => {
clearTimeout(timeout)
timeout = setTimeout(() => {
binding.value()
}, parseInt(binding.arg) || 300)
})
}
}
}
}
</script>

Loading…
Cancel
Save