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

界面修改

Browse Source
20240912_adapter_z
yewj 10 months ago
parent 6aebccf9bc
commit a7f6dda10a
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File

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

@ -15,24 +15,25 @@
<el-button-group> <el-button-group>
<el-button <el-button
type="primary" type="primary"
:disabled="isSelectOrder" :disabled="formData.billNo"
@click.native="nextCollectOrder()" @click.native="nextCollectOrder()"
>下一单据 >下一单据
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="isSelectOrder" :disabled="formData.billNo"
@click.native="selectPrescribe()" @click.native="selectPrescribe()"
>选入单据 >选入单据
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="!formData.billNo"
@click.native="saveDraftOrder()" @click.native="saveDraftOrder()"
>单据挂起 >单据挂起
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="!formData.billNo"
@click.native="confirmFinishOrder()" @click.native="confirmFinishOrder()"
>处理完成 >处理完成
</el-button> </el-button>
@ -196,26 +197,26 @@
<!-- :refreshPanel="refreshCodesPanelP"--> <!-- :refreshPanel="refreshCodesPanelP"-->
<!-- ></PanelOrderManuTagCode>--> <!-- ></PanelOrderManuTagCode>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="拆零详情" name="prescribeCodePanel1">--> <!-- <el-tab-pane label="拆零详情" name="prescribeCodePanel1">-->
<!-- <prescribeCodePanel--> <!-- <prescribeCodePanel-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
<!-- :prescribeData="curRow"--> <!-- :prescribeData="curRow"-->
<!-- :fifoSplit="1"--> <!-- :fifoSplit="1"-->
<!-- ></prescribeCodePanel>--> <!-- ></prescribeCodePanel>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="整取详情" name="prescribeCodePanel2">--> <!-- <el-tab-pane label="整取详情" name="prescribeCodePanel2">-->
<!-- <prescribeCodePanel--> <!-- <prescribeCodePanel-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
<!-- :prescribeData="curRow"--> <!-- :prescribeData="curRow"-->
<!-- :fifoSplit="2"--> <!-- :fifoSplit="2"-->
<!-- ></prescribeCodePanel>--> <!-- ></prescribeCodePanel>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="整单详情" name="PanelOrderAllDetail">--> <!-- <el-tab-pane label="整单详情" name="PanelOrderAllDetail">-->
<!-- <PanelOrderAllDetail--> <!-- <PanelOrderAllDetail-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
<!-- :prescribeData="curRow"--> <!-- :prescribeData="curRow"-->
<!-- ></PanelOrderAllDetail>--> <!-- ></PanelOrderAllDetail>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
</el-tabs> </el-tabs>
@ -305,11 +306,9 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
import {enterCodeWeb} from "@/api/inout/order"; import {enterCodeWeb} from "@/api/inout/order";
import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder"; import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
import {selectCorpList} from "@/api/basic/basicUnitMaintain"; import {selectCorpList} from "@/api/basic/basicUnitMaintain";
import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder"; import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail"; import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import A from '../../plugins/KeyScaner'
export default { export default {
/** /**
@ -621,12 +620,12 @@ export default {
this.originCode = ""; this.originCode = "";
this.filterQuery.code = "01" + response.data.nameCode; this.filterQuery.code = "01" + response.data.nameCode;
this.originCode = this.filterQuery.code; this.originCode = this.filterQuery.code;
}else if (response.code == 601) { } else if (response.code == 601) {
this.formData.billNo = response.data.billNo this.formData.billNo = response.data.billNo
this.getBillNo(this.formData.billNo) this.getBillNo(this.formData.billNo)
this.startDeal(); this.startDeal();
}else { } else {
this.scanCode = "" this.scanCode = ""
this.$alert(response.message, "提示", { this.$alert(response.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -727,15 +726,22 @@ export default {
if (res.code == 20000) { if (res.code == 20000) {
this.resetWork() this.resetWork()
} else if (res.code == 502) { } else if (res.code == 502) {
this.$confirm(res.message, '提示', { // this.$confirm(res.message, '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// this.formData.confirmFinish = true;
// // this.finishOrder();
// }).catch(() => {
// });
this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', callback: action => {
type: 'warning' }
}).then(() => {
this.formData.confirmFinish = true;
this.finishOrder();
}).catch(() => {
}); });
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }

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

@ -1118,7 +1118,6 @@ export default {
parseTime(date, "{y}{m}{d}{h}{i}{s}") + parseTime(date, "{y}{m}{d}{h}{i}{s}") +
Math.ceil(Math.random() * 89 + 10); Math.ceil(Math.random() * 89 + 10);
} }
debugger
this.loading = true; this.loading = true;
let tQuery = Object.assign( let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData)) JSON.parse(JSON.stringify(this.orderFormData))

Write Preview
Loading…
Cancel
Save