|
|
|
|
@ -81,37 +81,38 @@
|
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
<!-- </el-row>--> |
|
|
|
|
<div class='el-zy-top'> |
|
|
|
|
|
|
|
|
|
<div class="order-info"> |
|
|
|
|
<div class="el-zy-top"> |
|
|
|
|
<div class="order-info"> |
|
|
|
|
<ul> |
|
|
|
|
<li> |
|
|
|
|
<img src="../../../../public/img/bg/Delivery.png" /> <span>司机待签收数：{{ statistics.driverNub }}</span> |
|
|
|
|
<img src="../../../../public/img/bg/Delivery.png" /> |
|
|
|
|
<span>司机待签收数：{{ statistics.driverNub }}</span> |
|
|
|
|
</li> |
|
|
|
|
<li> |
|
|
|
|
<img src="../../../../public/img/bg/package.png" /> <span>文员待审核数：{{ statistics.clerkNub }}</span> |
|
|
|
|
<img src="../../../../public/img/bg/package.png" /> |
|
|
|
|
<span>文员待审核数：{{ statistics.clerkNub }}</span> |
|
|
|
|
</li> |
|
|
|
|
</ul> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<el-row > |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain--> |
|
|
|
|
<!-- >删 除</el-button--> |
|
|
|
|
<!-- >--> |
|
|
|
|
</div> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button> |
|
|
|
|
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> |
|
|
|
|
<el-button icon="el-icon-search" @click="searchHide" circle></el-button> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain--> |
|
|
|
|
<!-- >删 除</el-button--> |
|
|
|
|
<!-- >--> |
|
|
|
|
</div> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button> |
|
|
|
|
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> |
|
|
|
|
<el-button icon="el-icon-search" @click="searchHide" circle></el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
</div> |
|
|
|
|
<el-row> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<tablecmt |
|
|
|
|
@ -134,7 +135,10 @@
|
|
|
|
|
> |
|
|
|
|
<el-text |
|
|
|
|
size="small" |
|
|
|
|
v-if="slotProps.scope.row.sijiSigningStatus == '司机已签收' && slotProps.scope.row.wenyuanSigningStatus=='文员待审核'" |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.sijiSigningStatus == '司机已签收' && |
|
|
|
|
slotProps.scope.row.wenyuanSigningStatus == '文员待审核' |
|
|
|
|
" |
|
|
|
|
@click="handleSign(slotProps.scope.row)" |
|
|
|
|
>复 核</el-text |
|
|
|
|
> |
|
|
|
|
@ -239,6 +243,7 @@
|
|
|
|
|
</span> |
|
|
|
|
</template> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
<el-dialog :title="'签收'" v-model="signBox" width="45%" append-to-body> |
|
|
|
|
<avue-form :option="signoption" v-model="signform" :data="signdata" ref="signform"> |
|
|
|
|
</avue-form> |
|
|
|
|
@ -248,6 +253,112 @@
|
|
|
|
|
<el-button type="primary" @click="cancellation">取消</el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<span>-------------------------------------------------------------------------------</span> |
|
|
|
|
<div class="TcFrom"> |
|
|
|
|
<el-form :model="TcForm" label-width="120px"> |
|
|
|
|
<el-form-item label="收货人姓名"> |
|
|
|
|
<el-input disabled v-model="TcForm.consignee" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="收货人电话"> |
|
|
|
|
<el-input disabled v-model="TcForm.deliveryPhone" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="收货人地址"> |
|
|
|
|
<el-input disabled v-model="TcForm.deliveryAddress" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="签收人类型"> |
|
|
|
|
<el-radio-group v-model="TcForm.signingType" class="ml-4"> |
|
|
|
|
<el-radio label="1" size="large">签收</el-radio> |
|
|
|
|
<el-radio label="2" size="large">待签收</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="备注"> |
|
|
|
|
<el-input v-model="TcForm.clerkSignRemarks" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
<div class="imgName"> |
|
|
|
|
<span>上门照</span> |
|
|
|
|
<el-upload |
|
|
|
|
v-model:file-list="DoorstepPhoto" |
|
|
|
|
action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" |
|
|
|
|
list-type="picture-card" |
|
|
|
|
:on-preview="handlePictureCardPreview" |
|
|
|
|
:on-remove="handleRemove" |
|
|
|
|
> |
|
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
|
</el-upload> |
|
|
|
|
<el-dialog v-model="dialogVisible"> |
|
|
|
|
<img w-full :src="dialogImageUrl" alt="IMG" /> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div class="imgName"> |
|
|
|
|
<span>堆码照</span> |
|
|
|
|
<el-upload |
|
|
|
|
v-model:file-list="StackingPhoto" |
|
|
|
|
action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" |
|
|
|
|
list-type="picture-card" |
|
|
|
|
:on-preview="handlePictureCardPreview" |
|
|
|
|
:on-remove="handleRemove" |
|
|
|
|
> |
|
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
|
</el-upload> |
|
|
|
|
<el-dialog v-model="dialogVisible"> |
|
|
|
|
<img w-full :src="dialogImageUrl" alt="IMG" /> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div class="imgName"> |
|
|
|
|
<span>易碎照</span> |
|
|
|
|
<el-upload |
|
|
|
|
v-model:file-list="FragilePhotos" |
|
|
|
|
action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" |
|
|
|
|
list-type="picture-card" |
|
|
|
|
:on-preview="handlePictureCardPreview" |
|
|
|
|
:on-remove="handleRemove" |
|
|
|
|
> |
|
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
|
</el-upload> |
|
|
|
|
<el-dialog v-model="dialogVisible"> |
|
|
|
|
<img w-full :src="dialogImageUrl" alt="IMG" /> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div class="imgName"> |
|
|
|
|
<span>家配照</span> |
|
|
|
|
<el-upload |
|
|
|
|
v-model:file-list="HomePhotos" |
|
|
|
|
action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" |
|
|
|
|
list-type="picture-card" |
|
|
|
|
:on-preview="handlePictureCardPreview" |
|
|
|
|
:on-remove="handleRemove" |
|
|
|
|
> |
|
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
|
</el-upload> |
|
|
|
|
<el-dialog v-model="dialogVisible"> |
|
|
|
|
<img w-full :src="dialogImageUrl" alt="IMG" /> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div class="imgName"> |
|
|
|
|
<span>签收照</span> |
|
|
|
|
<el-upload |
|
|
|
|
v-model:file-list="SignForPhotos" |
|
|
|
|
action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" |
|
|
|
|
list-type="picture-card" |
|
|
|
|
:on-preview="handlePictureCardPreview" |
|
|
|
|
:on-remove="handleRemove" |
|
|
|
|
> |
|
|
|
|
<el-icon><Plus /></el-icon> |
|
|
|
|
</el-upload> |
|
|
|
|
<el-dialog v-model="dialogVisible"> |
|
|
|
|
<img w-full :src="dialogImageUrl" alt="IMG" /> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
</basic-container> |
|
|
|
|
@ -350,6 +461,20 @@ import dayjs from 'dayjs';
|
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
dialogImageUrl: '', //图片放大地址 |
|
|
|
|
dialogVisible: false, //图片状态 |
|
|
|
|
TcForm: {}, //弹窗表单 |
|
|
|
|
// 上门照 |
|
|
|
|
DoorstepPhoto: [], |
|
|
|
|
// 堆门照 |
|
|
|
|
StackingPhoto: [], |
|
|
|
|
// 易碎照 |
|
|
|
|
FragilePhotos: [], |
|
|
|
|
// 家配照 |
|
|
|
|
HomePhotos: [], |
|
|
|
|
// 签收照 |
|
|
|
|
SignForPhotos: [], |
|
|
|
|
|
|
|
|
|
columnList: [ |
|
|
|
|
// { |
|
|
|
|
// prop: '', |
|
|
|
|
@ -1227,7 +1352,17 @@ export default {
|
|
|
|
|
showdrawer(value) { |
|
|
|
|
this.drawerShow = value; |
|
|
|
|
}, |
|
|
|
|
// 图片上传回调 |
|
|
|
|
handleRemove(uploadFile, uploadFiles) { |
|
|
|
|
console.log(uploadFile, uploadFiles); |
|
|
|
|
console.log('执行了1回调'); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
handlePictureCardPreview(uploadFile) { |
|
|
|
|
console.log(uploadFile); |
|
|
|
|
console.log('执行了2回调'); |
|
|
|
|
dialogVisible.value = true; |
|
|
|
|
}, |
|
|
|
|
/** |
|
|
|
|
* 弹窗的勾选回调，用于更改头部数组 |
|
|
|
|
* 固定搭配，只需要更换 columnList |
|
|
|
|
@ -1327,8 +1462,33 @@ export default {
|
|
|
|
|
this.signform = row; |
|
|
|
|
this.signBox = true; |
|
|
|
|
getDetail(row.id).then(res => { |
|
|
|
|
console.log("res"); |
|
|
|
|
console.log(res, '点击复核的返回值'); |
|
|
|
|
this.form = res.data.data; |
|
|
|
|
this.TcForm = res.data.data; |
|
|
|
|
// 照片回显分类 |
|
|
|
|
this.DoorstepPhoto = []; |
|
|
|
|
this.StackingPhoto = []; |
|
|
|
|
this.FragilePhotos = []; |
|
|
|
|
this.HomePhotos = []; |
|
|
|
|
this.SignForPhotos = []; |
|
|
|
|
res.data.data.printVOList.forEach(item => { |
|
|
|
|
if (item.type == 'photo_1') { |
|
|
|
|
this.DoorstepPhoto.push({ name: item.name, url: item.urlRoute }); |
|
|
|
|
} |
|
|
|
|
if (item.type == 'photo_2') { |
|
|
|
|
this.StackingPhoto.push({ name: item.name, url: item.urlRoute }); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (item.type == 'photo_3') { |
|
|
|
|
this.FragilePhotos.push({ name: item.name, url: item.urlRoute }); |
|
|
|
|
} |
|
|
|
|
if (item.type == 'photo_4') { |
|
|
|
|
this.HomePhotos.push({ name: item.name, url: item.urlRoute }); |
|
|
|
|
} |
|
|
|
|
if (item.type == 'photo_5') { |
|
|
|
|
this.SignForPhotos.push({ name: item.name, url: item.urlRoute }); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
// this.wid= row.id |
|
|
|
|
// this.getWrapdetails(this.wpage) |
|
|
|
|
@ -1599,22 +1759,22 @@ export default {
|
|
|
|
|
width: 258px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el-zy-top{ |
|
|
|
|
display: flex; |
|
|
|
|
width: 100%; |
|
|
|
|
justify-content: space-between; |
|
|
|
|
align-items: center; |
|
|
|
|
.rows{ |
|
|
|
|
width:50%; |
|
|
|
|
} |
|
|
|
|
.avue-crud__header{ |
|
|
|
|
display: flex; |
|
|
|
|
.el-zy-top { |
|
|
|
|
display: flex; |
|
|
|
|
width: 100%; |
|
|
|
|
justify-content: space-between; |
|
|
|
|
align-items: center; |
|
|
|
|
.rows { |
|
|
|
|
width: 50%; |
|
|
|
|
} |
|
|
|
|
.avue-crud__header { |
|
|
|
|
display: flex; |
|
|
|
|
align-items: flex-end; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el-btn{ |
|
|
|
|
:deep(.el-form-item__content){ |
|
|
|
|
align-items: flex-end |
|
|
|
|
.el-btn { |
|
|
|
|
:deep(.el-form-item__content) { |
|
|
|
|
align-items: flex-end; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.order-info { |
|
|
|
|
@ -1653,4 +1813,23 @@ export default {
|
|
|
|
|
padding-left: 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.TcFrom { |
|
|
|
|
:deep(.el-form) { |
|
|
|
|
display: flex; |
|
|
|
|
justify-content: space-between; |
|
|
|
|
flex-wrap: wrap; |
|
|
|
|
.el-form-item { |
|
|
|
|
width: 46%; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.imgName { |
|
|
|
|
span { |
|
|
|
|
font-weight: bold; |
|
|
|
|
font-size: 16px; |
|
|
|
|
} |
|
|
|
|
span::after { |
|
|
|
|
content: ''; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
