|
|
@@ -28,16 +28,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item prop="printBillCode">
|
|
|
- <el-input placeholder="施工单号" :size="sizeType" v-model.trim="searchForm.printBillCode"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item prop="clientCode">
|
|
|
- <el-input placeholder="客户编号" :size="sizeType" v-model.trim="searchForm.clientCode"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
<el-form-item prop="clientName">
|
|
|
<el-input placeholder="客户名称" :size="sizeType" v-model.trim="searchForm.clientName"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -67,18 +57,6 @@
|
|
|
<el-input placeholder="制单人" :size="sizeType" v-model.trim="searchForm.createMan"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item prop="createMan">
|
|
|
- <el-input placeholder="平台单号" :size="sizeType" v-model.trim="searchForm.platformOrderID"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item prop="logisticsCode">
|
|
|
- <el-input placeholder="物流货号" :size="sizeType" v-model.trim="searchForm.logisticsCode"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <!-- <el-col :span='6'>物流货号</el-col>-->
|
|
|
</el-row>
|
|
|
<el-row :gutter="20" style="margin-bottom: 0px">
|
|
|
<el-col :span="6">
|
|
|
@@ -111,55 +89,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="业务类型" prop="businessKind">
|
|
|
- <el-select
|
|
|
- v-model="searchForm.businessKind"
|
|
|
- :size="sizeType"
|
|
|
- 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="3">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="订单类型" prop="orderType">
|
|
|
- <el-select v-model="searchForm.orderType" :size="sizeType" 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-row>
|
|
|
<el-button
|
|
|
style="margin-bottom: 10px;margin-right: 10px"
|
|
|
@@ -201,35 +130,11 @@
|
|
|
fixed
|
|
|
label="操作"
|
|
|
align="left"
|
|
|
- :width="permissionFlag2?'380px':'260px'"
|
|
|
+ :width="permissionFlag2?'180px':'160px'"
|
|
|
class-name="small-padding fixed-width">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-dropdown
|
|
|
size="mini"
|
|
|
- @command="orderPayType($event,row)"
|
|
|
- trigger="click">
|
|
|
- <el-button size="mini" type="primary" class="iconfont">
|
|
|
- 
|
|
|
- </el-button>
|
|
|
- <el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item command="1">收款</el-dropdown-item>
|
|
|
- <el-dropdown-item command="2">支付单</el-dropdown-item>
|
|
|
- </el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
- <el-button
|
|
|
- title="编辑发货通知"
|
|
|
- @click="openNotices(row)"
|
|
|
- type="green"
|
|
|
- style="color: white;
|
|
|
- background-color: #42b983;
|
|
|
- border-color: #42b983;"
|
|
|
- icon="el-icon-location-information"
|
|
|
- size="mini">
|
|
|
- </el-button>
|
|
|
- <!-- <el-button icon="el-icon-upload" type="info" size="mini" title="上传样稿文件"-->
|
|
|
- <!-- @click="openFileDialog(5, row)"></el-button>-->
|
|
|
- <el-dropdown
|
|
|
- size="mini"
|
|
|
@command="getUploadType1($event,row)"
|
|
|
trigger="click">
|
|
|
<el-button size="mini" type="info" icon="el-icon-upload"></el-button>
|
|
|
@@ -252,24 +157,6 @@
|
|
|
<!-- <el-dropdown-item command="5">上传样稿文件</el-dropdown-item>-->
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
- <el-dropdown
|
|
|
- size="mini"
|
|
|
- @command="guestComplaint($event,row)"
|
|
|
- trigger="click">
|
|
|
- <el-button size="mini" type="primary" icon="el-icon-headset"></el-button>
|
|
|
- <el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item command="1" v-if="row.businessKind == 0">补印订单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="2">登记客诉</el-dropdown-item>
|
|
|
- </el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- v-if="row.businessKind == 0"-->
|
|
|
-<!-- style="background-color: #db5ace;color: white"-->
|
|
|
-<!-- title="补印"-->
|
|
|
-<!-- @click="if($store.state.app.sidebar.opened){$store.dispatch('app/toggleSideBar')};$router.push({path:'/order/editOrder/'+row.id,query:{id:row.id,orderCode:row.orderCode,editType:2}})"-->
|
|
|
-<!-- >补-->
|
|
|
-<!-- </el-button>-->
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
v-if="row.orderState == 0 || row.orderState == 1"
|
|
|
@@ -277,10 +164,6 @@
|
|
|
icon="el-icon-delete"
|
|
|
@click="voidOrderbtn(row)"
|
|
|
title="回收站"></el-button>
|
|
|
- <!-- <el-button type="green" size="mini" @click="getOrderStep(row)" class="iconfont" title="查看脚印"></el-button>-->
|
|
|
- <el-button v-if="permissionFlag2" size="mini" style="background-color: #e80c3f;color: white"
|
|
|
- @click="forceComplete(row.id,row.versionCode,row.orderYear)" title="强制完成">强制完成
|
|
|
- </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1324,7 +1207,6 @@ export default {
|
|
|
path: '/order/createOrder/' + Date.parse(new Date()),
|
|
|
params: {
|
|
|
id: Date.parse(new Date()),
|
|
|
- info: _that.createInfo,
|
|
|
orderCategory: 1,
|
|
|
editType:0
|
|
|
},
|
|
|
@@ -1349,54 +1231,6 @@ export default {
|
|
|
_that.$refs.orderDetail.getInfo()
|
|
|
})
|
|
|
},
|
|
|
- // 编辑发货通知
|
|
|
- openNotices(row) {
|
|
|
- var _that = this;
|
|
|
- _that.deliveryTitle= "";
|
|
|
- // console.log(row);
|
|
|
- _that.deliveryTitle = "编辑发货通知"+"("+"订单编号:"+row.orderCode+"；"+"印品名称:"+row.orderName+"；"+"客户名称:"+row.clientName+")"
|
|
|
- _that.noticeVisible = true
|
|
|
- _that.$nextTick(function () {
|
|
|
- _that.$refs.deliveryNotice.sendMemo = ''
|
|
|
- _that.$refs.deliveryNotice.currentIdClient = row.idClient
|
|
|
- _that.$refs.deliveryNotice.currentIdOrder = row.id
|
|
|
- _that.$refs.deliveryNotice.inStockBoxCount = row.inStockBoxCount
|
|
|
- _that.$refs.deliveryNotice.waitSendBoxCount = row.waitSendBoxCount
|
|
|
-
|
|
|
- _that.$refs.deliveryNotice.addressDialogInfo.orderState = row.stateMemo
|
|
|
- _that.$refs.deliveryNotice.openNotices()
|
|
|
-
|
|
|
- })
|
|
|
- },
|
|
|
-
|
|
|
- // 获取物流档案
|
|
|
- getLogisticsInfo() {
|
|
|
- var _that = this
|
|
|
- var data = {
|
|
|
- params: {
|
|
|
- enable: 1
|
|
|
- }
|
|
|
- }
|
|
|
- getLogisticsInfoList(data).then(response => {
|
|
|
- // console.log('getSendKind', response)
|
|
|
- _that.sendKinds = response.data
|
|
|
- }).catch(err => {
|
|
|
- // console.log(err)
|
|
|
- })
|
|
|
- },
|
|
|
- // 获取发货区域
|
|
|
- getAreaList() {
|
|
|
- var _that = this
|
|
|
- getshipAreaListInfo().then(response => {
|
|
|
- // console.log('shipArea', response)
|
|
|
- const data = response.data
|
|
|
- // // 组合表单数据
|
|
|
- _that.shipAreaList = response.data
|
|
|
- }).catch(err => {
|
|
|
- console.log(err)
|
|
|
- })
|
|
|
- },
|
|
|
-
|
|
|
// 获取配置信息
|
|
|
getConfig(key) {
|
|
|
const _that = this
|
|
|
@@ -1417,146 +1251,6 @@ export default {
|
|
|
_that.$message.error(err)
|
|
|
})
|
|
|
},
|
|
|
- // 收款
|
|
|
- orderPayType($event, row) {
|
|
|
- const _that = this
|
|
|
- if ($event == 1) {
|
|
|
- _that.orderPayVisible = true
|
|
|
- _that.orderPayInfo.orderInfo = row
|
|
|
- var data = {
|
|
|
- idOrder: row.id
|
|
|
- }
|
|
|
- getOrderReceivableByOrder(data).then(res => {
|
|
|
- // console.log(res)
|
|
|
- _that.orderPayInfo.orderReceivableList = res.data
|
|
|
- _that.orderPayInfo.receivableMoney = ''
|
|
|
- })
|
|
|
- } else if ($event == 2) {
|
|
|
- _that.paymentBillVisible = true
|
|
|
- var page = {
|
|
|
- pageIndex: _that.orderPayListData.page,
|
|
|
- pageSize: _that.orderPayListData.pageSize
|
|
|
- }
|
|
|
- var data = {
|
|
|
- 'idOrder': row.id,
|
|
|
- 'page': JSON.stringify(page)
|
|
|
- }
|
|
|
- getPaymentBillByOrder(data).then(res => {
|
|
|
- // console.log(res);
|
|
|
- _that.paymentBillList = res.data
|
|
|
- })
|
|
|
- }
|
|
|
- },
|
|
|
- // 收款确认
|
|
|
- orderPaySure() {
|
|
|
- const _that = this
|
|
|
- if (_that.orderPayInfo.orderReceivableList.length > 0) {
|
|
|
- var receivableValueList = []
|
|
|
- var arr = _that.orderPayInfo.orderReceivableList
|
|
|
- for (let i = 0; i < arr.length; i++) {
|
|
|
- var item = arr[i]
|
|
|
- if (item.currencyValue == '' || item.currencyValue == undefined || item.currencyValue == null || item.currencyValue <= 0) {
|
|
|
- _that.$message.warning('请填写收款金额')
|
|
|
- return
|
|
|
- }
|
|
|
- var receivableValue = {
|
|
|
- id: item.id,
|
|
|
- currencyValue: item.currencyValue
|
|
|
- }
|
|
|
- receivableValueList.push(receivableValue)
|
|
|
- }
|
|
|
- // _that.orderPayInfo.orderReceivableList.forEach(item => {
|
|
|
- // var receivableValue = {
|
|
|
- // id: item.id,
|
|
|
- // currencyValue: item.currencyValue
|
|
|
- // }
|
|
|
- // receivableValueList.push(receivableValue)
|
|
|
- // })
|
|
|
- _that.orderPayLoading = true
|
|
|
- var data = {
|
|
|
- 'receivableValueList': JSON.stringify(receivableValueList)
|
|
|
- }
|
|
|
- // console.log(data)
|
|
|
- // return;
|
|
|
- orderPayRequest(data).then(res => {
|
|
|
- // console.log(res)
|
|
|
- if (res.httpCode == 200) {
|
|
|
- _that.orderPayVisible = false
|
|
|
- _that.orderPayLoading = false
|
|
|
- _that.$notify({
|
|
|
- title: '提示',
|
|
|
- message: '<img src="' + res.data.qrCodeImageUrl + '"width="100px" height="100px" onclick="window.open(this.src)">',
|
|
|
- duration: 0,
|
|
|
- dangerouslyUseHTMLString: true
|
|
|
- })
|
|
|
- }
|
|
|
- }).catch(err => {
|
|
|
- _that.orderPayLoading = false
|
|
|
- // _that.$message.error(err)
|
|
|
- })
|
|
|
- } else {
|
|
|
- if (_that.orderPayInfo.receivableMoney == '' || _that.orderPayInfo.receivableMoney == undefined || _that.orderPayInfo.receivableMoney == null || _that.orderPayInfo.receivableMoney <= 0) {
|
|
|
- _that.$message.warning('请填写收款金额')
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- _that.orderPayLoading = true
|
|
|
- var data = {
|
|
|
- 'idOrder': _that.orderPayInfo.orderInfo.id,
|
|
|
- 'receivableMoney': JSON.stringify(_that.orderPayInfo.receivableMoney)
|
|
|
- }
|
|
|
- orderPayRequest3(data).then(res => {
|
|
|
- // console.log(res)
|
|
|
- // res.data.qrCodeImageUrl
|
|
|
- if (res.httpCode == 200) {
|
|
|
- _that.orderPayVisible = false
|
|
|
- _that.orderPayLoading = false
|
|
|
- _that.$notify({
|
|
|
- title: '提示',
|
|
|
- message: '<img src="' + res.data.qrCodeImageUrl + '"width="100px" height="100px" onclick="window.open(this.src)">',
|
|
|
- duration: 0,
|
|
|
- dangerouslyUseHTMLString: true
|
|
|
- })
|
|
|
- }
|
|
|
- }).catch(err => {
|
|
|
- _that.orderPayLoading = false
|
|
|
- // _that.$message.error(err)
|
|
|
- })
|
|
|
- }
|
|
|
- },
|
|
|
- // clickImg(src) {
|
|
|
- // window.open(src)
|
|
|
- // },
|
|
|
- // 收款单取消
|
|
|
- cancelPay(row) {
|
|
|
- const _that = this
|
|
|
- var data = {
|
|
|
- idBill: row.id
|
|
|
- }
|
|
|
- cancelOrderPayRequest(data).then(res => {
|
|
|
- _that.paymentBillVisible = false
|
|
|
- _that.$message({
|
|
|
- type: 'success',
|
|
|
- message: '取消成功!'
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
- // 收款单重收
|
|
|
- resetPay(row) {
|
|
|
- const _that = this
|
|
|
- var data = {
|
|
|
- idBill: row.id
|
|
|
- }
|
|
|
- reOrderPayRequest(data).then(res => {
|
|
|
- _that.paymentBillVisible = false
|
|
|
- _that.$notify({
|
|
|
- title: '提示',
|
|
|
- message: '<img src="' + res.data.qrCodeImageUrl + '"width="100px" height="100px" onclick="window.open(this.src)">',
|
|
|
- duration: 0,
|
|
|
- dangerouslyUseHTMLString: true
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
getUploadType1($event, row) {
|
|
|
const _that = this
|
|
|
if ($event == 1) {
|
|
|
@@ -1632,34 +1326,6 @@ export default {
|
|
|
}, 1000)
|
|
|
},
|
|
|
|
|
|
- guestComplaint($event, row) {
|
|
|
- var _that = this
|
|
|
- if ($event == 1) {
|
|
|
- _that.reprintOrder(row)
|
|
|
- }else {
|
|
|
- _that.complaintRegister(row)
|
|
|
- }
|
|
|
- },
|
|
|
- // 补印订单
|
|
|
- reprintOrder(row) {
|
|
|
- if (this.$store.state.app.sidebar.opened) {
|
|
|
- this.$store.dispatch('app/toggleSideBar')
|
|
|
- }
|
|
|
- this.$router.push({path: '/order/editOrder/' + row.id, query: {id: row.id, orderCode: row.orderCode, editType: 2,versionCode: row.versionCode}})
|
|
|
- },
|
|
|
- // 登记客诉
|
|
|
- complaintRegister(row){
|
|
|
- var _that = this
|
|
|
- _that.$refs.complaintRegistration.handleCreateAdd()
|
|
|
- _that.$refs.complaintRegistration.form.clientName = row.clientName
|
|
|
- _that.$refs.complaintRegistration.form.linkPhone = row.linkPhone
|
|
|
- _that.$refs.complaintRegistration.form.orderCode = row.orderCode
|
|
|
- _that.$refs.complaintRegistration.form.orderName = row.orderName
|
|
|
- _that.$refs.complaintRegistration.form.idOrder = row.id
|
|
|
- _that.$refs.complaintRegistration.relationChecked = true
|
|
|
- _that.$refs.complaintRegistration.relationDisabled = true
|
|
|
- },
|
|
|
-
|
|
|
// 作废订单
|
|
|
voidOrderbtn(row) {
|
|
|
var _that = this
|
jlutt@163.com