diff --git a/src/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue index 220f6ab..200fe5b 100644 --- a/src/views/order/components/billOfLading.vue +++ b/src/views/order/components/billOfLading.vue @@ -77,6 +77,33 @@ +
+
+ + + + + + + + +
+
我来修改/锁定
@@ -112,9 +139,9 @@
取消 - 订单确认 + + 订单确认 +
@@ -128,6 +155,29 @@ + + + + + + + +
取 消 @@ -147,6 +197,83 @@ 确 定 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 提交 +
+ @@ -156,6 +283,8 @@ import order from 'api/order.js' import refineryInfoServe from 'api/refineryInfo.js' import autocomplete from 'components/autocomplete/index.vue' +import utils from 'utils/encode' +const JSESSIONID = utils.uuid() export default { components: { autocomplete @@ -214,7 +343,17 @@ export default { driverName: [{ required: true, message: '请输入提货人', trigger: 'blur' }], identityCard: [{ required: true, message: '请输入提货人身份证号', trigger: 'blur' }], plateNumber: [{ required: true, message: '请输入提货车牌号', trigger: 'blur' }] - } + }, + uploadUrl: process.env.VUE_APP_ENV === 'development' ? '/api/oil-oss/obejct/uploadFile' : '/adminapi/oil-oss/obejct/uploadFile', + imgDialog: false, + headers: { + dataSources: 'WEB', + Authorization: localStorage.getItem('businessToken'), + JSESSIONID: JSESSIONID, + token: utils.bcrypt(JSESSIONID) + }, + fileList: [], + imageAdd: false } }, created() {}, @@ -241,18 +380,19 @@ export default { } else if (e.deliveryStatus == 'PLATENUM_LOCKED') { this.billAddData = JSON.parse(JSON.stringify(e)) this.billAddData.deliveryStatus = 'PLATENUM_SUCCESS' - this.$confirm('是否确认?', '提示', { type: 'info' }).then(() => { - console.log(this.billData.list, index, this.billAddData, 'aaaaaaaaaaa') - order.update(this.billAddData).then(res => { - if (res.code == 20000) { - this.billListMeth() - // this.$set(this.billData.list,index,this.billAddData) - this.$message.success(res.msg) - this.dialogBillAdd = false - this.$emit('closeWindow') - } - }) - }) + this.imageAdd = true + // this.$confirm('是否确认?', '提示', { type: 'info' }).then(() => { + // console.log(this.billData.list, index, this.billAddData, 'aaaaaaaaaaa') + // order.update(this.billAddData).then(res => { + // if (res.code == 20000) { + // this.billListMeth() + // // this.$set(this.billData.list,index,this.billAddData) + // this.$message.success(res.msg) + // this.dialogBillAdd = false + // this.$emit('closeWindow') + // } + // }) + // }) } }, orderTagType(val) { @@ -285,6 +425,10 @@ export default { }, //创建修改提货单 billAddSave(e) { + if (!this.billAddData.createImage) { + this.$message.error('请上传图片!') + return false + } this.$refs['form'].validate(valid => { if (valid) { if (!e) { @@ -394,6 +538,106 @@ export default { this.$emit('closeWindow') this.form = {} this.controlWindows.bill = false + }, + imageAddSave() { + console.log(this.billData.list, this.billAddData, 'aaaaaaaaaaa') + if (!this.billAddData.outboundImage || !this.billAddData.weighImage || !this.billAddData.customImage) { + this.$message.error('请上传图片!') + return false + } + order.update(this.billAddData).then(res => { + if (res.code == 20000) { + this.billListMeth() + this.$message.success(res.msg) + this.imageAdd = false + this.$emit('closeWindow') + } + }) + }, + beforeHandle(file) { + if (file.type.indexOf('image/') === -1) { + this.$message.error('上传的文件不是图片格式!') + return false + } else if (file.size / 1024 / 1024 > 5) { + this.$message.error('上传图片大小不能超过 5MB!') + return false + } + return true + }, + + // img大图 + handlePictureCardPreview(file) { + this.billAddData.createImage = file.url + this.imgDialog = true + }, + // img remove + handleRemove(file, fileList) { + this.billAddData.createImage = '' + }, + // 上传成功 + handleSuccess(response, file, fileList) { + if (response.code !== 20000) { + this.$message.error(response.msg) + this.fileList = [] + return + } + this.billAddData.createImage = response.data.publicUrl + }, + // OutboundImage img大图 + handlePictureCardPreviewOutboundImage(file) { + this.billAddData.outboundImage = file.url + this.imgDialog = true + }, + // img remove + handleRemoveOutboundImage(file, fileList) { + this.billAddData.outboundImage = '' + }, + // 上传成功 + handleSuccessOutboundImage(response, file, fileList) { + if (response.code !== 20000) { + this.$message.error(response.msg) + this.fileList = [] + return + } + this.billAddData.outboundImage = response.data.publicUrl + }, + + // WeighImage img大图 + handlePictureCardPreviewWeighImage(file) { + this.billAddData.weighImage = file.url + this.imgDialog = true + }, + // img remove + handleRemoveWeighImage(file, fileList) { + this.billAddData.weighImage = '' + }, + // 上传成功 + handleSuccessWeighImage(response, file, fileList) { + if (response.code !== 20000) { + this.$message.error(response.msg) + this.fileList = [] + return + } + this.billAddData.weighImage = response.data.publicUrl + }, + + // customImage img大图 + handlePictureCardPreviewCustomImage(file) { + this.billAddData.customImage = file.url + this.imgDialog = true + }, + // img remove + handleRemoveCustomImage(file, fileList) { + this.billAddData.customImage = '' + }, + // 上传成功 + handleSuccessCustomImage(response, file, fileList) { + if (response.code !== 20000) { + this.$message.error(response.msg) + this.fileList = [] + return + } + this.billAddData.customImage = response.data.publicUrl } } }