java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

master
qb 1 year ago
parent
75f4b3f2df 920490669c
commit
e2a12f0c73
6 changed files with 209 additions and 63 deletions
Unified View
  1. 40
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  2. 145
      src/views/distribution/inventory/distrilbutionBillLading.vue
  3. 37
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  4. 20
      src/views/distribution/reservation/reservation.vue
  5. 20
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  6. 10
      src/views/distribution/stockup/distributionStockupSelf.vue

40
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -825,26 +825,26 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'isUrgentName', // prop: 'isUrgentName',
label: '是否加急', // label: '是否加急',
type: 1, // type: 1,
values: '', // values: '',
width: '180', // width: '180',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ // {
prop: 'assignStatusName', // prop: 'assignStatusName',
label: '备货指派状态', // label: '备货指派状态',
type: 1, // type: 1,
values: '', // values: '',
width: '180', // width: '180',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ {
prop: 'stockupStatusName', prop: 'stockupStatusName',
label: '备货状态', label: '备货状态',

145
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -90,10 +90,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <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"
@ -114,15 +114,15 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<el-text <el-button
v-if="slotProps.scope.row.isZero === '1'" v-if="slotProps.scope.row.isZero === '1'"
type="primary" type="primary"
text text
icon="el-icon-delete" icon="el-icon-delete"
@click.stop="handleZeroOrder(slotProps.scope.row)" @click.stop="handleZeroOrder(slotProps.scope.row)"
>录入预约数量</el-text >录入预约数量</el-button
> >
<el-text <el-button
v-if=" v-if="
slotProps.scope.row.isZero === '1' && Number(this.$route.query.type) !== 2 slotProps.scope.row.isZero === '1' && Number(this.$route.query.type) !== 2
" "
@ -130,23 +130,23 @@
text text
icon="el-icon-delete" icon="el-icon-delete"
@click.stop="handleStockZeroOrder(slotProps.scope.row)" @click.stop="handleStockZeroOrder(slotProps.scope.row)"
>维护在库数量</el-text >维护在库数量</el-button
> >
<el-text <el-button
type="primary" type="primary"
text text
icon="el-icon-delete" icon="el-icon-delete"
@click="rowOrder(slotProps.scope.row)" @click="rowOrder(slotProps.scope.row)"
>移除</el-text >移除</el-button
> >
<!-- 零担订单时不能选择包件 --> <!-- 零担订单时不能选择包件 -->
<el-text <el-button
v-if="Number(slotProps.scope.row.isZero) !== 1" v-if="Number(slotProps.scope.row.isZero) !== 1"
type="primary" type="primary"
@click="handleChooseOrder(slotProps.scope.row)" @click="handleChooseOrder(slotProps.scope.row)"
text text
icon="el-icon-delete" icon="el-icon-delete"
>选择包件</el-text >选择包件</el-button
> >
</template> </template>
</tablecmt> </tablecmt>
@ -179,6 +179,82 @@
</el-tabs> </el-tabs>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if = !view :span="8">
<el-form-item label="提货证件" label-width="120px">
<el-upload
v-model:file-list="fileListSell"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileListSell);
}
"
:on-remove="handleRemove"
list-type="picture"
>
<el-button type="primary">上传</el-button>
<template #tip>
<div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
</template>
</el-upload>
</el-form-item>
</el-col >
<el-col v-if = !view :span="8">
<el-form-item label="文员确定图片" label-width="120px">
<el-upload
v-model:file-list="fileListClerk"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileListClerk);
}
"
:on-remove="handleRemove"
list-type="picture"
>
<el-button type="primary">上传</el-button>
<template #tip>
<div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
</template>
</el-upload>
</el-form-item>
</el-col>
<el-col v-if = !view :span="8">
<el-form-item label="库管签收图片" label-width="120px">
<el-upload
v-model:file-list="fileListLibrary"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileListLibrary);
}
"
:on-remove="handleRemove"
list-type="picture"
>
<el-button type="primary">上传</el-button>
<template #tip>
<div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
</template>
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div v-if = view>
<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">
<el-upload <el-upload
@ -230,6 +306,7 @@
<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"
@ -244,7 +321,7 @@
:on-remove="handleRemove" :on-remove="handleRemove"
list-type="picture" list-type="picture"
> >
<el-button type="primary">上传</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>
@ -252,9 +329,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </div>
<!-- 表单按钮 -->
<div class="foot" v-if="!view"> <!-- &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"-->
<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
@ -492,6 +570,12 @@
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
<div class="LoadIMG">
<el-dialog v-model="dialogImg">
<img w-full :src="Imgurl" alt="Preview Image" />
</el-dialog>
</div>
</basic-container> </basic-container>
</template> </template>
@ -518,6 +602,8 @@ import { nextTick, ref } from 'vue';
export default { export default {
data() { data() {
return { return {
dialogImg:false,
Imgurl:undefined,
OrdercolumnList: [ OrdercolumnList: [
{ {
prop: 'serviceNumber', prop: 'serviceNumber',
@ -549,6 +635,8 @@ export default {
loading: false, loading: false,
// 是否为查看模式 // 是否为查看模式
view: false, view: false,
// 是否为上传模式
viewSC: false,
// 查询信息 // 查询信息
query: {}, query: {},
queryOrder: {}, queryOrder: {},
@ -1736,6 +1824,10 @@ 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') {
//查询提货编辑数据
this.view = true;
this.getDetailOen();
} }
/** /**
* 初始化获取本地缓存的编辑隐藏的列表 * 初始化获取本地缓存的编辑隐藏的列表
@ -2254,6 +2346,8 @@ export default {
}, },
handlePreview(file) { handlePreview(file) {
console.log(file); console.log(file);
this.Imgurl =file.url;
this.dialogImg =true;
}, },
textbox(e, index) { textbox(e, index) {
let nu = index + 1; let nu = index + 1;
@ -3023,4 +3117,23 @@ export default {
.el-input-number { .el-input-number {
width: 100%; width: 100%;
} }
:deep(.maboxhi){
height: 100% !important;
}
.toscontent{
:deep(.el-form-item__content){
height: 400px;
overflow-y: scroll;
align-items: flex-start;
}
:deep(.el-tabs){
height: 100% !important;
}
}
.LoadIMG{
img{
width: 100%;
height: 100%;
}
}
</style> </style>

37
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -31,12 +31,12 @@
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<span style="margin-bottom: 2%; font-size: 16px"> <span style="margin-bottom: 2%; font-size: 16px">
待提货：{{ treatNum }}单/{{ numBill }}件 待提货：{{ treatNum }}单/{{ this.sumTotal - this.signedFor }}件
</span> </span>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<span style="margin-bottom: 2%; font-size: 16px"> <span style="margin-bottom: 2%; font-size: 16px">
已提货：{{ stopNum }}单/{{ numBill }}件</span 已提货：{{ stopNum }}单/{{ signedFor }}件</span
> >
</el-col> </el-col>
</el-row> </el-row>
@ -116,12 +116,22 @@
type="primary" type="primary"
text text
icon="el-icon-edit" icon="el-icon-edit"
@click="handleEdits(slotProps.scope)" @click="handleEdits(slotProps.scope,'1')"
v-if=" v-if="
permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20 permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20
" "
>编辑提货信息</el-text >编辑提货信息</el-text
> >
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdits(slotProps.scope,'2')"
v-if="
permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions > 20
"
>上传签收图片</el-text
>
<!-- <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>--> <!-- <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
<el-text size="small" text <el-text size="small" text
@ -704,6 +714,8 @@ export default {
stopNum: 0, stopNum: 0,
treatNum: 0, treatNum: 0,
numBill: 0, numBill: 0,
signedFor: 0,
sumTotal: 0,
// 分页信息 // 分页信息
page: { page: {
currentPage: 1, currentPage: 1,
@ -1103,13 +1115,22 @@ export default {
}, },
handleEdits(row) { handleEdits(row,index) {
let name ;
let type ;
if(index === '1' ){
name = '编辑提货单'
type = "2";
}else{
name = "上传签收图片";
type = "4";
}
this.$router.push({ this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading', path: '/distribution/inventory/distrilbutionBillLading',
query: { query: {
id: row.row.id, id: row.row.id,
name: '编辑提货单', name: name,
type: '2', type: type,
}, },
}); });
}, },
@ -1213,7 +1234,9 @@ export default {
if (!!res.data.data) { if (!!res.data.data) {
this.treatNum = !res.data.data.treatNum ? 0 : parseInt(res.data.data.treatNum); this.treatNum = !res.data.data.treatNum ? 0 : parseInt(res.data.data.treatNum);
this.stopNum = !res.data.data.stopNum ? 0 : res.data.data.stopNum; this.stopNum = !res.data.data.stopNum ? 0 : res.data.data.stopNum;
this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum); this.signedFor = parseInt(res.data.data.signedFor); //已签收
this.sumTotal = parseInt(res.data.data.sumTotal); //全部
console.log(",.,.已签收",this.signedFor,"全部",this.sumTotal);
} }
}); });
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {

20
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -769,16 +769,16 @@ export default {
// sortable: true, // sortable: true,
// }, // },
// { {
// prop: 'notes', prop: 'operator',
// label: '备注', label: '操作人',
// type: 1, type: 1,
// values: '', values: '',
// width: '140', width: '140',
// checkarr: [], checkarr: [],
// fixed: false, fixed: false,
// sortable: false, sortable: false,
// }, },
{ {
prop: '', prop: '',
label: '操作', label: '操作',

20
src/views/distribution/stockup/distributionStockupDiscuss.vue
Unescape View File

@ -383,16 +383,16 @@ export default {
sortable: true, sortable: true,
head: false, head: false,
}, },
// { {
// prop: 'stockupUser', prop: 'consignee',
// label: '操作人', label: '客户名称',
// type: 2, type: 2,
// values: '', values: '',
// width: '130', width: '130',
// checkarr: [], checkarr: [],
// fixed: false, fixed: false,
// sortable: true, sortable: true,
// }, },
{ {
prop: 'stockupStatusName', prop: 'stockupStatusName',
label: '备货状态', label: '备货状态',

10
src/views/distribution/stockup/distributionStockupSelf.vue
Unescape View File

@ -370,6 +370,16 @@ export default {
// fixed: false, // fixed: false,
// sortable: true, // sortable: true,
// }, // },
{
prop: 'consignee',
label: '客户名称',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{ {
prop: 'stockupStatusName', prop: 'stockupStatusName',
label: '备货状态', label: '备货状态',

Write Preview
Loading…
Cancel
Save