|
|
@@ -3,14 +3,15 @@
|
|
|
<el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
|
|
|
<div class="filter-container clearfix">
|
|
|
<template v-if="orderCategory == 1">
|
|
|
- <el-button type="primary" size="small" @click="save(1)" :disabled="clickLoading">保存</el-button>
|
|
|
- <el-button type="green" size="small" @click="save(2)" :disabled="clickLoading">保存并提交</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="save(1)" :disabled="clickLoading">保存</el-button>
|
|
|
+ <el-button type="green" size="mini" @click="save(2)" :disabled="clickLoading">保存并提交</el-button>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
- <el-button type="primary" size="small" @click="editOrder(1)" :disabled="clickLoading">修改保存</el-button>
|
|
|
- <el-button type="green" size="small" @click="editOrder(2)" :disabled="clickLoading">修改并提交</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="editOrder(1)" :disabled="clickLoading">修改保存</el-button>
|
|
|
+ <el-button type="green" size="mini" @click="editOrder(2)" :disabled="clickLoading">修改并提交</el-button>
|
|
|
</template>
|
|
|
<el-select
|
|
|
+ size="mini"
|
|
|
v-model="form.orderState">
|
|
|
<el-option
|
|
|
key="0"
|
|
|
@@ -38,54 +39,223 @@
|
|
|
<span v-else style="color: red;font-weight: 700">订单未上传原图文件</span>
|
|
|
</template>
|
|
|
</div>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="15">
|
|
|
+ <el-tag size="small" style="margin-left: 30px" effect="dark">基本信息</el-tag>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
<el-row :gutter="10">
|
|
|
- <el-col :span="5">
|
|
|
- <el-form-item label="下单客户">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item size="small" label="下单客户">
|
|
|
<el-input v-model="form.clientName" disabled></el-input><!--新建时下拉选择，其他时候不能编辑-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
- <el-form-item label="产品类型">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item size="small" label="产品类型">
|
|
|
<el-input v-model="form.productName" disabled></el-input><!--新建时下拉选择，其他时候不能编辑-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
- <el-form-item label="产品名称">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item size="small" label="产品名称">
|
|
|
<el-input v-model="form.productName" disabled></el-input><!--新建时下拉选择，其他时候不能编辑-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
- <el-form-item label="联数">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item size="small" label="联数">
|
|
|
<el-input v-model="form.productName" disabled></el-input><!--新建时下拉选择，其他时候不能编辑-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
- <el-form-item label="材料类型">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item size="small" label="材料类型">
|
|
|
<el-input v-model="form.productName" disabled></el-input><!--新建时下拉选择，其他时候不能编辑-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
- <el-form-item label="每本页数">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item size="small" label="每本页数">
|
|
|
<el-input v-model="form.productName" disabled></el-input><!--新建时下拉选择，其他时候不能编辑-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
- <el-form-item label="印刷颜色">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item size="small" label="印刷颜色">
|
|
|
<el-input v-model="form.productName" disabled></el-input><!--新建时下拉选择，其他时候不能编辑-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="10">
|
|
|
-
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item size="small" label="生产工艺">
|
|
|
+ <el-checkbox v-model="checked1">打码</el-checkbox>
|
|
|
+ <el-checkbox v-model="checked2">封面</el-checkbox>
|
|
|
+ <el-checkbox v-model="checked3">加垫</el-checkbox>
|
|
|
+ <el-checkbox v-model="checked4">不打码</el-checkbox>
|
|
|
+ <el-checkbox v-model="checked5">封面全包</el-checkbox>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
- <el-row :gutter="10">
|
|
|
-
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="15">
|
|
|
+ <el-tag size="small" style="margin-left: 30px" type="success" effect="dark">报价信息</el-tag>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
- <el-row :gutter="10">
|
|
|
-
|
|
|
+ <el-row :gutter="24" type="flex" justify="left">
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item size="small" label="数量">
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ allow-create
|
|
|
+ style="width: 63%"
|
|
|
+ v-model="form.orderQty">
|
|
|
+ <el-option
|
|
|
+ v-for="item in copiesProductSizeOptions"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <el-input v-model="form.order" placeholder="单位" style="width: 20%"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="单价">
|
|
|
+ <el-input type="number" v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="金额">
|
|
|
+ <el-input type="number" v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
- <el-row :gutter="10">
|
|
|
-
|
|
|
+ <el-row :gutter="24" type="flex" justify="left">
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item size="small" label="送货方式">
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ allow-create
|
|
|
+ v-model="form.orderQty">
|
|
|
+ <el-option
|
|
|
+ v-for="item in copiesProductSizeOptions"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item size="small" label="送货地址">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" type="flex" justify="left">
|
|
|
+ <el-col :span="13">
|
|
|
+ <el-form-item size="small" label="备注">
|
|
|
+ <el-input type="textarea" :rows="2" v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="0" type="flex" justify="left">
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="上传图片">
|
|
|
+ <el-button size="mini" type="success" round>选择</el-button>
|
|
|
+ <el-button size="mini" type="primary" round>查看</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="上传附件">
|
|
|
+ <el-button size="mini" type="success" round>选择</el-button>
|
|
|
+ <el-button size="mini" type="primary" round>查看</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" type="flex" justify="left">
|
|
|
+ <el-col :span="15">
|
|
|
+ <el-tag size="small" style="margin-left: 30px" type="warning" effect="dark">外发信息</el-tag>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="2" type="flex" justify="left">
|
|
|
+ <el-col :span="15">
|
|
|
+ <el-form-item size="small" label="">
|
|
|
+ <el-radio v-model="radio" label="1">常规</el-radio>
|
|
|
+ <el-radio v-model="radio" label="2">销售</el-radio>
|
|
|
+ <el-radio v-model="radio" label="3">自产</el-radio>
|
|
|
+ <el-radio v-model="radio" label="4">外发</el-radio>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" type="flex" justify="left">
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="部门">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="供货商">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" type="flex">
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="数量">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="单价">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="金额">
|
|
|
+ <el-input style="width: 145%" v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="运费">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="交期">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item size="small" label="提点">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" type="flex" justify="left">
|
|
|
+ <el-col :span="13">
|
|
|
+ <el-form-item size="small" label="外发备注">
|
|
|
+ <el-input type="textarea" :rows="2" v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" type="flex" justify="left">
|
|
|
+ <el-col :span="15">
|
|
|
+ <el-tag size="small" style="margin-left: 30px" type="danger" effect="dark">成本信息</el-tag>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="2" type="flex" justify="left">
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item size="small" label="合计成本">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item size="small" label="毛利">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item size="small" label="毛利率">
|
|
|
+ <el-input v-model="form.order"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
@@ -100,24 +270,24 @@ import {
|
|
|
calcOrderSendDate,
|
|
|
quotePrintOrder,
|
|
|
orderFormToken, parseAddress,
|
|
|
- reprintCommitOrder,reprintOrder,getClientBalanceMoneyWeb
|
|
|
+ reprintCommitOrder, reprintOrder, getClientBalanceMoneyWeb
|
|
|
} from '@/api/order/orderDetail.js'
|
|
|
import basePaperInfo from '@/views/baseInfo/paper/basePaperInfo'
|
|
|
import accessoriesInfo from '@/views/baseInfo/accessories/accessoriesInfo'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
-import {regionData, CodeToText, TextToCode} from 'element-china-area-data'
|
|
|
-import {getDictTypeInfo} from '@/api/productFile/partWorkProcessInfo'
|
|
|
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
|
|
|
+import { getDictTypeInfo } from '@/api/productFile/partWorkProcessInfo'
|
|
|
import Addressdny from '@/components/Dialog/Addressdny'
|
|
|
import PaperQuote from '@/views/baseInfo/paperQuote/paperQuote'
|
|
|
-import {checkCompleteDispatchOrder} from '@/api/order/tobeReviewed'
|
|
|
-import SelectAccessories from "@/views/select/accessoriesInfo";
|
|
|
-import {getWorkProcess} from "@/api/productFile/workProcessInfo";
|
|
|
-import DeliveryNotice from "@/components/deliveryNotice/deliveryNotice";
|
|
|
+import { checkCompleteDispatchOrder } from '@/api/order/tobeReviewed'
|
|
|
+import SelectAccessories from '@/views/select/accessoriesInfo';
|
|
|
+import { getWorkProcess } from '@/api/productFile/workProcessInfo';
|
|
|
+import DeliveryNotice from '@/components/deliveryNotice/deliveryNotice';
|
|
|
import clientInfo from '@/views/doc/client/clientList'
|
|
|
|
|
|
const form = {
|
|
|
/* 订单信息*/
|
|
|
- businessKind:'',
|
|
|
+ businessKind: '',
|
|
|
fileDescription: '',
|
|
|
originFileLink: '',
|
|
|
orderStatePrePay: '',
|
|
|
@@ -140,7 +310,7 @@ const form = {
|
|
|
orderType: '', // 订单类型
|
|
|
sendMemo: '', // 发货备注
|
|
|
deliverDate: '', // 交货日期
|
|
|
- deliverTime:'',//交货时间
|
|
|
+ deliverTime: '',//交货时间
|
|
|
paperRequireFlag: 0,
|
|
|
traceFlag: 0,
|
|
|
usePreStore: 0,
|
|
|
@@ -161,7 +331,7 @@ const form = {
|
|
|
|
|
|
// 部件信息
|
|
|
partList: [],
|
|
|
- versionCode:'',
|
|
|
+ versionCode: ''
|
|
|
}
|
|
|
|
|
|
const sendAddressInfo = {
|
|
|
@@ -188,7 +358,7 @@ export default {
|
|
|
SelectAccessories,
|
|
|
PaperQuote,
|
|
|
Addressdny,
|
|
|
- Pagination, basePaperInfo, accessoriesInfo,clientInfo
|
|
|
+ Pagination, basePaperInfo, accessoriesInfo, clientInfo
|
|
|
},
|
|
|
props: {
|
|
|
isEdit: {
|
|
|
@@ -222,17 +392,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
return {
|
|
|
- balanceSpan:false,
|
|
|
- balanceMoney:'',
|
|
|
+ balanceSpan: false,
|
|
|
+ balanceMoney: '',
|
|
|
innerTitle: '',
|
|
|
innerType: 2,
|
|
|
- createInnerVisible:false,
|
|
|
- PriceInfo:"",
|
|
|
- valueTime:"",
|
|
|
+ createInnerVisible: false,
|
|
|
+ PriceInfo: '',
|
|
|
+ valueTime: '',
|
|
|
formToken: '',
|
|
|
orderCategory: 1, // 1.新建，2.修改
|
|
|
editType: 1, //1 正常，2补印
|
|
|
- versionCode:'',
|
|
|
+ versionCode: '',
|
|
|
pageFrom: 0, //0普通 1待编辑页面 2待审核页面
|
|
|
baseInfo: {},
|
|
|
idOrder: '',
|
|
|
@@ -407,14 +577,14 @@ export default {
|
|
|
|
|
|
// 验证规则
|
|
|
rules: {
|
|
|
- orderName: [{required: true, trigger: 'blur', message: '请填写订单名称'}],
|
|
|
- cutKind: [{required: true, trigger: 'blur', message: '请选择'}],
|
|
|
- boxRequire: [{required: true, trigger: 'blur', message: '请选择'}],
|
|
|
- orderMoneyTotal: [{required: true, trigger: 'blur', validator: validateMoney}],
|
|
|
- orderMoneyPre: [{trigger: 'blur', validator: validateMoney}],
|
|
|
- orderMoneyPrint: [{trigger: 'blur', validator: validateMoney}],
|
|
|
- orderMoneyProcess: [{trigger: 'blur', validator: validateMoney}],
|
|
|
- deliverDate: [{required: true, trigger: 'blur', message: '请选择交货时间'}]
|
|
|
+ orderName: [{ required: true, trigger: 'blur', message: '请填写订单名称' }],
|
|
|
+ cutKind: [{ required: true, trigger: 'blur', message: '请选择' }],
|
|
|
+ boxRequire: [{ required: true, trigger: 'blur', message: '请选择' }],
|
|
|
+ orderMoneyTotal: [{ required: true, trigger: 'blur', validator: validateMoney }],
|
|
|
+ orderMoneyPre: [{ trigger: 'blur', validator: validateMoney }],
|
|
|
+ orderMoneyPrint: [{ trigger: 'blur', validator: validateMoney }],
|
|
|
+ orderMoneyProcess: [{ trigger: 'blur', validator: validateMoney }],
|
|
|
+ deliverDate: [{ required: true, trigger: 'blur', message: '请选择交货时间' }]
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -443,20 +613,20 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- loadNumber: function (event) {
|
|
|
+ loadNumber: function(event) {
|
|
|
var el = event.currentTarget;
|
|
|
var elValue = el.value;
|
|
|
var reg = /^((?!0)\d{1,2}|100)$/;
|
|
|
if (!elValue.match(reg)) {
|
|
|
- elValue = "";
|
|
|
- console.log("b")
|
|
|
+ elValue = '';
|
|
|
+ console.log('b')
|
|
|
return false;
|
|
|
} else {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
},
|
|
|
- getBalanceMoney(){
|
|
|
+ getBalanceMoney() {
|
|
|
var _that = this;
|
|
|
_that.balanceSpan = true;
|
|
|
var data = {
|
|
|
@@ -476,31 +646,31 @@ export default {
|
|
|
this.form.clientName = data.clientName;
|
|
|
this.form.idClient = data.id;
|
|
|
},
|
|
|
- handleGet(data){
|
|
|
+ handleGet(data) {
|
|
|
var _that = this
|
|
|
- _that.form.deliverDate = data.slice(0,10);
|
|
|
- _that.form.deliverTime = data.slice(11,19);
|
|
|
+ _that.form.deliverDate = data.slice(0, 10);
|
|
|
+ _that.form.deliverTime = data.slice(11, 19);
|
|
|
},
|
|
|
- mentChange(){
|
|
|
+ mentChange() {
|
|
|
var _that = this
|
|
|
_that.$nextTick(function() {
|
|
|
// console.log(_that.getNewDate());
|
|
|
_that.form.deliverTime = _that.getNewDate();
|
|
|
})
|
|
|
},
|
|
|
- getNewDate(){
|
|
|
+ getNewDate() {
|
|
|
//获取当前时间
|
|
|
var _this = this;
|
|
|
let yy = new Date().getFullYear();
|
|
|
- let mm = new Date().getMonth()+1;
|
|
|
+ let mm = new Date().getMonth() + 1;
|
|
|
let dd = new Date().getDate();
|
|
|
let hh = new Date().getHours();
|
|
|
- let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
|
|
|
- let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
|
|
|
- if(hh<10){
|
|
|
- return '0'+hh+':'+mf+':'+'00';
|
|
|
- }else {
|
|
|
- return hh+':'+mf+':'+'00';
|
|
|
+ let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes();
|
|
|
+ let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds();
|
|
|
+ if (hh < 10) {
|
|
|
+ return '0' + hh + ':' + mf + ':' + '00';
|
|
|
+ } else {
|
|
|
+ return hh + ':' + mf + ':' + '00';
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -508,7 +678,7 @@ export default {
|
|
|
setTagsViewTitle() {
|
|
|
const title = this.tempRoute.meta.title
|
|
|
// console.log("tempRoute2",this.tempRoute);
|
|
|
- const route = Object.assign({}, this.tempRoute, {title: `${title}-${this.orderCode}`})
|
|
|
+ const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.orderCode}` })
|
|
|
// console.log("route",route)
|
|
|
this.$store.dispatch('tagsView/updateVisitedView', route)
|
|
|
},
|
|
|
@@ -537,7 +707,7 @@ export default {
|
|
|
} else {
|
|
|
_that.getInfo()
|
|
|
}
|
|
|
- _that.balanceMoney=0;
|
|
|
+ _that.balanceMoney = 0;
|
|
|
_that.balanceSpan = false;
|
|
|
_that.getDictInfo('PrintRequire')
|
|
|
_that.getDictInfo('OrderPrintDesc')
|
|
|
@@ -595,8 +765,8 @@ export default {
|
|
|
orderMemo: data.orderMemo, // 订单备注
|
|
|
orderType: data.orderType, // 订单类型
|
|
|
sendMemo: data.sendMemo, // 发货备注
|
|
|
- deliverDate: "", // 交货日期
|
|
|
- deliverTime: "", // 交货时间
|
|
|
+ deliverDate: '', // 交货日期
|
|
|
+ deliverTime: '', // 交货时间
|
|
|
/* 发货信息*/
|
|
|
sendAddressList: data.sendAddressList,
|
|
|
/* 价格信息*/
|
|
|
@@ -619,11 +789,11 @@ export default {
|
|
|
partList: [],
|
|
|
deliverInformList: data.deliverInformList
|
|
|
}
|
|
|
- if(data.deliverDate){
|
|
|
- _that.form.deliverDate = data.deliverDate.slice(0,10); // 交货日期
|
|
|
- _that.form.deliverTime = data.deliverDate.slice(11,19); // 交货日期
|
|
|
+ if (data.deliverDate) {
|
|
|
+ _that.form.deliverDate = data.deliverDate.slice(0, 10); // 交货日期
|
|
|
+ _that.form.deliverTime = data.deliverDate.slice(11, 19); // 交货日期
|
|
|
}
|
|
|
- if(_that.editType==2){
|
|
|
+ if (_that.editType == 2) {
|
|
|
_that.form.usePreStore = 0
|
|
|
}
|
|
|
if (data.packRequire) {
|
|
|
@@ -1063,9 +1233,10 @@ export default {
|
|
|
addressOption.push(TextToCode[row.province][row.city].code)
|
|
|
addressOption.push(TextToCode[row.province][row.city][row.area].code)
|
|
|
}
|
|
|
- if(row.shipModeName){
|
|
|
+ if (row.shipModeName) {
|
|
|
this.sendKindChange(row.shipModeName)
|
|
|
- };
|
|
|
+ }
|
|
|
+ ;
|
|
|
|
|
|
if (this.addressType == 0) {
|
|
|
this.sendAddressList.splice(0, 1, sendAddressItem)
|
|
|
@@ -1111,18 +1282,18 @@ export default {
|
|
|
this.addressOption.splice(index, 1)
|
|
|
},
|
|
|
// 验证尺寸
|
|
|
- verifies1(value,parameterName) {
|
|
|
+ verifies1(value, parameterName) {
|
|
|
var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
- if(!reg.test(value)){
|
|
|
- this.$message.error('请输入正确的'+parameterName)
|
|
|
+ if (!reg.test(value)) {
|
|
|
+ this.$message.error('请输入正确的' + parameterName)
|
|
|
return
|
|
|
}
|
|
|
},
|
|
|
// 验证尺寸
|
|
|
- verifies2(value,parameterName) {
|
|
|
+ verifies2(value, parameterName) {
|
|
|
var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
- if(!reg.test(value)){
|
|
|
- this.$message.error('请输入正确的'+parameterName)
|
|
|
+ if (!reg.test(value)) {
|
|
|
+ this.$message.error('请输入正确的' + parameterName)
|
|
|
return
|
|
|
}
|
|
|
},
|
|
|
@@ -1433,9 +1604,9 @@ export default {
|
|
|
var data = response.data[0]
|
|
|
var sendAddressItem = Object.assign({}, sendAddressInfo)
|
|
|
sendAddressItem.linkMan = data.name
|
|
|
- if (data.mobile==null || data.mobile=="" || data.mobile==undefined) {
|
|
|
+ if (data.mobile == null || data.mobile == '' || data.mobile == undefined) {
|
|
|
sendAddressItem.linkPhone = data.phone
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
sendAddressItem.linkPhone = data.mobile
|
|
|
}
|
|
|
sendAddressItem.sendProvince = data.province
|
|
|
@@ -1478,10 +1649,10 @@ export default {
|
|
|
_that.$message.error('请选择发货方式')
|
|
|
return
|
|
|
}
|
|
|
- if(!_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- }else {
|
|
|
- var deliverDate = _that.form.deliverDate+" "+_that.form.deliverTime
|
|
|
+ if (!_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ } else {
|
|
|
+ var deliverDate = _that.form.deliverDate + ' ' + _that.form.deliverTime
|
|
|
}
|
|
|
execParams = {
|
|
|
'sendKind': _that.sendAddressList[0].sendKind,
|
|
|
@@ -1498,10 +1669,10 @@ export default {
|
|
|
_that.$message.error('请选择发货方式')
|
|
|
return
|
|
|
}
|
|
|
- if(!_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- }else {
|
|
|
- var deliverDate = _that.form.deliverDate+" "+_that.form.deliverTime
|
|
|
+ if (!_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ } else {
|
|
|
+ var deliverDate = _that.form.deliverDate + ' ' + _that.form.deliverTime
|
|
|
}
|
|
|
execParams = {
|
|
|
'sendKind': sendAddressList[0].sendKind,
|
|
|
@@ -1515,23 +1686,23 @@ export default {
|
|
|
calcOrderSendDate(data).then(response => {
|
|
|
// console.log(response)
|
|
|
const data = response.data
|
|
|
- if(data.itemData.deliverDate){
|
|
|
- _that.form.deliverDate = data.itemData.deliverDate.slice(0,10);
|
|
|
- _that.form.deliverTime = data.itemData.deliverDate.slice(11,19)
|
|
|
+ if (data.itemData.deliverDate) {
|
|
|
+ _that.form.deliverDate = data.itemData.deliverDate.slice(0, 10);
|
|
|
+ _that.form.deliverTime = data.itemData.deliverDate.slice(11, 19)
|
|
|
}
|
|
|
|
|
|
}).catch(err => {
|
|
|
_that.$message.error(err)
|
|
|
})
|
|
|
},
|
|
|
- sendKindChange(val){
|
|
|
+ sendKindChange(val) {
|
|
|
// console.log(val);
|
|
|
var _that = this
|
|
|
var execParams = {}
|
|
|
- if(!_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- }else {
|
|
|
- var deliverDate = _that.form.deliverDate+" "+_that.form.deliverTime
|
|
|
+ if (!_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ } else {
|
|
|
+ var deliverDate = _that.form.deliverDate + ' ' + _that.form.deliverTime
|
|
|
}
|
|
|
execParams = {
|
|
|
'sendKind': val,
|
|
|
@@ -1543,9 +1714,9 @@ export default {
|
|
|
calcOrderSendDate(data).then(response => {
|
|
|
// console.log(response)
|
|
|
const data = response.data
|
|
|
- if(data.itemData.deliverDate){
|
|
|
- _that.form.deliverDate = data.itemData.deliverDate.slice(0,10);
|
|
|
- _that.form.deliverTime = data.itemData.deliverDate.slice(11,19)
|
|
|
+ if (data.itemData.deliverDate) {
|
|
|
+ _that.form.deliverDate = data.itemData.deliverDate.slice(0, 10);
|
|
|
+ _that.form.deliverTime = data.itemData.deliverDate.slice(11, 19)
|
|
|
}
|
|
|
|
|
|
}).catch(err => {
|
|
|
@@ -1566,7 +1737,7 @@ export default {
|
|
|
})
|
|
|
_that.form.packRequire = packrequireArr.join('+')
|
|
|
// console.log(_that.form.packRequire);
|
|
|
- this.$refs['form'].validate(async (valid) => {
|
|
|
+ this.$refs['form'].validate(async(valid) => {
|
|
|
if (valid) {
|
|
|
if (_that.form.deliverDate === '' || _that.form.deliverDate == null) {
|
|
|
_that.$message.error('交货时间不能为空')
|
|
|
@@ -1590,7 +1761,7 @@ export default {
|
|
|
// 付款方式
|
|
|
var selectionArr = []
|
|
|
for (let j = 0; j < _that.payType.length; j++) {
|
|
|
- if(_that.payType[j].guarantee.indexOf("+")!= -1 || _that.payType[j].guarantee.indexOf(":")!= -1){
|
|
|
+ if (_that.payType[j].guarantee.indexOf('+') != -1 || _that.payType[j].guarantee.indexOf(':') != -1) {
|
|
|
_that.$message.error('输入框中不能出现符号+和:')
|
|
|
return
|
|
|
}
|
|
|
@@ -1613,7 +1784,7 @@ export default {
|
|
|
// return
|
|
|
// }
|
|
|
|
|
|
- if(_that.form.usePreStore==0){
|
|
|
+ if (_that.form.usePreStore == 0) {
|
|
|
if (parseInt(_that.sums) < parseInt(_that.form.orderMoneyTotal)) {
|
|
|
_that.$message.error('付款方式总计金额不能小于总金额')
|
|
|
return
|
|
|
@@ -1632,9 +1803,9 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
if (param.fieldType == 3) {
|
|
|
- var reg = new RegExp("^[0-9]*$");
|
|
|
+ var reg = new RegExp('^[0-9]*$');
|
|
|
// console.log(param.fieldType,reg.test(param.paramValue));
|
|
|
- if(!reg.test(param.paramValue)){
|
|
|
+ if (!reg.test(param.paramValue)) {
|
|
|
_that.$message.error('请输入正确的' + param.parameterName)
|
|
|
return
|
|
|
}
|
|
|
@@ -1642,16 +1813,16 @@ export default {
|
|
|
if (param.fieldType == 6) {
|
|
|
var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
// console.log(param.fieldType,reg.test(param.paramValue));
|
|
|
- if(!reg.test(param.paramValue)){
|
|
|
+ if (!reg.test(param.paramValue)) {
|
|
|
_that.$message.error('请输入正确的' + param.parameterName)
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (param.fieldType == 7) {
|
|
|
- var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
+ var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
// console.log(param.fieldType,reg.test(param.paramValue));
|
|
|
- if(!reg.test(param.paramValue)){
|
|
|
+ if (!reg.test(param.paramValue)) {
|
|
|
_that.$message.error('请输入正确的' + param.parameterName)
|
|
|
return
|
|
|
}
|
|
|
@@ -1662,7 +1833,7 @@ export default {
|
|
|
_that.$message.error('订单有预收款不能直接提交')
|
|
|
return
|
|
|
}
|
|
|
- _that.calculatePrice(2, function () {
|
|
|
+ _that.calculatePrice(2, function() {
|
|
|
if (_that.jsTotalMoney) {
|
|
|
if (_that.jsTotalMoney > _that.form.orderMoneyTotal || _that.form.orderMoneyTotal > _that.jsTotalMoney * 1.2) {
|
|
|
_that.$confirm(`计算金额为${_that.jsTotalMoney}元，请确认价格是否正确`, '提示', {
|
|
|
@@ -1755,9 +1926,9 @@ export default {
|
|
|
_that.clickLoading = true
|
|
|
_that.form.sendAddressList = _that.sendAddressList;
|
|
|
_that.createParameter();
|
|
|
- if(_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- deliverDate = _that.form.deliverDate.slice(0,10)+" "+_that.form.deliverTime;
|
|
|
+ if (_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
|
|
|
_that.form.deliverDate = deliverDate;
|
|
|
}
|
|
|
var data = JSON.stringify(_that.form)
|
|
|
@@ -1771,7 +1942,7 @@ export default {
|
|
|
if (response.httpCode == 200) {
|
|
|
_that.clickLoading = false
|
|
|
_that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
|
|
|
- _that.$router.push({path: '/order/tobeEditedOrder/0'})
|
|
|
+ _that.$router.push({ path: '/order/tobeEditedOrder/0' })
|
|
|
})
|
|
|
} else if (response.httpCode != 409) {
|
|
|
_that.getToken()
|
|
|
@@ -1792,9 +1963,9 @@ export default {
|
|
|
_that.clickLoading = true
|
|
|
_that.form.sendAddressList = _that.sendAddressList
|
|
|
_that.createParameter()
|
|
|
- if(_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- deliverDate = _that.form.deliverDate.slice(0,10)+" "+_that.form.deliverTime;
|
|
|
+ if (_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
|
|
|
_that.form.deliverDate = deliverDate;
|
|
|
}
|
|
|
var data = JSON.stringify(_that.form)
|
|
|
@@ -1806,7 +1977,7 @@ export default {
|
|
|
if (response.httpCode == 200) {
|
|
|
_that.clickLoading = false
|
|
|
_that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
|
|
|
- _that.$router.push({path: '/order/orderList'})
|
|
|
+ _that.$router.push({ path: '/order/orderList' })
|
|
|
})
|
|
|
} else if (response.httpCode != 409) {
|
|
|
_that.getToken()
|
|
|
@@ -1859,7 +2030,7 @@ export default {
|
|
|
// 付款方式
|
|
|
var selectionArr = []
|
|
|
for (let j = 0; j < _that.payType.length; j++) {
|
|
|
- if(_that.payType[j].guarantee.indexOf("+")!= -1 || _that.payType[j].guarantee.indexOf(":")!= -1){
|
|
|
+ if (_that.payType[j].guarantee.indexOf('+') != -1 || _that.payType[j].guarantee.indexOf(':') != -1) {
|
|
|
_that.$message.error('付款方式输入框中不能出现符号+和:')
|
|
|
return
|
|
|
}
|
|
|
@@ -1882,7 +2053,7 @@ export default {
|
|
|
// _that.$message.error('付款方式总计金额和预收款之和不等于总金额')
|
|
|
// return
|
|
|
// }
|
|
|
- if(_that.form.usePreStore==0){
|
|
|
+ if (_that.form.usePreStore == 0) {
|
|
|
if (parseInt(_that.sums) < parseInt(_that.form.orderMoneyTotal)) {
|
|
|
_that.$message.error('付款方式总计金额不能小于总金额')
|
|
|
return
|
|
|
@@ -1901,8 +2072,8 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
if (param.fieldType == 3) {
|
|
|
- var reg = new RegExp("^[0-9]*$");
|
|
|
- if(!reg.test(param.paramValue)){
|
|
|
+ var reg = new RegExp('^[0-9]*$');
|
|
|
+ if (!reg.test(param.paramValue)) {
|
|
|
_that.$message.error('请输入正确的' + param.parameterName)
|
|
|
return
|
|
|
}
|
|
|
@@ -1910,16 +2081,16 @@ export default {
|
|
|
if (param.fieldType == 6) {
|
|
|
var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
// console.log(param.fieldType,reg.test(param.paramValue));
|
|
|
- if(!reg.test(param.paramValue)){
|
|
|
+ if (!reg.test(param.paramValue)) {
|
|
|
_that.$message.error('请输入正确的' + param.parameterName)
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (param.fieldType == 7) {
|
|
|
- var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
+ var reg = /^(\d+([.]\d+)?)\*(\d+([.]\d+)?)\*(\d+([.]\d+)?)$/;
|
|
|
// console.log(param.fieldType,reg.test(param.paramValue));
|
|
|
- if(!reg.test(param.paramValue)){
|
|
|
+ if (!reg.test(param.paramValue)) {
|
|
|
_that.$message.error('请输入正确的' + param.parameterName)
|
|
|
return
|
|
|
}
|
|
|
@@ -1927,7 +2098,7 @@ export default {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- _that.calculatePrice(2, function () {
|
|
|
+ _that.calculatePrice(2, function() {
|
|
|
// console.log('_that.jsTotalMoney', _that.jsTotalMoney)
|
|
|
|
|
|
if (_that.jsTotalMoney) {
|
|
|
@@ -1988,24 +2159,24 @@ export default {
|
|
|
_that.form.sendAddressList = _that.sendAddressList
|
|
|
_that.form.partList = _that.partListNew
|
|
|
// console.log(_that.form)
|
|
|
- if(_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- deliverDate = _that.form.deliverDate.slice(0,10)+" "+_that.form.deliverTime;
|
|
|
+ if (_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
|
|
|
_that.form.deliverDate = deliverDate;
|
|
|
}
|
|
|
var data = JSON.stringify(_that.form)
|
|
|
- if(_that.editType == 1){
|
|
|
+ if (_that.editType == 1) {
|
|
|
updatePrintOrder(data).then(response => {
|
|
|
// console.log(response)
|
|
|
if (response.httpCode == 200) {
|
|
|
_that.clickLoading = false
|
|
|
_that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
|
|
|
if (_that.pageFrom == '2') {
|
|
|
- _that.$router.push({path: '/order/TobeReviewed/1'})
|
|
|
- } else if (_that.pageFrom == '1'){
|
|
|
- _that.$router.push({path: '/order/tobeEditedOrder/0'})
|
|
|
- }else {
|
|
|
- _that.$router.push({path: '/order/tobeEditedOrder/0'})
|
|
|
+ _that.$router.push({ path: '/order/TobeReviewed/1' })
|
|
|
+ } else if (_that.pageFrom == '1') {
|
|
|
+ _that.$router.push({ path: '/order/tobeEditedOrder/0' })
|
|
|
+ } else {
|
|
|
+ _that.$router.push({ path: '/order/tobeEditedOrder/0' })
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -2014,7 +2185,7 @@ export default {
|
|
|
// console.log(err)
|
|
|
// _that.$message.error(err)
|
|
|
})
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
reprintOrder(data, _that.formToken).then(response => {
|
|
|
// console.log(response)
|
|
|
if (response.httpCode == 200) {
|
|
|
@@ -2022,14 +2193,14 @@ export default {
|
|
|
|
|
|
_that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
|
|
|
if (_that.pageFrom == '2') {
|
|
|
- _that.$router.push({path: '/order/TobeReviewed/1'})
|
|
|
- } else if (_that.pageFrom == '1'){
|
|
|
- _that.$router.push({path: '/order/tobeEditedOrder/0'})
|
|
|
+ _that.$router.push({ path: '/order/TobeReviewed/1' })
|
|
|
+ } else if (_that.pageFrom == '1') {
|
|
|
+ _that.$router.push({ path: '/order/tobeEditedOrder/0' })
|
|
|
} else {
|
|
|
- _that.$router.push({path: '/order/tobeEditedOrder/0'})
|
|
|
+ _that.$router.push({ path: '/order/tobeEditedOrder/0' })
|
|
|
}
|
|
|
})
|
|
|
- }else if (response.httpCode != 409) {
|
|
|
+ } else if (response.httpCode != 409) {
|
|
|
_that.getToken()
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
@@ -2048,23 +2219,23 @@ export default {
|
|
|
_that.form.sendAddressList = _that.sendAddressList
|
|
|
_that.form.partList = _that.partListNew
|
|
|
|
|
|
- if(_that.editType == 2){
|
|
|
+ if (_that.editType == 2) {
|
|
|
_that.form.needImageProcess = 0;
|
|
|
- if(_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- deliverDate = _that.form.deliverDate.slice(0,10)+" "+_that.form.deliverTime;
|
|
|
+ if (_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
|
|
|
_that.form.deliverDate = deliverDate;
|
|
|
}
|
|
|
var data = JSON.stringify(_that.form)
|
|
|
_that.editAndPushSure(data)
|
|
|
} else {
|
|
|
- checkCompleteDispatchOrder({idOrder: _that.idOrder}).then(res => {
|
|
|
+ checkCompleteDispatchOrder({ idOrder: _that.idOrder }).then(res => {
|
|
|
// console.log(res)
|
|
|
if (res.data.length == 0) {
|
|
|
_that.form.needImageProcess = 0;
|
|
|
- if(_that.form.deliverDate){
|
|
|
- var deliverDate = "";
|
|
|
- deliverDate = _that.form.deliverDate.slice(0,10)+" "+_that.form.deliverTime;
|
|
|
+ if (_that.form.deliverDate) {
|
|
|
+ var deliverDate = '';
|
|
|
+ deliverDate = _that.form.deliverDate.slice(0, 10) + ' ' + _that.form.deliverTime;
|
|
|
_that.form.deliverDate = deliverDate;
|
|
|
}
|
|
|
var data = JSON.stringify(_that.form)
|
|
|
@@ -2076,7 +2247,6 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// var data = JSON.stringify(_that.form)
|
|
|
|
|
|
// console.log(data)
|
|
|
@@ -2095,18 +2265,18 @@ export default {
|
|
|
}
|
|
|
_that.clickLoading = true
|
|
|
// console.log(data)
|
|
|
- if(_that.editType == 1){
|
|
|
+ if (_that.editType == 1) {
|
|
|
editAndCommitPrintOrder(data).then(response => {
|
|
|
// console.log(response)
|
|
|
if (response.httpCode == 200) {
|
|
|
_that.clickLoading = false
|
|
|
_that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
|
|
|
if (_that.pageFrom == '2') {
|
|
|
- _that.$router.push({path: '/order/TobeReviewed/1'})
|
|
|
- } else if (_that.pageFrom == '1'){
|
|
|
- _that.$router.push({path: '/order/tobeEditedOrder/0'})
|
|
|
+ _that.$router.push({ path: '/order/TobeReviewed/1' })
|
|
|
+ } else if (_that.pageFrom == '1') {
|
|
|
+ _that.$router.push({ path: '/order/tobeEditedOrder/0' })
|
|
|
} else {
|
|
|
- _that.$router.push({path: '/order/tobeEditedOrder/0'})
|
|
|
+ _that.$router.push({ path: '/order/tobeEditedOrder/0' })
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -2115,19 +2285,19 @@ export default {
|
|
|
// console.log(err)
|
|
|
_that.$message.error(err)
|
|
|
})
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
reprintCommitOrder(data, _that.formToken).then(response => {
|
|
|
// console.log(response)
|
|
|
if (response.httpCode == 200) {
|
|
|
_that.clickLoading = false
|
|
|
_that.$store.dispatch('tagsView/delView', _that.tempRoute).then(() => {
|
|
|
if (_that.form.stateMemo == '待审核') {
|
|
|
- _that.$router.push({path: '/order/TobeReviewed/1'})
|
|
|
+ _that.$router.push({ path: '/order/TobeReviewed/1' })
|
|
|
} else {
|
|
|
- _that.$router.push({path: '/order/orderList'})
|
|
|
+ _that.$router.push({ path: '/order/orderList' })
|
|
|
}
|
|
|
})
|
|
|
- }else if (response.httpCode != 409) {
|
|
|
+ } else if (response.httpCode != 409) {
|
|
|
_that.getToken()
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
@@ -2142,7 +2312,7 @@ export default {
|
|
|
},
|
|
|
// 表格合计
|
|
|
getSummaries(param) {
|
|
|
- const {columns, data} = param
|
|
|
+ const { columns, data } = param
|
|
|
const sums = []
|
|
|
columns.forEach((column, index) => {
|
|
|
// 如果是第一列，则最后一行展示为“总计”两个字
|
|
|
@@ -2211,7 +2381,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
// 展开收起
|
|
|
- unfold: function (e, data, type) {
|
|
|
+ unfold: function(e, data, type) {
|
|
|
const dv = document.getElementById(data)
|
|
|
|
|
|
var pv = dv.parentNode
|
|
|
@@ -2332,4 +2502,5 @@ export default {
|
|
|
::v-deep .el-card__body {
|
|
|
padding: 10px;
|
|
|
}
|
|
|
+
|
|
|
</style>
|
