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

界面修改

Browse Source
20240912_adapter_z
yewj 1 year ago
parent 8697a9fe3d
commit d377f0d486
5 changed files with 116 additions and 88 deletions
Show Stats Download Patch File Download Diff File

4
src/api/inout/order.js
Unescape Escape View File

@ -83,8 +83,7 @@ export function filterInvoice(params) {
} }
export function orderListError(query) {+ export function orderListError(query) {
6
return axios({ return axios({
url: "/udiwms/inout/order/error", url: "/udiwms/inout/order/error",
method: "get", method: "get",
@ -532,7 +531,6 @@ export function deleteAllInvByCode(query) {
} }
export function rollbackOrder(params) { export function rollbackOrder(params) {
return axios({ return axios({
url: "/udiwms/inout/order/received/rollback", url: "/udiwms/inout/order/received/rollback",

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

@ -167,8 +167,8 @@
</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="packUnit"> <el-form-item label="最小包装单位:" prop="packUnit">
<el-input style="width: 90%" size="small" placeholder="请输入包装单位" <el-input style="width: 90%" size="small" placeholder="请输入最小包装单位"
v-model.trim="newProductData.packUnit" v-model.trim="newProductData.packUnit"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -183,8 +183,8 @@
</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="prepnUnit"> <el-form-item label="剂型:" prop="prepnUnit">
<el-input style="width: 90%" size="small" placeholder="请输入制剂单位" <el-input style="width: 90%" size="small" placeholder="请输入剂型"
v-model.trim="newProductData.prepnUnit" v-model.trim="newProductData.prepnUnit"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -316,7 +316,7 @@
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="药品状态:" prop="majorStatus"> <el-form-item label="药品状态:" prop="majorStatus">
<el-select v-model="newProductData.majorStatus" style="width: 90%" placeholder="选择药品状态" > <el-select v-model="newProductData.majorStatus" style="width: 90%" placeholder="选择药品状态">
<el-option label="停用" :value="0"></el-option> <el-option label="停用" :value="0"></el-option>
<el-option label="在用" :value="1"></el-option> <el-option label="在用" :value="1"></el-option>
</el-select> </el-select>
@ -546,8 +546,8 @@ import {
import { import {
getYbHcflDetail, removeRl, thirdSysDetail getYbHcflDetail, removeRl, thirdSysDetail
} from '@/api/basic/product/udiRelevance' } from '@/api/basic/product/udiRelevance'
import { filterClassify } from '@/api/purchase/classifyCode' import {filterClassify} from '@/api/purchase/classifyCode'
import { filterByUuid } from '@/api/basic/product/udiInfo' import {filterByUuid} from '@/api/basic/product/udiInfo'
import selectChargesProjectDialog from './selectChargesProjectDialog' import selectChargesProjectDialog from './selectChargesProjectDialog'
import chooseHouseDrug from './chooseHouseDrug' import chooseHouseDrug from './chooseHouseDrug'
@ -584,7 +584,7 @@ export default {
required: true required: true
} }
}, },
components: { selectChargesProjectDialog, chooseHouseDrug }, components: {selectChargesProjectDialog, chooseHouseDrug},
data() { data() {
return { return {
ybHcflDetail: {}, ybHcflDetail: {},
@ -621,45 +621,45 @@ export default {
activeNames: ['0', '1', '2'], activeNames: ['0', '1', '2'],
formRules: { formRules: {
cpmctymc: [ cpmctymc: [
{ required: true, message: '请输入药品通用名', trigger: 'blur' } {required: true, message: '请输入药品通用名', trigger: 'blur'}
], ],
prepnSpec: [ prepnSpec: [
{ required: true, message: '请输入制剂规格', trigger: 'blur' } {required: true, message: '请输入制剂规格', trigger: 'blur'}
], ],
packUnit: [ packUnit: [
{ required: true, message: '请输入包装单位', trigger: 'blur' } {required: true, message: '请输入包装单位', trigger: 'blur'}
], ],
prepnUnit: [ prepnUnit: [
{ required: true, message: '请输入制剂单位', trigger: 'blur' } {required: true, message: '请输入制剂单位', trigger: 'blur'}
], ],
// packRatio: [ // packRatio: [
// {required: true, message: '请输入包装比例', trigger: 'blur'} // {required: true, message: '请输入包装比例', trigger: 'blur'}
// ], // ],
packMatrial: [ packMatrial: [
{ required: true, message: '请输入包装材质', trigger: 'blur' } {required: true, message: '请输入包装材质', trigger: 'blur'}
], ],
zczbhhzbapzbh: [ zczbhhzbapzbh: [
{ required: true, message: '请输入批准文号', trigger: 'blur' } {required: true, message: '请输入批准文号', trigger: 'blur'}
], ],
manufactory: [ manufactory: [
{ required: true, message: '生产企业不能为空', trigger: 'blur' } {required: true, message: '生产企业不能为空', trigger: 'blur'}
], ],
physicType: [ physicType: [
{ required: true, message: '药品类型不能为空', trigger: 'blur' } {required: true, message: '药品类型不能为空', trigger: 'blur'}
], ],
ybbm: [ ybbm: [
{ required: true, message: '医保编码不能为空', trigger: 'blur' } {required: true, message: '医保编码不能为空', trigger: 'blur'}
], ],
price: [ price: [
{ required: true, message: '药品价格不能为空', trigger: 'blur' } {required: true, message: '药品价格不能为空', trigger: 'blur'}
], ],
majorStatus: [ majorStatus: [
{ required: true, message: '请选择药品状态', trigger: 'blur' } {required: true, message: '请选择药品状态', trigger: 'blur'}
] ]
}, },
detailList: [ detailList: [
// 初始化一个空对象或包含默认值的对象 // 初始化一个空对象或包含默认值的对象
{ nameCode: '', packLevel: null, bhxjsl: null, isDisabled: false, isUpDisabled: true, rowDisabled: false } {nameCode: '', packLevel: null, bhxjsl: null, isDisabled: false, isUpDisabled: true, rowDisabled: false}
], ],
status: false, status: false,
rowDisabled: false, rowDisabled: false,
@ -718,7 +718,7 @@ export default {
}, },
saveNewProduct() { saveNewProduct() {
if (!this.isSave){ if (!this.isSave) {
return this.$message.error("请先保存药品层级") return this.$message.error("请先保存药品层级")
} }
this.addProductDialogVisible = false this.addProductDialogVisible = false
@ -879,7 +879,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
if (row.id != null) { if (row.id != null) {
let params = { nameCode: row.nameCode } let params = {nameCode: row.nameCode}
delDrugLevel(params).then((res) => { delDrugLevel(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.isSave = true this.isSave = true

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

@ -66,7 +66,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="formData.autoTag == 1"> <el-col :span="12" class="el-col">
<el-form-item label="独占工位库存:" prop="monopoly" class="query-form-item"> <el-form-item label="独占工位库存:" prop="monopoly" class="query-form-item">
<el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存" <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存"
:disabled="formData.autoTag == 0"> :disabled="formData.autoTag == 0">
@ -76,7 +76,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="常用业务类型:" prop="isPopular" class="query-form-item"> <el-form-item label="常用业务名称:" prop="isPopular" class="query-form-item">
<el-select v-model="formData.isPopular" style="width: 80%" placeholder="业务类型是否常用"> <el-select v-model="formData.isPopular" style="width: 80%" placeholder="业务类型是否常用">
<el-option label="是" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="否" :value="0"></el-option>
@ -108,35 +108,62 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item" v-if="formData.scanType != 1"> <!-- <el-col :span="12" class="el-col">-->
<el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件"> <!-- <el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item">-->
<el-option label="完全赋码" :value="0"></el-option> <!-- <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件"-->
<el-option label="部分赋码" :value="1"></el-option> <!-- :disabled="formData.scanType == 1"-->
<el-option label="赋码超出" :value="2"></el-option> <!-- >-->
</el-select> <!-- <el-option label="完全赋码" :value="0"></el-option>-->
</el-form-item> <!-- <el-option label="部分赋码" :value="1"></el-option>-->
</el-col> <!-- &lt;!&ndash; <el-option label="赋码超出" :value="2"></el-option>&ndash;&gt;-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="结果处理:" prop="checkInsert" class="query-form-item"> <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
<el-select v-model="formData.checkInsert" style="width: 80%" placeholder="结果处理" <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="结果处理"
:disabled="formData.scanType == 1" :disabled="formData.scanType == 1"
> >
<el-option label="自动添加" :value="1"></el-option> <el-option label="自动添加" :value="1"></el-option>
<el-option label="自动不添加" :value="2"></el-option> <el-option label="禁止添加" :value="2"></el-option>
<el-option label="依提示决定" :value="3"></el-option> <el-option label="依提示决定" :value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item"> <!-- <el-col :span="12" class="el-col">-->
<el-select v-model="formData.warnType" style="width: 80%" placeholder="请选择异常提醒方式"> <!-- <el-form-item label="三期不一致:" prop="checkBatchInsert" class="query-form-item">-->
<el-option label="信息提醒" :value="1"></el-option> <!-- <el-select v-model="formData.checkBatchInsert" style="width: 80%" placeholder="结果处理"-->
<el-option label="信息弹框提醒" :value="2"></el-option> <!-- :disabled="formData.scanType == 1"-->
<el-option label="不提醒" :value="3"></el-option> <!-- >-->
</el-select> <!-- <el-option label="自动添加" :value="1"></el-option>-->
</el-form-item> <!-- <el-option label="禁止添加" :value="2"></el-option>-->
</el-col> <!-- <el-option label="依提示决定" :value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="数量溢出:" prop="overCount" class="query-form-item">-->
<!-- <el-select v-model="formData.overCount" style="width: 80%" placeholder="是否允许数量溢出"-->
<!-- :disabled="formData.scanType == 1"-->
<!-- >-->
<!-- <el-option label="自动添加" :value="1"></el-option>-->
<!-- <el-option label="禁止添加" :value="2"></el-option>-->
<!-- <el-option label="依提示决定" :value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item">-->
<!-- <el-select v-model="formData.warnType" style="width: 80%" placeholder="请选择异常提醒方式">-->
<!-- <el-option label="信息提醒" :value="1"></el-option>-->
<!-- <el-option label="信息弹框提醒" :value="2"></el-option>-->
<!-- <el-option label="不提醒" :value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
@ -260,8 +287,8 @@ export default {
data() { data() {
return { return {
formData: { formData: {
scanType: 1, scanType: 2,
checkInsert: 1, checkInsert: 2,
isMatching: 1, isMatching: 1,
inoutType: null, inoutType: null,
documentTypeCode: null, documentTypeCode: null,
@ -272,7 +299,9 @@ export default {
monopoly: 0, monopoly: 0,
orderFinishVerify: 0, orderFinishVerify: 0,
isPopular: 1, isPopular: 1,
invCode: '' invCode: '',
overCount: 1,
checkBatchInsert:2,
}, },
invList: [], invList: [],
busTypes: [], busTypes: [],

22
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -210,14 +210,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="thrBusName" width="100"></el-table-column> <el-table-column label="单据类型" prop="thrBusName" width="100"></el-table-column>
<el-table-column label="单据完成条件" prop="orderFinishVerify" width="100"> <!-- <el-table-column label="单据完成条件" prop="orderFinishVerify" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ orderFinishVerifys[scope.row.orderFinishVerify] }}</span> <!-- <span>{{ orderFinishVerifys[scope.row.orderFinishVerify] }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="队列管理" prop="autoTag" width="100"> <el-table-column label="队列管理" prop="autoTag" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ autoTagTypes[scope.row.autoTag] }}</span> <span>{{ autoTagTypes[scope.row.autoTag] }}</span>9
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="独占库存" prop="monopoly" width="90"> <el-table-column label="独占库存" prop="monopoly" width="90">
@ -240,11 +240,11 @@
<span>{{ checkInserts[scope.row.checkInsert] }}</span> <span>{{ checkInserts[scope.row.checkInsert] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="异常方式提醒" prop="warnType" width="100"> <!-- <el-table-column label="异常方式提醒" prop="warnType" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ warnTypeMap[scope.row.warnType] }}</span> <!-- <span>{{ warnTypeMap[scope.row.warnType] }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="是否常用" prop="isPopular" width="100"> <el-table-column label="是否常用" prop="isPopular" width="100">
<template slot-scope="scope"> <template slot-scope="scope">

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

@ -624,6 +624,7 @@ export default {
viewType: "tagCode", viewType: "tagCode",
workPlaceCode: this.workplaceId, workPlaceCode: this.workplaceId,
originCode: this.originCode, originCode: this.originCode,
busType: this.formData.busType,
code: this.filterQuery.code.trim(), code: this.filterQuery.code.trim(),
}; };
enterCodeWeb(tQuery).then((response) => { enterCodeWeb(tQuery).then((response) => {

Write Preview
Loading…
Cancel
Save