|
|
|
|
@ -157,6 +157,13 @@
|
|
|
|
|
> |
|
|
|
|
包明细 |
|
|
|
|
</el-text> |
|
|
|
|
|
|
|
|
|
<el-text |
|
|
|
|
v-if="slotProps.scope.row.totalNum === 0" |
|
|
|
|
@click="handleCreatePackage(slotProps.scope)" |
|
|
|
|
> |
|
|
|
|
生成包条 |
|
|
|
|
</el-text> |
|
|
|
|
</template> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
@ -201,15 +208,15 @@
|
|
|
|
|
<div class="fwb" :id="titleId" :class="titleClass">开标签</div> |
|
|
|
|
<div class="flex-c-c"> |
|
|
|
|
<!-- 全屏显示按钮 --> |
|
|
|
|
<el-button type="text" v-if="!details.fullscreenObj.addTagVisited"> |
|
|
|
|
<el-icon class="" @click="handleFullScrean('open', 'addTagVisited')" |
|
|
|
|
><FullScreen |
|
|
|
|
/></el-icon> |
|
|
|
|
<el-button |
|
|
|
|
type="text" |
|
|
|
|
@click="handleFullScrean('open', 'addTagVisited')" |
|
|
|
|
v-if="!details.fullscreenObj.addTagVisited" |
|
|
|
|
> |
|
|
|
|
<el-icon class=""><FullScreen /></el-icon> |
|
|
|
|
</el-button> |
|
|
|
|
<el-button type="text" v-else> |
|
|
|
|
<el-icon class="" @click="handleFullScrean('close', 'addTagVisited')" |
|
|
|
|
><CopyDocument |
|
|
|
|
/></el-icon> |
|
|
|
|
<el-button type="text" @click="handleFullScrean('close', 'addTagVisited')" v-else> |
|
|
|
|
<el-icon class=""><CopyDocument /></el-icon> |
|
|
|
|
</el-button> |
|
|
|
|
|
|
|
|
|
<!-- 弹窗关闭按钮 --> |
|
|
|
|
@ -478,6 +485,39 @@
|
|
|
|
|
</template> |
|
|
|
|
</div> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
<!-- 暂存单生成包条 --> |
|
|
|
|
<el-dialog |
|
|
|
|
:modal-append-to-body="false" |
|
|
|
|
:append-to-body="false" |
|
|
|
|
class="el-dialog-createPackge" |
|
|
|
|
title="生成包条" |
|
|
|
|
width="780px" |
|
|
|
|
v-model="details.popUpShow.createPackge" |
|
|
|
|
> |
|
|
|
|
<div class="title mb20">订单号：{{ details.form.orderCode }}</div> |
|
|
|
|
|
|
|
|
|
<el-form-item label="生成数量：" style="margin-right: 0"> |
|
|
|
|
<el-input-number |
|
|
|
|
class="inputNum" |
|
|
|
|
v-model="details.form.enterNum" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:controls="false" |
|
|
|
|
:min="1" |
|
|
|
|
:precision="0" |
|
|
|
|
:value-on-clear="0" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<div style="text-align: right"> |
|
|
|
|
<el-button icon="CircleClose" @click="details.popUpShow.createPackge = false"> |
|
|
|
|
取 消 |
|
|
|
|
</el-button> |
|
|
|
|
<el-button type="primary" icon="Position" @click="handleSubmitCreatePackage"> |
|
|
|
|
提 交 |
|
|
|
|
</el-button> |
|
|
|
|
</div> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
</basic-container> |
|
|
|
|
|
|
|
|
|
@ -512,6 +552,7 @@ import {
|
|
|
|
|
postOpenOrderDeletedAdvance, |
|
|
|
|
postFindBrandList, |
|
|
|
|
postOpenLabel, |
|
|
|
|
postCreateOrderPackage, |
|
|
|
|
} from '@/api/waybill/TemporaryStorageList'; |
|
|
|
|
import { getLazyTreeAll } from '@/api/base/region'; |
|
|
|
|
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
@ -623,6 +664,8 @@ const details = reactive<any>({
|
|
|
|
|
UploadBatch: false, |
|
|
|
|
/** 新增标签 */ |
|
|
|
|
addTagVisited: false, |
|
|
|
|
/** 生成包条 */ |
|
|
|
|
createPackge: false, |
|
|
|
|
}, |
|
|
|
|
/** 列表Dom节点 */ |
|
|
|
|
listNode: '', |
|
|
|
|
@ -1414,6 +1457,35 @@ const handleDownLoadFile = () => {
|
|
|
|
|
downloadFileBase64(url, name); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 开启生成包条的弹窗 */ |
|
|
|
|
const handleCreatePackage = ({ row }) => { |
|
|
|
|
details.form = { ...row, enterNum: 1 }; |
|
|
|
|
details.popUpShow.createPackge = true; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 生成包条 */ |
|
|
|
|
const handleSubmitCreatePackage = async () => { |
|
|
|
|
try { |
|
|
|
|
if (!details.form.enterNum) return ElMessage.warning('请输入大于零的数量'); |
|
|
|
|
|
|
|
|
|
details.popUpShow.createPackge = false; |
|
|
|
|
details.loadingObj.pageLoading = true; |
|
|
|
|
|
|
|
|
|
const res = await postCreateOrderPackage({ |
|
|
|
|
advanceId: details.form.id, |
|
|
|
|
enterNum: details.form.enterNum, |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
const { code, data } = res.data; |
|
|
|
|
if (code !== 200) return; |
|
|
|
|
onLoad(); |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
details.loadingObj.pageLoading = false; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
onActivated(() => { |
|
|
|
|
console.log('activated'); |
|
|
|
|
console.log('this.$store :>> ', $store); |
|
|
|
|
@ -1571,4 +1643,28 @@ onActivated(() => {
|
|
|
|
|
:deep(.el-overlay-dialog) { |
|
|
|
|
position: absolute; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 生成包条 |
|
|
|
|
.el-dialog-createPackge { |
|
|
|
|
.title { |
|
|
|
|
display: flex; |
|
|
|
|
align-items: center; |
|
|
|
|
font-weight: bold; |
|
|
|
|
|
|
|
|
|
&::before { |
|
|
|
|
content: ''; |
|
|
|
|
display: block; |
|
|
|
|
height: 1rem; |
|
|
|
|
width: 4px; |
|
|
|
|
background: var(--el-color-primary); |
|
|
|
|
margin-right: 5px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.inputNum { |
|
|
|
|
:deep(.el-input__inner) { |
|
|
|
|
text-align: left !important; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
