diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js
index 5b4175ae..fff92c4a 100644
--- a/src/api/collect/splitCreateOrder.js
+++ b/src/api/collect/splitCreateOrder.js
@@ -37,6 +37,15 @@ export function finishOrder(query) {
});
}
+export function finishCheckOrder(query) {
+ return axios({
+ url: "/udiwms/basic/collect/order/finishCheckOrder",
+ method: "post",
+ data: query
+ });
+}
+
+
export function vailOrderFinish(query) {
return axios({
url: "/udiwms/basic/collect/order/vailFinish",
@@ -81,4 +90,26 @@ export function checkCollectOrderManCode(query) {
});
}
+export function scanCheckCodeOrder(query) {
+ return axios({
+ url: "/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCode",
+ method: "post",
+ data: query
+ });
+}
+export function scanCheckCodeReplace(query) {
+ return axios({
+ url: "/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCodeReplace",
+ method: "post",
+ data: query
+ });
+}
+
+export function commitCheckCodeOrder(query) {
+ return axios({
+ url: "/udiwms/basic/collect/IoCollectCodeBackup/commitCheckCodeOrder",
+ method: "post",
+ data: query
+ });
+}
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index d2e98a7a..4b6e77a3 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -79,6 +79,13 @@
>
+
+
+
+
+
-
+
@@ -830,6 +837,7 @@ export default {
productId: null,
nameCode: '',
packLevel: null,
+ packRatio: null,
bhxjsl: null,
isDisabled: false,
isUpDisabled: true,
@@ -849,7 +857,8 @@ export default {
levelUnitList: [],
maxLevel: 1,
- editRowSwitch: false //产品标识编辑开关 没保存前其他编辑不能按
+ editRowSwitch: false, //产品标识编辑开关 没保存前其他编辑不能按
+ isSpecial:false
}
},
@@ -1061,7 +1070,8 @@ export default {
uuid: this.newProductData.uuid,
productId: row.productId,
diType: row.diType,
- xjdw: row.xjdw
+ xjdw: row.xjdw,
+ packRatio: row.packRatio
}
updateLevelDrug(editQuery).then(res => {
this.saveLoading = false
@@ -1150,6 +1160,7 @@ export default {
.then((response) => {
this.loading = false
this.detailList = response.data || []
+ this.checkIsSpecial()
})
.catch(() => {
this.loading = false
@@ -1157,7 +1168,15 @@ export default {
})
}
},
-
+ checkIsSpecial(){
+ if (this.detailList.length > 0){
+ this.detailList.forEach(item => {
+ if (item.nameCode.startsWith('89')) {
+ this.isSpecial = true
+ }
+ })
+ }
+ },
distributeLevelDiChange(val) {
const matchingItem = this.detailList.find(item => item.nameCode == val)
if (matchingItem) {
diff --git a/src/views/basic/workplace/busTypeManage.vue b/src/views/basic/workplace/busTypeManage.vue
index 042fec2f..c0893980 100644
--- a/src/views/basic/workplace/busTypeManage.vue
+++ b/src/views/basic/workplace/busTypeManage.vue
@@ -353,13 +353,12 @@ export default {
3: '用户所属仓库',
},
consignees: {
- 1: '原始单据的收货方',
- 2: '原始单据的发货方',
- 3: '供应商',
- 4: '客户',
- 5: '特殊往来',
- 6: '内部科室',
- 7: '填写',
+ 1: '客户',
+ 2: '供应商',
+ 3: '内部科室',
+ 4: '特殊往来',
+ 5: '原始单据的收货方',
+ 6: '原始单据的发货方',
},
userList: [],
userLoading: false,
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 763faf96..2993fb75 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -912,13 +912,12 @@ export default {
'true' : '是',
},
consignees: {
- 1: '原始单据的收货方',
- 2: '原始单据的发货方',
- 3: '供应商',
- 4: '客户',
- 5: '特殊往来',
- 6: '内部科室',
- 7: '填写',
+ 1: '客户',
+ 2: '供应商',
+ 3: '内部科室',
+ 4: '特殊往来',
+ 5: '原始单据的收货方',
+ 6: '原始单据的发货方',
},
userList: [],
userLoading: false,
diff --git a/src/views/collect/CollectFinishOrderBackupDetail.vue b/src/views/collect/CollectFinishOrderBackupDetail.vue
index 0a65834a..5027c654 100644
--- a/src/views/collect/CollectFinishOrderBackupDetail.vue
+++ b/src/views/collect/CollectFinishOrderBackupDetail.vue
@@ -274,15 +274,14 @@ export default {
///界面配置相关------------end
preHandleCurrentChange(val) {
- this.filterQuery.page = val.page;
- this.getPrescribeDetail(this, null);
+ this.preQuery.page = val.page;
+ this.getPrescribeDetail(this);
},
getPrescribeDetail(_this) {
-
if (_this.prescribeData == null)
return
if (_this.prescribeData != null) {
- _this.preQuery.page = 1
+ // _this.preQuery.page = 1
_this.preQuery.orderIdFk = this.prescribeData.billNo
}
_this.preLoading = true;
@@ -293,6 +292,7 @@ export default {
return
}
_this.preDetailList = res.data.list
+ _this.preTotal = res.data.total
_this.preLoading = false
}).catch(() => {
_this.preLoading = false
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 6558a6c7..240931fc 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -57,7 +57,7 @@
-
+
处理单据
@@ -444,6 +444,7 @@ export default {
tabIndex: 0,
menuActive: 0,
autoTag: 0,
+ inAndOutType: 0,
workPlaceClass: 1,
resetKeys: {}
}
@@ -642,9 +643,11 @@ export default {
let busType = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType)
this.formData.busName = busType.busName;
this.autoTag = busType.autoTag;
+ this.inAndOutType = busType.inAndOutType;
} else if (this.busTypeList.length == 1) {
this.formData.busType = this.busTypeList[0].documentTypeCode
this.autoTag = this.busTypeList[0].autoTag;
+ this.inAndOutType = this.busTypeList[0].inAndOutType;
this.$router.push({query: {...this.$route.query, busType: this.formData.busType}, path: this.$route.path})
this.selectBusTypeDisabled = false
this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName;
@@ -653,6 +656,21 @@ export default {
this.formData.busType = null
}
+ if(this.inAndOutType == 1){
+ this.closeAllTabs()
+ this.editableTabsValue = 'IocCollectOrderCheckCode';
+ this.menuActive= 10,
+ this.editableTabs = [{
+ number: 10,
+ title: '单据审核',
+ name: 'IocCollectOrderCheckCode',
+ component: IocCollectOrderCheckCode,
+ // 假设你需要传递的参数
+ componentProps: {}
+ }
+ ];
+ }
+
}
return
})
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index dc6b5e2e..684c8ef2 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -1425,7 +1425,9 @@ export default {
this.formData = {
tagStatus: -1,
workPlaceCode: this.formData.workPlaceCode,
- busType: this.formData.busType
+ busType: this.formData.busType,
+ shipper : null,
+ fromCorp : null,
};
this.curRow = null
this.formData.confirmFinish = false;
diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue
index 2aaf5978..c96a21c1 100644
--- a/src/views/collect/DialogCheckCode.vue
+++ b/src/views/collect/DialogCheckCode.vue
@@ -1,10 +1,17 @@
+
+ 校验完成
+
+
-
+
-->
单据 {{ orderData.billNo }}-追溯码详情
-
+
@@ -86,10 +93,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ 替换码
+ |
+
+
+
+
+ |
+
+ 已校验
+ |
+
@@ -104,7 +139,8 @@
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index bc62cda4..8dadd2e6 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -45,7 +45,7 @@
-
+
@@ -130,7 +130,7 @@
- 单据 {{ filterQuery.billNo }}-追溯码详情
+ 单据 {{ orderData.billNo }}-追溯码详情
@@ -154,6 +154,31 @@
@pagination="getCodeList"
>
+
+ 单据 {{ orderData.billNo }}-业务详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -166,7 +191,7 @@ import { isBlank } from '@/utils/strUtil'
import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
import { enterCodeBillNo } from '@/api/inout/order'
import { autoCodeResult, findByBill, manualCodeDetail, orderDetail } from '@/api/collect/collectOrder'
-import { cancelOrder, checkCollectOrderManCode } from '@/api/collect/splitCreateOrder'
+import { checkCollectOrderManCode, finishCheckOrder } from '@/api/collect/splitCreateOrder'
export default {
name: 'IocCollectOrderCheckCode',
@@ -186,6 +211,7 @@ export default {
scanResultType: 'success',
result: '\n',
errVisible: false,
+ loading: false,
successVisible: true,
errResult: '',
scanCode: '',
@@ -197,6 +223,13 @@ export default {
page: 1,
limit: 10
},
+ busQuery: {
+ billNo: null,
+ orderIdFk: null,
+ code: null,
+ page: 1,
+ limit: 10
+ },
filterQuery: {
code: '',
billNo: null,
@@ -215,7 +248,9 @@ export default {
curRow: null,
codeList: [],
- checkCodeList: []
+ checkCodeList: [],
+ busDataList:[],
+ busDataTotal:0
}
},
@@ -252,7 +287,7 @@ export default {
},
enterBillNoKey(billNo) {
- // this.checkSuccess = true;
+ this.loading = true;
this.filterQuery.code = this.scanCode
let tQuery = {
viewType: 'tagCode',
@@ -267,11 +302,12 @@ export default {
if (response.code == 601) {
this.placeholder = '已选入单据，请扫描追溯码进行审核'
this.orderData.billNo = response.data.billNo
- this.getBillNo(this.filterQuery.billNo)
+ this.getBillNo(this.orderData.billNo)
this.$refs.inputRef.focus()
this.$refs.inputRef.select()
this.scanCode = ''
this.getCodeList()
+ this.getBizDetailList()
}else {
this.$refs.inputRef.focus()
this.$refs.inputRef.select()
@@ -302,21 +338,19 @@ export default {
})
},
getBizDetailList() {
- let preQuery = {}
- if (this.filterQuery == null) {
- return
- }
- if (this.filterQuery != null) {
- preQuery = {
- orderIdFk: this.filterQuery.billNo
- }
+ if (this.orderData != null) {
+ // this.codeQuery.page = 1
+ this.busQuery.orderIdFk = this.orderData.billNo
+ // this.codeQuery.bizIdFk = this.bizId
}
- orderDetail(preQuery).then(res => {
+ orderDetail(this.busQuery).then(res => {
if (res.code != 20000) {
this.$message.error(res.message)
return
}
+ this.busDataList = res.data.list
+ this.busDataTotal = res.data.total
}).catch(() => {
this.$message.error('数据加载失败')
})
@@ -414,6 +448,7 @@ export default {
async printCodeResultList(vailCodeResultResponses) {
this.errResult = ''
this.result = ''
+ this.scanCode = ''
this.successVisible = false
this.errVisible = false
this.scanTitle = '扫码结果：'
@@ -503,6 +538,7 @@ export default {
}
},
+
batchVailCode(params) {
// batchVailCode(params).then((res) => {
// if (res.code === 20000) {
@@ -526,9 +562,20 @@ export default {
})
},
commitCheckOrder() {
+ this.finishOrder()
this.init()
this.$message.success('单据审核完成')
},
+ finishOrder() {
+ finishCheckOrder(this.orderData).then(res => {
+ if (res.code == 20000) {
+ }else {
+ this.$message.error(res.message)
+ }
+ }).catch(() => {
+
+ })
+ },
cancelOrder() {
this.$confirm('此操作将取消当前正在审核单据，是否继续?', '提示', {
confirmButtonText: '确定',
@@ -536,6 +583,7 @@ export default {
type: 'warning'
}).then(() => {
this.init()
+ this.$message.success("放弃成功")
}).catch(() => {
});
},
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 6cab307c..b72c1d86 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -273,16 +273,19 @@
@@ -412,6 +415,11 @@ export default {
//码校验数据
+ scanTitle: 1,
+ scanTitleMap: {
+ 1 : '扫码校验',
+ 2 : '校验详情'
+ }
}
},
@@ -560,9 +568,20 @@ export default {
//码校验
codeCheckClick(_this,row){
+ _this.scanTitle = 1
+ _this.curRow = row
+ _this.codeCheckVisible = true
+ },
+ //校验详情
+ codeCheckDetail(_this,row){
+ _this.scanTitle = 2
_this.curRow = row
_this.codeCheckVisible = true
},
+ closeCodeCheckDialog(){
+ this.codeCheckVisible = false
+ this.getList()
+ }
},
created() {
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 3701a049..203a9309 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -504,7 +504,7 @@ export default {
this.inputQuery.list = this.invoiceRow;
let mount = 0;
for (var i = 0; i < this.invoiceRow.length; i++) {
- mount += this.invoiceRow[i].amount
+ mount += this.invoiceRow[i].price
}
if (mount != this.inputQuery.price) {
this.$confirm("价格不匹配，是否确定提交?", "提示", {
diff --git a/src/views/inoutDrug/InvoiceCkeck.vue b/src/views/inoutDrug/InvoiceCkeck.vue
index 75e2ba35..c122117a 100644
--- a/src/views/inoutDrug/InvoiceCkeck.vue
+++ b/src/views/inoutDrug/InvoiceCkeck.vue
@@ -155,100 +155,6 @@
-
-
-
- 单据 {{ input.billNo }}-单据详情
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -708,6 +710,7 @@ export default {
acceptQuery: null,
acceptOrderVisible: false,
subRow: null,
+ detaillist:[],
};
},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
@@ -737,11 +740,13 @@ export default {
this.getList();
},
InvoiceRegister1(_this,row) {
- _this.savebillno = row.billNo
+ _this.savebillno = _this.currentRow.billNo
_this.inputInv = row;
+ _this.detaillist.push(row)
_this.checkInvoice = true;
},
closecheckInvoice() {
+ this.detaillist = []
this.checkInvoice = false;
this.getList();
this.currentRow.billNo = this.savebillno;