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

Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

Browse Source
yanshishuju
wangwei 6 months ago
parent d3ae6838a6 d7c5048e98
commit ab4b61cd71
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File

31
src/views/basic/product/drug/drugAdd.vue
Unescape Escape View File

@ -399,6 +399,7 @@
<el-select v-model="newProductData.useLevelDi" size="small" style="width: 90%"
@change="useLevelDiChange"
clearable
disabled
placeholder="请选择流通计量层级标识"
>
<el-option
@ -707,19 +708,19 @@ export default {
if (response.code == 20000) {
this.ybDrugDetail = response.data
//对照关系
this.newProductData.prepnSpec = this.ybDrugDetail.realityMedicinemodel
this.newProductData.zczbhhzbapzbh = this.ybDrugDetail.approvalCode
this.newProductData.cpmctymc = this.ybDrugDetail.registeredProductName
this.newProductData.spmc = this.ybDrugDetail.goodsName
this.newProductData.bzgg = this.ybDrugDetail.registeredOutlook
this.newProductData.matrial = this.ybDrugDetail.materialName
this.newProductData.packMatrial = this.ybDrugDetail.materialName
this.newProductData.packUnit = this.ybDrugDetail.unit
this.newProductData.bhxjsl = this.ybDrugDetail.factor
this.newProductData.manufactory = this.ybDrugDetail.companyNameSc
this.newProductData.prepnUnit = this.ybDrugDetail.minUnit
this.newProductData.prepnSpec = this.ybDrugDetail.realityOutlook
this.newProductData.zczbhhzbapzbh = this.ybDrugDetail.approvalCode
this.newProductData.cpmctymc = this.ybDrugDetail.registeredProductName
this.newProductData.spmc = this.ybDrugDetail.goodsName
this.newProductData.bzgg = this.ybDrugDetail.factor + this.ybDrugDetail.minUnit + "/" + this.ybDrugDetail.unit
this.newProductData.matrial = this.ybDrugDetail.materialName
this.newProductData.packMatrial = this.ybDrugDetail.materialName
this.newProductData.packUnit = this.ybDrugDetail.unit
this.newProductData.bhxjsl = this.ybDrugDetail.factor
this.newProductData.manufactory = this.ybDrugDetail.companyNameSc
this.newProductData.prepnUnit = this.ybDrugDetail.realityMedicinemodel
if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null){
if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null) {
if ("甲" == this.ybDrugDetail.productInsuranceType) {
this.newProductData.medicareType = 1
} else if ("乙" == this.ybDrugDetail.productInsuranceType) {
@ -729,7 +730,7 @@ export default {
} else {
this.newProductData.medicareType = null
}
console.log( this.newProductData.medicareType)
console.log(this.newProductData.medicareType)
}
@ -929,8 +930,8 @@ export default {
let query = {
uuid: this.newProductData.uuid,
id: this.newProductData.id,
nameCode:this.newProductData.nameCode,
productType:this.newProductData.productsType,
nameCode: this.newProductData.nameCode,
productType: this.newProductData.productsType,
}
this.loading = true
filterByUuid(query)

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

@ -86,7 +86,7 @@
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<!--<el-button type="primary" icon="el-icon-plus" @click="chooseDrug">选入药品信息</el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="chooseHouseDrug">添加院内药品</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>-->
</el-button-group>
</div>

1
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -808,6 +808,7 @@
<el-select v-model="editQuery.useLevelDi" size="small" style="width: 90%"
@change="useLevelDiChange"
clearable
disabled
placeholder="请选择流通计量层级标识">
<el-option
v-for="item in detailList"

22
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -20,22 +20,21 @@
>选入已完成单据
</el-button>
<el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
>选入单据
</el-button>
<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
v-show="isLinkDisabled"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"
>保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
>上货完成
</el-button>
<el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"
<!-- <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"
v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
>保存
</el-button>
</el-button> -->
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
>退货完成
@ -1315,6 +1314,12 @@ export default {
},
refreshCodesPanel() {
this.warnResult = "";
this.errResult = "";
this.result = "";
this.warnVisible = false;
this.errVisible = false;
this.isCodeAlive = false;
this.isBizDetailAlive = false;
this.isCodeDetailAlive = false;
@ -1583,6 +1588,7 @@ export default {
}
this.rowData.workPlaceCode = this.orderFormData.workPlaceCode
this.rowData.fifoSplit = this.orderFormData.fifoSplit
this.$router.push({query: {...this.$route.query, splitType: this.splitType}, path: this.$route.path})
this.chooseDraftOrderVisible = true
},
closeChooseDialog() {
@ -1634,6 +1640,12 @@ export default {
}
},
enterKey(event) {
this.warnResult = "";
this.errResult = "";
this.result = "";
this.warnVisible = false;
this.errVisible = false;
this.checkSuccess = true;
if (this.getDMHotskeyValue(this.scanCode))
return

Write Preview
Loading…
Cancel
Save