|
@@ -1,47 +1,50 @@
|
|
|
<template>
|
|
|
- <div class="bg-in-stock" ref="printId">
|
|
|
- <div class="numOrder">
|
|
|
- <barcode :value="barcodeValue"></barcode>
|
|
|
- </div>
|
|
|
- <el-form ref="orderFormRef" :rules="rules" :model="OrderForm" label-width="140px" inline :disabled="isDetail">
|
|
|
- <h3>基本信息</h3>
|
|
|
- <el-row>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="订单类型:" prop="type" :rules="rules.type">
|
|
|
- {{ getTypeName(OrderForm.type) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="订单渠道:" prop="sale_channel_id">
|
|
|
- {{ getchannName(OrderForm.sale_channel_id) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="下单客户:" prop="member_id">
|
|
|
- {{ getMemberName(OrderForm.member_id) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="客户名称:" prop="customer_name">
|
|
|
- {{ OrderForm.customer_name }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="客户联系方式:">
|
|
|
- {{ OrderForm.customer_phone }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="起始时间:" prop="time" :rules="rules.start_time" v-if="OrderForm.type == 'TO_C'">
|
|
|
- {{ OrderForm.start_time + '-' + OrderForm.end_time }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="付款方式:" prop="pay_type" :rules="rules.pay_type">
|
|
|
- {{ getPayType(OrderForm.pay_type) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <!-- <el-col :span="10">
|
|
|
+ <div>
|
|
|
+ <div class="bg-in-stock" ref="printId">
|
|
|
+ <div class="numOrder">
|
|
|
+ <barcode :value="barcodeValue"></barcode>
|
|
|
+ </div>
|
|
|
+ <el-form ref="orderFormRef" :rules="rules" :model="OrderForm" label-width="140px" inline
|
|
|
+ :disabled="isDetail">
|
|
|
+ <h3>基本信息</h3>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="订单类型:" prop="type" :rules="rules.type">
|
|
|
+ {{ getTypeName(OrderForm.type) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="订单渠道:" prop="sale_channel_id">
|
|
|
+ {{ getchannName(OrderForm.sale_channel_id) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="下单客户:" prop="member_id">
|
|
|
+ {{ getMemberName(OrderForm.member_id) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="客户名称:" prop="customer_name">
|
|
|
+ {{ OrderForm.customer_name }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="客户联系方式:">
|
|
|
+ {{ OrderForm.customer_phone }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="起始时间:" prop="time" :rules="rules.start_time"
|
|
|
+ v-if="OrderForm.type == 'TO_C'">
|
|
|
+ {{ OrderForm.start_time + '-' + OrderForm.end_time }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="付款方式:" prop="pay_type" :rules="rules.pay_type">
|
|
|
+ {{ getPayType(OrderForm.pay_type) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <!-- <el-col :span="10">
|
|
|
<el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
|
|
|
<span>{{ "¥" + price }}</span>
|
|
|
</el-form-item>
|
|
@@ -57,32 +60,32 @@
|
|
|
{{ "¥" + OrderForm.real_price }}
|
|
|
</el-form-item>
|
|
|
</el-col>-->
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="销售人员:" prop="marketing_id" :rules="rules.marketing_id">
|
|
|
- {{ getMarketingName(OrderForm.marketing_id) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="配送方式:" prop="send_type" :rules="rules.send_type">
|
|
|
- {{ getSendType(OrderForm.send_type) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="配送仓库:" prop="warehouse_id" :rules="rules.warehouse_id">
|
|
|
- {{ warehouseNames(OrderForm.warehouse_id) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="返回仓库:" prop="return_warehouse_id" :rules="rules.return_warehouse_id">
|
|
|
- {{ warehouseName(OrderForm.return_warehouse_id) }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="配送地址:" prop="province_city_area_address">
|
|
|
- {{ OrderForm.province_city_area_address }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <!-- <el-col :span="10">
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="销售人员:" prop="marketing_id" :rules="rules.marketing_id">
|
|
|
+ {{ getMarketingName(OrderForm.marketing_id) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="配送方式:" prop="send_type" :rules="rules.send_type">
|
|
|
+ {{ getSendType(OrderForm.send_type) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="配送仓库:" prop="warehouse_id" :rules="rules.warehouse_id">
|
|
|
+ {{ warehouseNames(OrderForm.warehouse_id) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="返回仓库:" prop="return_warehouse_id" :rules="rules.return_warehouse_id">
|
|
|
+ {{ warehouseName(OrderForm.return_warehouse_id) }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="配送地址:" prop="province_city_area_address">
|
|
|
+ {{ OrderForm.province_city_area_address }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <!-- <el-col :span="10">
|
|
|
<el-form-item label="允许负库存:">
|
|
|
<el-radio-group v-model="OrderForm.subtract_stock" :disabled="type == 'pone'">
|
|
|
<el-radio :label="false">禁止</el-radio>
|
|
@@ -90,103 +93,103 @@
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col> -->
|
|
|
- <el-col :span="24">
|
|
|
- <div class="redClass">
|
|
|
- <el-form-item label="备注:" prop="remark">
|
|
|
- {{ OrderForm.remark }}
|
|
|
- </el-form-item>
|
|
|
- </div>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <div style="margin-bottom: 10px">
|
|
|
- <h3>商品明细</h3>
|
|
|
- <div v-if="!isDetail">
|
|
|
- <!-- <el-button class="button" size="mini" type="primary" @click="handleSelectGoods">手动选择</el-button>
|
|
|
+ <el-col :span="24">
|
|
|
+ <div class="redClass">
|
|
|
+ <el-form-item label="备注:" prop="remark">
|
|
|
+ {{ OrderForm.remark }}
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <div style="margin-bottom: 10px">
|
|
|
+ <h3>商品明细</h3>
|
|
|
+ <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="handleSelectGrou">选择分组商品</el-button> -->
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <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-column type="selection" width="40" align="center" />
|
|
|
- <el-table-column label="图标">
|
|
|
- <template slot-scope="scope">
|
|
|
- <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px">
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="仓库名称">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ warehouseName(scope.row.warehouse_id) }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="库位号">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-popover placement="right" trigger="click">
|
|
|
- <div>
|
|
|
- <p v-for="item in scope.row.area_stock_list" :key="item.id">{{
|
|
|
- item.warehouse_area_name }}</p>
|
|
|
- </div>
|
|
|
- <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
|
|
|
- scope.row.area_stock_list[0].warehouse_area_name }}</span>
|
|
|
- </el-popover>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="商品编号">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.goods_vo.sn }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="商品名称">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.goods_vo.name }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="sku">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
|
|
|
- <span v-else> {{ scope.row.product_vo.sku }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="序列号">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="!id"> {{ scope.row.product_vo.sn_code }}</span>
|
|
|
- <span v-else> {{ scope.row.product_vo.sn_code }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="product_vo.spec_name" label="规格型号">
|
|
|
- <!-- <template slot-scope="scope">
|
|
|
+ <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-column type="selection" width="40" align="center" />
|
|
|
+ <el-table-column label="图标">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px">
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="仓库名称">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ warehouseName(scope.row.warehouse_id) }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="库位号">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-popover placement="right" trigger="click">
|
|
|
+ <div>
|
|
|
+ <p v-for="item in scope.row.area_stock_list" :key="item.id">{{
|
|
|
+ item.warehouse_area_name }}</p>
|
|
|
+ </div>
|
|
|
+ <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
|
|
|
+ scope.row.area_stock_list[0].warehouse_area_name }}</span>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="商品编号">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.goods_vo.sn }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="商品名称">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.goods_vo.name }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="sku">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
|
|
|
+ <span v-else> {{ scope.row.product_vo.sku }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="序列号">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="!id"> {{ scope.row.product_vo.sn_code }}</span>
|
|
|
+ <span v-else> {{ scope.row.product_vo.sn_code }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="product_vo.spec_name" label="规格型号">
|
|
|
+ <!-- <template slot-scope="scope">
|
|
|
<span v-if="!id">{{ scope.row.product_vo.spec_name }}</span>
|
|
|
<span v-else>{{ scope.row.product_vo.spec_name }}</span>
|
|
|
</template> -->
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="单位">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="!id"> {{ scope.row.product_vo.unit }}</span>
|
|
|
- <span v-else> {{ scope.row.product_vo.unit }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="订单数量">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.num }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="库存数量">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.usable_stock }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="售后数量">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.return_num }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="租赁天数" v-if="OrderForm.type == 'TO_C'">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.day_num }}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="单位">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="!id"> {{ scope.row.product_vo.unit }}</span>
|
|
|
+ <span v-else> {{ scope.row.product_vo.unit }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="订单数量">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.num }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="库存数量">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.usable_stock }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="售后数量">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.return_num }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="租赁天数" v-if="OrderForm.type == 'TO_C'">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.day_num }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <!-- <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"
|
|
@@ -201,148 +204,150 @@
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>-->
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- <el-row style="margin-top: 15px;margin-bottom: 20px;">
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
|
|
|
- <span>{{ "¥" + price }}</span>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
|
|
|
- {{ OrderForm.real_price }}
|
|
|
- <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入"
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ <el-row style="margin-top: 15px;margin-bottom: 20px;">
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
|
|
|
+ <span>{{ "¥" + price }}</span>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
|
|
|
+ {{ OrderForm.real_price }}
|
|
|
+ <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入"
|
|
|
:disabled="type == 'pone'"></el-input> style="display: flex;justify-content: center;" -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8" v-if="OrderForm.type == 'TO_C' && id">
|
|
|
+ <el-form-item label="总金额:" prop="real_price" :rules="rules.pay_price">
|
|
|
+ {{ '¥' + totalAmount }}
|
|
|
+ <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input> -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="16" v-if="OrderForm.type == 'TO_C' && id">
|
|
|
+ <el-form-item label="交通费汇总:" prop="real_price">
|
|
|
+ <span>{{ '¥' + TO_Cmoney }} </span>
|
|
|
+ <el-button @click="reimList">查看明细</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="抬头:" :rules="rules.pay_price" v-if="OrderForm.merchant_pay_info.invoice">
|
|
|
+ {{ OrderForm.merchant_pay_info.invoice }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="税号:" :rules="rules.pay_price">
|
|
|
+ {{ OrderForm.merchant_pay_info.duty_paragraph }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="开户行:" :rules="rules.pay_price">
|
|
|
+ {{ OrderForm.merchant_pay_info.bank }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="账号:" :rules="rules.pay_price">
|
|
|
+ {{ OrderForm.merchant_pay_info.bank_no }}
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="扫码支付(支付宝):" :rules="rules.pay_price">
|
|
|
+ <div id="qrCode" ref="qrCodeDiv"></div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ </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-form-item label="公司名称" prop="name">
|
|
|
+ <el-input v-model="customer.supplierForm.name" :minlength="2" :maxlength="20" clearable
|
|
|
+ placeholder="请输入公司名称"></el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8" v-if="OrderForm.type == 'TO_C' && id">
|
|
|
- <el-form-item label="总金额:" prop="real_price" :rules="rules.pay_price">
|
|
|
- {{ '¥' + totalAmount }}
|
|
|
- <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input> -->
|
|
|
+ <el-form-item label="客户联系人" prop="contact ">
|
|
|
+ <el-input v-model="customer.supplierForm.contact" :minlength="2" :maxlength="20" clearable
|
|
|
+ placeholder="请输入客户联系人"></el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="16" v-if="OrderForm.type == 'TO_C' && id">
|
|
|
- <el-form-item label="交通费汇总:" prop="real_price">
|
|
|
- <span>{{ '¥' + TO_Cmoney }} </span>
|
|
|
- <el-button @click="reimList">查看明细</el-button>
|
|
|
+ <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-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="抬头:" :rules="rules.pay_price">
|
|
|
- {{ OrderForm.merchant_pay_info.invoice }}
|
|
|
+ <el-form-item label="手机号码" prop="mobile">
|
|
|
+ <el-input v-model="customer.supplierForm.mobile" :minlength="2" :maxlength="20" clearable
|
|
|
+ placeholder="请输入手机号码"></el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="税号:" :rules="rules.pay_price">
|
|
|
- {{ OrderForm.merchant_pay_info.duty_paragraph }}
|
|
|
+ <el-form-item label="邮件" prop="email">
|
|
|
+ <el-input v-model="customer.supplierForm.email" :minlength="2" :maxlength="20" clearable
|
|
|
+ placeholder="请输入电子邮件"></el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="开户行:" :rules="rules.pay_price">
|
|
|
- {{ OrderForm.merchant_pay_info.bank }}
|
|
|
+ <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-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="账号:" :rules="rules.pay_price">
|
|
|
- {{ OrderForm.merchant_pay_info.bank_no }}
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="扫码支付(支付宝):" :rules="rules.pay_price">
|
|
|
- <div id="qrCode" ref="qrCodeDiv"></div>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <div class="footer">
|
|
|
- <!-- <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">打印</el-button>
|
|
|
- <el-button @click="roBack()" :disabled="false">返回</el-button>
|
|
|
- </div>
|
|
|
- </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-form-item label="公司名称" prop="name">
|
|
|
- <el-input v-model="customer.supplierForm.name" :minlength="2" :maxlength="20" clearable
|
|
|
- placeholder="请输入公司名称"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="客户联系人" prop="contact ">
|
|
|
- <el-input v-model="customer.supplierForm.contact" :minlength="2" :maxlength="20" clearable
|
|
|
- placeholder="请输入客户联系人"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <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-form-item>
|
|
|
- <el-form-item label="手机号码" prop="mobile">
|
|
|
- <el-input v-model="customer.supplierForm.mobile" :minlength="2" :maxlength="20" clearable
|
|
|
- placeholder="请输入手机号码"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="邮件" prop="email">
|
|
|
- <el-input v-model="customer.supplierForm.email" :minlength="2" :maxlength="20" clearable
|
|
|
- placeholder="请输入电子邮件"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <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-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <!-- <el-form-item label="状态" prop="status">
|
|
|
+ <!-- <el-form-item label="状态" prop="status">
|
|
|
<el-input v-model="customer.supplierForm.status" :minlength="2" :maxlength="20" clearable
|
|
|
placeholder="请输入客户状态"></el-input>
|
|
|
</el-form-item> -->
|
|
|
- </el-form>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="customer.dialogVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitSupplierForm">确 定</el-button>
|
|
|
- </span>
|
|
|
- </el-dialog>
|
|
|
- <el-dialog title="商品列表" :visible.sync="goodsVisible" width="1000px" @close="closeGoosData">
|
|
|
- <el-table ref="table" :data="goodsData.records" border style="width: 100%"
|
|
|
- @selection-change="handleSelChange">
|
|
|
- <el-table-column type="selection" width="55" />
|
|
|
- <el-table-column prop="name" label="分组名称"> </el-table-column>
|
|
|
- <el-table-column prop="remark" label="描述"> </el-table-column>
|
|
|
- </el-table>
|
|
|
- <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
|
|
|
- :current-page="goodsData.page" :page-sizes="[10, 20, 50, 100]" :page-size="goodsData.size"
|
|
|
- layout="total, sizes, prev, pager, next, jumper" :total="goodsData.total"></el-pagination>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="closeGoosData">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitGoosData()">确 定</el-button>
|
|
|
- </span>
|
|
|
- </el-dialog>
|
|
|
- <el-dialog title="明细列表" :visible.sync="reimListVisible">
|
|
|
- <el-table ref="table" :data="OrderForm.order_customer_fees" border style="width: 100%">
|
|
|
- <!-- <el-table-column type="selection" width="55" /> -->
|
|
|
- <el-table-column prop="money" label="金额"> </el-table-column>
|
|
|
- <el-table-column prop="file_url" label="图片">
|
|
|
- <template slot-scope="scope">
|
|
|
- <img :src="scope.row.file_url" alt="" @click="showImage(scope.row.file_url)"
|
|
|
- style="width: 60px;height: 60px">
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- <!-- <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
|
|
|
+ </el-form>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="customer.dialogVisible = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitSupplierForm">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog title="商品列表" :visible.sync="goodsVisible" width="1000px" @close="closeGoosData">
|
|
|
+ <el-table ref="table" :data="goodsData.records" border style="width: 100%"
|
|
|
+ @selection-change="handleSelChange">
|
|
|
+ <el-table-column type="selection" width="55" />
|
|
|
+ <el-table-column prop="name" label="分组名称"> </el-table-column>
|
|
|
+ <el-table-column prop="remark" label="描述"> </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
|
|
|
+ :current-page="goodsData.page" :page-sizes="[10, 20, 50, 100]" :page-size="goodsData.size"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper" :total="goodsData.total"></el-pagination>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="closeGoosData">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitGoosData()">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog title="明细列表" :visible.sync="reimListVisible">
|
|
|
+ <el-table ref="table" :data="OrderForm.order_customer_fees" border style="width: 100%">
|
|
|
+ <!-- <el-table-column type="selection" width="55" /> -->
|
|
|
+ <el-table-column prop="money" label="金额"> </el-table-column>
|
|
|
+ <el-table-column prop="file_url" label="图片">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <img :src="scope.row.file_url" alt="" @click="showImage(scope.row.file_url)"
|
|
|
+ style="width: 60px;height: 60px">
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <!-- <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
|
|
|
:current-page="goodsData.page" :page-sizes="[10, 20, 50, 100]" :page-size="goodsData.size"
|
|
|
layout="total, sizes, prev, pager, next, jumper" :total="goodsData.total"></el-pagination> -->
|
|
|
- <!-- <span slot="footer" class="dialog-footer">
|
|
|
+ <!-- <span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="closeGoosData">取 消</el-button>
|
|
|
<el-button type="primary" @click="submitGoosData()">确 定</el-button>
|
|
|
</span> -->
|
|
|
- </el-dialog>
|
|
|
- <el-dialog :visible.sync="imgDialogVisible" width="60%">
|
|
|
- <img :src="currentImage" alt="" style="width: 100%">
|
|
|
- </el-dialog>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog :visible.sync="imgDialogVisible" width="60%">
|
|
|
+ <img :src="currentImage" alt="" style="width: 100%">
|
|
|
+ </el-dialog>
|
|
|
+ </div>
|
|
|
+ <div class="footer">
|
|
|
+ <!-- <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">打印</el-button>
|
|
|
+ <el-button @click="roBack()" :disabled="false">返回</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -378,7 +383,13 @@ const initOrderForm = {
|
|
|
subtract_stock: false,
|
|
|
payment_status: "NOT_PAY",
|
|
|
start_time: null,
|
|
|
- real_price: 0
|
|
|
+ real_price: 0,
|
|
|
+ merchant_pay_info: {
|
|
|
+ invoice: '',
|
|
|
+ duty_paragraph: '',
|
|
|
+ bank: '',
|
|
|
+ bank_no: ''
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
export default {
|
|
@@ -420,6 +431,12 @@ export default {
|
|
|
start_time: null,
|
|
|
customer_name: "",
|
|
|
customer_phone: '',
|
|
|
+ merchant_pay_info: {
|
|
|
+ invoice: '',
|
|
|
+ duty_paragraph: '',
|
|
|
+ bank: '',
|
|
|
+ bank_no: ''
|
|
|
+ }
|
|
|
},
|
|
|
formLoading: false,
|
|
|
isDetail: undefined,
|
|
@@ -689,20 +706,17 @@ export default {
|
|
|
colorLight: "#ffffff", //二维码背景色
|
|
|
correctLevel: QRCode.CorrectLevel.L//容错率,L/M/H
|
|
|
})
|
|
|
- // 等待二维码生成完成
|
|
|
+ /* // 等待二维码生成完成
|
|
|
setTimeout(() => {
|
|
|
// 获取生成的二维码 canvas
|
|
|
const qrCodeCanvas = this.$refs.qrCodeDiv.querySelector('canvas');
|
|
|
-
|
|
|
// 创建一个新的 canvas 用于叠加 logo
|
|
|
const canvas = document.createElement('canvas');
|
|
|
const ctx = canvas.getContext('2d');
|
|
|
canvas.width = qrCodeCanvas.width;
|
|
|
canvas.height = qrCodeCanvas.height;
|
|
|
-
|
|
|
// 绘制二维码到新的 canvas
|
|
|
ctx.drawImage(qrCodeCanvas, 0, 0);
|
|
|
-
|
|
|
// 加载 logo 图片
|
|
|
const logo = new Image();
|
|
|
logo.src = this.logoUrl;
|
|
@@ -711,12 +725,11 @@ export default {
|
|
|
const x = (canvas.width - logoSize) / 2;
|
|
|
const y = (canvas.height - logoSize) / 2;
|
|
|
ctx.drawImage(logo, x, y, logoSize, logoSize);
|
|
|
-
|
|
|
// 将生成的二维码添加到 DOM
|
|
|
this.$refs.qrCodeDiv.innerHTML = '';
|
|
|
this.$refs.qrCodeDiv.appendChild(canvas);
|
|
|
};
|
|
|
- }, 100); // 等待二维码生成完成
|
|
|
+ }, 100); // 等待二维码生成完成 */
|
|
|
}, 500);
|
|
|
},
|
|
|
cleanUrl(url) {
|
|
@@ -842,26 +855,29 @@ export default {
|
|
|
const scrollLeft =
|
|
|
document.documentElement.scrollLeft || document.body.scrollLeft; // 获取水平滚动轴的长度
|
|
|
|
|
|
- html2canvas(printContent, {
|
|
|
- canvas,
|
|
|
- backgroundColor: null,
|
|
|
- useCORS: true,
|
|
|
- windowHeight: document.body.scrollHeight,
|
|
|
- scrollX: -scrollLeft, // 解决水平偏移问题,防止打印的内容不全
|
|
|
- scrollY: -scrollTop,
|
|
|
- })
|
|
|
- .then((canvas) => {
|
|
|
- const url = canvas.toDataURL("image/png");
|
|
|
- printJS({
|
|
|
- printable: url,
|
|
|
- type: "image",
|
|
|
- documentTitle: "", // 标题
|
|
|
- style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
|
|
|
- });
|
|
|
+ // 确保二维码生成完成后再进行打印
|
|
|
+ this.$nextTick(() => {
|
|
|
+ html2canvas(printContent, {
|
|
|
+ canvas,
|
|
|
+ backgroundColor: null,
|
|
|
+ useCORS: true,
|
|
|
+ windowHeight: document.body.scrollHeight,
|
|
|
+ scrollX: -scrollLeft, // 解决水平偏移问题,防止打印的内容不全
|
|
|
+ scrollY: -scrollTop
|
|
|
})
|
|
|
- .catch((err) => {
|
|
|
- console.error(err);
|
|
|
- });
|
|
|
+ .then((canvas) => {
|
|
|
+ const url = canvas.toDataURL("image/png");
|
|
|
+ printJS({
|
|
|
+ printable: url,
|
|
|
+ type: "image",
|
|
|
+ documentTitle: "", // 标题
|
|
|
+ style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
|
|
|
+ });
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ });
|
|
|
},
|
|
|
//获取仓库名称
|
|
|
warehouseName(val) {
|