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

耗材字典更新流通计量单元问题

Browse Source
20240912_adapter_z
yewj 8 months ago
parent 8708a7157f
commit 3674d21d4c
4 changed files with 156 additions and 108 deletions
Show Stats Download Patch File Download Diff File

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

@ -1678,22 +1678,22 @@
@closePre="closeUdi" @closePre="closeUdi"
></product-edit> ></product-edit>
<div style="text-align: center; margin-top: 12px"> <!-- <div style="text-align: center; margin-top: 12px">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
size="small" <!-- size="small"-->
icon="search" <!-- icon="search"-->
@click="onAddSubmit(false)" <!-- @click="onAddSubmit(false)"-->
:loading="onAddLoading" <!-- :loading="onAddLoading"-->
>提交 <!-- >提交-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="small" <!-- size="small"-->
icon="search" <!-- icon="search"-->
@click="cancelDialog" <!-- @click="cancelDialog"-->
>取消 <!-- >取消-->
</el-button> <!-- </el-button>-->
</div> <!-- </div>-->
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="耗材字典-编辑" title="耗材字典-编辑"
@ -2511,6 +2511,7 @@ export default {
this.selectHospProductVisible = false; this.selectHospProductVisible = false;
this.addProductVisible = false; this.addProductVisible = false;
this.selectUnBindHospProductVisible = false; this.selectUnBindHospProductVisible = false;
this.getList();
}, },
onAddSubmit(relSubmit) { onAddSubmit(relSubmit) {
this.editFormat.relSubmit = relSubmit; this.editFormat.relSubmit = relSubmit;

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

@ -768,77 +768,92 @@
font-weight: bold;"> font-weight: bold;">
<div style="width: 96%;margin: 0 auto"> <div style="width: 96%;margin: 0 auto">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px"> <el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">
<el-select v-model="editQuery.distributeLevelDi" size="small" style="width: 90%" <el-select v-model="editQuery.distributeLevelDi" size="small" style="width: 90%"
@change="distributeLevelDiChange" @change="distributeLevelDiChange"
clearable clearable
placeholder="请选择流通计量层级标识"> placeholder="请选择流通计量层级标识">
<el-option <el-option
v-for="item in detailList" v-for="item in detailList"
:key="item.nameCode" :key="item.nameCode"
:value="item.nameCode" :value="item.nameCode"
:label="item.nameCode"> :label="item.nameCode">
<span style="float: left">{{ item.nameCode }}</span> <span style="float: left">{{ item.nameCode }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px"> <el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">
<el-select v-model="editQuery.useLevelDi" size="small" style="width: 90%" <el-select v-model="editQuery.useLevelDi" size="small" style="width: 90%"
@change="useLevelDiChange" @change="useLevelDiChange"
clearable clearable
placeholder="请选择流通计量层级标识"> placeholder="请选择流通计量层级标识">
<el-option <el-option
v-for="item in detailList" v-for="item in detailList"
:key="item.nameCode" :key="item.nameCode"
:value="item.nameCode" :value="item.nameCode"
:label="item.nameCode"> :label="item.nameCode">
<span style="float: left">{{ item.nameCode }}</span> <span style="float: left">{{ item.nameCode }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px"> <el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">
<el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位" <el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"
disabled disabled
v-model="editQuery.distributeLevelUnit" v-model="editQuery.distributeLevelUnit"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="使用计量层级标识:" prop="useLevelUnit" label-width="160px"> <el-form-item label="使用计量层级标识:" prop="useLevelUnit" label-width="160px">
<el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识" <el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"
disabled disabled
v-model.trim="editQuery.useLevelUnit" v-model.trim="editQuery.useLevelUnit"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px"> <el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">
<el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量" <el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"
v-model.trim="editQuery.distributeLevelCount" v-model.trim="editQuery.distributeLevelCount"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px"> <el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">
<el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量" <el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"
v-model.trim="editQuery.useLeverCount" v-model.trim="editQuery.useLeverCount"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div style="text-align: center; margin-top: 12px">
<el-button
type="primary"
size="small"
icon="search"
@click="onAddSubmit(false)"
:loading="onAddLoading"
>提交
</el-button>
<el-button
size="small"
icon="search"
@click="cancelSubmit"
>取消
</el-button>
</div>
</el-form> </el-form>
@ -920,7 +935,7 @@ import {
removeDiRl, removeDiRl,
removeRl, removeRl,
thirdSysDetail, thirdSysDetail,
updatetSingleUdiInfo updatetSingleUdiInfo, updatetUdiInfos
} from "@/api/basic/product/udiRelevance"; } from "@/api/basic/product/udiRelevance";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {filterByUuid} from "@/api/basic/product/udiInfo"; import {filterByUuid} from "@/api/basic/product/udiInfo";
@ -934,7 +949,7 @@ import {getHslbs} from "@/api/thrsys/thrHsfl";
import {filterClassify} from "@/api/purchase/classifyCode" import {filterClassify} from "@/api/purchase/classifyCode"
import selectmedicalSuppliesDialog from "./selectmedicalSuppliesDialog" import selectmedicalSuppliesDialog from "./selectmedicalSuppliesDialog"
import { import {
calculateDistCount,calculateUseCount calculateDistCount, calculateUseCount
} from '@/api/basic/product/drugUdiinfos' } from '@/api/basic/product/drugUdiinfos'
export default { export default {
@ -999,6 +1014,7 @@ export default {
}, },
classifyList: [], classifyList: [],
addLoading: false, addLoading: false,
onAddLoading: false,
} }
}, },
components: { components: {
@ -1031,18 +1047,26 @@ export default {
const matchingItem = this.detailList.find(item => item.nameCode == val); const matchingItem = this.detailList.find(item => item.nameCode == val);
if (matchingItem) { if (matchingItem) {
this.editQuery.distributeLevelUnit = matchingItem.packUnit; this.editQuery.distributeLevelUnit = matchingItem.packUnit;
this.editQuery.distributeLevel = matchingItem.packLevel
} }
calculateDistCount(matchingItem).then((res) => { calculateDistCount(matchingItem).then((res) => {
this.editQuery.distributeLevelCount = res.data.distributeLevelCount this.editQuery = {
...this.editQuery,
distributeLevelCount: res.data.distributeLevelCount,
}
}) })
}, },
useLevelDiChange(val) { useLevelDiChange(val) {
const matchingItem = this.detailList.find(item => item.nameCode == val); const matchingItem = this.detailList.find(item => item.nameCode == val);
if (matchingItem) { if (matchingItem) {
this.editQuery.useLevelUnit = matchingItem.packUnit; this.editQuery.useLevelUnit = matchingItem.packUnit;
this.editQuery.useLevel = matchingItem.packLevel;
} }
calculateUseCount(matchingItem).then((res) => { calculateUseCount(matchingItem).then((res) => {
this.editQuery.useLeverCount = res.data.useLeverCount this.editQuery = {
...this.editQuery,
useLeverCount: res.data.useLeverCount,
}
}) })
}, },
classifyChange() { classifyChange() {
@ -1185,6 +1209,7 @@ export default {
this.cancelDialog(); this.cancelDialog();
}); });
}, },
removeErp(row) { removeErp(row) {
this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", { this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -1352,7 +1377,27 @@ export default {
getData(data) { getData(data) {
this.tollProjectDialogVisible = false this.tollProjectDialogVisible = false
this.editQuery.payFeeCode = data.medCatalogCode this.editQuery.payFeeCode = data.medCatalogCode
} },
onAddSubmit(relSubmit) {
this.editQuery.relSubmit = relSubmit;
this.onAddLoading = true
updatetUdiInfos(this.editQuery)
.then((response) => {
this.onAddLoading = false
if (response.code == 20000) {
this.$emit("closePre", true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.onAddLoading = false
this.$emit("closePre", true);
});
},
cancelSubmit() {
this.$emit("closePre", true);
},
}, },
directives: { directives: {
'debounce-input': { 'debounce-input': {

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

@ -42,31 +42,30 @@
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2"
@click.native="saveDraftOrder()" @click.native="saveDraftOrder()"
>单据挂起 >单据挂起
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2"
@click.native="confirmFinishOrder()" @click.native="confirmFinishOrder()"
>处理完成 >处理完成
</el-button> </el-button>
<!-- <el-dropdown @command="handleCommand">--> <!-- <el-dropdown @command="handleCommand">-->
<!-- <el-button type="primary">--> <!-- <el-button type="primary">-->
<!-- 更多功能<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>--> <!-- 更多功能<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>--> <!-- <el-dropdown-item divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货--> <!-- <el-dropdown-item divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>--> <!-- <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单--> <!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>--> <!-- <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>-->
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
</el-button-group> </el-button-group>
</el-col> </el-col>
</el-row> </el-row>
@ -284,9 +283,9 @@
<!-- </div>--> <!-- </div>-->
</div> </div>
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
> >
<!-- 假设这里有一些信息内容 --> <!-- 假设这里有一些信息内容 -->
<p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">{{ info.documentTypeCode }}</p> <p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">{{ info.remark }}</p>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
@click="selectBusType(info.documentTypeCode)">开始作业 @click="selectBusType(info.documentTypeCode)">开始作业
</el-button> </el-button>
@ -813,6 +812,8 @@ export default {
}, },
startDeal() { startDeal() {
debugger
this.$message.error("开始处理单据")
this.curRow = this.formData; this.curRow = this.formData;
this.dealSplitOrder() this.dealSplitOrder()
this.formData.tagStatus = 2; this.formData.tagStatus = 2;

5
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -42,13 +42,12 @@
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2"
@click.native="saveDraftOrder()" @click.native="saveDraftOrder()"
>单据挂起 >单据挂起
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2"
@click.native="confirmFinishOrder()" @click.native="confirmFinishOrder()"
>处理完成 >处理完成
</el-button> </el-button>
@ -813,6 +812,8 @@ export default {
}, },
startDeal() { startDeal() {
debugger
this.$message.error("开始处理单据")
this.curRow = this.formData; this.curRow = this.formData;
this.dealSplitOrder() this.dealSplitOrder()
this.formData.tagStatus = 2; this.formData.tagStatus = 2;

Write Preview
Loading…
Cancel
Save