|
|
|
|
@ -128,7 +128,7 @@
|
|
|
|
|
<view class="list-title"><text style="color: #fa3534;">*</text>配送单照片</view>
|
|
|
|
|
<view class="devpicon">
|
|
|
|
|
<u-upload ref="uUploadps" :auto-upload="false" upload-text='' :max-size="10 * 1024 * 1024" max-count="3" :width="100" :height="100"
|
|
|
|
|
@on-remove="onRemovePS" @on-choose-complete="onChooseCompletePS" :file-list="itemList.deliveryPhoto"
|
|
|
|
|
@on-remove="onRemovePS" @on-choose-complete="onChooseCompletePS" :file-list="itemList.deliveryPhoto0"
|
|
|
|
|
:deletable="true" :source-type="sourceType" style="background-color: #ecf5ff;">
|
|
|
|
|
</u-upload>
|
|
|
|
|
</view>
|
|
|
|
|
@ -404,6 +404,7 @@ export default {
|
|
|
|
|
deliveryCar:'',// 车牌号
|
|
|
|
|
files: [],
|
|
|
|
|
deliveryPhoto:[], // 配送单图片
|
|
|
|
|
deliveryPhoto0:[],
|
|
|
|
|
departCode:"",
|
|
|
|
|
workshop:"",
|
|
|
|
|
location:"",
|
|
|
|
|
@ -600,7 +601,10 @@ export default {
|
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
|
new Compressor(file, {
|
|
|
|
|
quality: 0.3, // 压缩质量,范围是0-1
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小,单位是字节。如果图片大小小于这个值,则不进行压缩。
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> e53878004c989de2e23cc181dc0c247667489fee
|
|
|
|
|
success: (compressedFile) => {
|
|
|
|
|
// 读取压缩后的图片文件为base64
|
|
|
|
|
const reader = new FileReader();
|
|
|
|
|
@ -668,7 +672,7 @@ export default {
|
|
|
|
|
const base64 = evt.target.result.substr(22)
|
|
|
|
|
console.log("base64",base64)
|
|
|
|
|
resolve(base64)
|
|
|
|
|
that.itemList.deliveryPhoto[index]['url']="data:image/png;base64"+base64;
|
|
|
|
|
that.itemList.deliveryPhoto0[index]['url']="data:image/png;base64"+base64;
|
|
|
|
|
that.$forceUpdate();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -689,14 +693,17 @@ export default {
|
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
|
new Compressor(file, {
|
|
|
|
|
quality: 0.3, // 压缩质量,范围是0-1
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
convertSize: 1048576, // 如果大于1M(1024*1024)进行压缩 转换后的图片大小,单位是字节。如果图片大小小于这个值,则不进行压缩。
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> e53878004c989de2e23cc181dc0c247667489fee
|
|
|
|
|
success: (compressedFile) => {
|
|
|
|
|
// 读取压缩后的图片文件为base64
|
|
|
|
|
const reader = new FileReader();
|
|
|
|
|
reader.onload = (e) => {
|
|
|
|
|
const base64 = e.target.result;
|
|
|
|
|
resolve(base64);
|
|
|
|
|
that.itemList.deliveryPhoto[index]={
|
|
|
|
|
that.itemList.deliveryPhoto0[index]={
|
|
|
|
|
url:base64
|
|
|
|
|
};
|
|
|
|
|
that.$forceUpdate();
|
|
|
|
|
@ -1281,7 +1288,7 @@ export default {
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(!this.itemList.deliveryPhoto||this.itemList.deliveryPhoto.length<1){
|
|
|
|
|
if(!this.itemList.deliveryPhoto0&&this.itemList.deliveryPhoto0.length<1){
|
|
|
|
|
this.$refs.uToast.show({
|
|
|
|
|
title: "请上传配送单图片!",
|
|
|
|
|
type: "warning",
|
|
|
|
|
@ -1292,9 +1299,10 @@ export default {
|
|
|
|
|
|
|
|
|
|
// 配送单图片
|
|
|
|
|
this.itemList.files=[];
|
|
|
|
|
this.itemList.deliveryPhoto.forEach(item=>{
|
|
|
|
|
this.itemList.deliveryPhoto0.forEach(item=>{
|
|
|
|
|
this.itemList.files.push(item.url);
|
|
|
|
|
});
|
|
|
|
|
this.itemList.deliveryPhoto=this.itemList.files
|
|
|
|
|
this.$forceUpdate();
|
|
|
|
|
|
|
|
|
|
var data=[];
|
|
|
|
|
|