Browse Source

修复预约查看包件为空的问题

dev-xx
qb 1 year ago
parent
commit
38756a9196
  1. 2
      src/api/distribution/distributionStockArticle.js
  2. 55
      src/views/distribution/inventory/distrilbutionBillLading.vue
  3. 499
      src/views/distribution/reservation/reservationAddFrom.vue

2
src/api/distribution/distributionStockArticle.js

@ -305,7 +305,7 @@ export const getPackageListByStockArticleId = (current, size, orderId) => {
url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId', url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId',
method: 'get', method: 'get',
params: { params: {
orderId, ...orderId,
current, current,
size, size,
}, },

55
src/views/distribution/inventory/distrilbutionBillLading.vue

@ -91,9 +91,9 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="toscontent"> <el-row :gutter="20" class="toscontent">
<el-col :span="24" > <el-col :span="24">
<el-form-item label="物品明细" prop="certificateType" > <el-form-item label="物品明细" prop="certificateType">
<el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%;"> <el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%">
<el-tab-pane label="定制品"> <el-tab-pane label="定制品">
<el-button <el-button
type="primary" type="primary"
@ -179,7 +179,7 @@
</el-tabs> </el-tabs>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if = !view :span="8"> <el-col v-if="!view" :span="8">
<el-form-item label="提货证件" label-width="120px"> <el-form-item label="提货证件" label-width="120px">
<el-upload <el-upload
v-model:file-list="fileListSell" v-model:file-list="fileListSell"
@ -202,8 +202,8 @@
</template> </template>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col > </el-col>
<el-col v-if = !view :span="8"> <el-col v-if="!view" :span="8">
<el-form-item label="文员确定图片" label-width="120px"> <el-form-item label="文员确定图片" label-width="120px">
<el-upload <el-upload
v-model:file-list="fileListClerk" v-model:file-list="fileListClerk"
@ -227,7 +227,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if = !view :span="8"> <el-col v-if="!view" :span="8">
<el-form-item label="库管签收图片" label-width="120px"> <el-form-item label="库管签收图片" label-width="120px">
<el-upload <el-upload
v-model:file-list="fileListLibrary" v-model:file-list="fileListLibrary"
@ -253,7 +253,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div v-if = view> <div v-if="view">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="提货证件" label-width="120px"> <el-form-item label="提货证件" label-width="120px">
@ -306,7 +306,6 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="库管签收图片" label-width="120px"> <el-form-item label="库管签收图片" label-width="120px">
<el-upload <el-upload
v-model:file-list="fileListLibrary" v-model:file-list="fileListLibrary"
class="upload-demo" class="upload-demo"
:action="action" :action="action"
@ -321,7 +320,7 @@
:on-remove="handleRemove" :on-remove="handleRemove"
list-type="picture" list-type="picture"
> >
<el-button type="primary" :disabled = "!view">上传</el-button> <el-button type="primary" :disabled="!view">上传</el-button>
<template #tip> <template #tip>
<div class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div> <div class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</template> </template>
@ -331,8 +330,8 @@
</el-row> </el-row>
</div> </div>
<!-- &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"--> <!-- &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"-->
<div class="foot" :disabled="view" > <div class="foot" :disabled="view">
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')" <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
> </el-button > </el-button
@ -575,7 +574,6 @@
<img w-full :src="Imgurl" alt="Preview Image" /> <img w-full :src="Imgurl" alt="Preview Image" />
</el-dialog> </el-dialog>
</div> </div>
</basic-container> </basic-container>
</template> </template>
@ -602,8 +600,8 @@ import { nextTick, ref } from 'vue';
export default { export default {
data() { data() {
return { return {
dialogImg:false, dialogImg: false,
Imgurl:undefined, Imgurl: undefined,
OrdercolumnList: [ OrdercolumnList: [
{ {
prop: 'serviceNumber', prop: 'serviceNumber',
@ -1824,7 +1822,7 @@ export default {
this.onLoad(this.page); this.onLoad(this.page);
} else if (this.$route.query.type == '3') { } else if (this.$route.query.type == '3') {
this.onLoadCj(); this.onLoadCj();
}else if (this.$route.query.type == '4') { } else if (this.$route.query.type == '4') {
// //
this.view = true; this.view = true;
this.getDetailOen(); this.getDetailOen();
@ -2135,6 +2133,7 @@ export default {
}, },
// //
callFordeliveryOrder() { callFordeliveryOrder() {
console.log('111 :>> ', 111);
let st = false; let st = false;
let sts = false; let sts = false;
let ad = false; let ad = false;
@ -2142,9 +2141,11 @@ export default {
let consigneeMobile = ''; let consigneeMobile = '';
this.selectionList.some(i => { this.selectionList.some(i => {
if (this.dataList.length > 0) { if (this.dataList.length > 0) {
let w = this.dataList.find( let w = this.dataList.find(c => {
c => c.consigneeMobile == i.consigneeMobile && c.consigneePerson == i.consigneePerson console.log('i :>> ', i);
); console.log('c :>> ', c);
return c.consigneeMobile == i.consigneeMobile && c.consigneePerson == i.consigneePerson;
});
if (!w) { if (!w) {
ad = true; ad = true;
} }
@ -2346,8 +2347,8 @@ export default {
}, },
handlePreview(file) { handlePreview(file) {
console.log(file); console.log(file);
this.Imgurl =file.url; this.Imgurl = file.url;
this.dialogImg =true; this.dialogImg = true;
}, },
textbox(e, index) { textbox(e, index) {
let nu = index + 1; let nu = index + 1;
@ -3117,21 +3118,21 @@ export default {
.el-input-number { .el-input-number {
width: 100%; width: 100%;
} }
:deep(.maboxhi){ :deep(.maboxhi) {
height: 100% !important; height: 100% !important;
} }
.toscontent{ .toscontent {
:deep(.el-form-item__content){ :deep(.el-form-item__content) {
height: 400px; height: 400px;
overflow-y: scroll; overflow-y: scroll;
align-items: flex-start; align-items: flex-start;
} }
:deep(.el-tabs){ :deep(.el-tabs) {
height: 100% !important; height: 100% !important;
} }
} }
.LoadIMG{ .LoadIMG {
img{ img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }

499
src/views/distribution/reservation/reservationAddFrom.vue

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save