新增集采校验功能

busUser
anthonywj 2 years ago
parent 1ccbc2a86d
commit cfa2329d1e

@ -1,6 +1,6 @@
{
"BASE_URL": "http://192.168.1.20:9996",
"SERVER_IP": "http://192.168.1.20:9996",
"BASE_URL": "http://192.168.0.166:9996",
"SERVER_IP": "http://192.168.0.166:9996",
"hosp_name": "福建省XX市医院"
}

@ -203,6 +203,10 @@ export default {
checkBalacne: null,
secCheckBalacne: null,
secCheckCopy: null,
checkUdiwms: null,
secCheckUdiwms: null,
corpType: null,
storageCode: null,
supplementOrderType: null,
@ -217,6 +221,8 @@ export default {
defaultInv: null,
defaultSubInv: null,
orderVisibleType: 0,
vailDispatch: false,
vailGroupBuy: 0,
},
enableMap: {
true: "是",
@ -393,6 +399,10 @@ export default {
orderVisibleType: row.orderVisibleType,
checkCopy: row.checkCopy,
secCheckCopy: row.secCheckCopy,
checkUdiwms: row.checkUdiwms,
secCheckUdiwms: row.secCheckUdiwms,
vailDispatch: row.vailDispatch,
vailGroupBuy: row.vailGroupBuy
};
this.modifyDialogVisible = true;
},

@ -212,8 +212,6 @@
<el-option label="批次号" :value=0></el-option>
<el-option label="条码清单" :value=1></el-option>
</el-select>
</div>
</el-col>
</el-row>
@ -226,13 +224,30 @@
</el-checkbox>
<el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">
</el-checkbox>
<el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction=='WareHouseIn'">
<el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction=='WareHouseIn'">
是否只允许有库存产品出库
</el-checkbox>
<el-checkbox v-model="inputQuery.codeFillCheck">UDI
</el-checkbox>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.vailDispatch">
</el-checkbox>
<span style="margin-left: 15px">校验是否集采产品:</span>
<el-select v-model="inputQuery.vailGroupBuy" style="margin-left: 5px"
size="mini">
<el-option label="无需校验" :value=0></el-option>
<el-option label="只采集集采产品" :value=1></el-option>
<el-option label="只采集非集采产品" :value=2></el-option>
</el-select>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="4" class="el-col">
@ -268,10 +283,12 @@
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.checkPc" :disabled="!inputQuery.checkEnable">UDI</el-checkbox>
<el-checkbox v-model="inputQuery.checkPc" :disabled="!inputQuery.checkEnable">UDI
</el-checkbox>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
<el-col :span="4" class="el-col">
@ -292,6 +309,12 @@
</el-checkbox>
</div>
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.checkUdiwms" :disabled="!inputQuery.checkEnable">UDI
</el-checkbox>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
@ -357,6 +380,12 @@
</el-checkbox>
</div>
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.secCheckUdiwms" :disabled="!inputQuery.secCheckEnable">UDI
</el-checkbox>
</div>
</el-col>
</el-row>
<el-divider></el-divider>

@ -116,7 +116,16 @@
prop="qxlb"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="是否集采"
prop="groupBuy"
show-overflow-tooltip
>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.groupBuy] }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="操作" fixed="right">
<template slot-scope="scope">
<el-button
@ -504,6 +513,18 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-checkbox v-model="editQuery.dispatch"
>是否可配送
</el-checkbox>
<el-checkbox v-model="editQuery.groupBuy"
@change="groupBuyChange"
>是否集采产品
</el-checkbox>
</el-row>
<el-divider></el-divider>
<el-collapse v-model="activeNames">
@ -1078,6 +1099,10 @@ export default {
configParms: {},
activeNames: ['1'],
updateLoading: false,
enableMap: {
true: "是",
false: "否",
},
};
},
@ -1136,6 +1161,15 @@ export default {
this.detailList = [];
});
},
groupBuyChange() {
if (this.editQuery.groupBuy == true) {
this.editQuery.dispatch = true;
} else {
this.editQuery.dispatch = false;
}
},
keyup_submit(event) {
this.filterQuery.page = 1;
this.getList();

@ -350,7 +350,6 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-collapse v-model="activeNames">

@ -151,6 +151,14 @@
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollBack(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"
@ -218,7 +226,8 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
><template slot-scope="scope">
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
@ -226,9 +235,11 @@
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
> <template slot-scope="scope">
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template></el-table-column>
</template>
</el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -377,6 +388,7 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
import {rollbackOrder} from "@/api/warehouse/stockOrder";
const formJson = {
site_id: "",
@ -732,32 +744,49 @@ export default {
// this.dialogTableVisible = true;
},
getUnitList() {
this.loading = true;
this.loading = true; this.loading = false;
unitListBykey(this.unitquery)
.then((response) => {
this.loading = false;
this.unitlist = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
},
intentDetail(row) {
// this.$router.push({
// path: "../inout/detail",
// query: { id: row.id },
// rollBack(row) {
// this.$confirm('稿, ?', '', {
// confirmButtonText: '',
// cancelButtonText: '',
// type: 'warning'
// }).then(() => {
// let param = {billNo: row.billNo};
// rollbackOrder(param).then((res) => {
// if (res.code === 20000) {
// this.$message.success("");
// this.getList();
// } else {
// this.$message.error(res.message);
// }
// })
// }).catch(() => {
// // this.$message.info('退');
// });
// },
intentDetail(row) {
this.codeDetailVisible = true;
this.idQuery.id = row.id;
},
}
,
successOrderExportPDFSetting(row) {
this.idQuery.id = '';
if (this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;
}
this.successOrderExportPDFSettingVisible = true;
},
}
,
successOrderExportPDF(row) {
let tQuery = {
orderId: row.id,
@ -786,11 +815,13 @@ export default {
}).catch(() => {
this.loading = false;
});
},
}
,
closeDialog() {
this.successOrderExportPDFSettingVisible = false;
this.getList();
},
}
,
selectUnit(row) {
this.unitUpdateQuery.id = this.curIndex;
@ -804,7 +835,8 @@ export default {
.catch(() => {
this.dialogTableVisible = false;
});
},
}
,
deleteOrders(data) {
this.loading = true;
this.deleteData.id = data;
@ -824,14 +856,16 @@ export default {
})
.catch(() => {
});
},
}
,
tableRowClassName({row, rowIndex}) {
if (row.reCount === row.count) {
return "success-row";
} else {
return "warning-row";
}
},
}
,
exportDialog(value) {
var mOrder = value;
@ -880,7 +914,8 @@ export default {
.catch(() => {
});
}
},
}
,
uploadOrderDialog(value) {
@ -898,7 +933,8 @@ export default {
})
.catch(() => {
});
},
}
,
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
@ -911,10 +947,12 @@ export default {
})
.catch(() => {
});
},
}
,
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
}
,
closeManuDialog(val) {
this.addDialogVisible = false;
if (val) {
@ -925,16 +963,19 @@ export default {
} else {
this.$message.error("选入失败");
}
},
}
,
cancelDialog() {
this.addDialogVisible = false;
},
}
,
importOrder(row) {
this.orderId = row.id;
this.billAction = row.action;
this.curLocInv = row.locStorageCode;
this.addDialogVisible = true;
},
}
,
getBusType() {
let query = {
code: this.filterQuery.invWarehouseCode,
@ -948,14 +989,16 @@ export default {
})
.catch(() => {
});
},
}
,
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
}
,
getStorage() {
this.storageList = [];
filterAllByUser()
@ -968,7 +1011,8 @@ export default {
})
.catch(() => {
});
},
}
,
invChange() {
this.filterQuery.invWarehouseCode = "";
this.subInvList = [];
@ -985,7 +1029,8 @@ export default {
.catch(() => {
});
}
},
}
,
getSubInvList() {
@ -998,7 +1043,8 @@ export default {
})
.catch(() => {
});
},
}
,
subInvChange() {
this.getBusType();
@ -1011,14 +1057,17 @@ export default {
true: "danger",
};
return statusMap[status];
},
},
}
,
}
,
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
}
,
created() {
this.getStorage();
@ -1038,8 +1087,10 @@ export default {
}
}
})
},
};
}
,
}
;
</script>

Loading…
Cancel
Save