|
@@ -1,40 +1,26 @@
|
|
<template>
|
|
<template>
|
|
<div class="bg-in-stock" ref="printId">
|
|
<div class="bg-in-stock" ref="printId">
|
|
- <!-- <h2 v-if="barcodeValue">订单编号</h2> -->
|
|
|
|
- <div class="numOrder" v-if="barcodeValue">
|
|
|
|
|
|
+ <!-- <h2 v-if="barcodeValue">订单编号</h2> -->
|
|
|
|
+ <div class="numOrder" v-if="barcodeValue &&type !=='pone'">
|
|
<barcode :value="barcodeValue"></barcode>
|
|
<barcode :value="barcodeValue"></barcode>
|
|
</div>
|
|
</div>
|
|
- <el-form
|
|
|
|
- ref="orderFormRef"
|
|
|
|
- :rules="rules"
|
|
|
|
- :model="OrderForm"
|
|
|
|
- label-width="120px"
|
|
|
|
- inline
|
|
|
|
- :disabled="isDetail"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-form ref="orderFormRef" :rules="rules" :model="OrderForm" label-width="120px" inline :disabled="isDetail">
|
|
<h3>基本信息</h3>
|
|
<h3>基本信息</h3>
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
<el-form-item label="订单类型" prop="type" :rules="rules.type">
|
|
<el-form-item label="订单类型" prop="type" :rules="rules.type">
|
|
<!-- @change="cleanGoodsList" -->
|
|
<!-- @change="cleanGoodsList" -->
|
|
- <el-select v-model="OrderForm.type" clearable>
|
|
|
|
- <el-option
|
|
|
|
- v-for="(item, index) in orderTypeList"
|
|
|
|
- :key="index"
|
|
|
|
- :label="item.label"
|
|
|
|
- :value="item.value"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-select v-model="OrderForm.type" clearable :disabled="type=='pone'">
|
|
|
|
+ <el-option v-for="(item, index) in orderTypeList" :key="index" :label="item.label" :value="item.value" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="租赁时间"
|
|
|
|
- prop="time"
|
|
|
|
- :rules="rules.time"
|
|
|
|
- v-if="OrderForm.type == 'TO_C'"
|
|
|
|
- >
|
|
|
|
- <!-- -->
|
|
|
|
|
|
+ <el-form-item label="起始时间" prop="time" :rules="rules.start_time" v-if="OrderForm.type == 'TO_C'" >
|
|
|
|
+ <el-date-picker v-model="OrderForm.start_time" type="datetime" placeholder="选择日期时间" :disabled="type=='pone'"
|
|
|
|
+ :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss">
|
|
|
|
+ </el-date-picker>
|
|
|
|
+ <!--
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="time"
|
|
v-model="time"
|
|
type="daterange"
|
|
type="daterange"
|
|
@@ -62,125 +48,62 @@
|
|
shortcuts: MixinPickerShortcuts,
|
|
shortcuts: MixinPickerShortcuts,
|
|
}"
|
|
}"
|
|
>
|
|
>
|
|
- </el-date-picker>
|
|
|
|
|
|
+ </el-date-picker>-->
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="下单客户"
|
|
|
|
- prop="member_id"
|
|
|
|
- :rules="rules.member_id"
|
|
|
|
- >
|
|
|
|
- <el-select v-model="OrderForm.member_id" clearable>
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in customerList"
|
|
|
|
- :key="item.id"
|
|
|
|
- :label="item.name"
|
|
|
|
- :value="item.id"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-form-item label="下单客户" prop="member_id" :rules="rules.member_id" >
|
|
|
|
+ <el-select v-model="OrderForm.member_id" clearable :disabled="type=='pone'">
|
|
|
|
+ <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
- <el-button type="primary" @click="addCust">新增客户</el-button>
|
|
|
|
|
|
+ <el-button type="primary" v-if="type!=='pone'" @click="addCust">新增客户</el-button>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="付款方式"
|
|
|
|
- prop="pay_type"
|
|
|
|
- :rules="rules.pay_type"
|
|
|
|
- >
|
|
|
|
- <el-select v-model="OrderForm.pay_type" clearable>
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in collectingAccountList"
|
|
|
|
- :key="item.id"
|
|
|
|
- :label="item.name"
|
|
|
|
- :value="item.id"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-form-item label="付款方式" prop="pay_type" :rules="rules.pay_type" >
|
|
|
|
+ <el-select v-model="OrderForm.pay_type" clearable :disabled="type=='pone'">
|
|
|
|
+ <el-option v-for="item in collectingAccountList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="应付金额:"
|
|
|
|
- prop="pay_price"
|
|
|
|
- :rules="rules.pay_price"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
|
|
<span>{{ "¥" + price }}</span>
|
|
<span>{{ "¥" + price }}</span>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="实付金额:"
|
|
|
|
- prop="pay_price"
|
|
|
|
- :rules="rules.pay_price"
|
|
|
|
- >
|
|
|
|
- <!-- @input="validateNumber" -->
|
|
|
|
- <span
|
|
|
|
- >折扣:<el-input
|
|
|
|
- placeholder="请输入"
|
|
|
|
- v-model="discount"
|
|
|
|
- @blur="handleBlur"
|
|
|
|
- style="width: 70px"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-form-item label="实付金额:" prop="pay_price" :rules="rules.pay_price">
|
|
|
|
+ <!-- @input="validateNumber" -->
|
|
|
|
+ <span>折扣:<el-input placeholder="请输入" v-model="discount" @blur="handleBlur" style="width: 70px" :disabled="type=='pone'"></el-input>
|
|
</span>
|
|
</span>
|
|
<span>折后金额:</span>
|
|
<span>折后金额:</span>
|
|
- <el-input
|
|
|
|
- v-model="OrderForm.real_price"
|
|
|
|
- placeholder="请输入"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type=='pone'"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
<el-form-item label="销售人员" :rules="rules.marketing_id">
|
|
<el-form-item label="销售人员" :rules="rules.marketing_id">
|
|
- <el-select v-model="OrderForm.marketing_id" clearable>
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in marketingList"
|
|
|
|
- :key="item.id"
|
|
|
|
- :label="item.real_name"
|
|
|
|
- :value="item.id"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-select v-model="OrderForm.marketing_id" clearable :disabled="type=='pone'">
|
|
|
|
+ <el-option v-for="item in marketingList" :key="item.id" :label="item.real_name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="配送方式"
|
|
|
|
- prop="send_type"
|
|
|
|
- :rules="rules.send_type"
|
|
|
|
- >
|
|
|
|
- <el-select v-model="OrderForm.send_type" clearable>
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in deliveryTypeList"
|
|
|
|
- :key="item.code"
|
|
|
|
- :label="item.name"
|
|
|
|
- :value="item.code"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-form-item label="配送方式" prop="send_type" :rules="rules.send_type" >
|
|
|
|
+ <el-select v-model="OrderForm.send_type" clearable :disabled="type=='pone'">
|
|
|
|
+ <el-option v-for="item in deliveryTypeList" :key="item.code" :label="item.name" :value="item.code" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="配送仓库"
|
|
|
|
- prop="warehouse_id"
|
|
|
|
- :rules="rules.warehouse_id"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-form-item label="配送仓库" prop="warehouse_id" :rules="rules.warehouse_id" >
|
|
<!-- <el-cascader v-model="OrderForm.dept_id" :options="deptList" :props="{
|
|
<!-- <el-cascader v-model="OrderForm.dept_id" :options="deptList" :props="{
|
|
label: 'name',
|
|
label: 'name',
|
|
value: 'id',
|
|
value: 'id',
|
|
emitPath: false,
|
|
emitPath: false,
|
|
checkStrictly: true
|
|
checkStrictly: true
|
|
}" clearable></el-cascader> -->
|
|
}" clearable></el-cascader> -->
|
|
- <el-select
|
|
|
|
- @change="cleanGoodsList"
|
|
|
|
- v-model="OrderForm.warehouse_id"
|
|
|
|
- multiple
|
|
|
|
- clearable
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in warehouseList"
|
|
|
|
- :key="item.id"
|
|
|
|
- :label="item.name"
|
|
|
|
- :value="item.id"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-select @change="cleanGoodsList" v-model="OrderForm.warehouse_id" multiple clearable :disabled="type=='pone'">
|
|
|
|
+ <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -194,38 +117,23 @@
|
|
:value="item.id"
|
|
:value="item.id"
|
|
/>
|
|
/>
|
|
</el-select> -->
|
|
</el-select> -->
|
|
- <el-cascader
|
|
|
|
- size="large"
|
|
|
|
- :options="options"
|
|
|
|
- clearable
|
|
|
|
- v-model="selectedOptions"
|
|
|
|
- @change="handleChange"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-cascader size="large" :options="options" clearable v-model="selectedOptions" @change="handleChange" :disabled="type=='pone'">
|
|
</el-cascader>
|
|
</el-cascader>
|
|
- <el-input
|
|
|
|
- v-model="OrderForm.address"
|
|
|
|
- placeholder="请输入"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="OrderForm.address" placeholder="请输入" :disabled="type=='pone'"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
- <el-form-item
|
|
|
|
- label="允许负库存"
|
|
|
|
- >
|
|
|
|
- <el-radio-group v-model="OrderForm.subtract_stock">
|
|
|
|
- <el-radio :label="false">禁止</el-radio>
|
|
|
|
- <el-radio :label="true">允许</el-radio>
|
|
|
|
- </el-radio-group>
|
|
|
|
|
|
+ <el-form-item label="允许负库存">
|
|
|
|
+ <el-radio-group v-model="OrderForm.subtract_stock" :disabled="type=='pone'">
|
|
|
|
+ <el-radio :label="false">禁止</el-radio>
|
|
|
|
+ <el-radio :label="true">允许</el-radio>
|
|
|
|
+ </el-radio-group>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
<div class="redClass">
|
|
<div class="redClass">
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
|
- <el-input
|
|
|
|
- v-model="OrderForm.remark"
|
|
|
|
- type="textarea"
|
|
|
|
- :autosize="{ minRows: 2 }"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-form-item label="备注" prop="remark" >
|
|
|
|
+ <el-input v-model="OrderForm.remark" type="textarea" :autosize="{ minRows: 2 }" :disabled="type=='pone'"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</div>
|
|
</div>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -233,25 +141,18 @@
|
|
<div style="margin-bottom: 10px">
|
|
<div style="margin-bottom: 10px">
|
|
<h3>商品明细</h3>
|
|
<h3>商品明细</h3>
|
|
<div v-if="!isDetail">
|
|
<div v-if="!isDetail">
|
|
- <el-button
|
|
|
|
- class="button"
|
|
|
|
- size="mini"
|
|
|
|
- type="primary"
|
|
|
|
- @click="handleSelectGoods"
|
|
|
|
- >手动选择</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-button class="button" size="mini" type="primary" @click="handleSelectGoods">手动选择</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div style="display: block">
|
|
<div style="display: block">
|
|
- <el-table
|
|
|
|
- :data="OrderForm.product_list"
|
|
|
|
- border
|
|
|
|
- :cell-style="{ textAlign: 'center' }"
|
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
|
- :header-cell-style="{ textAlign: 'center' }"
|
|
|
|
- style="width: 95%"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table :data="OrderForm.product_list" border :cell-style="{ textAlign: 'center' }"
|
|
|
|
+ @selection-change="handleSelectionChange" :header-cell-style="{ textAlign: 'center' }" style="width: 95%">
|
|
<el-table-column type="selection" width="40" align="center" />
|
|
<el-table-column type="selection" width="40" align="center" />
|
|
|
|
+ <el-table-column label="图标">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <img :src="scope.row.goods_vo.image_small_list[0].original" alt="" width="50px">
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column label="仓库名称">
|
|
<el-table-column label="仓库名称">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
{{ warehouseName(scope.row.warehouse_id) }}
|
|
{{ warehouseName(scope.row.warehouse_id) }}
|
|
@@ -293,12 +194,7 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="订单数量">
|
|
<el-table-column label="订单数量">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <el-input
|
|
|
|
- v-model="scope.row.num"
|
|
|
|
- type="number"
|
|
|
|
- :min="0"
|
|
|
|
- :maxlength="20"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="scope.row.num" type="number" :min="0" :maxlength="20"></el-input>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="库存数量">
|
|
<el-table-column label="库存数量">
|
|
@@ -306,12 +202,19 @@
|
|
{{ scope.row.usable_stock }}
|
|
{{ scope.row.usable_stock }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="差异">
|
|
|
|
|
|
+ <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <el-date-picker style="width: 170px;" v-model="scope.row.end_time" type="datetime" placeholder="选择日期时间"
|
|
|
|
+ :picker-options="pickerOptionsEnd" value-format="yyyy-MM-dd HH:mm:ss">
|
|
|
|
+ </el-date-picker>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <!-- <el-table-column label="差异">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
{{ scope.row.usable_stock - scope.row.num || 0 }}
|
|
{{ scope.row.usable_stock - scope.row.num || 0 }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <!-- <el-table-column label="数量">
|
|
|
|
|
|
+ <el-table-column label="数量">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-form-item v-if="!isDetail" :prop="'product_list.'+scope.$index+'.num'" :rules="rules.product_list.num" class="tableFormItem">
|
|
<el-form-item v-if="!isDetail" :prop="'product_list.'+scope.$index+'.num'" :rules="rules.product_list.num" class="tableFormItem">
|
|
<el-input v-model="scope.row.num" :maxlength="20" :minlength="1"></el-input>
|
|
<el-input v-model="scope.row.num" :maxlength="20" :minlength="1"></el-input>
|
|
@@ -364,13 +267,9 @@
|
|
<span v-else>{{ scope.row.remark }}</span>
|
|
<span v-else>{{ scope.row.remark }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column> -->
|
|
</el-table-column> -->
|
|
- <el-table-column label="操作" v-if="!isDetail">
|
|
|
|
|
|
+ <el-table-column label="操作" v-if="!isDetail&& type!=='pone'">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <el-button
|
|
|
|
- size="mini"
|
|
|
|
- type="danger"
|
|
|
|
- @click="OrderForm.product_list.splice(scope.$index, 1)"
|
|
|
|
- >删除
|
|
|
|
|
|
+ <el-button size="mini" type="danger" @click="OrderForm.product_list.splice(scope.$index, 1)">删除
|
|
</el-button>
|
|
</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -421,97 +320,42 @@
|
|
</el-table>
|
|
</el-table>
|
|
</div> -->
|
|
</div> -->
|
|
<div class="footer">
|
|
<div class="footer">
|
|
- <el-button
|
|
|
|
- type="primary"
|
|
|
|
- @click="submitOrderForm"
|
|
|
|
- v-if="!isDetail"
|
|
|
|
- :loading="formLoading"
|
|
|
|
- >保存</el-button
|
|
|
|
- >
|
|
|
|
- <el-button
|
|
|
|
- type="primary"
|
|
|
|
- @click="saveSubmitOrderForm"
|
|
|
|
- v-if="!isDetail"
|
|
|
|
- :loading="formLoading"
|
|
|
|
- >确认并保存</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-button type="primary" @click="submit" v-if="!isDetail&&type=='pone'" :loading="formLoading">确认</el-button>
|
|
|
|
+ <el-button type="primary" @click="submitOrderForm" v-if="!isDetail&&type!=='pone'" :loading="formLoading">保存</el-button>
|
|
|
|
+ <el-button type="primary" @click="saveSubmitOrderForm" v-if="!isDetail&&type!=='pone'" :loading="formLoading">确认并保存</el-button>
|
|
<el-button @click="printIng" :disabled="false" v-if="isDetail">打印</el-button>
|
|
<el-button @click="printIng" :disabled="false" v-if="isDetail">打印</el-button>
|
|
<!-- <el-button type="primary" :disabled="false" @click="handleAudit(true)" v-if="isDetail && checkPermission(['order:audit']) && OrderForm.allowable.audit">审核通过</el-button>
|
|
<!-- <el-button type="primary" :disabled="false" @click="handleAudit(true)" v-if="isDetail && checkPermission(['order:audit']) && OrderForm.allowable.audit">审核通过</el-button>
|
|
<el-button type="danger" :disabled="false" @click="handleAudit(false)" v-if="isDetail && checkPermission(['order:audit']) && OrderForm.allowable.audit">审核驳回</el-button> -->
|
|
<el-button type="danger" :disabled="false" @click="handleAudit(false)" v-if="isDetail && checkPermission(['order:audit']) && OrderForm.allowable.audit">审核驳回</el-button> -->
|
|
<el-button @click="roBack()" :disabled="false">返回</el-button>
|
|
<el-button @click="roBack()" :disabled="false">返回</el-button>
|
|
</div>
|
|
</div>
|
|
</el-form>
|
|
</el-form>
|
|
- <el-dialog
|
|
|
|
- title="添加客户信息"
|
|
|
|
- :visible.sync="customer.dialogVisible"
|
|
|
|
- width="1100px"
|
|
|
|
- @open="handleDialogOpen"
|
|
|
|
- :modal-append-to-body="false"
|
|
|
|
- :close-on-click-modal="false"
|
|
|
|
- :close-on-press-escape="false"
|
|
|
|
- >
|
|
|
|
- <el-form
|
|
|
|
- :model="customer.supplierForm"
|
|
|
|
- :rules="customer.supplierRules"
|
|
|
|
- ref="supplierForm"
|
|
|
|
- label-width="120px"
|
|
|
|
- inline
|
|
|
|
- >
|
|
|
|
|
|
+ <el-dialog title="添加客户信息" :visible.sync="customer.dialogVisible" width="1100px" @open="handleDialogOpen"
|
|
|
|
+ :modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false">
|
|
|
|
+ <el-form :model="customer.supplierForm" :rules="customer.supplierRules" ref="supplierForm" label-width="120px"
|
|
|
|
+ inline>
|
|
<el-form-item label="公司名称" prop="name">
|
|
<el-form-item label="公司名称" prop="name">
|
|
- <el-input
|
|
|
|
- v-model="customer.supplierForm.name"
|
|
|
|
- :minlength="2"
|
|
|
|
- :maxlength="20"
|
|
|
|
- clearable
|
|
|
|
- placeholder="请输入公司名称"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="customer.supplierForm.name" :minlength="2" :maxlength="20" clearable
|
|
|
|
+ placeholder="请输入公司名称"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="客户联系人" prop="contact ">
|
|
<el-form-item label="客户联系人" prop="contact ">
|
|
- <el-input
|
|
|
|
- v-model="customer.supplierForm.contact"
|
|
|
|
- :minlength="2"
|
|
|
|
- :maxlength="20"
|
|
|
|
- clearable
|
|
|
|
- placeholder="请输入客户联系人"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="customer.supplierForm.contact" :minlength="2" :maxlength="20" clearable
|
|
|
|
+ placeholder="请输入客户联系人"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="性别" prop="gender">
|
|
<el-form-item label="性别" prop="gender">
|
|
- <el-radio v-model="customer.supplierForm.gender" label="男"
|
|
|
|
- >男</el-radio
|
|
|
|
- >
|
|
|
|
- <el-radio v-model="customer.supplierForm.gender" label="女"
|
|
|
|
- >女</el-radio
|
|
|
|
- >
|
|
|
|
|
|
+ <el-radio v-model="customer.supplierForm.gender" label="男">男</el-radio>
|
|
|
|
+ <el-radio v-model="customer.supplierForm.gender" label="女">女</el-radio>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="手机号码" prop="mobile">
|
|
<el-form-item label="手机号码" prop="mobile">
|
|
- <el-input
|
|
|
|
- v-model="customer.supplierForm.mobile"
|
|
|
|
- :minlength="2"
|
|
|
|
- :maxlength="20"
|
|
|
|
- clearable
|
|
|
|
- placeholder="请输入手机号码"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="customer.supplierForm.mobile" :minlength="2" :maxlength="20" clearable
|
|
|
|
+ placeholder="请输入手机号码"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="邮件" prop="email">
|
|
<el-form-item label="邮件" prop="email">
|
|
- <el-input
|
|
|
|
- v-model="customer.supplierForm.email"
|
|
|
|
- :minlength="2"
|
|
|
|
- :maxlength="20"
|
|
|
|
- clearable
|
|
|
|
- placeholder="请输入电子邮件"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="customer.supplierForm.email" :minlength="2" :maxlength="20" clearable
|
|
|
|
+ placeholder="请输入电子邮件"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="客户类别" prop="type">
|
|
<el-form-item label="客户类别" prop="type">
|
|
- <el-select
|
|
|
|
- v-model="customer.supplierForm.type"
|
|
|
|
- placeholder="请选择客户类别"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="item in customer.options"
|
|
|
|
- :key="item.value"
|
|
|
|
- :label="item.label"
|
|
|
|
- :value="item.value"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-select v-model="customer.supplierForm.type" placeholder="请选择客户类别">
|
|
|
|
+ <el-option v-for="item in customer.options" :key="item.value" :label="item.label" :value="item.value">
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -557,6 +401,7 @@ const initOrderForm = {
|
|
send_type: "express",
|
|
send_type: "express",
|
|
subtract_stock: false,
|
|
subtract_stock: false,
|
|
payment_status: "NOT_PAY",
|
|
payment_status: "NOT_PAY",
|
|
|
|
+ start_time: null,
|
|
};
|
|
};
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -591,7 +436,8 @@ export default {
|
|
address: "",
|
|
address: "",
|
|
province_city_area_address: "",
|
|
province_city_area_address: "",
|
|
subtract_stock: false,
|
|
subtract_stock: false,
|
|
- warehouse_id:[],
|
|
|
|
|
|
+ warehouse_id: [],
|
|
|
|
+ start_time: null,
|
|
},
|
|
},
|
|
formLoading: false,
|
|
formLoading: false,
|
|
isDetail: undefined,
|
|
isDetail: undefined,
|
|
@@ -763,28 +609,29 @@ export default {
|
|
],
|
|
],
|
|
},
|
|
},
|
|
supplierForm: {},
|
|
supplierForm: {},
|
|
- options: [
|
|
|
|
- /* {
|
|
|
|
- value: '全部',
|
|
|
|
- label: '全部'
|
|
|
|
- },{
|
|
|
|
- value: '销售客户',
|
|
|
|
- label: '销售客户'
|
|
|
|
- }, {
|
|
|
|
- value: '租赁客户',
|
|
|
|
- label: '租赁客户'
|
|
|
|
- }, */
|
|
|
|
- ],
|
|
|
|
|
|
+ options: [],
|
|
},
|
|
},
|
|
//折扣
|
|
//折扣
|
|
discount: '',
|
|
discount: '',
|
|
|
|
+ pickerOptions: {
|
|
|
|
+ disabledDate(v) {
|
|
|
|
+ return v.getTime() < new Date().getTime() - 86400000;// - 86400000是否包括当天
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ pickerOptionsEnd:{
|
|
|
|
+ disabledDate(time){
|
|
|
|
+ // 禁用所有在 start_time 之前的时间
|
|
|
|
+ return time.getTime() < new Date().getTime() ;
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ type:'',
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
- ...mapGetters(["user"]),
|
|
|
|
|
|
+ ...mapGetters(["user"])
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
- console.log(this.OrderForm);
|
|
|
|
|
|
+ this.type=this.$route.params.type
|
|
this.GET_WarehouseList();
|
|
this.GET_WarehouseList();
|
|
this.GET_MemberList();
|
|
this.GET_MemberList();
|
|
this.GET_MarketingList();
|
|
this.GET_MarketingList();
|
|
@@ -801,18 +648,18 @@ export default {
|
|
this.discount = ''; // 清空不符合条件的输入
|
|
this.discount = ''; // 清空不符合条件的输入
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- /* //折扣正则
|
|
|
|
- handleInput(event) {
|
|
|
|
- // 使用正则表达式来检查输入是否为1到10的整数或最多两位小数
|
|
|
|
- const value = event.target.value;
|
|
|
|
- const regex = /^(10|([1-9](\.\d{0,1})?))$/;
|
|
|
|
- console.log(regex.test(value) || value === '');
|
|
|
|
- if (regex.test(value) || value === '') {
|
|
|
|
- this.discount = value;
|
|
|
|
- } else {
|
|
|
|
- event.target.value = this.discount;
|
|
|
|
- }
|
|
|
|
- }, */
|
|
|
|
|
|
+ /* //折扣正则
|
|
|
|
+ handleInput(event) {
|
|
|
|
+ // 使用正则表达式来检查输入是否为1到10的整数或最多两位小数
|
|
|
|
+ const value = event.target.value;
|
|
|
|
+ const regex = /^(10|([1-9](\.\d{0,1})?))$/;
|
|
|
|
+ console.log(regex.test(value) || value === '');
|
|
|
|
+ if (regex.test(value) || value === '') {
|
|
|
|
+ this.discount = value;
|
|
|
|
+ } else {
|
|
|
|
+ event.target.value = this.discount;
|
|
|
|
+ }
|
|
|
|
+ }, */
|
|
// 打印功能
|
|
// 打印功能
|
|
printIng() {
|
|
printIng() {
|
|
// Print({
|
|
// Print({
|
|
@@ -861,17 +708,17 @@ export default {
|
|
console.error(err);
|
|
console.error(err);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
- /* validateNumber(){
|
|
|
|
- const regex = '/^(?:[0-9]|10(?:\.0{1,2})?)$/';
|
|
|
|
- return regex.test(this.discount)
|
|
|
|
- }, */
|
|
|
|
|
|
+ /* validateNumber(){
|
|
|
|
+ const regex = '/^(?:[0-9]|10(?:\.0{1,2})?)$/';
|
|
|
|
+ return regex.test(this.discount)
|
|
|
|
+ }, */
|
|
//获取仓库名称
|
|
//获取仓库名称
|
|
- warehouseName(val){
|
|
|
|
- let name=''
|
|
|
|
- this.warehouseList.map(el=>{
|
|
|
|
- if(el.id==val) {
|
|
|
|
- return name=el.name
|
|
|
|
- }
|
|
|
|
|
|
+ warehouseName(val) {
|
|
|
|
+ let name = ''
|
|
|
|
+ this.warehouseList.map(el => {
|
|
|
|
+ if (el.id == val) {
|
|
|
|
+ return name = el.name
|
|
|
|
+ }
|
|
})
|
|
})
|
|
return name
|
|
return name
|
|
},
|
|
},
|
|
@@ -934,7 +781,7 @@ export default {
|
|
this.customerList = response.data;
|
|
this.customerList = response.data;
|
|
console.log(this.customerList);
|
|
console.log(this.customerList);
|
|
})
|
|
})
|
|
- .catch(() => {});
|
|
|
|
|
|
+ .catch(() => { });
|
|
API_Setting.getPage({ dictType: "order_type" }).then((res) => {
|
|
API_Setting.getPage({ dictType: "order_type" }).then((res) => {
|
|
this.orderTypeList = res.data;
|
|
this.orderTypeList = res.data;
|
|
});
|
|
});
|
|
@@ -992,42 +839,25 @@ export default {
|
|
},
|
|
},
|
|
// 选择批次商品
|
|
// 选择批次商品
|
|
async handleSelectGoods() {
|
|
async handleSelectGoods() {
|
|
- if(!this.OrderForm.type){
|
|
|
|
|
|
+ if (!this.OrderForm.type) {
|
|
this.$message.error("请选择订单类型!");
|
|
this.$message.error("请选择订单类型!");
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- if (this.OrderForm.warehouse_id.length==0) {
|
|
|
|
|
|
+ if (this.OrderForm.warehouse_id.length == 0) {
|
|
this.$message.error("请选择仓库!");
|
|
this.$message.error("请选择仓库!");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- let warehouse_ids=this.OrderForm.warehouse_id.join(',')
|
|
|
|
|
|
+ let warehouse_ids = this.OrderForm.warehouse_id.join(',')
|
|
console.log(this.OrderForm.warehouse_id);
|
|
console.log(this.OrderForm.warehouse_id);
|
|
const goodsData = await this.$EnPickerGoods({
|
|
const goodsData = await this.$EnPickerGoods({
|
|
- goodsApi:`/admin/erp/warehouseOut/getGoodByWarehouse/warehouseIdAndOrderType/${this.OrderForm.type}/${warehouse_ids}`,
|
|
|
|
- // goodsApi: `/admin/erp/warehouseOut/getGoodByWarehouse/warehouseIdAndOrderType`,
|
|
|
|
|
|
+ goodsApi: `/admin/erp/warehouseOut/getGoodByWarehouse/warehouseIdAndOrderType/${this.OrderForm.type}/${warehouse_ids}`,
|
|
|
|
+ // goodsApi: `/admin/erp/warehouseOut/getGoodByWarehouse/warehouseIdAndOrderType`,
|
|
selectedIds: this.OrderForm.product_list.map((item) => item.product_id),
|
|
selectedIds: this.OrderForm.product_list.map((item) => item.product_id),
|
|
//goodsApiParams: { order_type: this.OrderForm.type,warehouse_ids:arr },
|
|
//goodsApiParams: { order_type: this.OrderForm.type,warehouse_ids:arr },
|
|
|
|
|
|
});
|
|
});
|
|
|
|
|
|
this.OrderForm.product_list = goodsData;
|
|
this.OrderForm.product_list = goodsData;
|
|
- /* .map((item) => {
|
|
|
|
- // 初始化字段,和订单的item字段名保持一致
|
|
|
|
- item.product_id = item.id;
|
|
|
|
- item.product_name = item.name;
|
|
|
|
- item.product_sn = item.sn;
|
|
|
|
- item.product_specification = item.specification;
|
|
|
|
- item.product_unit = item.unit;
|
|
|
|
- item.num = 0;
|
|
|
|
- item.discount_price = 0;
|
|
|
|
- // 原价(总)
|
|
|
|
- item.total_price = 0;
|
|
|
|
- // 税额(总)
|
|
|
|
- item.tax_price = 0;
|
|
|
|
- // 合计
|
|
|
|
-
|
|
|
|
- return item;
|
|
|
|
- }); */
|
|
|
|
},
|
|
},
|
|
/** 添加支付方式 */
|
|
/** 添加支付方式 */
|
|
handleInsertPayment() {
|
|
handleInsertPayment() {
|
|
@@ -1134,17 +964,6 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
const { id } = this.OrderForm;
|
|
const { id } = this.OrderForm;
|
|
- //设置时间
|
|
|
|
- delete this.OrderForm.start_time;
|
|
|
|
- delete this.OrderForm.end_time;
|
|
|
|
- if (this.time && this.time.length >= 2) {
|
|
|
|
- this.OrderForm.start_time = this.time[0];
|
|
|
|
- this.OrderForm.end_time = this.time[1];
|
|
|
|
- } else {
|
|
|
|
- console.error("时间数组不完整:", this.time);
|
|
|
|
- // 可以设置一些默认值或进行错误处理
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
var loc = "";
|
|
var loc = "";
|
|
for (let i = 0; i < this.selectedOptions.length; i++) {
|
|
for (let i = 0; i < this.selectedOptions.length; i++) {
|
|
loc += codeToText[this.selectedOptions[i]] + ",";
|
|
loc += codeToText[this.selectedOptions[i]] + ",";
|
|
@@ -1161,7 +980,7 @@ export default {
|
|
el.goods_id = el.id;
|
|
el.goods_id = el.id;
|
|
el.id = "";
|
|
el.id = "";
|
|
});*/
|
|
});*/
|
|
- params.price = this.price;
|
|
|
|
|
|
+ params.pay_price = this.price;
|
|
params.real_price = Number(params.real_price);
|
|
params.real_price = Number(params.real_price);
|
|
/* params.product_list.map((el) => {
|
|
/* params.product_list.map((el) => {
|
|
return (el.product_id = el.id);
|
|
return (el.product_id = el.id);
|
|
@@ -1202,13 +1021,13 @@ export default {
|
|
}
|
|
}
|
|
const { id } = this.OrderForm;
|
|
const { id } = this.OrderForm;
|
|
//设置时间
|
|
//设置时间
|
|
- delete this.OrderForm.start_time;
|
|
|
|
- delete this.OrderForm.end_time;
|
|
|
|
- if (this.time) {
|
|
|
|
- this.OrderForm.start_time = this.time[0];
|
|
|
|
- this.OrderForm.end_time = this.time[1];
|
|
|
|
- }
|
|
|
|
- delete this.time;
|
|
|
|
|
|
+ /* delete this.OrderForm.start_time;
|
|
|
|
+ delete this.OrderForm.end_time;
|
|
|
|
+ if (this.time) {
|
|
|
|
+ this.OrderForm.start_time = this.time[0];
|
|
|
|
+ this.OrderForm.end_time = this.time[1];
|
|
|
|
+ }
|
|
|
|
+ delete this.time; */
|
|
var loc = "";
|
|
var loc = "";
|
|
for (let i = 0; i < this.selectedOptions.length; i++) {
|
|
for (let i = 0; i < this.selectedOptions.length; i++) {
|
|
loc += codeToText[this.selectedOptions[i]] + ",";
|
|
loc += codeToText[this.selectedOptions[i]] + ",";
|
|
@@ -1220,7 +1039,7 @@ export default {
|
|
el.id = "";
|
|
el.id = "";
|
|
return el;
|
|
return el;
|
|
});
|
|
});
|
|
- params.price = this.price;
|
|
|
|
|
|
+ params.pay_price = this.price;
|
|
params.real_price = Number(params.real_price);
|
|
params.real_price = Number(params.real_price);
|
|
params.item_list = params.product_list;
|
|
params.item_list = params.product_list;
|
|
/* params.product_list.map((el) => {
|
|
/* params.product_list.map((el) => {
|
|
@@ -1257,6 +1076,36 @@ export default {
|
|
});
|
|
});
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ //延期确定
|
|
|
|
+ async submit(){
|
|
|
|
+ // 校验商品明细数据
|
|
|
|
+ const valid = await this.$refs.orderFormRef
|
|
|
|
+ .validate()
|
|
|
|
+ .catch((err) => err);
|
|
|
|
+ if (valid !== true) {
|
|
|
|
+ this.$message.error("表单数据输入有误,请检查!");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ const { id } = this.OrderForm;
|
|
|
|
+ /* var loc = "";
|
|
|
|
+ for (let i = 0; i < this.selectedOptions.length; i++) {
|
|
|
|
+ loc += codeToText[this.selectedOptions[i]] + ",";
|
|
|
|
+ }
|
|
|
|
+ this.OrderForm.province_city_area_address = loc + this.OrderForm.address; */
|
|
|
|
+ const params = this.MixinClone(this.OrderForm);
|
|
|
|
+ /* params.pay_price = this.price;
|
|
|
|
+ params.real_price = Number(params.real_price); */
|
|
|
|
+ params.item_list = params.product_list;
|
|
|
|
+ this.formLoading = true;
|
|
|
|
+ API_Order.extension(id, params)
|
|
|
|
+ .then((response) => {
|
|
|
|
+ this.$message.success("调整成功!");
|
|
|
|
+ this.backOrderList();
|
|
|
|
+ })
|
|
|
|
+ .finally(() => {
|
|
|
|
+ this.formLoading = false;
|
|
|
|
+ });
|
|
|
|
+ },
|
|
/** 获取仓库 */
|
|
/** 获取仓库 */
|
|
GET_WarehouseList() {
|
|
GET_WarehouseList() {
|
|
API_BasicSetting.getWarehouseListAll({}).then((response) => {
|
|
API_BasicSetting.getWarehouseListAll({}).then((response) => {
|
|
@@ -1293,48 +1142,11 @@ export default {
|
|
GET_OrderDetail() {
|
|
GET_OrderDetail() {
|
|
API_Order.getOrderDetail(this.id).then((response) => {
|
|
API_Order.getOrderDetail(this.id).then((response) => {
|
|
/**/ this.price = response.price;
|
|
/**/ this.price = response.price;
|
|
- this.barcodeValue=response.sn
|
|
|
|
- response.product_list = response.item_list.map(el=>{
|
|
|
|
- el.good_vo=el.goods_vo
|
|
|
|
|
|
+ this.barcodeValue = response.sn
|
|
|
|
+ response.product_list = response.item_list.map(el => {
|
|
|
|
+ el.good_vo = el.goods_vo
|
|
return el
|
|
return el
|
|
- }); /* .map((el) => {
|
|
|
|
- el.allow_sn = el.good_vo.allow_sn;
|
|
|
|
- el.bar_code = el.goods_vo.bar_code;
|
|
|
|
- el.brand_id = el.goods_vo.brand_id;
|
|
|
|
- el.brand_name = el.goods_vo.brand_name;
|
|
|
|
- el.category_id = el.goods_vo.category_id;
|
|
|
|
- el.category_ids = el.goods_vo.category_ids;
|
|
|
|
- el.category_name = el.goods_vo.category_name;
|
|
|
|
- el.cost_price = el.goods_vo.cost_price;
|
|
|
|
- el.create_time = el.goods_vo.create_time;
|
|
|
|
- el.creator = el.goods_vo.creator;
|
|
|
|
- el.description = el.goods_vo.description;
|
|
|
|
- el.en_name = el.goods_vo.en_name;
|
|
|
|
- el.freight_template_id = el.goods_vo.freight_template_id;
|
|
|
|
- el.goods_style = el.goods_vo.goods_style;
|
|
|
|
- el.goods_unit = el.goods_vo.goods_unit;
|
|
|
|
- el.goods_unit = el.goods_vo.goods_unit;
|
|
|
|
- el.have_spec = el.goods_vo.have_spec;
|
|
|
|
- el.hire_or_sail = el.goods_vo.hire_or_sail;
|
|
|
|
- el.id = el.goods_vo.id;
|
|
|
|
- el.image = el.goods_vo.image;
|
|
|
|
- el.image_list = el.goods_vo.image_list;
|
|
|
|
- el.label_names = el.goods_vo.label_names;
|
|
|
|
- el.market_enable = el.goods_vo.market_enable;
|
|
|
|
- el.mkt_price = el.goods_vo.mkt_price;
|
|
|
|
- el.name = el.goods_vo.name;
|
|
|
|
- el.params_list = el.goods_vo.params_list;
|
|
|
|
- el.price = el.goods_vo.price;
|
|
|
|
- el.sn = el.goods_vo.sn;
|
|
|
|
- el.sn_code = el.goods_vo.sn_code;
|
|
|
|
- el.sort = el.goods_vo.sort;
|
|
|
|
- el.update_time = el.goods_vo.update_time;
|
|
|
|
- el.updater = el.goods_vo.updater;
|
|
|
|
- el.usable_stock = el.goods_vo.usable_stock;
|
|
|
|
- el.video = el.goods_vo.video;
|
|
|
|
- return el;
|
|
|
|
- }); */
|
|
|
|
-
|
|
|
|
|
|
+ });
|
|
this.selectedOptions = response.province_city_area.split(",");
|
|
this.selectedOptions = response.province_city_area.split(",");
|
|
this.OrderForm = response;
|
|
this.OrderForm = response;
|
|
console.log(this.OrderForm.product_list);
|
|
console.log(this.OrderForm.product_list);
|
|
@@ -1348,27 +1160,28 @@ export default {
|
|
this.time.push(response.start_time);
|
|
this.time.push(response.start_time);
|
|
this.time.push(response.end_time);
|
|
this.time.push(response.end_time);
|
|
}
|
|
}
|
|
- if (this.OrderForm.payment_time) {
|
|
|
|
|
|
+ /* if (this.OrderForm.payment_time) {
|
|
this.OrderForm.payment_time = Math.floor(
|
|
this.OrderForm.payment_time = Math.floor(
|
|
this.OrderForm.payment_time * 1000
|
|
this.OrderForm.payment_time * 1000
|
|
);
|
|
);
|
|
- }
|
|
|
|
|
|
+ } */
|
|
});
|
|
});
|
|
},
|
|
},
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
price() {
|
|
price() {
|
|
let total = 0;
|
|
let total = 0;
|
|
- if(!this.OrderForm.product_list) return
|
|
|
|
|
|
+ if (!this.OrderForm.product_list) return
|
|
if (!this.id) {
|
|
if (!this.id) {
|
|
if (this.OrderForm.type == "TO_C") {
|
|
if (this.OrderForm.type == "TO_C") {
|
|
- var start = new Date(this.time[1]); // 将起始日期字符串转换为Date对象
|
|
|
|
- var end = new Date(this.time[0]); // 将结束日期字符串转换为Date对象
|
|
|
|
|
|
+ var start = new Date(this.OrderForm.start_time); // 将起始日期字符串转换为Date对象
|
|
|
|
+ this.OrderForm.product_list.map((item) => {
|
|
|
|
+ var end = new Date(item.end_time); // 将结束日期字符串转换为Date对象
|
|
var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
|
|
var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
|
|
- this.OrderForm.product_list.map((item) => {
|
|
|
|
- total += item.day_price * item.num * monthDiff;
|
|
|
|
|
|
+ total += item.product_vo.day_price * item.num * monthDiff;
|
|
});
|
|
});
|
|
|
|
+
|
|
return total;
|
|
return total;
|
|
} else {
|
|
} else {
|
|
this.OrderForm.product_list.map((item) => {
|
|
this.OrderForm.product_list.map((item) => {
|
|
@@ -1399,7 +1212,7 @@ export default {
|
|
discount: {
|
|
discount: {
|
|
deep: true,
|
|
deep: true,
|
|
handler(newVal) {
|
|
handler(newVal) {
|
|
- this.OrderForm.real_price = this.price * newVal/10;
|
|
|
|
|
|
+ this.OrderForm.real_price = this.price * newVal / 10;
|
|
},
|
|
},
|
|
},
|
|
},
|
|
"OrderForm.product_list": {
|
|
"OrderForm.product_list": {
|
|
@@ -1480,6 +1293,7 @@ export default {
|
|
background-color: #fff;
|
|
background-color: #fff;
|
|
margin: 10px;
|
|
margin: 10px;
|
|
padding: 25px;
|
|
padding: 25px;
|
|
|
|
+
|
|
.numOrder {
|
|
.numOrder {
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: center;
|
|
justify-content: center;
|
|
@@ -1512,23 +1326,28 @@ export default {
|
|
/deep/ .el-form-item__error {
|
|
/deep/ .el-form-item__error {
|
|
// position: relative;
|
|
// position: relative;
|
|
}
|
|
}
|
|
|
|
+
|
|
/** date-picker宽度和其他输入框保持一致 */
|
|
/** date-picker宽度和其他输入框保持一致 */
|
|
/deep/ .el-date-editor {
|
|
/deep/ .el-date-editor {
|
|
.el-input__inner {
|
|
.el-input__inner {
|
|
padding-inline-start: 15px;
|
|
padding-inline-start: 15px;
|
|
}
|
|
}
|
|
|
|
+
|
|
.el-input__prefix {
|
|
.el-input__prefix {
|
|
display: none;
|
|
display: none;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
.redClass /deep/ .el-form-item__label {
|
|
.redClass /deep/ .el-form-item__label {
|
|
//color: red !important;
|
|
//color: red !important;
|
|
font-weight: 700;
|
|
font-weight: 700;
|
|
width: 500px;
|
|
width: 500px;
|
|
}
|
|
}
|
|
|
|
+
|
|
/deep/ .el-form-item {
|
|
/deep/ .el-form-item {
|
|
width: 100%;
|
|
width: 100%;
|
|
height: auto;
|
|
height: auto;
|
|
|
|
+
|
|
.el-input {
|
|
.el-input {
|
|
width: 200px;
|
|
width: 200px;
|
|
}
|
|
}
|