|
|
@@ -2,107 +2,119 @@
|
|
|
<div class="app-container">
|
|
|
|
|
|
<div class="filter-container">
|
|
|
- <el-form :size="sizeType" ref="searchForm" :model="searchForm">
|
|
|
- <el-row :gutter="15">
|
|
|
- <el-col :span="5.5">
|
|
|
- <el-form-item prop="orderCode">
|
|
|
- <el-date-picker
|
|
|
- :size="sizeType"
|
|
|
- v-model="searchTime"
|
|
|
- type="daterange"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- format="yyyy-MM-dd"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- :default-time="['00:00:00', '23:59:59']">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input :size="sizeType" v-model.trim="search.keyWord" @change="combinedQueryBtn" clearable placeholder="关键字" ></el-input>
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-form-item prop="orderCode">
|
|
|
- <el-input placeholder="订单编号" :size="sizeType" @change="combinedQueryBtn" clearable v-model.trim="searchForm.orderCode"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-form-item prop="clientName">
|
|
|
- <el-input placeholder="客户名称" :size="sizeType" @change="combinedQueryBtn" clearable v-model.trim="searchForm.clientName"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-form-item prop="orderName">
|
|
|
- <el-input placeholder="订单名称" :size="sizeType" @change="combinedQueryBtn" clearable v-model.trim="searchForm.orderName"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="3">
|
|
|
- <el-form-item label="订单状态" prop="orderState">
|
|
|
- <el-select v-model="searchForm.orderState" style="width: 50%" :size="sizeType" @change="combinedQueryBtn" filterable placeholder="订单状态" value-key="id">
|
|
|
- <el-option
|
|
|
- label="全部"
|
|
|
- value="-1">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="待审核"
|
|
|
- value="0">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="已审核"
|
|
|
- value="1">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="已作废"
|
|
|
- value="2">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="3">
|
|
|
- <el-form-item label="收款状态" prop="orderStateCharge">
|
|
|
- <el-select v-model="searchForm.orderStateCharge" style="width: 50%" :size="sizeType" @change="combinedQueryBtn" filterable placeholder="收款状态" value-key="id">
|
|
|
- <el-option
|
|
|
- label="全部"
|
|
|
- value="-1">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="未收款"
|
|
|
- value="0">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="部分收款"
|
|
|
- value="2">
|
|
|
- </el-option>
|
|
|
- <el-option
|
|
|
- label="完成收款"
|
|
|
- value="3">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-button
|
|
|
- style="margin-bottom: 10px;margin-right: 10px"
|
|
|
- type="primary"
|
|
|
- :size="sizeType"
|
|
|
- @click="combinedQueryBtn">搜索
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- class="filter-item"
|
|
|
- type="green"
|
|
|
- icon="el-icon-plus"
|
|
|
- :size="sizeType"
|
|
|
- @click="createOrderFun">
|
|
|
- 创建订单
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- style="margin-bottom: 10px;margin-right: 10px"
|
|
|
- type="warning"
|
|
|
- :size="sizeType"
|
|
|
- @click="exportList">导出
|
|
|
- </el-button>
|
|
|
- </el-form>
|
|
|
+ <el-form :size="sizeType" ref="searchForm" :model="searchForm">
|
|
|
+ <el-row :gutter="15">
|
|
|
+ <el-col :span="5.5">
|
|
|
+ <el-form-item prop="orderCode">
|
|
|
+ <el-date-picker
|
|
|
+ :size="sizeType"
|
|
|
+ v-model="searchTime"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="-"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ format="yyyy-MM-dd"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ :default-time="['00:00:00', '23:59:59']">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2">
|
|
|
+ <el-input :size="sizeType" v-model.trim="search.keyWord" @change="combinedQueryBtn" clearable
|
|
|
+ placeholder="关键字"></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2">
|
|
|
+ <el-form-item prop="orderCode">
|
|
|
+ <el-input placeholder="订单编号" :size="sizeType" @change="combinedQueryBtn" clearable
|
|
|
+ v-model.trim="searchForm.orderCode"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2">
|
|
|
+ <el-form-item prop="clientName">
|
|
|
+ <el-input placeholder="客户名称" :size="sizeType" @change="combinedQueryBtn" clearable
|
|
|
+ v-model.trim="searchForm.clientName"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2">
|
|
|
+ <el-form-item prop="orderName">
|
|
|
+ <el-input placeholder="订单名称" :size="sizeType" @change="combinedQueryBtn" clearable
|
|
|
+ v-model.trim="searchForm.orderName"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2">
|
|
|
+ <el-form-item prop="createManUser">
|
|
|
+ <el-input placeholder="下单人" :size="sizeType" @change="combinedQueryBtn" clearable
|
|
|
+ v-model.trim="searchForm.createManUser"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item label="订单状态" prop="orderState">
|
|
|
+ <el-select v-model="searchForm.orderState" style="width: 50%" :size="sizeType" @change="combinedQueryBtn"
|
|
|
+ filterable placeholder="订单状态" value-key="id">
|
|
|
+ <el-option
|
|
|
+ label="正常"
|
|
|
+ value="0">
|
|
|
+ </el-option>
|
|
|
+ <!-- <el-option-->
|
|
|
+ <!-- label="待审核"-->
|
|
|
+ <!-- value="0">-->
|
|
|
+ <!-- </el-option>-->
|
|
|
+ <!-- <el-option-->
|
|
|
+ <!-- label="已审核"-->
|
|
|
+ <!-- value="1">-->
|
|
|
+ <!-- </el-option>-->
|
|
|
+ <el-option
|
|
|
+ label="已作废"
|
|
|
+ value="2">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item label="收款状态" prop="orderStateCharge">
|
|
|
+ <el-select v-model="searchForm.orderStateCharge" style="width: 50%" :size="sizeType"
|
|
|
+ @change="combinedQueryBtn" filterable placeholder="收款状态" value-key="id">
|
|
|
+ <el-option
|
|
|
+ label="全部"
|
|
|
+ value="-1">
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="未收款"
|
|
|
+ value="0">
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="部分收款"
|
|
|
+ value="2">
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="完成收款"
|
|
|
+ value="3">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-button
|
|
|
+ style="margin-bottom: 10px;margin-right: 10px"
|
|
|
+ type="primary"
|
|
|
+ :size="sizeType"
|
|
|
+ @click="combinedQueryBtn">搜索
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ class="filter-item"
|
|
|
+ type="green"
|
|
|
+ icon="el-icon-plus"
|
|
|
+ :size="sizeType"
|
|
|
+ @click="createOrderFun">
|
|
|
+ 创建订单
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ style="margin-bottom: 10px;margin-right: 10px"
|
|
|
+ type="warning"
|
|
|
+ :size="sizeType"
|
|
|
+ @click="exportList">导出
|
|
|
+ </el-button>
|
|
|
+ </el-form>
|
|
|
<div class="top-right-btn">
|
|
|
<el-tooltip class="item" effect="dark" content="刷新" placement="top">
|
|
|
<el-button size="mini" circle icon="el-icon-refresh" @click="getList"/>
|
|
|
@@ -116,6 +128,8 @@
|
|
|
v-loading="listLoading"
|
|
|
row-key="id"
|
|
|
max-height="720"
|
|
|
+ show-summary
|
|
|
+ :summary-method="getSummaries"
|
|
|
border
|
|
|
stripe
|
|
|
:size="sizeType"
|
|
|
@@ -130,7 +144,7 @@
|
|
|
class-name="small-padding fixed-width">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-button
|
|
|
- v-show ="row.chargeMoney != 0"
|
|
|
+ v-show="row.chargeMoney != 0"
|
|
|
:title="row.chargeMoney < 0 ? '订单收款(多收)': '订单收款(有欠款)'"
|
|
|
:class="row.chargeMoney < 0 ? 'buttonPurple': 'buttonRed'"
|
|
|
@click="orderPay(row)"
|
|
|
@@ -173,14 +187,15 @@
|
|
|
icon="el-icon-edit"
|
|
|
size="mini">
|
|
|
</el-button>
|
|
|
- <el-button v-if="row.orderState == 1" title="退回" size="mini" type="danger" icon = "el-icon-back" class="iconfont" @click="backOrderFunc(row)">
|
|
|
+ <el-button v-if="row.orderState == 1" title="退回" size="mini" type="danger" icon="el-icon-back"
|
|
|
+ class="iconfont" @click="backOrderFunc(row)">
|
|
|
</el-button>
|
|
|
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- label="序号"
|
|
|
fixed
|
|
|
+ label="序号"
|
|
|
align="center"
|
|
|
width="50"
|
|
|
type="index">
|
|
|
@@ -190,22 +205,22 @@
|
|
|
</el-table-column>
|
|
|
<template v-for="column in columnnames">
|
|
|
<el-table-column
|
|
|
+ fixed
|
|
|
v-if="column.id == 1"
|
|
|
:prop="column.field"
|
|
|
:label="column.name"
|
|
|
:width="column.width"
|
|
|
- fixed
|
|
|
show-overflow-tooltip>
|
|
|
<template slot-scope="{row}">
|
|
|
<a href="javascript:;" style="color: #20a0ff" @click="openDetail(row)">{{ row[column.field] }}</a>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- v-else-if="column.id == 3 || column.id == 2"
|
|
|
+ fixed
|
|
|
+ v-else-if="column.id == 24 || column.id == 3 || column.id == 2"
|
|
|
:prop="column.field"
|
|
|
:label="column.name"
|
|
|
:width="column.width"
|
|
|
- fixed
|
|
|
show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -216,8 +231,8 @@
|
|
|
align="left"
|
|
|
show-overflow-tooltip>
|
|
|
<template slot-scope="{row}">
|
|
|
- <el-tag size="mini" v-if="row[column.field] == '0'" type="info">待审核</el-tag>
|
|
|
- <el-tag size="mini" v-else-if="row[column.field] == '1'" type="success">已审核</el-tag>
|
|
|
+ <el-tag size="mini" v-if="row[column.field] == '0'" type="success">正常</el-tag>
|
|
|
+ <el-tag size="mini" v-else-if="row[column.field] == '1'" type="success">正常</el-tag>
|
|
|
<el-tag size="mini" v-else-if="row[column.field] == '2'" type="danger">已作废</el-tag>
|
|
|
<el-button size="mini" class="button-new-tag" v-else>{{ row[column.field] }}</el-button>
|
|
|
</template>
|
|
|
@@ -240,12 +255,13 @@
|
|
|
header-align="center"
|
|
|
show-overflow-tooltip>
|
|
|
<template slot-scope="{row}">
|
|
|
- <span v-if="row.chargeMoney != 0" :class="row.chargeMoney < 0 ? 'txtGreen': 'txtRed'" >{{row.chargeMoney}}</span>
|
|
|
- <span v-else="row.chargeMoney === 0" >{{row.chargeMoney}}</span>
|
|
|
+ <span v-if="row.chargeMoney != 0"
|
|
|
+ :class="row.chargeMoney < 0 ? 'txtGreen': 'txtRed'">{{ row.chargeMoney }}</span>
|
|
|
+ <span v-else="row.chargeMoney === 0">{{ row.chargeMoney }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- v-else-if="column.id === 20 || column.id === 21 || column.id === 22 || column.id === 23"
|
|
|
+ v-else-if="column.id === 20 || column.id === 21 || column.id === 22"
|
|
|
:prop="column.field"
|
|
|
:label="column.name"
|
|
|
:width="column.width"
|
|
|
@@ -254,19 +270,61 @@
|
|
|
show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- v-else-if="column.id == 14"
|
|
|
- :label="column.name"
|
|
|
- :prop="column.field"
|
|
|
- :width="column.width"
|
|
|
- align="center"
|
|
|
- header-align="center"
|
|
|
- sortable="custom"
|
|
|
+ v-else-if="column.id === 23"
|
|
|
+ :prop="column.field"
|
|
|
+ :label="column.name"
|
|
|
+ :width="column.width"
|
|
|
+ align="center"
|
|
|
+ header-align="center"
|
|
|
+ show-overflow-tooltip>
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <span v-if="row.orderGrossProfitRate">{{ row.orderGrossProfitRate }}%</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ v-else-if="column.id == 14"
|
|
|
+ :label="column.name"
|
|
|
+ :prop="column.field"
|
|
|
+ :width="column.width"
|
|
|
+ align="center"
|
|
|
+ header-align="center"
|
|
|
+ sortable="custom"
|
|
|
>
|
|
|
<template slot-scope="{row}">
|
|
|
<span v-if="row.createTime">{{ row.createTime | getTime }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ v-else-if="column.id == 16"
|
|
|
+ :label="column.name"
|
|
|
+ :prop="column.field"
|
|
|
+ :width="column.width"
|
|
|
+ align="center"
|
|
|
+ header-align="center"
|
|
|
+ sortable="custom"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <el-link :href="row.printFileUrlLink" target="_blank" style="color: #20a0ff">{{ row[column.field] }}
|
|
|
+ </el-link>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ v-else-if="column.id == 17"
|
|
|
+ :label="column.name"
|
|
|
+ :prop="column.field"
|
|
|
+ :width="column.width"
|
|
|
+ align="center"
|
|
|
+ header-align="center"
|
|
|
+ sortable="custom"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <el-link :href="row.attachFileUrlLink" target="_blank" style="color: #20a0ff">{{ row[column.field] }}
|
|
|
+ </el-link>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
v-else
|
|
|
:prop="column.field"
|
|
|
:label="column.name"
|
|
|
@@ -425,17 +483,18 @@ import OrderMessage from '@/components/orderMessage/orderMessage'
|
|
|
import plupload from '@/components/plupload/plupload.vue'
|
|
|
import Addressdny from '@/components/Dialog/Addressdny'
|
|
|
import OrderDetail from '@/components/orderDetail/orderDetail'
|
|
|
-import {getConfigInfo} from '@/api/system/config'
|
|
|
+import { getConfigInfo } from '@/api/system/config'
|
|
|
import OrderStep from '@/components/orderStep/orderStep'
|
|
|
import DeliveryNotice from '@/components/deliveryNotice/deliveryNotice'
|
|
|
import new_badge from '@/assets/new_badge.gif';
|
|
|
|
|
|
const searchForm = {
|
|
|
- orderState: '-1',
|
|
|
+ orderState: '0',
|
|
|
orderStateCharge: '-1',
|
|
|
orderCode: '',
|
|
|
clientName: '',
|
|
|
orderName: '',
|
|
|
+ createManUser: '',
|
|
|
beginTime: '',
|
|
|
endTime: ''
|
|
|
}
|
|
|
@@ -456,25 +515,25 @@ const lifeForm = {
|
|
|
|
|
|
const defaultItems = [
|
|
|
{
|
|
|
- name: '订单编号', id: 1, field: 'orderCode', width: '120'
|
|
|
+ name: '制单人', id: 24, field: 'createManUser', width: '70'
|
|
|
},
|
|
|
{
|
|
|
- name: '印品名称', id: 2, field: 'orderName', width: '100'
|
|
|
+ name: '订单编号', id: 1, field: 'orderCode', width: '110'
|
|
|
},
|
|
|
{
|
|
|
- name: '客户名称', id: 3, field: 'clientName', width: '120'
|
|
|
+ name: '客户名称', id: 3, field: 'clientName', width: '100'
|
|
|
},
|
|
|
{
|
|
|
- name: '订单状态', id: 15, field: 'orderState', width: ''
|
|
|
+ name: '印品名称', id: 2, field: 'orderName', width: '100'
|
|
|
},
|
|
|
{
|
|
|
- name: '产品类型', id: 4, field: 'productName', width: '90'
|
|
|
+ name: '产品类型', id: 4, field: 'productName', width: '80'
|
|
|
},
|
|
|
{
|
|
|
- name: '订单数量', id: 5, field: 'printQty', width: '90'
|
|
|
+ name: '订单数量', id: 5, field: 'printQty', width: '80'
|
|
|
},
|
|
|
{
|
|
|
- name: '单价', id: 6, field: 'printPrice', width: '80'
|
|
|
+ name: '单价', id: 6, field: 'printPrice', width: '70'
|
|
|
},
|
|
|
{
|
|
|
name: '订单金额', id: 7, field: 'printMoneyTotal', width: '80'
|
|
|
@@ -489,40 +548,43 @@ const defaultItems = [
|
|
|
name: '外发金额', id: 20, field: 'outMoneyTotal', width: '80'
|
|
|
},
|
|
|
{
|
|
|
- name: '外发运费', id: 21, field: 'outSendMoney', width: '80'
|
|
|
+ name: '外发运费', id: 21, field: 'outSendMoney', width: '70'
|
|
|
},
|
|
|
{
|
|
|
- name: '毛利', id: 22, field: 'orderGrossProfit', width: '80'
|
|
|
+ name: '毛利', id: 22, field: 'orderGrossProfit', width: '70'
|
|
|
},
|
|
|
{
|
|
|
- name: '毛利率(%)', id: 23, field: 'orderGrossProfitRate', width: '80'
|
|
|
+ name: '毛利率(%)', id: 23, field: 'orderGrossProfitRate', width: '70'
|
|
|
},
|
|
|
+ // {
|
|
|
+ // name: '联数', id: 8, field: 'receiptsCount', width: '100'
|
|
|
+ // },
|
|
|
{
|
|
|
- name: '联数', id: 8, field: 'receiptsCount', width: '100'
|
|
|
+ name: '送货地址', id: 13, field: 'sendAddress', width: '100'
|
|
|
},
|
|
|
{
|
|
|
- name: '材料类型', id: 9, field: 'paperName', width: '100'
|
|
|
+ name: '材料类型', id: 9, field: 'paperName', width: '90'
|
|
|
},
|
|
|
{
|
|
|
- name: '每本页数', id: 10, field: 'pageCount', width: '100'
|
|
|
+ name: '每本页数', id: 10, field: 'pageCount', width: '90'
|
|
|
},
|
|
|
{
|
|
|
- name: '印刷颜色', id: 11, field: 'printColor', width: '100'
|
|
|
+ name: '印刷颜色', id: 11, field: 'printColor', width: '90'
|
|
|
},
|
|
|
// {
|
|
|
// name: '生产工艺', id: 12, field: 'printAllCoverFlag', width: '100'
|
|
|
// },
|
|
|
{
|
|
|
- name: '送货地址', id: 13, field: 'sendAddress', width: '100'
|
|
|
+ name: '制单时间', id: 14, field: 'createTime', width: '130'
|
|
|
},
|
|
|
{
|
|
|
- name: '制单时间', id: 14, field: 'createTime', width: '160'
|
|
|
+ name: '原图文件', id: 16, field: 'printFileName', width: '100'
|
|
|
},
|
|
|
{
|
|
|
- name: '原图文件', id: 16, field: 'printFileName', width: '100px'
|
|
|
+ name: '附件', id: 17, field: 'attachFileName', width: '100'
|
|
|
},
|
|
|
{
|
|
|
- name: '附件', id: 17, field: 'attachFileName', width: '190px'
|
|
|
+ name: '订单状态', id: 15, field: 'orderState', width: ''
|
|
|
}
|
|
|
]
|
|
|
|
|
|
@@ -558,7 +620,7 @@ export default {
|
|
|
// next()
|
|
|
next(vm => {
|
|
|
// beforeRouteEnter不能通过this访问组件实例，但是可以通过 vm 访问组件实例
|
|
|
- if (to.path == "/order/orderList") {
|
|
|
+ if (to.path == '/order/orderList') {
|
|
|
// vm.getTableInfo();
|
|
|
// vm.checkPermission();
|
|
|
vm.checkPermission('order:cycle:admin')
|
|
|
@@ -573,7 +635,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- deliveryTitle:"",
|
|
|
+ deliveryTitle: '',
|
|
|
sizeType: 'mini',
|
|
|
new_badge: new_badge,
|
|
|
permissionFlag1: false, // 权限标识
|
|
|
@@ -591,7 +653,8 @@ export default {
|
|
|
queryType: 1, // 1模糊搜索，2组合搜索
|
|
|
searchTime: [],
|
|
|
search: {
|
|
|
- keyWord: ''
|
|
|
+ keyWord: '',
|
|
|
+ orderState: '0'
|
|
|
},
|
|
|
combinedQuery: false,
|
|
|
searchForm: Object.assign({}, searchForm),
|
|
|
@@ -628,6 +691,7 @@ export default {
|
|
|
confirmdialog: false,
|
|
|
listLoading: false,
|
|
|
tableData: [],
|
|
|
+ tableCollection: {},
|
|
|
|
|
|
createInnerVisible: false,
|
|
|
innerTitle: '',
|
|
|
@@ -686,12 +750,12 @@ export default {
|
|
|
configValue3: '',
|
|
|
// 验证规则
|
|
|
rules: {
|
|
|
- productName: [{required: true, trigger: 'blur', message: '请选择产品类型'}],
|
|
|
- clientName: [{required: true, trigger: 'blur', message: '请选择客户'}]
|
|
|
+ productName: [{ required: true, trigger: 'blur', message: '请选择产品类型' }],
|
|
|
+ clientName: [{ required: true, trigger: 'blur', message: '请选择客户' }]
|
|
|
},
|
|
|
clientPayRules: {
|
|
|
- clientName: [{required: true, trigger: 'blur', message: '请选择客户'}],
|
|
|
- receivableMoney: [{required: true, trigger: 'blur', message: '请输入预存金额'}]
|
|
|
+ clientName: [{ required: true, trigger: 'blur', message: '请选择客户' }],
|
|
|
+ receivableMoney: [{ required: true, trigger: 'blur', message: '请输入预存金额' }]
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -725,7 +789,23 @@ export default {
|
|
|
}
|
|
|
return str.substr(0, frontLen) + xing + str.substr(str.length - endLen)
|
|
|
},
|
|
|
-
|
|
|
+ //合计数据
|
|
|
+ getSummaries(param) {
|
|
|
+ const _that = this
|
|
|
+ const { columns, data } = param
|
|
|
+ const sums = []
|
|
|
+ columns.forEach((column, index) => {
|
|
|
+ if (index === 0) {
|
|
|
+ sums[index] = '合计'
|
|
|
+ return
|
|
|
+ }
|
|
|
+ const resultColumn = _that.columnnames.find(x => x.field === column.property)
|
|
|
+ if (resultColumn) {
|
|
|
+ sums[index] = _that.tableCollection[resultColumn.field.toLowerCase()]
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return sums
|
|
|
+ },
|
|
|
// 排序
|
|
|
changeSort(val) {
|
|
|
// console.log(val)
|
|
|
@@ -803,6 +883,7 @@ export default {
|
|
|
const data = response.data
|
|
|
// // 组合表单数据
|
|
|
_that.tableData = data
|
|
|
+ _that.tableCollection = response.collection
|
|
|
_that.listData.total = response.total
|
|
|
// console.log(_that.tableData)
|
|
|
_that.listLoading = false
|
|
|
@@ -879,7 +960,7 @@ export default {
|
|
|
params: {
|
|
|
id: Date.parse(new Date()),
|
|
|
orderCategory: 1,
|
|
|
- editType:0
|
|
|
+ editType: 0
|
|
|
},
|
|
|
query: {
|
|
|
orderCategory: 1,
|
|
|
@@ -896,7 +977,7 @@ export default {
|
|
|
id: row.id,
|
|
|
orderCode: row.orderCode,
|
|
|
orderCategory: 2,
|
|
|
- editType:1
|
|
|
+ editType: 1
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -908,7 +989,7 @@ export default {
|
|
|
}).then(() => {
|
|
|
var order = {
|
|
|
'id': row.id,
|
|
|
- 'orderState' : 0
|
|
|
+ 'orderState': 0
|
|
|
}
|
|
|
var data = {
|
|
|
'order': JSON.stringify(order)
|
|
|
@@ -1066,12 +1147,12 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 强制完成
|
|
|
- forceComplete(id,versionCode,orderYear) {
|
|
|
+ forceComplete(id, versionCode, orderYear) {
|
|
|
var _that = this
|
|
|
var params = {
|
|
|
printOrder: {
|
|
|
id: id,
|
|
|
- versionCode:versionCode,
|
|
|
+ versionCode: versionCode,
|
|
|
orderYear: orderYear
|
|
|
}
|
|
|
}
|
|
|
@@ -1112,7 +1193,7 @@ export default {
|
|
|
'id': _that.orderPayInfo.orderInfo.id,
|
|
|
'payMoney': _that.orderPayInfo.receivableMoney
|
|
|
}
|
|
|
- var data = JSON.stringify(order)
|
|
|
+ var data = JSON.stringify(order)
|
|
|
payPrintOrder(data).then(res => {
|
|
|
const h = this.$createElement;
|
|
|
if (res.httpCode == 200) {
|
|
|
@@ -1122,7 +1203,7 @@ export default {
|
|
|
_that.$notify({
|
|
|
title: '提示',
|
|
|
type: 'success',
|
|
|
- message: h('i', { style: 'color: teal'}, '收款成功'),
|
|
|
+ message: h('i', { style: 'color: teal' }, '收款成功'),
|
|
|
duration: 30000,
|
|
|
dangerouslyUseHTMLString: true
|
|
|
})
|
|
|
@@ -1194,9 +1275,10 @@ export default {
|
|
|
</style>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
-::v-deep .v-modal{
|
|
|
+::v-deep .v-modal {
|
|
|
z-index: -1 !important;
|
|
|
}
|
|
|
+
|
|
|
.filter-container {
|
|
|
margin-bottom: 15px;
|
|
|
}
|
|
|
@@ -1281,27 +1363,36 @@ export default {
|
|
|
::v-deep .el-button + .el-button {
|
|
|
margin-left: 0;
|
|
|
}
|
|
|
-.buttonPurple{
|
|
|
+
|
|
|
+::v-deep .el-table {
|
|
|
+ .el-table__body-wrapper {
|
|
|
+ z-index: 2;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+.buttonPurple {
|
|
|
color: white;
|
|
|
background-color: #c640dc;
|
|
|
border-color: #c640dc;
|
|
|
}
|
|
|
|
|
|
-.buttonGreen{
|
|
|
+.buttonGreen {
|
|
|
color: white;
|
|
|
background-color: #42b983;
|
|
|
border-color: #42b983;
|
|
|
}
|
|
|
-.buttonRed{
|
|
|
+
|
|
|
+.buttonRed {
|
|
|
color: white;
|
|
|
background-color: #e53232;
|
|
|
border-color: #ee1333;
|
|
|
}
|
|
|
-.txtGreen{
|
|
|
+
|
|
|
+.txtGreen {
|
|
|
color: #c640dc;
|
|
|
}
|
|
|
|
|
|
-.txtRed{
|
|
|
+.txtRed {
|
|
|
color: #e53232;
|
|
|
}
|
|
|
</style>
|
