dev
This commit is contained in:
parent
102efe5b42
commit
0f94372e55
|
|
@ -50,7 +50,7 @@
|
|||
<!-- <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>-->
|
||||
</div>
|
||||
<div class="list" v-loading="loading">
|
||||
<ul style="height: 100%">
|
||||
<ul>
|
||||
<el-scrollbar style="height: 100%">
|
||||
<li class="list-item" :class="curItem.id == item.id ? 'active' : ''"
|
||||
v-for="(item, index) in ChargeQueueList"
|
||||
|
|
@ -230,6 +230,7 @@ const selected = ref(false)
|
|||
min-height: 0;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
.list-title {
|
||||
height: 48px;
|
||||
|
|
@ -253,6 +254,7 @@ const selected = ref(false)
|
|||
ul {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
height: 100%;
|
||||
|
||||
.list-item {
|
||||
height: 48px;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ const closeBtn = () => {
|
|||
watch(
|
||||
() => height,
|
||||
(newVal) => {
|
||||
console.log(1111)
|
||||
_height.value = newVal == null ? 800 : Number(newVal);
|
||||
height_rem.value =(_height.value/16).toFixed(2);
|
||||
},{deep:true}
|
||||
|
|
|
|||
|
|
@ -113,11 +113,11 @@ import {Delete} from "@element-plus/icons-vue";
|
|||
const props = defineProps({
|
||||
status: {
|
||||
type: Boolean,
|
||||
default: 0
|
||||
default: false
|
||||
},
|
||||
statusDisabled: {
|
||||
type: Boolean,
|
||||
default: 0
|
||||
default: false
|
||||
}
|
||||
})
|
||||
const goodsDetail = defineModel<any>();
|
||||
|
|
|
|||
|
|
@ -85,11 +85,11 @@ import {Delete} from "@element-plus/icons-vue";
|
|||
const props = defineProps({
|
||||
status: {
|
||||
type: Boolean,
|
||||
default: 0
|
||||
default: false
|
||||
},
|
||||
statusDisabled: {
|
||||
type: Boolean,
|
||||
default: 0
|
||||
default: false
|
||||
}
|
||||
})
|
||||
const itemDetail = defineModel<any>();
|
||||
|
|
|
|||
|
|
@ -17,9 +17,7 @@ const querySearchAsync = (queryString: string, cb: (arg: any) => void) => {
|
|||
}
|
||||
const emit = defineEmits(['selectCallBack'])
|
||||
const handleSelect = (item: any) => {
|
||||
console.log(item,'item')
|
||||
let goods = JSON.parse(JSON.stringify(item));
|
||||
console.log("goods",goods)
|
||||
let inventory = {
|
||||
hilistCode: goods.hilistCode,
|
||||
unitPrice: goods.unitPrice,
|
||||
|
|
|
|||
|
|
@ -267,7 +267,6 @@ const changeOutNumber = (row: any) => {
|
|||
}
|
||||
row.totalOutWholeNumber = totalOutWholeNumber;
|
||||
row.totalFragmentNumber = totalOutFragmentNumber;
|
||||
console.log(row)
|
||||
}
|
||||
const save = () => {
|
||||
post("inventory/apply/create", {useInfo: formData.value, data: tableList.value}).then((res: any) => {
|
||||
|
|
|
|||
|
|
@ -231,7 +231,6 @@ const emit = defineEmits(['close'])
|
|||
let setChange = function (row: any) {
|
||||
let totalBefore = row.before.wholeNumber * row.minPackagingNumber + row.before.fragmentNumber; // 使用原始数据
|
||||
let totalAfter = row.after.wholeNumber * row.minPackagingNumber + row.after.fragmentNumber; // 使用原始数据
|
||||
console.log(totalBefore, totalAfter)
|
||||
let diff = totalAfter - totalBefore;
|
||||
|
||||
row.change.wholeNumber = Math.trunc(diff / row.minPackagingNumber);
|
||||
|
|
|
|||
|
|
@ -160,7 +160,6 @@ const move = (direction: number, row: any) => {
|
|||
if (targetIndex < 0 || targetIndex >= cateList.value.length) return;
|
||||
// 交换元素位置
|
||||
[cateList.value[index], cateList.value[targetIndex]] = [cateList.value[targetIndex], cateList.value[index]];
|
||||
console.log(cateList)
|
||||
|
||||
}
|
||||
const cancelAdd = () => {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ const getHilistInfo = () => {
|
|||
if (hilistCode.value) {
|
||||
post("social/directory/getByCode", {code: hilistCode.value}).then((res: any) => {
|
||||
hilistInfo.value = res
|
||||
console.log("hilistInfo", res)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@
|
|||
<!-- <Mask :is-show="is_add" :top="100">-->
|
||||
<!-- <Edit ref="editRef" @close="is_add = false;"/>-->
|
||||
<!-- </Mask>-->
|
||||
<CheckoutDetail ref="checkoutDetailRef" @confirm="confirmTrace"></CheckoutDetail>
|
||||
<!-- <CheckoutDetail ref="checkoutDetailRef" @confirm="confirmTrace"></CheckoutDetail>-->
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
|
|
@ -319,7 +319,6 @@ function getFormattedDate() {
|
|||
}
|
||||
|
||||
let confirm = async () => {
|
||||
console.log('table_list.value++++++++++++++', table_list.value)
|
||||
// 进行表单验证
|
||||
try {
|
||||
await orderForm.value.validate()
|
||||
|
|
@ -349,7 +348,6 @@ let confirm = async () => {
|
|||
}
|
||||
}
|
||||
table_list.value.forEach((item: any) => {
|
||||
console.log(item.traceabilityCodeList)
|
||||
item.traceabilityCode = JSON.stringify(item.traceabilityCodeList)
|
||||
})
|
||||
let data = {
|
||||
|
|
@ -363,7 +361,6 @@ let confirm = async () => {
|
|||
})
|
||||
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
ElMessage.warning('请填写完整必填项')
|
||||
} finally {
|
||||
isLoading.value = false
|
||||
|
|
@ -435,26 +432,6 @@ const getManagerUserList = () => {
|
|||
managerUserList.value = res
|
||||
})
|
||||
}
|
||||
// 追溯码代码
|
||||
const openCheckoutDetail = (row: any) => {
|
||||
let goodlist = []
|
||||
goodlist.push(row)
|
||||
nextTick(() => {
|
||||
checkoutDetailRef.value.init(goodlist);
|
||||
})
|
||||
}
|
||||
//追溯码页面回调
|
||||
const confirmTrace = (data: any) => {
|
||||
let index = findIndexForTableList(data[0].goodId);
|
||||
table_list.value[index] = data[0]
|
||||
checkoutDetailRef.value.close();
|
||||
// table_list.value.forEach((item: any) => {
|
||||
// if(item.goodId === data[0].goodId){
|
||||
// item = data[0]
|
||||
// table_list.value.
|
||||
// }
|
||||
// })
|
||||
}
|
||||
const addSupplierRef = ref()
|
||||
const addSupplier = () => {
|
||||
nextTick(() => {
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ const toExcel = () => {
|
|||
}
|
||||
post("inventory/order/toExcel", {cateIdList: cateIdList}).then((token: any) => {
|
||||
loadConfig().then((res: any) => {
|
||||
console.log(res.base_url + "file/download/" + token)
|
||||
window.open(res.base_url + "file/download/" + token)
|
||||
})
|
||||
|
||||
|
|
@ -96,7 +95,6 @@ const uploadCateIds = () => {
|
|||
if (item[item.length - 1] === 0) return
|
||||
ids.value.push(item[item.length - 1])
|
||||
})
|
||||
console.log(ids)
|
||||
}
|
||||
const fromExcel = () => {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -258,7 +258,6 @@ const socialCard: any = ref({
|
|||
const socialCardUpdate = (e: any) => {
|
||||
isShowCard.value = false
|
||||
if (e) {
|
||||
console.log(e, '123456')
|
||||
isShowCard.value = false
|
||||
ruleForm.value.sex = Number(e.data.baseinfo.gend)
|
||||
ruleForm.value.name = e.data.baseinfo.psn_name
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ const copyItem = (item: any) => {
|
|||
emit('copyItem', item)
|
||||
}
|
||||
const copyGoods = (item: any) => {
|
||||
console.log(item,'item')
|
||||
emit('copyGoods', item)
|
||||
}
|
||||
defineExpose({init,clearList})
|
||||
|
|
|
|||
|
|
@ -310,7 +310,6 @@ const isShowCard = ref<any>(true)
|
|||
const tableData = ref<any>([])
|
||||
const socialCardUpdate = (e: any) => {
|
||||
isShowCard.value = false
|
||||
console.log(e)
|
||||
if (e) {
|
||||
isShowCard.value = false
|
||||
edit_data.value.gender = Number(e.data.baseinfo.gend)
|
||||
|
|
@ -337,7 +336,6 @@ const socialCardUpdate = (e: any) => {
|
|||
}
|
||||
nextTick(() => {
|
||||
if (tableData.value.length > 0) {
|
||||
console.log(tableData.value)
|
||||
height.value = 700
|
||||
} else {
|
||||
height.value = 470
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@ const tableData = ref<TableItem[]>([]);
|
|||
const init = (newIdCode: any, newTableDate: any) => {
|
||||
traceabilityCode.value = newIdCode;
|
||||
tableData.value = newTableDate;
|
||||
console.log(tableData)
|
||||
show.value = true;
|
||||
}
|
||||
const selected = ref()
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@ const show = ref(false);
|
|||
const init = (data: any) => {
|
||||
item.value = data;
|
||||
show.value = true;
|
||||
console.log("tllllllllllll",item.value)
|
||||
}
|
||||
defineExpose({init});
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ const list = ref()
|
|||
const orderInfo = ref()
|
||||
const init = (data: any) => {
|
||||
list.value = data
|
||||
console.log(list)
|
||||
show.value = true
|
||||
}
|
||||
const close = () => {
|
||||
|
|
@ -185,7 +184,6 @@ const addTraceabilityCodeDo = (item: any) => {
|
|||
}
|
||||
cleanInputIdCode()
|
||||
getGatherNumber(item)
|
||||
console.log("item", item)
|
||||
}
|
||||
const getGatherNumber = (item: any) => {
|
||||
let gatherNumber = 0;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ const getBillList = () => {
|
|||
tableData.value.forEach((item:any)=>{
|
||||
item.data = JSON.parse(item.data)
|
||||
})
|
||||
console.log(tableData)
|
||||
})
|
||||
}
|
||||
const ladingBill = (row:any)=>{
|
||||
|
|
|
|||
|
|
@ -197,7 +197,6 @@ const close = () => {
|
|||
}
|
||||
defineExpose({init})
|
||||
const refund = () => {
|
||||
console.log(orderInfo.value)
|
||||
post("retail/refund",{orderId:orderInfo.value.id}).then((res:any)=>{
|
||||
close()
|
||||
})
|
||||
|
|
@ -232,7 +231,6 @@ const print = () => {
|
|||
if (res.retailSocialPayLog){
|
||||
res.retailSocialPayLog.medTypeStr = medTypeJson[res.retailSocialPayLog.medType as MedTypeKey];
|
||||
}
|
||||
console.log(res)
|
||||
wsStore.sendMessage({
|
||||
type: "PrintReceipt",
|
||||
config: null,
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ const close = ()=>{
|
|||
}
|
||||
const currentRow = ref<any>(null)
|
||||
const handleCurrentChange = (val:any)=>{
|
||||
console.log(val)
|
||||
currentRow.value = val
|
||||
}
|
||||
const emit = defineEmits(['selected'])
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ const payType = ref(null);
|
|||
const retailOrder = ref<any>(null);
|
||||
const init = (order: any) => {
|
||||
retailOrder.value = order;
|
||||
console.log(order)
|
||||
show.value = true;
|
||||
}
|
||||
defineExpose({init})
|
||||
|
|
@ -79,7 +78,6 @@ const completeSettlement = ()=>{
|
|||
}
|
||||
if(payType.value == 1){
|
||||
//医保结算
|
||||
console.log('医保结算',socialCard.value)
|
||||
socialSettlement();
|
||||
}else {
|
||||
//其他结算
|
||||
|
|
|
|||
|
|
@ -143,7 +143,6 @@ const addTraceabilityCode = (item: any) => {
|
|||
inputTraceabilityCode.value = "";
|
||||
getGatherNumber(item)
|
||||
addIdCode(idCode)
|
||||
console.log("item", item)
|
||||
}
|
||||
const removeTraceAbility = (item: any) => {
|
||||
item.traceAbilityCodeList.splice(item.traceAbilityCodeList.findIndex((codeObj: any) => codeObj.code === inputTraceabilityCode.value), 1)
|
||||
|
|
|
|||
|
|
@ -94,7 +94,6 @@ const rules = {
|
|||
const save = () => {
|
||||
formDataRef.value?.validate((valid: boolean) => {
|
||||
if (!valid) {
|
||||
console.log("表单验证失败");
|
||||
return;
|
||||
}
|
||||
// 如果验证通过,发送请求
|
||||
|
|
|
|||
|
|
@ -87,8 +87,6 @@ let change_page = (page: number) => {
|
|||
// })
|
||||
const change_current_search_data_index = (val: any) => {
|
||||
current_search_data = JSON.parse(JSON.stringify(val));
|
||||
// console.log(current_search_data.id)
|
||||
// proos.changeData(current_search_data)
|
||||
}
|
||||
const init = (_name: string) => {
|
||||
keyword.value = _name;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@
|
|||
const submitForm = ()=>{
|
||||
formRef.value?.validate((valid: boolean) => {
|
||||
if (!valid) {
|
||||
console.log("表单验证失败");
|
||||
return;
|
||||
}
|
||||
if (formData.value.confirmWord != "确认冲正"){
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@ const sourceOptions = [
|
|||
}
|
||||
]
|
||||
const handleCurrentChange = (val: any) => {
|
||||
console.log(`当前页: ${val}`);
|
||||
};
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
export function getKey(map: any, key: any) {
|
||||
console.log(key)
|
||||
if (Object.keys(map).length === 0) {
|
||||
return "未知";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,20 +25,17 @@ const wsInit = (finish: () => void) => {
|
|||
}
|
||||
socket = new WebSocket('ws://localhost:8090');
|
||||
socket.addEventListener('open', (event) => {
|
||||
console.log('WebSocket连接已打开');
|
||||
finish();
|
||||
reconnectAttempts = 0; // 连接成功后重置重连计数器
|
||||
});
|
||||
|
||||
// 监听错误事件
|
||||
socket.addEventListener('error', (event) => {
|
||||
console.log('WebSocket连接失败');
|
||||
for(let i = 0; i < onErrorList.length; i++){
|
||||
onErrorList[i]();
|
||||
}
|
||||
});
|
||||
socket.addEventListener('message', (event) => {
|
||||
console.log('收到服务器消息:', event.data);
|
||||
let parsedMessage: Response = JSON.parse(event.data);
|
||||
onMessageList.forEach(callback => {
|
||||
callback(parsedMessage);
|
||||
|
|
@ -47,7 +44,6 @@ const wsInit = (finish: () => void) => {
|
|||
socket.onerror = (e) => e.stopImmediatePropagation();
|
||||
// 监听连接关闭事件
|
||||
socket.addEventListener('close', (event) => {
|
||||
console.log("websocket连接异常")
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -369,7 +369,6 @@ const searchVip = () => {
|
|||
list.value = res.list;
|
||||
totalCount.value = res.total_count
|
||||
listItem.value = res.list[0];
|
||||
console.log(listItem)
|
||||
});
|
||||
};
|
||||
// 分页
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ import PatientCard from "@/components/charge/PatientCard.vue";
|
|||
import ServiceDetail from "@/components/common/service/ServiceDetail.vue";
|
||||
import GoodsDetail from "@/components/common/goods/GoodsDetail.vue";
|
||||
|
||||
const curRegister = ref()
|
||||
const curRegister = ref<any>()
|
||||
const registerId = ref()
|
||||
const patientId = ref()
|
||||
const itemDetail = ref([])
|
||||
|
|
@ -150,7 +150,9 @@ const changeTab = (e: any) => {
|
|||
patientRegistration.value = {}
|
||||
itemId.value = null
|
||||
isShowFrom.value = false
|
||||
if (curRegister.value) {
|
||||
curRegister.value.status = e
|
||||
}
|
||||
nextTick(() => {
|
||||
medicalHistoryRef.value?.clearList();
|
||||
})
|
||||
|
|
|
|||
|
|
@ -74,42 +74,7 @@ const options = ref([
|
|||
},
|
||||
])
|
||||
const selectRef = ref();
|
||||
const querySearchAsync = (queryString: string, cb: (arg: any) => void) => {
|
||||
console.log(queryString)
|
||||
// post("goods/goods/search", {keyword: queryString}).then((res: any) => {
|
||||
// options.value = res;
|
||||
// let list = res;
|
||||
// for (let i = 0; i < list.length; i++) {
|
||||
// list[i].value = list[i].name;
|
||||
// }
|
||||
// console.log("search",list)
|
||||
// // cb(res)
|
||||
// })
|
||||
}
|
||||
const emit = defineEmits(['selectCallBack'])
|
||||
const handleSelect = (item: any) => {
|
||||
let goods = JSON.parse(JSON.stringify(item));
|
||||
let inventory = {
|
||||
hilistCode: goods.hilistCode,
|
||||
unitPrice: goods.unitPrice,
|
||||
packagingUnit: goods.packagingUnit,
|
||||
minPackagingUnit: goods.minPackagingUnit,
|
||||
disassemblyPrice: goods.disassemblyPrice,
|
||||
minPackagingNumber: goods.minPackagingNumber,
|
||||
goodId: goods.id,
|
||||
name: goods.name,
|
||||
wholeNumber: 0,
|
||||
idCode: (goods.idCode && goods.idCode != "") ? goods.idCode.split(",") : [],
|
||||
purchaseUnitPrice: goods.purchaseUnitPrice,
|
||||
trdnFlag: goods.trdnFlag
|
||||
}
|
||||
if (selectRef.value) {
|
||||
(selectRef.value as HTMLElement).blur();
|
||||
}
|
||||
emit('selectCallBack', inventory);
|
||||
state.value = []
|
||||
|
||||
}
|
||||
const isShow = ref(false)
|
||||
const ItemEditRef = ref<any>('')
|
||||
const id = ref<any>('')
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ import {formatDateArray, getEndOfDay, getThisMonth, getToday} from "@/utils/date
|
|||
import {post} from "@/utils/request.ts";
|
||||
import DetailList from "@/components/social/reconciliation/DetailList.vue";
|
||||
import ArtificialReconciliation from "@/components/social/reconciliation/ArtificialReconciliation.vue";
|
||||
import {ElMessage} from "element-plus";
|
||||
import {reconciliationResult} from "@/assets/config/constants.ts";
|
||||
import {getKey} from "@/utils/discrotyUtil.ts";
|
||||
import clrType from "@/assets/config/directory/clrType.json"
|
||||
import insutypes from "@/assets/config/directory/insutypes.json"
|
||||
|
|
@ -54,7 +52,6 @@ const selectDate = ref<any>();
|
|||
const changeDate = (dates: Date[]) => {
|
||||
selectDate.value = formatDateArray(dates);
|
||||
selectDate.value[1] = getEndOfDay(selectDate.value[1])
|
||||
console.log(selectDate.value);
|
||||
getList()
|
||||
};
|
||||
|
||||
|
|
@ -73,7 +70,6 @@ const list = ref<any>();
|
|||
const getList = () => {
|
||||
post("social/reconciliation/getList", {beginTime: selectDate.value[0], endTime: selectDate.value[1]}).then(
|
||||
res => {
|
||||
console.log(res);
|
||||
list.value = res;
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ function init() {
|
|||
}
|
||||
|
||||
let change_tab = (tab: TabsPaneContext, event: Event) => {
|
||||
console.log(current_tab.value)
|
||||
}
|
||||
let totalNumber = 0;
|
||||
// 一键上传
|
||||
|
|
|
|||
Loading…
Reference in New Issue