|
|
@@ -1,6 +1,12 @@
|
|
|
<template>
|
|
|
<ele-modal :visible.sync="visible" :title="title" width="80vw" append-to-body>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="90px" class="create-form">
|
|
|
+ <el-form
|
|
|
+ ref="form"
|
|
|
+ :model="form"
|
|
|
+ :rules="rules"
|
|
|
+ label-width="90px"
|
|
|
+ class="create-form"
|
|
|
+ >
|
|
|
<el-row :gutter="15">
|
|
|
<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
|
<el-form-item label="销售订单号:">
|
|
|
@@ -19,7 +25,11 @@
|
|
|
</el-col>
|
|
|
<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
|
<el-form-item label="订单类型:">
|
|
|
- <el-select v-model="form.orderType" placeholder="请选择" @change="chooseType">
|
|
|
+ <el-select
|
|
|
+ v-model="form.orderType"
|
|
|
+ placeholder="请选择"
|
|
|
+ @change="chooseType"
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="item in typeList"
|
|
|
:key="item.id"
|
|
|
@@ -42,7 +52,11 @@
|
|
|
</el-col>
|
|
|
<el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
|
|
|
<el-form-item label="客户名称:">
|
|
|
- <el-input clearable v-model="form.customerName" :disabled="form.orderType==3"/>
|
|
|
+ <el-input
|
|
|
+ clearable
|
|
|
+ v-model="form.customerName"
|
|
|
+ :disabled="form.orderType == 3"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
|
@@ -53,7 +67,7 @@
|
|
|
<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
|
<el-form-item label="交付日期:" prop="deliveryTime">
|
|
|
<el-date-picker
|
|
|
- :picker-options="pickerOptions"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
style="width: 100%"
|
|
|
v-model="form.deliveryTime"
|
|
|
type="date"
|
|
|
@@ -147,22 +161,23 @@
|
|
|
import { getCode } from '@/api/codeManagement';
|
|
|
import EquipmentDialog from '../components/EquipmentDialog.vue';
|
|
|
import { createOrUpdate, getOrderDetail } from '@/api/saleOrder';
|
|
|
- import dayjs from "dayjs"
|
|
|
+ import dayjs from 'dayjs';
|
|
|
export default {
|
|
|
components: {
|
|
|
EquipmentDialog
|
|
|
},
|
|
|
data () {
|
|
|
-
|
|
|
return {
|
|
|
visible: false,
|
|
|
loading: false,
|
|
|
form: {
|
|
|
productInfoList: [],
|
|
|
- deliveryRequirements:1,
|
|
|
- orderType:1,
|
|
|
- orderLibraryType:2,
|
|
|
- deliveryTime: dayjs(new Date().getTime() + 3600 * 1000 * 24 * 10).format('YYYY-MM-DD')
|
|
|
+ deliveryRequirements: 1,
|
|
|
+ orderType: 1,
|
|
|
+ orderLibraryType: 2,
|
|
|
+ deliveryTime: dayjs(
|
|
|
+ new Date().getTime() + 3600 * 1000 * 24 * 10
|
|
|
+ ).format('YYYY-MM-DD')
|
|
|
},
|
|
|
// 表单验证规则
|
|
|
rules: {
|
|
|
@@ -176,13 +191,14 @@
|
|
|
{ id: 3, label: '预制订单' }
|
|
|
],
|
|
|
title: '创建订单',
|
|
|
- pickerOptions: {
|
|
|
- disabledDate: (time) => { // 禁用日期
|
|
|
- let nowData = new Date()
|
|
|
- nowData = new Date(nowData.setDate(nowData.getDate() - 1))
|
|
|
- return time < nowData
|
|
|
- }
|
|
|
- }
|
|
|
+ pickerOptions: {
|
|
|
+ disabledDate: (time) => {
|
|
|
+ // 禁用日期
|
|
|
+ let nowData = new Date();
|
|
|
+ nowData = new Date(nowData.setDate(nowData.getDate() - 1));
|
|
|
+ return time < nowData;
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -211,10 +227,12 @@
|
|
|
cancel () {
|
|
|
this.form = {
|
|
|
productInfoList: [],
|
|
|
- deliveryRequirements:1,
|
|
|
- orderType:1,
|
|
|
- orderLibraryType:2,
|
|
|
- deliveryTime: dayjs(new Date().getTime() + 3600 * 1000 * 24 * 10).format('YYYY-MM-DD')
|
|
|
+ deliveryRequirements: 1,
|
|
|
+ orderType: 1,
|
|
|
+ orderLibraryType: 2,
|
|
|
+ deliveryTime: dayjs(
|
|
|
+ new Date().getTime() + 3600 * 1000 * 24 * 10
|
|
|
+ ).format('YYYY-MM-DD')
|
|
|
};
|
|
|
this.$refs.form.clearValidate();
|
|
|
this.visible = false;
|
|
|
@@ -249,15 +267,15 @@
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
- // 选择订单类型
|
|
|
- chooseType(val){
|
|
|
- if(val==2){
|
|
|
- this.$set(this.form,'orderLibraryType',1)
|
|
|
- }else{
|
|
|
- this.$set(this.form,'orderLibraryType',2)
|
|
|
- }
|
|
|
- },
|
|
|
+
|
|
|
+ // 选择订单类型
|
|
|
+ chooseType (val) {
|
|
|
+ if (val == 2) {
|
|
|
+ this.$set(this.form, 'orderLibraryType', 1);
|
|
|
+ } else {
|
|
|
+ this.$set(this.form, 'orderLibraryType', 2);
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
async getSaleCode () {
|
|
|
const res = await getCode('sale_order');
|
|
|
@@ -269,9 +287,13 @@
|
|
|
confirmChoose (list) {
|
|
|
list = list.map((item, index) => {
|
|
|
return {
|
|
|
+ categoryId: item.id,
|
|
|
productCode: item.code,
|
|
|
productName: item.name,
|
|
|
- productUnitWeight: item.netWeightUnit=='G'?item.netWeight*1000000 /1000000000:item.netWeight ,
|
|
|
+ productUnitWeight:
|
|
|
+ item.netWeightUnit == 'G'
|
|
|
+ ? (item.netWeight * 1000000) / 1000000000
|
|
|
+ : item.netWeight,
|
|
|
model: item.modelType,
|
|
|
brandNo: item.brandNum
|
|
|
};
|
|
|
@@ -333,7 +355,7 @@
|
|
|
margin: 10px 0;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
- .create-form .el-form-item{
|
|
|
- margin-bottom: 15px!important;
|
|
|
+ .create-form .el-form-item {
|
|
|
+ margin-bottom: 15px !important;
|
|
|
}
|
|
|
</style>
|