|
|
@@ -101,11 +101,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
- <el-form-item
|
|
|
- label="发货方式"
|
|
|
- prop="sendtype"
|
|
|
- label-width="90px"
|
|
|
- >
|
|
|
+ <el-form-item label="发货方式" prop="sendtype" label-width="90px">
|
|
|
<el-select
|
|
|
v-model="ruleForm.sendtype"
|
|
|
placeholder="发货方式"
|
|
|
@@ -122,7 +118,11 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="2" style="text-align: right">
|
|
|
- <el-button :size="'mini'" type="primary" @click="submitForm"
|
|
|
+ <el-button
|
|
|
+ :size="'mini'"
|
|
|
+ type="primary"
|
|
|
+ :disabled="loading"
|
|
|
+ @click="submitForm"
|
|
|
>保 存
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -138,11 +138,7 @@
|
|
|
<el-col :span="12">
|
|
|
<el-row>
|
|
|
<el-col :span="12"
|
|
|
- ><el-form-item
|
|
|
- label="凭证类型"
|
|
|
- prop="proof_type"
|
|
|
- label-width="85px"
|
|
|
- >
|
|
|
+ ><el-form-item label="凭证类型" prop="proof_type" label-width="85px">
|
|
|
<el-select
|
|
|
v-model="ruleForm.proof_type"
|
|
|
@change="set_proof_url()"
|
|
|
@@ -160,11 +156,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item
|
|
|
- label="到货时间"
|
|
|
- prop="arrtime"
|
|
|
- label-width="85px"
|
|
|
- >
|
|
|
+ <el-form-item label="到货时间" prop="arrtime" label-width="85px">
|
|
|
<el-date-picker
|
|
|
v-model="ruleForm.arrtime"
|
|
|
type="date"
|
|
|
@@ -180,19 +172,11 @@
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item
|
|
|
- label="凭证文件"
|
|
|
- prop="proof_url"
|
|
|
- label-width="85px"
|
|
|
- >
|
|
|
+ <el-form-item label="凭证文件" prop="proof_url" label-width="85px">
|
|
|
<ul class="shangchuan-ul">
|
|
|
<li v-if="ruleForm.proof_type === '1'" class="shiping">
|
|
|
<div v-if="video_url" class="clearfix">
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="300"
|
|
|
- trigger="hover"
|
|
|
- >
|
|
|
+ <el-popover placement="top" width="300" trigger="hover">
|
|
|
<video width="275" controls class="fl">
|
|
|
<source :src="video_url" type="video/mp4" />
|
|
|
<source :src="video_url" type="video/avi" />
|
|
|
@@ -218,16 +202,12 @@
|
|
|
<i class="el-icon-plus avatar-uploader-icon"></i>
|
|
|
<video-upload
|
|
|
class="Upload"
|
|
|
- :disabled="
|
|
|
- type === 'view' || type === 'editCoin'
|
|
|
- "
|
|
|
+ :disabled="type === 'view' || type === 'editCoin'"
|
|
|
:accept="'.mp4,.avi'"
|
|
|
:multiple="false"
|
|
|
:uploadcondition="beforeVideoUpload"
|
|
|
@UploadErrorEvent="UploadVideoEventproof_url"
|
|
|
- @UploadSuccessEvent="
|
|
|
- UploadSuccessVideoproof_url
|
|
|
- "
|
|
|
+ @UploadSuccessEvent="UploadSuccessVideoproof_url"
|
|
|
/>
|
|
|
</div>
|
|
|
|
|
|
@@ -258,16 +238,12 @@
|
|
|
<i class="el-icon-plus avatar-uploader-icon"></i>
|
|
|
<file-upload
|
|
|
class="Upload"
|
|
|
- :disabled="
|
|
|
- type === 'view' || type === 'editCoin'
|
|
|
- "
|
|
|
+ :disabled="type === 'view' || type === 'editCoin'"
|
|
|
:accept="'.jpg,.png,.jpeg'"
|
|
|
:multiple="false"
|
|
|
:uploadcondition="beforeAvatarUpload"
|
|
|
@UploadErrorEvent="UploadErrorEventproof_url"
|
|
|
- @UploadSuccessEvent="
|
|
|
- UploadSuccessEventproof_url
|
|
|
- "
|
|
|
+ @UploadSuccessEvent="UploadSuccessEventproof_url"
|
|
|
></file-upload>
|
|
|
</div>
|
|
|
<div class="txt-tips fl">
|
|
|
@@ -278,9 +254,7 @@
|
|
|
</li>
|
|
|
<li v-if="ruleForm.proof_type === '3'" class="qita">
|
|
|
<div v-if="other_url" class="clearfix">
|
|
|
- <a :href="other_url" download="凭证文件"
|
|
|
- >点击下载</a
|
|
|
- >
|
|
|
+ <a :href="other_url" download="凭证文件">点击下载</a>
|
|
|
|
|
|
<el-link
|
|
|
:underline="false"
|
|
|
@@ -300,9 +274,7 @@
|
|
|
:multiple="false"
|
|
|
:uploadcondition="beforeOtherUpload"
|
|
|
@UploadErrorEvent="UploadErrorOtherproof_url"
|
|
|
- @UploadSuccessEvent="
|
|
|
- UploadSuccessOtherproof_url
|
|
|
- "
|
|
|
+ @UploadSuccessEvent="UploadSuccessOtherproof_url"
|
|
|
/>
|
|
|
</div>
|
|
|
<div class="txt-tips fl">
|
|
|
@@ -318,11 +290,7 @@
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item
|
|
|
- label="其他单号"
|
|
|
- prop="workNo"
|
|
|
- label-width="115px"
|
|
|
- >
|
|
|
+ <el-form-item label="其他单号" prop="workNo" label-width="115px">
|
|
|
<el-input
|
|
|
v-model="ruleForm.workNo"
|
|
|
maxlength="2000"
|
|
|
@@ -372,9 +340,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
v-if="scope.row.edit"
|
|
|
- :prop="
|
|
|
- 'order_addr.' + scope.$index + '.' + 'receipt_quantity'
|
|
|
- "
|
|
|
+ :prop="'order_addr.' + scope.$index + '.' + 'receipt_quantity'"
|
|
|
:rules="addrRules.receipt_quantity"
|
|
|
:size="'mini'"
|
|
|
:style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
@@ -386,9 +352,7 @@
|
|
|
maxlength="10"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <span v-if="!scope.row.edit">{{
|
|
|
- scope.row.receipt_quantity
|
|
|
- }}</span>
|
|
|
+ <span v-if="!scope.row.edit">{{ scope.row.receipt_quantity }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -464,9 +428,7 @@
|
|
|
@selectChange="select_area_change($event, scope.$index)"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <span v-if="!scope.row.edit">{{
|
|
|
- scope.row.addr_code_name
|
|
|
- }}</span>
|
|
|
+ <span v-if="!scope.row.edit">{{ scope.row.addr_code_name }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -584,7 +546,7 @@
|
|
|
</el-card>
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
- <script>
|
|
|
+<script>
|
|
|
import resToken from "@/mixins/resToken";
|
|
|
import asyncRequest from "@/apis/service/sellOut/zixunOrder";
|
|
|
import searchStockGoodModal from "@/components/search-stock-good-modal";
|
|
|
@@ -662,9 +624,7 @@ export default {
|
|
|
],
|
|
|
pickerOptions: {
|
|
|
disabledDate: (time) => {
|
|
|
- return (
|
|
|
- time.getTime() < new Date(this.sitem.in_arrival_time).getTime()
|
|
|
- );
|
|
|
+ return time.getTime() < new Date(this.sitem.in_arrival_time).getTime();
|
|
|
},
|
|
|
},
|
|
|
|
|
|
@@ -867,8 +827,7 @@ export default {
|
|
|
if (this.$refs.ruleForm) {
|
|
|
this.$refs.ruleForm.resetFields();
|
|
|
this.$refs.ruleForm.clearValidate();
|
|
|
- const { bidNo, in_num, in_arrival_time, sale_price, remark } =
|
|
|
- this.sitem;
|
|
|
+ const { bidNo, in_num, in_arrival_time, sale_price, remark } = this.sitem;
|
|
|
this.ruleForm = {
|
|
|
bidNo: bidNo || "", //竞价单反馈编号
|
|
|
good_num: in_num || "0", //商品数量
|
|
|
@@ -956,63 +915,62 @@ export default {
|
|
|
async submitForm() {
|
|
|
await this.$refs.ruleForm.validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
- if (!this.loading) {
|
|
|
- this.loading = true;
|
|
|
- let model = JSON.parse(JSON.stringify(this.ruleForm));
|
|
|
- model.order_addr = [];
|
|
|
- const { sendtype, good_num } = model;
|
|
|
- const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
|
|
|
- if (sendtype === "1" && order_addr && order_addr.length === 0) {
|
|
|
- this.$message.warning("至少上传一个地址信息！");
|
|
|
+ if (this.loading) return;
|
|
|
+ this.loading = true;
|
|
|
+ let model = JSON.parse(JSON.stringify(this.ruleForm));
|
|
|
+ model.order_addr = [];
|
|
|
+ const { sendtype, good_num } = model;
|
|
|
+ const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
|
|
|
+ if (sendtype === "1" && order_addr && order_addr.length === 0) {
|
|
|
+ this.$message.warning("至少上传一个地址信息！");
|
|
|
+ this.loading = false;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (sendtype === "1") {
|
|
|
+ let addrT = 0,
|
|
|
+ isAEdit = false;
|
|
|
+ order_addr.forEach((v2) => {
|
|
|
+ if (v2.edit) {
|
|
|
+ isAEdit = true;
|
|
|
+ }
|
|
|
+ addrT += parseInt(v2.receipt_quantity + "");
|
|
|
+ let model2 = {
|
|
|
+ addr_code: v2.addr_code.toString(),
|
|
|
+ contactor: v2.contactor,
|
|
|
+ mobile: v2.mobile,
|
|
|
+ addr: v2.addr,
|
|
|
+ receipt_quantity: v2.receipt_quantity,
|
|
|
+ };
|
|
|
+ model.order_addr.push(model2);
|
|
|
+ });
|
|
|
+
|
|
|
+ if (isAEdit) {
|
|
|
+ this.$message.warning("请保存地址信息！");
|
|
|
this.loading = false;
|
|
|
return;
|
|
|
}
|
|
|
- if (sendtype === "1") {
|
|
|
- let addrT = 0,
|
|
|
- isAEdit = false;
|
|
|
- order_addr.forEach((v2) => {
|
|
|
- if (v2.edit) {
|
|
|
- isAEdit = true;
|
|
|
- }
|
|
|
- addrT += parseInt(v2.receipt_quantity + "");
|
|
|
- let model2 = {
|
|
|
- addr_code: v2.addr_code.toString(),
|
|
|
- contactor: v2.contactor,
|
|
|
- mobile: v2.mobile,
|
|
|
- addr: v2.addr,
|
|
|
- receipt_quantity: v2.receipt_quantity,
|
|
|
- };
|
|
|
- model.order_addr.push(model2);
|
|
|
- });
|
|
|
-
|
|
|
- if (isAEdit) {
|
|
|
- this.$message.warning("请保存地址信息！");
|
|
|
- this.loading = false;
|
|
|
- return;
|
|
|
- }
|
|
|
- if (parseInt(good_num + "") !== addrT) {
|
|
|
- this.$message.warning("收货总数量与购买不一致！");
|
|
|
- this.loading = false;
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
- this.loading = false;
|
|
|
- let res = await asyncRequest.consultorder(model);
|
|
|
- this.loading = false;
|
|
|
- if (res && res.code === 0) {
|
|
|
- this.$notify.success({
|
|
|
- title: "下单成功！",
|
|
|
- message: "",
|
|
|
- });
|
|
|
- this.showModelThis = false;
|
|
|
- // 刷新
|
|
|
- this.$emit("refresh");
|
|
|
- } else if (res && res.code >= 100 && res.code <= 104) {
|
|
|
- await this.logout();
|
|
|
- } else {
|
|
|
- this.$message.warning(res.message);
|
|
|
+ if (parseInt(good_num + "") !== addrT) {
|
|
|
+ this.$message.warning("收货总数量与购买不一致！");
|
|
|
+ this.loading = false;
|
|
|
+ return;
|
|
|
}
|
|
|
}
|
|
|
+ this.loading = false;
|
|
|
+ let res = await asyncRequest.consultorder(model);
|
|
|
+ this.loading = false;
|
|
|
+ if (res && res.code === 0) {
|
|
|
+ this.$notify.success({
|
|
|
+ title: "下单成功！",
|
|
|
+ message: "",
|
|
|
+ });
|
|
|
+ this.showModelThis = false;
|
|
|
+ // 刷新
|
|
|
+ this.$emit("refresh");
|
|
|
+ } else if (res && res.code >= 100 && res.code <= 104) {
|
|
|
+ await this.logout();
|
|
|
+ } else {
|
|
|
+ this.$message.warning(res.message);
|
|
|
+ }
|
|
|
} else {
|
|
|
console.log("error submit!!");
|
|
|
return false;
|
|
|
@@ -1181,8 +1139,7 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-
|
|
|
- <style lang="scss" scoped>
|
|
|
+<style lang="scss" scoped>
|
|
|
// .capitalClaim {
|
|
|
.excelUploadBox {
|
|
|
position: relative;
|
|
|
@@ -1250,4 +1207,4 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
// }
|
|
|
-</style>
|
|
|
+</style>
|
