Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev-warehouse
caoyizhong 2 years ago
parent
commit
59fc56f626
  1. 2
      src/api/distribution/distributionSignfor.js
  2. 1
      src/option/basicdata/basicdataCarrier.js
  3. 1
      src/views/basicdata/driverArtery/basicdataDriverArtery.vue
  4. 10
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  5. 205
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  6. 2
      src/views/distribution/signdetail/distributionSigndetail.vue
  7. 27
      src/views/distribution/signfor/distributionSignfor.vue
  8. 500
      src/views/distribution/signfor/distributionSignforedt.vue
  9. 191
      src/views/distribution/signfor/distributionSignfortreat.vue

2
src/api/distribution/distributionSignfor.js

@ -74,7 +74,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
url: '/api/logpm-distribution/signfor/submit',
url: '/api/logpm-distribution/signfor/update',
method: 'post',
data: row
})

1
src/option/basicdata/basicdataCarrier.js

@ -387,7 +387,6 @@ export default {
res: 'data',
url: 'link',
},
},
{
label: "合同附件",

1
src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@ -613,6 +613,7 @@
});
},
rowUpdate(row, index, done, loading) {
console.log("swx>>>>>>>>>>>>>>");
update(row).then(() => {
this.onLoad(this.page);
this.$message({

10
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -315,6 +315,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'fee',
label: '增值服务',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderNumber',
label: '订单总数',

205
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -79,7 +79,8 @@
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)"> </el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收' "> </el-button>
</template>
</el-table-column>
</el-table>
@ -183,12 +184,32 @@
<!-- </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>
<div style="bottom: 7%;margin-left: 500px;width: 50%">
<div style="width: 100%">
<el-button type="primary" @click="submitForm" style="margin-right: 20%" >确定</el-button>
<el-button type="primary" @click="cancellation" >取消</el-button>
</div>
</div>
</el-dialog>
</div>
</basic-container>
</template>
<script>
import { getList, getDetail, add, update, remove,getPage,getstatistics,getWrapdetail,getpackdetail } from "@/api/distribution/distributionDeliveryList";
import { update as updatesign } from "@/api/distribution/distributionSignfor";
import option from '@/option/basic/basicPdarecords';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
@ -201,6 +222,8 @@ export default {
title: '',
//
box: false,
//
signBox: false,
dataForm: {},
//
search: true,
@ -219,6 +242,8 @@ export default {
padview:false,
//
view: false,
//
signView:false,
//
query: {},
inputTypeData:[],
@ -230,6 +255,8 @@ export default {
},
//
form: {},
//
signform: {},
//
selectionList: [],
isLiabilityData: [],
@ -306,6 +333,131 @@ export default {
]
},
//
signoption: {
height:'auto',
width:'40px',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
dialogClickModal: false,
emptyBtn: false, //
submitBtn: false, //
column: [
{
label: "收货人姓名",
labelWidth:'150',
span:11,
prop: "consignee",
type: "input",
width:"150px",
align:'center',
disabled:true,
// rules: [{
// required: true,
// message: "",
// trigger: "blur"
// }],
},
{
label: "收货人电话",
prop: "deliveryPhone",
labelWidth:'150',
span:11,
type: "input",
width:"150px",
align:'center',
disabled:true,
},
{
label: "收货地址",
prop: "deliveryAddress",
labelWidth:'150',
span:11,
type: "input",
width:"150px",
align:'center',
disabled:true,
},
{
label: "签收类型",
prop: "signingType",
labelWidth:'150',
span:11,
type: "radio",
width:"150px",
align:'center',
disabled:true,
dicData: [
{
label: '签收',
value: '1',
},
{
label: '代签收',
value: '2',
}
],
},
{
label: "司机签收图片",
prop: "deliverySignPictures",
labelWidth:'150',
type: 'upload',
listType: 'picture-card',
width:"150px",
span:15,
multiple:true,
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
limit: 5,
propsHttp: {
res: 'data',
url: 'link',
},
disabled:true,
},
{
label: "复核图片",
prop: "clerkSignPictures",
type: 'upload',
listType: 'picture-card',
dataType: 'string',
labelWidth:'150',
span:15,
multiple:true,
width:"200px",
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
limit: 15,
propsHttp: {
res: 'data',
url: 'link',
},
rules: [{
required: true,
message: "请上传图片",
trigger: "blur"
}],
},
{
label: "备注",
prop: "clerkSignRemarks",
labelWidth:'150',
span:15,
type: "input",
width:"150px",
align:'center',
},
]
},
//
wrapoption: {
@ -373,6 +525,8 @@ export default {
},
//
data: [],
//
signdata: [],
//id
wid:null,
//
@ -417,9 +571,17 @@ export default {
}
},
methods: {
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
//
rowUpdate() {
rowUpdate(row, index, done, loading) {
console.log("row>>>>>>>>",row);
},
queryDictionary() {
getDictionaryBiz('yes_no').then(res => {
@ -433,6 +595,10 @@ export default {
//
handleViewpda() {
},
//
cancellation(){
this.signBox = false;
},
init() {
this.height = this.setPx(document.body.clientHeight - 340);
@ -486,6 +652,30 @@ export default {
}
});
},
submitForm(){
this.$refs.signform.validate(valid => {
if (valid) {
let row = {}
row.id = this.signform.deliveryId
row.clerkSignPictures = this.signform.clerkSignPictures
row.clerkSignRemarks = this.signform.clerkSignRemarks
row.signingStatus = '2'
console.log("更新参数>>>>>>>>",row);
// if (!!row.id){
updatesign(row).then(() => {
this.$message({
type: "success",
message: "操作成功!"
});
this.signBox = false;
}, error => {
console.log(error);
this.signBox = false;
});
}
});
},
//
handleCustom(){
this.cus =true
@ -528,6 +718,15 @@ export default {
this.box = true;
this.wid= row.id
this.getWrapdetails(this.wpage)
},
handleSign(row) {
console.log("签收>>>>>>>>>>",row);
// this.title = '';
// this.view = true;
this.signform = row
this.signBox = true;
// this.wid= row.id
// this.getWrapdetails(this.wpage)
},
getWrapdetails(page){
let params={}

2
src/views/distribution/signdetail/distributionSigndetail.vue

@ -188,7 +188,7 @@ export default {
head: false,
},
{
prop: 'shoppingName',
prop: 'mallName',
label: '商城名称',
type: 2,
values: '',

27
src/views/distribution/signfor/distributionSignfor.vue

@ -65,36 +65,11 @@
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)"> </el-button>
<el-button size="small" @click="editsolt(slotProps.scope)"> </el-button>
<!-- <el-button size="small" @click="editsolt(slotProps.scope)"> </el-button>-->
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</template>
</tablecmt>
<!-- <el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">签收</el-button>
</template>
</el-table-column>
</el-table> -->
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">

500
src/views/distribution/signfor/distributionSignforedt.vue

@ -3,93 +3,138 @@
<div class="avue-crud">
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24" >
<span style="padding-left: 10%" >当前签收单状态{{basicdata.signingStatus}}</span>
<span style="padding-left: 10%" >当前签收单状态>>>>>>>>> {{signfordata.signingStatusAll}}</span>
</el-col>
</el-row>
<el-divider>基本信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24" >
<span>配送类型{{deliverydata.kind}} </span>
<el-col :xl="5" :lg="7" :md="8" :sm="24" >
<span>预约单号{{signfordata.reservationCode}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>商场名称{{signfordata.mallName}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>预约时间{{signfordata.reservationDate}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>配送车辆{{deliverydata.vehicleName}} </span>
<el-col :xl="3" :lg="7" :md="8" :sm="24">
<span>服务类型{{signfordata.deliveryType}}</span>
</el-col>
</el-row>
<el-divider>订单列表</el-divider>
<!-- <el-row>-->
<!-- &lt;!&ndash; 列表模块 &ndash;&gt;-->
<!-- <el-table ref="table" v-loading="loading"-->
<!-- @selection-change="selectionChange"-->
<!-- :data="data"-->
<!-- :height="height"-->
<!-- style="width: 100%"-->
<!-- :border="option.border">-->
<!-- <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
<!-- <template v-for="(item,index) in option.column">-->
<!-- &lt;!&ndash; table字段 &ndash;&gt;-->
<!-- <el-table-column v-if="item.hide!==true"-->
<!-- :prop="item.prop"-->
<!-- :label="item.label"-->
<!-- align="center"-->
<!-- :width="item.width"-->
<!-- :key="index">-->
<!-- </el-table-column>-->
<!-- </template>-->
<!-- &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <template #="{row}">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-row>-->
<el-row>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<!-- <el-pagination align="right"-->
<!-- background-->
<!-- @size-change="sizeChange"-->
<!-- @current-change="currentChange"-->
<!-- :current-page="page.currentPage"-->
<!-- :page-sizes="[10, 20, 30, 40, 50, 100]"-->
<!-- :page-size="page.pageSize"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- :total="page.total">-->
<!-- </el-pagination>-->
</div>
<el-divider>收货人信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="10" :sm="24" >
<span>收货人{{signfordata.consignee}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>手机号码{{signfordata.deliveryPhone}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>收货地址{{signfordata.deliveryAddress}} </span>
</el-col>
</el-row>
<!-- 表单模块 -->
<!-- <el-dialog :title="title"-->
<!-- v-model="box"-->
<!-- width="50%"-->
<!-- :before-close="beforeClose"-->
<!-- append-to-body>-->
<!-- <el-table ref="table" v-loading="loading"-->
<!-- @selection-change="selectionChange"-->
<!-- :data="wrapdata"-->
<!-- :height="height"-->
<!-- style="width: 100%"-->
<!-- :border="option.border">-->
<!-- <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
<!-- <template v-for="(item,index) in wrapoption.column">-->
<!-- &lt;!&ndash; table字段 &ndash;&gt;-->
<!-- <el-table-column v-if="item.hide!==true"-->
<!-- :prop="item.prop"-->
<!-- :label="item.label"-->
<!-- align="center"-->
<!-- :width="item.width"-->
<!-- :key="index">-->
<!-- </el-table-column>-->
<!-- </template>-->
<!-- </el-table>-->
<!-- &lt;!&ndash; 表单按钮 &ndash;&gt;-->
<!-- <template #footer>-->
<!-- <span v-if="!view" class="dialog-footer">-->
<!-- <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"> </el-button>-->
<!-- <el-button icon="el-icon-circle-close" @click="box = false"> </el-button>-->
<!-- </span>-->
<!-- </template>-->
<!-- </el-dialog>-->
<!-- <el-divider>服务内容</el-divider>-->
<!-- <div class="topbox">-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>上楼</div>-->
<!-- <div>2178501088045989849</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div>货物件数</div>-->
<!-- <div>预估费用500.00</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>超区</div>-->
<!-- <div>超区公里10KM</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div></div>-->
<!-- <div>预估费用500.00</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>拆样</div>-->
<!-- <div>货物件数10</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div></div>-->
<!-- <div>预估费用500.00</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>返货</div>-->
<!-- <div>货物件数10</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div></div>-->
<!-- <div>预估费用500.00</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>搬运</div>-->
<!-- <div>人员张三李四</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div></div>-->
<!-- <div></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>返货</div>-->
<!-- <div>货物件数10</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div></div>-->
<!-- <div>预估费用500.00</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>到付运费</div>-->
<!-- <div></div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div></div>-->
<!-- <div>费用500.00</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="titlxbx">-->
<!-- <div>-->
<!-- <div>代收货款</div>-->
<!-- <div></div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div></div>-->
<!-- <div>费用500.00</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<el-divider>订单信息</el-divider>
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope.row)"> </el-button>
<el-button size="small" @click="costadd(slotProps.scope.row)"> </el-button>
</template>
</tablecmt>
</div>
</basic-container>
</template>
@ -113,7 +158,7 @@ export default {
search: true,
//
isadd: false,
deliverydata:{},
signfordata:{},
//
loading: true,
//
@ -125,6 +170,69 @@ export default {
//
query: {},
inputTypeData:[],
columnList: [
// {
// prop: '',
// label: '',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'orderSelfNumbering',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
// head: true,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signinQuantity',
label: '数量',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'mallName',
label: '商城',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '150',
checkarr: [],
fixed:'right',
sortable: false,
}
// ...
],
//
page: {
currentPage: 1,
@ -138,21 +246,7 @@ export default {
isLiabilityData: [],
//
stateData: [],
//
basicoption: {
menu:false,
index: false,
border: false,
selection: false,
column: [
{
label: "客户配送单号",
prop: "noteNumber",
search: true,
width:"100px"
},
]
},
//
wrapoption: {
expand: false,
@ -160,36 +254,7 @@ export default {
border: true,
selection: true,
column: [
{
label: "包条码",
prop: "packetBarCode",
search: true,
width:"100px"
},
{
label: "一级品类",
prop: "firsts",
search: true,
width:"100px"
},
{
label: "二级品类",
prop: "second",
search: true,
width:"100px"
},
{
label: "三级品类",
prop: "thirdProduct",
search: true,
width:"100px"
},
{
label: "物料名称",
prop: "material",
search: true,
width:"100px"
},
]
@ -269,6 +334,47 @@ export default {
this.page.currentPage = 1;
this.onLoad(this.page);
},
costadd(scope) {
const { row } = scope;
},
selectionsc(value) {
console.log("进来了>>>>>>>>>>>>>",value);
},
delectsolt(scope) {
const { row } = scope;
console.log(row);
},
handleClose(done) {
this.$confirm('确认关闭?')
.then(_ => {
done();
})
.catch(_ => {
});
},
editsolt(scope) {
},
btnsc(index, row) {
console.log(index, row);
},
selectsc(index, row) {
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
timesc(index, row) {
console.log(index, row);
},
inputsc(index, row) {
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
handleSubmit() {
this.$refs.form.validate(valid => {
if (valid) {
@ -387,17 +493,155 @@ export default {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad() {
onLoad(page) {
//
this.loading = true;
let id = this.$route.query.id;
getDetail(id).then(res => {
const data = res.data.data
this.basicdata = data
this.data = res.data.data.reservationList
this.signfordata = data
//this.data = res.data.data.reservationList
});
this.loading = false;
}
}
};
</script>
<style lang="scss">
.btsbx{
display: flex;
align-items: center;
justify-content: center;
margin-top: 20px;
>button{
width: 120px;
height: 40px;
}
}
.maxitembxlist{
display: flex;
flex-direction: column;
// padding: 10px;
box-sizing: border-box;
margin-top: 20px;
>.items{
display: flex;
flex-direction: column;
width: 100%;
background-color: #fcfcfc;
padding: 10px;
box-sizing: border-box;
border: 1px solid #e2e0e0;
border-radius: 2px;
margin-bottom: 20px;
&:nth-last-child(1){
margin-bottom: 0;
}
>.contbx{
display: flex;
flex-direction: column;
width: 100%;
margin-top: 10px;
>.tabitem{
display: flex;
align-items: center;
>div{
flex: 1;
height: 45px;
display: flex;
align-items: center;
justify-content: center;
background-color: #f3f3f3;
border: 1px solid #e2e0e0;
margin-bottom: -2px;
margin-right: -2px;
}
}
>.contentitem{
display: flex;
align-items: center;
>div{
flex: 1;
height: 45px;
display: flex;
align-items: center;
justify-content: center;
background-color: #ffffff;
border: 1px solid #e2e0e0;
margin-bottom: -2px;
margin-right: -2px;
}
}
}
>.titltophead{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.icons{
font-size: 27px;
&:nth-of-type(1){
margin-right: 8px;
}
}
}
>.editinput{
display: flex;
flex-direction: column;
padding: 20px 0;
>.inputitem{
display: flex;
align-items: flex-start;
justify-content: space-between;
margin-bottom: 10px;
&:nth-last-child(1){
margin-bottom: 0;
}
.inpts{
display: flex;
align-items: flex-start;
flex: 1;
padding-right: 10px;
>span{
width: 90px;
}
>div:nth-of-type(1){
flex: 1;
}
}
}
}
}
}
.topbox{
display: flex;
flex-direction: column;
>.titlxbx{
font-size: 16px;
display: flex;
align-items: center;
>div{
flex: 1;
display: flex;
align-items: center;
>div{
flex: 1;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
border: 1px solid #e2e0e0;
margin-bottom: -1px;
margin-right: -1px;
word-break: break-all;
&:nth-of-type(1){
background-color: #f3f3f3;
}
}
}
}
}
</style>

191
src/views/distribution/signfor/distributionSignfortreat.vue

@ -73,7 +73,7 @@
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)"> </el-button>
<el-button size="small" @click="editsolt(slotProps.scope)"> </el-button>
<el-button size="small" @click="handleSign(slotProps.scope.row)" > </el-button>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</template>
@ -173,6 +173,24 @@
</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>
<div style="bottom: 7%;margin-left: 250px;width: 50%">
<div style="width: 100%">
<el-button type="primary" @click="submitForm" style="margin-right: 40%" >确定</el-button>
<el-button type="primary" @click="cancellation" >取消</el-button>
</div>
</div>
</el-dialog>
</div>
</basic-container>
<edittablehead
@ -185,6 +203,7 @@
<script>
import { getList, getDetail, add, update, remove ,getPage,getstatistics} from '@/api/distribution/distributionSignfor';
import { update as updatesign } from "@/api/distribution/distributionSignfor";
import option from '@/option/distribution/distributionSignfor';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
@ -214,7 +233,7 @@ export default {
// head: false,
// },
{
prop: 'shoppingName',
prop: 'mallName',
label: '商城名称',
type: 2,
values: '',
@ -422,8 +441,138 @@ export default {
loading: true,
//
view: false,
//
signBox: false,
//
signform: {},
//
signdata: [],
//
query: {},
//
signoption: {
height:'auto',
width:'40px',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
dialogClickModal: false,
emptyBtn: false, //
submitBtn: false, //
column: [
{
label: "收货人姓名",
labelWidth:'150',
span:11,
prop: "consignee",
type: "input",
width:"150px",
align:'center',
disabled:true,
// rules: [{
// required: true,
// message: "",
// trigger: "blur"
// }],
},
{
label: "收货人电话",
prop: "deliveryPhone",
labelWidth:'150',
span:11,
type: "input",
width:"150px",
align:'center',
disabled:true,
},
{
label: "收货地址",
prop: "deliveryAddress",
labelWidth:'150',
span:11,
type: "input",
width:"150px",
align:'center',
disabled:true,
},
{
label: "签收类型",
prop: "signingType",
labelWidth:'150',
span:11,
type: "radio",
width:"150px",
align:'center',
disabled:true,
dicData: [
{
label: '签收',
value: '1',
},
{
label: '代签收',
value: '2',
}
],
},
{
label: "司机签收图片",
prop: "deliverySignPictures",
labelWidth:'150',
type: 'upload',
listType: 'picture-card',
width:"150px",
span:15,
multiple:true,
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
limit: 5,
propsHttp: {
res: 'data',
url: 'link',
},
disabled:true,
},
{
label: "复核图片",
prop: "clerkSignPictures",
type: 'upload',
listType: 'picture-card',
dataType: 'string',
labelWidth:'150',
span:15,
multiple:true,
width:"200px",
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
limit: 15,
propsHttp: {
res: 'data',
url: 'link',
},
rules: [{
required: true,
message: "请上传图片",
trigger: "blur"
}],
},
{
label: "备注",
prop: "clerkSignRemarks",
labelWidth:'150',
span:15,
type: "input",
width:"150px",
align:'center',
},
]
},
//
statistics:{},
//
@ -558,6 +707,35 @@ export default {
}
},
//
cancellation(){
this.signBox = false;
},
//
submitForm(){
// this.isDis = true;
this.$refs.signform.validate(valid => {
if (valid) {
let row = {}
row.id = this.signform.id
row.clerkSignPictures = this.signform.clerkSignPictures
row.clerkSignRemarks = this.signform.clerkSignRemarks
row.signingStatus = '2'
// if (!!row.id){
updatesign(row).then(() => {
this.$message({
type: "success",
message: "操作成功!"
});
this.signBox = false;
this.onLoad(this.page);
}, error => {
console.log(error);
this.signBox = false;
});
}
});
},
selectionsc(value) {
console.log(value);
},
@ -565,6 +743,15 @@ export default {
const { row } = scope;
console.log(row);
},
handleSign(row) {
console.log("签收>>>>>>>>>>",row);
// this.title = '';
// this.view = true;
this.signform = row
this.signBox = true;
// this.wid= row.id
// this.getWrapdetails(this.wpage)
},
editsolt(scope) {
const { row } = scope;
console.log("row>>>>>>>>>>>>>>>>>>>",row);

Loading…
Cancel
Save