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

确认取货板面调整

Browse Source
20240912_adapter
yewj 5 months ago
parent 0248ca7160
commit 004bda3db5
2 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File

236
src/views/collect/ConfirmDrugDealOrder.vue
Unescape Escape View File

@ -13,16 +13,16 @@
<el-row :gutter="0" style="margin-top: 15px">
<el-col :span="24" align="right">
<el-button-group>
<el-button type="primary" @click.native="deleteCode"
v-if="labelName == 1"
:disabled="formData.billNo == null"
>扫码剔除
</el-button>
<el-button size="mini" type="primary"
v-if="labelName == 2"
@click.native="overdeleteCode"
>结束剔除
</el-button>
<!-- <el-button type="primary" @click.native="deleteCode"-->
<!-- v-if="labelName == 1"-->
<!-- :disabled="formData.billNo == null"-->
<!-- >扫码剔除-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary"-->
<!-- v-if="labelName == 2"-->
<!-- @click.native="overdeleteCode"-->
<!-- >结束剔除-->
<!-- </el-button>-->
<el-button
type="primary"
:disabled="formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"
@ -35,18 +35,18 @@
@click.native="selectPrescribe()"
>选单
</el-button>
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="saveDraftOrder()"
>挂起
</el-button>
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="cancelOrder()"
>放弃
</el-button>
<!-- <el-button-->
<!-- type="primary"-->
<!-- :disabled="!formData.billNo"-->
<!-- @click.native="saveDraftOrder()"-->
<!-- >挂起-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- :disabled="!formData.billNo"-->
<!-- @click.native="cancelOrder()"-->
<!-- >放弃-->
<!-- </el-button>-->
<el-button
type="primary"
:disabled="!formData.billNo"
@ -162,79 +162,79 @@
</el-row>
<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
<el-row :gutter="0" style="margin-top: 5px">
<el-col :span="20">
<el-form-item prop="code" :label="scanTip" label-width="80px">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref="inputRef"
style="ime-mode: disabled"
type="tel"
:placeholder="this.placeholder"
v-model="scanCode"
></el-input>
<!-- :disabled="scanDisabled"-->
</el-form-item>
</el-col>
<el-col :span="4">
<el-button-group style="display: flex;">
<el-button
type="primary"
size="mini"
icon="el-icon-search"
@click.native.stop="addCode()"
style="margin-left: 15px"
>
</el-button>
<!-- :disabled="!formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"-->
<el-button type="primary"
@click="addGs">ALT+29
</el-button>
<el-button
type="primary"
size="mini"
icon="el-icon-delete"
@click.native.stop="clearCode()"
>清空
</el-button>
</el-button-group>
</el-col>
</el-row>
<el-row :gutter="0">
<el-col :span="20" style="margin-top: 0px;margin-bottom: 10px;margin-left: 80px">
<el-checkbox v-model="checked" v-if="!this.formData.billNo && this.formDataVisible.scanType != 1">定向查询
</el-checkbox>
</el-col>
</el-row>
<el-alert
:title="scanTitle"
:type="scanResultType"
:closable="false"
:dangerouslyUseHTMLString="true"
:description="result">
</el-alert>
<el-alert
v-if="warnVisible"
title="警告信息:"
type="warning"
:closable="true"
:dangerouslyUseHTMLString="true"
:description="warnResult">
</el-alert>
<el-alert
v-if="errVisible"
title="错误信息:"
type="warning"
:closable="true"
:dangerouslyUseHTMLString="true"
:description="errResult">
</el-alert>
</div>
<!-- <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">-->
<!-- <el-row :gutter="0" style="margin-top: 5px">-->
<!-- <el-col :span="20">-->
<!-- <el-form-item prop="code" :label="scanTip" label-width="80px">-->
<!-- <el-input-->
<!-- id="inputer"-->
<!-- @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="enterKey($event)"-->
<!-- ref="inputRef"-->
<!-- style="ime-mode: disabled"-->
<!-- type="tel"-->
<!-- :placeholder="this.placeholder"-->
<!-- v-model="scanCode"-->
<!-- ></el-input>-->
<!-- &lt;!&ndash; :disabled="scanDisabled"&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4">-->
<!-- <el-button-group style="display: flex;">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- icon="el-icon-search"-->
<!-- @click.native.stop="addCode()"-->
<!-- style="margin-left: 15px"-->
<!-- >-->
<!-- </el-button>-->
<!-- &lt;!&ndash; :disabled="!formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"&ndash;&gt;-->
<!-- <el-button type="primary"-->
<!-- @click="addGs">ALT+29-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- icon="el-icon-delete"-->
<!-- @click.native.stop="clearCode()"-->
<!-- >清空-->
<!-- </el-button>-->
<!-- </el-button-group>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="0">-->
<!-- <el-col :span="20" style="margin-top: 0px;margin-bottom: 10px;margin-left: 80px">-->
<!-- <el-checkbox v-model="checked" v-if="!this.formData.billNo && this.formDataVisible.scanType != 1">定向查询-->
<!-- </el-checkbox>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-alert-->
<!-- :title="scanTitle"-->
<!-- :type="scanResultType"-->
<!-- :closable="false"-->
<!-- :dangerouslyUseHTMLString="true"-->
<!-- :description="result">-->
<!-- </el-alert>-->
<!-- <el-alert-->
<!-- v-if="warnVisible"-->
<!-- title="警告信息:"-->
<!-- type="warning"-->
<!-- :closable="true"-->
<!-- :dangerouslyUseHTMLString="true"-->
<!-- :description="warnResult">-->
<!-- </el-alert>-->
<!-- <el-alert-->
<!-- v-if="errVisible"-->
<!-- title="错误信息:"-->
<!-- type="warning"-->
<!-- :closable="true"-->
<!-- :dangerouslyUseHTMLString="true"-->
<!-- :description="errResult">-->
<!-- </el-alert>-->
<!-- </div>-->
<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
<el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
<el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item>
@ -1302,29 +1302,29 @@ export default {
vailOrderFinish() {
if (!this.autoFinishOrderFlag) {
return
}
vailOrderFinish(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
if (res.data) {
this.$confirm("单据已赋码或可自动赋码，是否立即完成单据？", '提示', {
confirmButtonText: '立即提交',
cancelButtonText: '手动扫码',
type: 'warning'
}).then(() => {
this.finishOrder();
}).catch(() => {
this.autoFinishOrderFlag = false
});
}
} else {
}
}).catch(() => {
this.loading = false
})
// if (!this.autoFinishOrderFlag) {
// return
// }
// vailOrderFinish(this.formData).then(res => {
// this.loading = false
// if (res.code == 20000) {
// if (res.data) {
// this.$confirm("单据已赋码或可自动赋码，是否立即完成单据？", '提示', {
// confirmButtonText: '立即提交',
// cancelButtonText: '手动扫码',
// type: 'warning'
// }).then(() => {
// this.finishOrder();
// }).catch(() => {
// this.autoFinishOrderFlag = false
// });
// }
// } else {
//
// }
// }).catch(() => {
// this.loading = false
// })
},

2
src/views/collect/PannelOrderBizCard.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template>
<div>
<el-row>
<el-col v-for="(info, index) in preDetailList" :key="index" :xs="12" :sm="6" :md="6" :lg="6" >
<el-col v-for="(info, index) in preDetailList" :key="index" :xs="12" :sm="6" :md="6" :lg="8" >
<el-card :body-style="{margin:'20px'}"
style="margin:20px 20px 20px 20px;;background-color: #e1f3fb;border-radius: 12px; position: relative;">
<div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >

Write Preview
Loading…
Cancel
Save