|
|
|
@ -20,12 +20,14 @@ |
|
|
|
<el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input> |
|
|
|
<el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="业务类型:"> |
|
|
|
<el-form-item label="业务类型:"> |
|
|
|
<el-select v-model="query.deliveryType" placeholder="请选择业务类型"> |
|
|
|
<el-select v-model="query.businessType" placeholder="请选择业务类型"> |
|
|
|
<el-option |
|
|
|
<el-option |
|
|
|
:value="1">商配 |
|
|
|
:key="'1'" |
|
|
|
|
|
|
|
:value="'商配'">商配 |
|
|
|
</el-option> |
|
|
|
</el-option> |
|
|
|
<el-option |
|
|
|
<el-option |
|
|
|
:value="2">市配 |
|
|
|
:key="'2'" |
|
|
|
|
|
|
|
:value="'市配'">市配 |
|
|
|
</el-option> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-select> |
|
|
|
<!-- <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>--> |
|
|
|
<!-- <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>--> |
|
|
|
@ -255,12 +257,21 @@ |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
<script> |
|
|
|
import { getList, getDetail, add, update, remove ,getPage,getstatistics} from '@/api/distribution/distributionSignfor'; |
|
|
|
import { |
|
|
|
import { update as updatesign } from "@/api/distribution/distributionSignfor"; |
|
|
|
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 option from '@/option/distribution/distributionSignfor'; |
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
import dayjs from 'dayjs'; |
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
export default { |
|
|
|
data() { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
return { |
|
|
|
@ -286,15 +297,15 @@ export default { |
|
|
|
// head: false, |
|
|
|
// head: false, |
|
|
|
// }, |
|
|
|
// }, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'mallName', |
|
|
|
prop: 'trainNumber', |
|
|
|
label: '商城名称', |
|
|
|
label: '配送车次', |
|
|
|
type: 2, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '150', |
|
|
|
width: '150', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
head: false, |
|
|
|
head: false |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'stockArticleId', |
|
|
|
prop: 'stockArticleId', |
|
|
|
@ -305,103 +316,114 @@ export default { |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
head: false, |
|
|
|
head: false |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'storeName', |
|
|
|
prop: 'consignee', |
|
|
|
label: '门店名称', |
|
|
|
label: '客户名称', |
|
|
|
type: 2, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '150', |
|
|
|
width: '150', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
head: false, |
|
|
|
head: false |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'consignee', |
|
|
|
prop: 'deliveryPhone', |
|
|
|
label: '客户名称', |
|
|
|
label: '客户电话', |
|
|
|
type: 2, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '150', |
|
|
|
width: '180', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
head: false, |
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'deliveryTypeName', |
|
|
|
prop: 'deliveryAddress', |
|
|
|
label: '业务类型', |
|
|
|
label: '地址', |
|
|
|
type: 3, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '150', |
|
|
|
width: '300', |
|
|
|
checkarr: [ |
|
|
|
checkarr: [], |
|
|
|
{ |
|
|
|
|
|
|
|
label: '市配', |
|
|
|
|
|
|
|
value: '1' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '商配', |
|
|
|
|
|
|
|
value: '2' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '自提', |
|
|
|
|
|
|
|
value: '3' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'deliveryTime', |
|
|
|
prop: 'warehouseName', |
|
|
|
label: '装车时间', |
|
|
|
label: '配送仓库', |
|
|
|
type: 4, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '180', |
|
|
|
width: '150', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
|
|
|
|
head: false, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'deliveryPhone', |
|
|
|
prop: 'mallName', |
|
|
|
label: '电话', |
|
|
|
label: '商城名称', |
|
|
|
type: 2, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '180', |
|
|
|
width: '150', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
|
|
|
|
head: false |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'trainNumber', |
|
|
|
prop: 'storeName', |
|
|
|
label: '配送车次', |
|
|
|
label: '门店名称', |
|
|
|
type: 2, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '150', |
|
|
|
width: '150', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
head: false, |
|
|
|
head: false |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'deliveryDriverName', |
|
|
|
prop: 'deliveryTypeName', |
|
|
|
label: '配送司机', |
|
|
|
label: '业务类型', |
|
|
|
type: 2, |
|
|
|
type: 3, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '150', |
|
|
|
width: '150', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '市配', |
|
|
|
|
|
|
|
value: '1' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '商配', |
|
|
|
|
|
|
|
value: '2' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '自提', |
|
|
|
|
|
|
|
value: '3' |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
// { |
|
|
|
|
|
|
|
// prop: 'deliveryDriverName', |
|
|
|
|
|
|
|
// label: '配送司机', |
|
|
|
|
|
|
|
// type: 2, |
|
|
|
|
|
|
|
// values: '', |
|
|
|
|
|
|
|
// width: '150', |
|
|
|
|
|
|
|
// checkarr: [], |
|
|
|
|
|
|
|
// fixed: false, |
|
|
|
|
|
|
|
// sortable: true |
|
|
|
|
|
|
|
// }, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'deliveryAddress', |
|
|
|
prop: 'deliveryTime', |
|
|
|
label: '地址', |
|
|
|
label: '装车时间', |
|
|
|
type: 2, |
|
|
|
type: 4, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '300', |
|
|
|
width: '180', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
// { |
|
|
|
// { |
|
|
|
// prop: 'signingTime', |
|
|
|
// prop: 'signingTime', |
|
|
|
@ -441,7 +463,7 @@ export default { |
|
|
|
width: '180', |
|
|
|
width: '180', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'loadedNumber', |
|
|
|
prop: 'loadedNumber', |
|
|
|
@ -451,7 +473,7 @@ export default { |
|
|
|
width: '180', |
|
|
|
width: '180', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'receivedQuantity', |
|
|
|
prop: 'receivedQuantity', |
|
|
|
@ -461,10 +483,10 @@ export default { |
|
|
|
width: '180', |
|
|
|
width: '180', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'driverSigning', |
|
|
|
prop: 'signingStatusAll', |
|
|
|
label: '司机签收状态', |
|
|
|
label: '司机签收状态', |
|
|
|
type: 3, |
|
|
|
type: 3, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
@ -472,15 +494,15 @@ export default { |
|
|
|
checkarr: [ |
|
|
|
checkarr: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
value: '2', |
|
|
|
value: '2', |
|
|
|
label: '已签收', |
|
|
|
label: '已签收' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
value: '1', |
|
|
|
value: '1', |
|
|
|
label: '未签收', |
|
|
|
label: '未签收' |
|
|
|
}, |
|
|
|
} |
|
|
|
], |
|
|
|
], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: '', |
|
|
|
prop: '', |
|
|
|
@ -490,8 +512,8 @@ export default { |
|
|
|
width: '150', |
|
|
|
width: '150', |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: 'right', |
|
|
|
fixed: 'right', |
|
|
|
hide: true, |
|
|
|
hide: true |
|
|
|
}, |
|
|
|
} |
|
|
|
// 更多列的配置... |
|
|
|
// 更多列的配置... |
|
|
|
], |
|
|
|
], |
|
|
|
// 表单配置 |
|
|
|
// 表单配置 |
|
|
|
@ -655,14 +677,14 @@ export default { |
|
|
|
submitBtn: false, //隐藏提交按钮 |
|
|
|
submitBtn: false, //隐藏提交按钮 |
|
|
|
column: [ |
|
|
|
column: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "收货人姓名", |
|
|
|
label: '收货人姓名', |
|
|
|
labelWidth: '150', |
|
|
|
labelWidth: '150', |
|
|
|
span: 11, |
|
|
|
span: 11, |
|
|
|
prop: "consignee", |
|
|
|
prop: 'consignee', |
|
|
|
type: "input", |
|
|
|
type: 'input', |
|
|
|
width:"150px", |
|
|
|
width: '150px', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
disabled:true, |
|
|
|
disabled: true |
|
|
|
// rules: [{ |
|
|
|
// rules: [{ |
|
|
|
// required: true, |
|
|
|
// required: true, |
|
|
|
// message: "输入承运商编号", |
|
|
|
// message: "输入承运商编号", |
|
|
|
@ -670,52 +692,52 @@ export default { |
|
|
|
// }], |
|
|
|
// }], |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "收货人电话", |
|
|
|
label: '收货人电话', |
|
|
|
prop: "deliveryPhone", |
|
|
|
prop: 'deliveryPhone', |
|
|
|
labelWidth: '150', |
|
|
|
labelWidth: '150', |
|
|
|
span: 11, |
|
|
|
span: 11, |
|
|
|
type: "input", |
|
|
|
type: 'input', |
|
|
|
width:"150px", |
|
|
|
width: '150px', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
disabled:true, |
|
|
|
disabled: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "收货地址", |
|
|
|
label: '收货地址', |
|
|
|
prop: "deliveryAddress", |
|
|
|
prop: 'deliveryAddress', |
|
|
|
labelWidth: '150', |
|
|
|
labelWidth: '150', |
|
|
|
span: 11, |
|
|
|
span: 11, |
|
|
|
type: "input", |
|
|
|
type: 'input', |
|
|
|
width:"150px", |
|
|
|
width: '150px', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
disabled:true, |
|
|
|
disabled: true |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "签收类型", |
|
|
|
label: '签收类型', |
|
|
|
prop: "signingType", |
|
|
|
prop: 'signingType', |
|
|
|
labelWidth: '150', |
|
|
|
labelWidth: '150', |
|
|
|
span: 11, |
|
|
|
span: 11, |
|
|
|
type: "radio", |
|
|
|
type: 'radio', |
|
|
|
width:"150px", |
|
|
|
width: '150px', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
disabled:true, |
|
|
|
// disabled:true, |
|
|
|
dicData: [ |
|
|
|
dicData: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '签收', |
|
|
|
label: '签收', |
|
|
|
value: '1', |
|
|
|
value: '1' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '代签收', |
|
|
|
label: '代签收', |
|
|
|
value: '2', |
|
|
|
value: '2' |
|
|
|
} |
|
|
|
} |
|
|
|
], |
|
|
|
] |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: "司机签收图片", |
|
|
|
label: '司机签收图片', |
|
|
|
prop: "deliverySignPictures", |
|
|
|
prop: 'deliverySignPictures', |
|
|
|
labelWidth: '150', |
|
|
|
labelWidth: '150', |
|
|
|
type: 'upload', |
|
|
|
type: 'upload', |
|
|
|
listType: 'picture-card', |
|
|
|
listType: 'picture-card', |
|
|
|
width:"150px", |
|
|
|
width: '150px', |
|
|
|
span: 15, |
|
|
|
span: 15, |
|
|
|
multiple: true, |
|
|
|
multiple: true, |
|
|
|
align: 'left', |
|
|
|
align: 'left', |
|
|
|
@ -723,43 +745,43 @@ export default { |
|
|
|
limit: 5, |
|
|
|
limit: 5, |
|
|
|
propsHttp: { |
|
|
|
propsHttp: { |
|
|
|
res: 'data', |
|
|
|
res: 'data', |
|
|
|
url: 'link', |
|
|
|
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: [{ |
|
|
|
disabled: false |
|
|
|
required: true, |
|
|
|
|
|
|
|
message: "请上传图片", |
|
|
|
|
|
|
|
trigger: "blur" |
|
|
|
|
|
|
|
}], |
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
// { |
|
|
|
|
|
|
|
// 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: "备注", |
|
|
|
label: '备注', |
|
|
|
prop: "clerkSignRemarks", |
|
|
|
prop: 'clerkSignRemarks', |
|
|
|
labelWidth: '150', |
|
|
|
labelWidth: '150', |
|
|
|
span: 15, |
|
|
|
span: 15, |
|
|
|
type: "input", |
|
|
|
type: 'input', |
|
|
|
width:"150px", |
|
|
|
width: '150px', |
|
|
|
align:'center', |
|
|
|
align: 'center' |
|
|
|
}, |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
] |
|
|
|
] |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -777,7 +799,7 @@ export default { |
|
|
|
page: { |
|
|
|
page: { |
|
|
|
currentPage: 1, |
|
|
|
currentPage: 1, |
|
|
|
pageSize: 10, |
|
|
|
pageSize: 10, |
|
|
|
total: 40, |
|
|
|
total: 40 |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 表单数据 |
|
|
|
// 表单数据 |
|
|
|
form: {}, |
|
|
|
form: {}, |
|
|
|
@ -786,7 +808,7 @@ export default { |
|
|
|
// 表单配置 |
|
|
|
// 表单配置 |
|
|
|
option: option, |
|
|
|
option: option, |
|
|
|
// 表单列表 |
|
|
|
// 表单列表 |
|
|
|
data: [], |
|
|
|
data: [] |
|
|
|
}; |
|
|
|
}; |
|
|
|
}, |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
mounted() { |
|
|
|
@ -811,13 +833,13 @@ export default { |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
let arr=[] |
|
|
|
let arr = []; |
|
|
|
this.columnList.map(item => { |
|
|
|
this.columnList.map(item => { |
|
|
|
if (item.head) { |
|
|
|
if (item.head) { |
|
|
|
arr.push(item.label) |
|
|
|
arr.push(item.label); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.$functions.setStorage(window.location.pathname+'checkList',arr) |
|
|
|
this.$functions.setStorage(window.location.pathname + 'checkList', arr); |
|
|
|
} |
|
|
|
} |
|
|
|
if (flexListnewarr) { |
|
|
|
if (flexListnewarr) { |
|
|
|
this.columnList.map(item => { |
|
|
|
this.columnList.map(item => { |
|
|
|
@ -835,13 +857,13 @@ export default { |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
let arr=[] |
|
|
|
let arr = []; |
|
|
|
this.columnList.map(item => { |
|
|
|
this.columnList.map(item => { |
|
|
|
if (item.fixed) { |
|
|
|
if (item.fixed) { |
|
|
|
arr.push(item.label) |
|
|
|
arr.push(item.label); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.$functions.setStorage(window.location.pathname+'flexList',arr) |
|
|
|
this.$functions.setStorage(window.location.pathname + 'flexList', arr); |
|
|
|
} |
|
|
|
} |
|
|
|
if (sortlistnewarr) { |
|
|
|
if (sortlistnewarr) { |
|
|
|
this.columnList.map(item => { |
|
|
|
this.columnList.map(item => { |
|
|
|
@ -855,13 +877,13 @@ export default { |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
let arr=[] |
|
|
|
let arr = []; |
|
|
|
this.columnList.map(item => { |
|
|
|
this.columnList.map(item => { |
|
|
|
if (item.sortable) { |
|
|
|
if (item.sortable) { |
|
|
|
arr.push(item.label) |
|
|
|
arr.push(item.label); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.$functions.setStorage(window.location.pathname+'sortlist',arr) |
|
|
|
this.$functions.setStorage(window.location.pathname + 'sortlist', arr); |
|
|
|
} |
|
|
|
} |
|
|
|
// this.columnListedit=JSON.parse(JSON.stringify(this.columnList)) |
|
|
|
// this.columnListedit=JSON.parse(JSON.stringify(this.columnList)) |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -873,11 +895,11 @@ export default { |
|
|
|
ids.push(ele.id); |
|
|
|
ids.push(ele.id); |
|
|
|
}); |
|
|
|
}); |
|
|
|
return ids.join(','); |
|
|
|
return ids.join(','); |
|
|
|
}, |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
showdrawer(value) { |
|
|
|
showdrawer(value) { |
|
|
|
this.drawerShow=value |
|
|
|
this.drawerShow = value; |
|
|
|
}, |
|
|
|
}, |
|
|
|
/** |
|
|
|
/** |
|
|
|
* 弹窗的勾选回调，用于更改头部数组 |
|
|
|
* 弹窗的勾选回调，用于更改头部数组 |
|
|
|
@ -906,16 +928,16 @@ export default { |
|
|
|
// this.isDis = true; |
|
|
|
// this.isDis = true; |
|
|
|
this.$refs.signform.validate(valid => { |
|
|
|
this.$refs.signform.validate(valid => { |
|
|
|
if (valid) { |
|
|
|
if (valid) { |
|
|
|
let row = {} |
|
|
|
let row = {}; |
|
|
|
row.id = this.signform.id |
|
|
|
row.id = this.signform.id; |
|
|
|
row.clerkSignPictures = this.signform.clerkSignPictures |
|
|
|
row.clerkSignPictures = this.signform.clerkSignPictures; |
|
|
|
row.clerkSignRemarks = this.signform.clerkSignRemarks |
|
|
|
row.clerkSignRemarks = this.signform.clerkSignRemarks; |
|
|
|
row.signingStatus = '2' |
|
|
|
row.signingStatus = '2'; |
|
|
|
// if (!!row.id){ |
|
|
|
// if (!!row.id){ |
|
|
|
updatesign(row).then(() => { |
|
|
|
updatesign(row).then(() => { |
|
|
|
this.$message({ |
|
|
|
this.$message({ |
|
|
|
type: "success", |
|
|
|
type: 'success', |
|
|
|
message: "操作成功!" |
|
|
|
message: '操作成功!' |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.signBox = false; |
|
|
|
this.signBox = false; |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
@ -934,17 +956,17 @@ export default { |
|
|
|
console.log(row); |
|
|
|
console.log(row); |
|
|
|
}, |
|
|
|
}, |
|
|
|
handleSign(row) { |
|
|
|
handleSign(row) { |
|
|
|
console.log("签收>>>>>>>>>>",row); |
|
|
|
console.log('签收>>>>>>>>>>', row); |
|
|
|
// this.title = '查看'; |
|
|
|
// this.title = '查看'; |
|
|
|
// this.view = true; |
|
|
|
// this.view = true; |
|
|
|
this.signform = row |
|
|
|
this.signform = row; |
|
|
|
this.signBox = true; |
|
|
|
this.signBox = true; |
|
|
|
// this.wid= row.id |
|
|
|
// this.wid= row.id |
|
|
|
// this.getWrapdetails(this.wpage) |
|
|
|
// this.getWrapdetails(this.wpage) |
|
|
|
}, |
|
|
|
}, |
|
|
|
editsolt(scope) { |
|
|
|
editsolt(scope) { |
|
|
|
const { row } = scope; |
|
|
|
const { row } = scope; |
|
|
|
console.log("row>>>>>>>>>>>>>>>>>>>",row); |
|
|
|
console.log('row>>>>>>>>>>>>>>>>>>>', row); |
|
|
|
console.log(row); |
|
|
|
console.log(row); |
|
|
|
this.$router.push({ |
|
|
|
this.$router.push({ |
|
|
|
path: '/distribution/signfor/distributionSignforedt', |
|
|
|
path: '/distribution/signfor/distributionSignforedt', |
|
|
|
@ -958,9 +980,9 @@ export default { |
|
|
|
console.log(index, row); |
|
|
|
console.log(index, row); |
|
|
|
}, |
|
|
|
}, |
|
|
|
selectsc(index, row) { |
|
|
|
selectsc(index, row) { |
|
|
|
this.query[row.prop] =index |
|
|
|
this.query[row.prop] = index; |
|
|
|
if (!index) { |
|
|
|
if (!index) { |
|
|
|
delete this.query[row.prop] |
|
|
|
delete this.query[row.prop]; |
|
|
|
} |
|
|
|
} |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -968,16 +990,16 @@ export default { |
|
|
|
if (!!index) { |
|
|
|
if (!!index) { |
|
|
|
index = dayjs(index).format('YYYY-MM-DD'); |
|
|
|
index = dayjs(index).format('YYYY-MM-DD'); |
|
|
|
} |
|
|
|
} |
|
|
|
this.query[row.prop] = index |
|
|
|
this.query[row.prop] = index; |
|
|
|
if (!index) { |
|
|
|
if (!index) { |
|
|
|
delete this.query[row.prop] |
|
|
|
delete this.query[row.prop]; |
|
|
|
} |
|
|
|
} |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
}, |
|
|
|
}, |
|
|
|
inputsc(index, row) { |
|
|
|
inputsc(index, row) { |
|
|
|
this.query[row.prop] =index |
|
|
|
this.query[row.prop] = index; |
|
|
|
if (!index) { |
|
|
|
if (!index) { |
|
|
|
delete this.query[row.prop] |
|
|
|
delete this.query[row.prop]; |
|
|
|
} |
|
|
|
} |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -988,9 +1010,9 @@ export default { |
|
|
|
getDictionaryBiz('order_source').then(res => { |
|
|
|
getDictionaryBiz('order_source').then(res => { |
|
|
|
this.orderSourceData = res.data.data; |
|
|
|
this.orderSourceData = res.data.data; |
|
|
|
this.columnList[6].checkarr = res.data.data.map(item => { |
|
|
|
this.columnList[6].checkarr = res.data.data.map(item => { |
|
|
|
item.value=item.dictKey |
|
|
|
item.value = item.dictKey; |
|
|
|
item.label=item.dictValue |
|
|
|
item.label = item.dictValue; |
|
|
|
return item |
|
|
|
return item; |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
getDictionaryBiz('distribution_signfor_status').then(res => { |
|
|
|
getDictionaryBiz('distribution_signfor_status').then(res => { |
|
|
|
@ -999,9 +1021,9 @@ export default { |
|
|
|
getDictionaryBiz('distribution_type').then(res => { |
|
|
|
getDictionaryBiz('distribution_type').then(res => { |
|
|
|
this.deliveryTypeData = res.data.data; |
|
|
|
this.deliveryTypeData = res.data.data; |
|
|
|
this.columnList[4].checkarr = res.data.data.map(item => { |
|
|
|
this.columnList[4].checkarr = res.data.data.map(item => { |
|
|
|
item.value=item.dictKey |
|
|
|
item.value = item.dictKey; |
|
|
|
item.label=item.dictValue |
|
|
|
item.label = item.dictValue; |
|
|
|
return item |
|
|
|
return item; |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
}); |
|
|
|
}); |
|
|
|
@ -1015,7 +1037,17 @@ export default { |
|
|
|
searchChange() { |
|
|
|
searchChange() { |
|
|
|
if (this.query.querySigningStatus) { |
|
|
|
if (this.query.querySigningStatus) { |
|
|
|
this.query.signingStatus = this.query.querySigningStatus; |
|
|
|
this.query.signingStatus = this.query.querySigningStatus; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (this.query.businessType) { |
|
|
|
|
|
|
|
let businessType = this.query.businessType; |
|
|
|
|
|
|
|
switch (businessType) { |
|
|
|
|
|
|
|
case '商配': |
|
|
|
|
|
|
|
this.query.deliveryType = '1'; |
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
case '市配': |
|
|
|
|
|
|
|
this.query.deliveryType = '2'; |
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -1031,7 +1063,7 @@ export default { |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.$message({ |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|
type: 'success', |
|
|
|
message: '操作成功!', |
|
|
|
message: '操作成功!' |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
@ -1040,7 +1072,7 @@ export default { |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.$message({ |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|
type: 'success', |
|
|
|
message: '操作成功!', |
|
|
|
message: '操作成功!' |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1073,7 +1105,7 @@ export default { |
|
|
|
this.$confirm('确定将选择数据删除?', { |
|
|
|
this.$confirm('确定将选择数据删除?', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning', |
|
|
|
type: 'warning' |
|
|
|
}) |
|
|
|
}) |
|
|
|
.then(() => { |
|
|
|
.then(() => { |
|
|
|
return remove(this.ids); |
|
|
|
return remove(this.ids); |
|
|
|
@ -1083,7 +1115,7 @@ export default { |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.$message({ |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|
type: 'success', |
|
|
|
message: '操作成功!', |
|
|
|
message: '操作成功!' |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -1091,7 +1123,7 @@ export default { |
|
|
|
this.$confirm('确定将选择数据删除?', { |
|
|
|
this.$confirm('确定将选择数据删除?', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning', |
|
|
|
type: 'warning' |
|
|
|
}) |
|
|
|
}) |
|
|
|
.then(() => { |
|
|
|
.then(() => { |
|
|
|
return remove(row.id); |
|
|
|
return remove(row.id); |
|
|
|
@ -1100,7 +1132,7 @@ export default { |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.$message({ |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|
type: 'success', |
|
|
|
message: '操作成功!', |
|
|
|
message: '操作成功!' |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -1127,7 +1159,7 @@ export default { |
|
|
|
onLoad(page, params = {}) { |
|
|
|
onLoad(page, params = {}) { |
|
|
|
this.loading = true; |
|
|
|
this.loading = true; |
|
|
|
this.query.signingStatus = '1'; |
|
|
|
this.query.signingStatus = '1'; |
|
|
|
console.log("this.query>>>>>>>",this.query); |
|
|
|
console.log('this.query>>>>>>>', this.query); |
|
|
|
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
const data = res.data.data; |
|
|
|
const data = res.data.data; |
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
@ -1159,9 +1191,9 @@ export default { |
|
|
|
// this.selectionClear(); |
|
|
|
// this.selectionClear(); |
|
|
|
}); |
|
|
|
}); |
|
|
|
getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
this.statistics = res.data.data |
|
|
|
this.statistics = res.data.data; |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
} |
|
|
|
}, |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
</script> |
|
|
|
</script> |
|
|
|
|
