Merge branch 'dev'
This commit is contained in:
commit
d8f2620b95
@ -187,7 +187,9 @@ const changePackage=(val)=>{
|
|||||||
packagePrice.value=item.discount_product_total_amount;
|
packagePrice.value=item.discount_product_total_amount;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
if(tuwenPrice.value) {
|
||||||
|
emits('setPrice',tuwenPrice.value*0.6*5+packagePrice.value)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const healthConfig=async()=>{
|
const healthConfig=async()=>{
|
||||||
const {code,data}=await getHealthConfigAddList({
|
const {code,data}=await getHealthConfigAddList({
|
||||||
|
|||||||
@ -33,6 +33,12 @@
|
|||||||
<a-input :style="{ width: '182px' }" v-model="queryForm.product_remarks
|
<a-input :style="{ width: '182px' }" v-model="queryForm.product_remarks
|
||||||
" placeholder="请输入药品备注" @press-enter="handleQuery" />
|
" placeholder="请输入药品备注" @press-enter="handleQuery" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
<a-form-item field="order.stock" label="库存排序">
|
||||||
|
<a-select v-model="queryForm.order.stock" placeholder="库存排序" :style="{ width: '182px' }">
|
||||||
|
<a-option value="asc">正序</a-option>
|
||||||
|
<a-option value="desc">倒序</a-option>
|
||||||
|
</a-select>
|
||||||
|
</a-form-item>
|
||||||
<a-form-item field="product_type" label="药品类型">
|
<a-form-item field="product_type" label="药品类型">
|
||||||
<a-select v-model="queryForm.product_type" placeholder="请选择药品类型" :style="{ width: '182px' }">
|
<a-select v-model="queryForm.product_type" placeholder="请选择药品类型" :style="{ width: '182px' }">
|
||||||
<a-option :value="0">未知</a-option>
|
<a-option :value="0">未知</a-option>
|
||||||
@ -136,7 +142,7 @@
|
|||||||
};
|
};
|
||||||
// form
|
// form
|
||||||
const queryForm = reactive({
|
const queryForm = reactive({
|
||||||
order:null
|
order:{}
|
||||||
});
|
});
|
||||||
const modalForm = reactive({
|
const modalForm = reactive({
|
||||||
user:{},
|
user:{},
|
||||||
@ -170,30 +176,7 @@
|
|||||||
{ title: '批准文号', dataIndex: 'license_number',width:200 },
|
{ title: '批准文号', dataIndex: 'license_number',width:200 },
|
||||||
{ title: '生产厂家', dataIndex: 'manufacturer',width:200 },
|
{ title: '生产厂家', dataIndex: 'manufacturer',width:200 },
|
||||||
{ title: '药店编码', dataIndex: 'product_pharmacy_code',width:100 },
|
{ title: '药店编码', dataIndex: 'product_pharmacy_code',width:100 },
|
||||||
{ title: '库存', dataIndex: 'stock',width:100,sortable: {
|
{ title: '库存', dataIndex: 'stock',width:100 },
|
||||||
sortDirections: ['ascend', 'descend',''],
|
|
||||||
sorter:false
|
|
||||||
// sorter:function(a,b,extra){
|
|
||||||
|
|
||||||
// console.log(extra);
|
|
||||||
// if(extra.direction=='ascend'){
|
|
||||||
// queryForm.order={
|
|
||||||
// stock:'asc'
|
|
||||||
// }
|
|
||||||
// }else if(extra.direction=='descend'){
|
|
||||||
// queryForm.order={
|
|
||||||
// stock:'desc'
|
|
||||||
// }
|
|
||||||
// }else{
|
|
||||||
// queryForm.order=null
|
|
||||||
// }
|
|
||||||
// if(!lock.value){
|
|
||||||
// getMedinceInfo({ ...pager, ...queryForm });
|
|
||||||
// lock.value=true;
|
|
||||||
// }
|
|
||||||
// return true
|
|
||||||
// }
|
|
||||||
}, },
|
|
||||||
{ title: '购买上限', dataIndex: 'prescription_num',width:100 },
|
{ title: '购买上限', dataIndex: 'prescription_num',width:100 },
|
||||||
{ title: '状态', dataIndex: 'product_status',slotName:'product_status',width:100 },
|
{ title: '状态', dataIndex: 'product_status',slotName:'product_status',width:100 },
|
||||||
// { title: '启用状态', dataIndex: 'status', slotName: 'status' },
|
// { title: '启用状态', dataIndex: 'status', slotName: 'status' },
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user