|
|
@@ -4,26 +4,25 @@
|
|
|
|
|
|
<template #slot-tabs>
|
|
|
<el-tabs class="liu-tabs" type="border-card" v-model="tabIndex" @tab-click="handleClick">
|
|
|
- <el-tab-pane
|
|
|
- v-for="(item, index) in tabsData"
|
|
|
- :key="index"
|
|
|
- :label="`${item.text}`"
|
|
|
- :name="item.key"
|
|
|
- ></el-tab-pane>
|
|
|
+ <el-tab-pane v-for="(item, index) in tabsData" :key="index" :label="`${item.text}`" :name="item.key" ></el-tab-pane>
|
|
|
</el-tabs>
|
|
|
</template>
|
|
|
|
|
|
- <template #table-column-sendStaffName="{scope}">
|
|
|
- <span v-if="scope.row.sendStaffName!=''" style="cursor:pointer;" @click="changeSendStaff(scope.row)">{{ scope.row.sendStaffName }}</span>
|
|
|
- <span v-else>
|
|
|
- <i class="el-icon-edit" style="color:#409eff;font-size:17px;cursor:pointer;" slot="reference" @click="changeSendStaff(scope.row)"></i>
|
|
|
- </span>
|
|
|
+ <template #table-column-itemCover="{ scope }">
|
|
|
+ <el-popover placement="right" width="200" trigger="hover">
|
|
|
+ <div style="width:200px;height:200px;">
|
|
|
+ <img style="width:100%;height:100%;object-fit: cover;" :src="scope.row.bigCover" />
|
|
|
+ </div>
|
|
|
+ <div style="width:40px;" slot="reference">
|
|
|
+ <img style="width:100%;height:100%;object-fit: cover;border-radius:5px;" :src="scope.row.cover" />
|
|
|
+ </div>
|
|
|
+ </el-popover>
|
|
|
</template>
|
|
|
|
|
|
- <template #table-column-shopAdminName="{scope}">
|
|
|
- <span v-if="scope.row.shopAdminName!=''" style="cursor:pointer;" @click="changeKdStaff(scope.row)">{{ scope.row.shopAdminName }}</span>
|
|
|
+ <template #table-column-switch="{scope}">
|
|
|
+ <span v-if="scope.row.switch==0"></span>
|
|
|
<span v-else>
|
|
|
- <i class="el-icon-edit" style="color:#409eff;font-size:17px;cursor:pointer;" slot="reference" @click="changeKdStaff(scope.row)"></i>
|
|
|
+ <i class="el-icon-success" style="color:green;font-size:18px;"></i>
|
|
|
</span>
|
|
|
</template>
|
|
|
|
|
|
@@ -40,7 +39,7 @@
|
|
|
<el-select size="mini" v-model="currentKdStaffName" placeholder="开单人" style="width:110px;margin-left:8px;" @change="getKdStaff" :clearable="true">
|
|
|
<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
- <span style="margin-left:9px;font-size:16px;">账单时间:</span>
|
|
|
+ <span style="margin-left:9px;font-size:18px;">时间:</span>
|
|
|
<el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
|
|
|
class="custom-date-picker" end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:8px;">
|
|
|
</el-date-picker>
|
|
|
@@ -57,50 +56,17 @@
|
|
|
|
|
|
</x-crud>
|
|
|
|
|
|
- <select-staff ref="selectStaffRef" @getStaff="getStaff" :staffData="staffData" />
|
|
|
-
|
|
|
- <arrival ref="arrivalRef" :arrivalData="arrivalData" @searchFocus="searchFocus" @addNewItem="addNewItem" @refreshData="refreshData" @getStockDetail="getStockDetail" @getCostChange="getCostChange" @openLoan="openLoan" />
|
|
|
-
|
|
|
- <simple-item ref="simpleItemRef" :simpleData="simpleData" @renewArrival="renewArrival" />
|
|
|
-
|
|
|
- <order-detail ref="LiveDetail" :orderOperate="optionData" @getStockDetail="getStockDetail" @searchFocus="searchFocus" />
|
|
|
-
|
|
|
- <sel-order ref="selOrder" :id="optionData.id" @song-success="onSongSuccess" />
|
|
|
-
|
|
|
- <stock-detail ref="stockDetail" :itemData="itemData" />
|
|
|
-
|
|
|
- <begin-refund ref="beginRefundRef" :currentRefundData="currentRefundData" @searchFocus="searchFocus" />
|
|
|
- <refund-record ref="refundRecordRef" :currentData="refundRecordData" @searchFocus="searchFocus" />
|
|
|
- <cost-change ref="costChangeRef" :costData="costData" @searchFocus="searchFocus" />
|
|
|
- <loan-item ref="loanItemRef" :currentData="loanData" @renewArrival="renewArrival" />
|
|
|
+ <live-detail ref="LiveDetail" :orderOperate="optionData" @getStockDetail="getStockDetail" @searchFocus="searchFocus" />
|
|
|
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import selectStaff from '@/components/staff/select-staff';
|
|
|
-import stockDetail from './components/stock-detail';
|
|
|
-import SelOrder from './components/sel-order';
|
|
|
import LiveDetail from './components/live-detail';
|
|
|
-import arrival from './components/arrival';
|
|
|
-import simpleItem from './components/simple-item';
|
|
|
-import beginRefund from './components/begin-refund';
|
|
|
-import refundRecord from './components/refund-record';
|
|
|
-import costChange from '@/components/item/cost-change';
|
|
|
-import loanItem from '@/components/item/loan-item';
|
|
|
import {hiprint, defaultElementTypeProvider} from 'vue-plugin-hiprint'
|
|
|
export default {
|
|
|
components: {
|
|
|
- SelOrder,
|
|
|
LiveDetail,
|
|
|
- arrival,
|
|
|
- simpleItem,
|
|
|
- beginRefund,
|
|
|
- refundRecord,
|
|
|
- selectStaff,
|
|
|
- stockDetail,
|
|
|
- costChange,
|
|
|
- loanItem
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -187,16 +153,6 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
let that = this;
|
|
|
- document.onkeydown=function(e) {
|
|
|
- if(e && e.key == ',' && e.ctrlKey){
|
|
|
- let query = {}
|
|
|
- that.$router.push({path:'/order/add',query})
|
|
|
- }
|
|
|
- if(e && e.key == '.' && e.ctrlKey){
|
|
|
- let query = {}
|
|
|
- that.$router.push({path:'/in/add',query})
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.orderSearchRef.focus()
|
|
|
@@ -245,9 +201,6 @@ export default {
|
|
|
this.$refs.beginRefundRef.init()
|
|
|
})
|
|
|
},
|
|
|
- renewArrival(info){
|
|
|
- this.confirmArrival(info)
|
|
|
- },
|
|
|
getStockDetail(info){
|
|
|
this.itemData = {id:info.productId,name:info.name,direction:'rtl'}
|
|
|
setTimeout(() => {
|
|
|
@@ -291,37 +244,6 @@ export default {
|
|
|
that.app.refresh({ status: that.tabIndex,book:that.book,searchTime:that.searchTime,startTime:that.startTime,endTime:that.endTime,name:that.name,shopAdminId:this.currentKdStaffId })
|
|
|
},650)
|
|
|
},
|
|
|
- confirmReach(info){
|
|
|
- let that = this
|
|
|
- this.$confirm('确认已送达?', '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
|
|
|
- this.$service.order.confirmReach({id:info.id}).then(res=>{
|
|
|
- that.$message.success('确认成功')
|
|
|
- that.refreshData()
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
- confirmSend(info){
|
|
|
- let that = this
|
|
|
- this.$service.order.fh({id:info.id,fhType:0}).then(data => {
|
|
|
- this.$notify({ title: '操作成功', message: '', type: 'success'})
|
|
|
- that.refreshData()
|
|
|
- })
|
|
|
- },
|
|
|
- changeReCheck(info){
|
|
|
- let that = this
|
|
|
- this.$service.order.modifyReCheck({id:info.id}).then(data => {
|
|
|
- this.$notify({ title: '操作成功', message: '', type: 'success'})
|
|
|
- info.reCheck = 1
|
|
|
- })
|
|
|
- },
|
|
|
- newCg(){
|
|
|
- let query = {}
|
|
|
- this.$router.push({path:'/in/add',query})
|
|
|
- },
|
|
|
- billing(){
|
|
|
- let query = {}
|
|
|
- this.$router.push({path:'/order/add',query})
|
|
|
- },
|
|
|
changeBook(e){
|
|
|
this.book = e
|
|
|
this.app.refresh({ status: this.tabIndex,book:this.book,name:this.name,shopAdminId:this.currentKdStaffId });
|
|
|
@@ -419,7 +341,7 @@ export default {
|
|
|
prop: 'itemCover',
|
|
|
label: '图片',
|
|
|
align: 'center',
|
|
|
- width: '120'
|
|
|
+ width: '65'
|
|
|
},
|
|
|
{
|
|
|
prop: 'itemName',
|
|
|
@@ -441,21 +363,21 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
prop: 'switch',
|
|
|
- label: '转换',
|
|
|
+ label: '已转订单',
|
|
|
align: 'center',
|
|
|
- width: '60'
|
|
|
+ width: '100'
|
|
|
},
|
|
|
{
|
|
|
prop: 'addTime',
|
|
|
label: '创建时间',
|
|
|
align: 'center',
|
|
|
- width: 150
|
|
|
+ width: 160
|
|
|
},
|
|
|
{
|
|
|
prop: 'updateTime',
|
|
|
label: '修改时间',
|
|
|
align: 'center',
|
|
|
- width: 150
|
|
|
+ width: 160
|
|
|
},
|
|
|
],
|
|
|
on: {
|
|
|
@@ -474,7 +396,7 @@ export default {
|
|
|
op: {
|
|
|
visible: true,
|
|
|
props: {
|
|
|
- width: 330,
|
|
|
+ width: 600,
|
|
|
align: 'center',
|
|
|
fixed: 'right',
|
|
|
label: '操作'
|
|
|
@@ -499,9 +421,6 @@ export default {
|
|
|
})
|
|
|
.done();
|
|
|
app.refresh({ status: this.tabIndex,book:this.book,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,name:this.name,shopAdminId:this.currentKdStaffId })
|
|
|
- },
|
|
|
- onSongSuccess() {
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
};
|