|
|
|
|
@ -278,17 +278,17 @@
|
|
|
|
|
<script>
|
|
|
|
|
import addOrder from '@/views/inout/DialogCreateOrder'
|
|
|
|
|
import errOrder from '@/views/inout/IoCreateErrorOrder'
|
|
|
|
|
import {executeFuc, getHead} from '@/utils/customConfig'
|
|
|
|
|
import {convertDate} from '@/utils/date'
|
|
|
|
|
import { executeFuc, getHead } from '@/utils/customConfig'
|
|
|
|
|
import { convertDate } from '@/utils/date'
|
|
|
|
|
import prescribeCodePanel from './PanelOrderTagCode'
|
|
|
|
|
import PanelOrderManuTagCode from './PanelOrderManuTagCode'
|
|
|
|
|
import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
|
|
|
|
|
import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
|
|
|
|
|
import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail"
|
|
|
|
|
import CollectFinishOrderBackupDetail from './CollectFinishOrderBackupDetail'
|
|
|
|
|
|
|
|
|
|
import {orderFinish, orderPage, orderUpload} from '@/api/collect/collectOrder'
|
|
|
|
|
import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
|
|
|
|
|
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
|
|
|
|
|
import { orderFinish, orderPage, orderUpload } from '@/api/collect/collectOrder'
|
|
|
|
|
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
|
|
|
|
|
import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: 'panelOrderUpload',
|
|
|
|
|
@ -343,33 +343,33 @@ export default {
|
|
|
|
|
pickerOptions: {
|
|
|
|
|
shortcuts: [
|
|
|
|
|
{
|
|
|
|
|
text: "最近一周",
|
|
|
|
|
text: '最近一周',
|
|
|
|
|
onClick(picker) {
|
|
|
|
|
const end = new Date();
|
|
|
|
|
const start = new Date();
|
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
|
|
|
|
picker.$emit("pick", [start, end]);
|
|
|
|
|
},
|
|
|
|
|
const end = new Date()
|
|
|
|
|
const start = new Date()
|
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
|
|
|
|
|
picker.$emit('pick', [start, end])
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: "最近一个月",
|
|
|
|
|
text: '最近一个月',
|
|
|
|
|
onClick(picker) {
|
|
|
|
|
const end = new Date();
|
|
|
|
|
const start = new Date();
|
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
|
|
|
|
picker.$emit("pick", [start, end]);
|
|
|
|
|
},
|
|
|
|
|
const end = new Date()
|
|
|
|
|
const start = new Date()
|
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
|
|
|
|
|
picker.$emit('pick', [start, end])
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: "最近三个月",
|
|
|
|
|
text: '最近三个月',
|
|
|
|
|
onClick(picker) {
|
|
|
|
|
const end = new Date();
|
|
|
|
|
const start = new Date();
|
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
|
|
|
picker.$emit("pick", [start, end]);
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
const end = new Date()
|
|
|
|
|
const start = new Date()
|
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
|
|
|
|
|
picker.$emit('pick', [start, end])
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
actDateRange: [],
|
|
|
|
|
//界面配置-------------end
|
|
|
|
|
@ -384,7 +384,7 @@ export default {
|
|
|
|
|
page: 1,
|
|
|
|
|
limit: 10
|
|
|
|
|
},
|
|
|
|
|
defaultSort: {prop: 'createTime', order: 'desc'},
|
|
|
|
|
defaultSort: { prop: 'createTime', order: 'desc' },
|
|
|
|
|
loading: false,
|
|
|
|
|
list: [],
|
|
|
|
|
total: 0,
|
|
|
|
|
@ -403,7 +403,7 @@ export default {
|
|
|
|
|
isLinkDisabled: false,
|
|
|
|
|
options: {
|
|
|
|
|
findWorkPlace: [],
|
|
|
|
|
getBusType: [],
|
|
|
|
|
getBusType: []
|
|
|
|
|
},
|
|
|
|
|
showType: 1
|
|
|
|
|
}
|
|
|
|
|
@ -426,14 +426,14 @@ export default {
|
|
|
|
|
_this.busQuery.workplaceCode = query
|
|
|
|
|
getWorkBindBusTypes(this.busQuery).then(res => {
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
let busTypes = res.data.list || [];
|
|
|
|
|
let busTypes = res.data.list || []
|
|
|
|
|
// _this.options.getWorkPlace = res.data.list || [];
|
|
|
|
|
let getWorkPlace = busTypes.map(busType => {
|
|
|
|
|
return {
|
|
|
|
|
code: busType.documentTypeCode,
|
|
|
|
|
label: busType.busName
|
|
|
|
|
};
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
_this.options.getBusType = getWorkPlace
|
|
|
|
|
if (_this.options.getBusType.length == 1) {
|
|
|
|
|
_this.filterQuery.busType = _this.options.getBusType[0].code
|
|
|
|
|
@ -468,24 +468,32 @@ export default {
|
|
|
|
|
hideSearch() {
|
|
|
|
|
this.showSearch = !this.showSearch
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
console.log('组件已刷新');
|
|
|
|
|
});
|
|
|
|
|
console.log('组件已刷新')
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
onReset() {
|
|
|
|
|
this.filterQuery = {
|
|
|
|
|
busType: null,
|
|
|
|
|
tagStatus: null,
|
|
|
|
|
uploadStatus: 1,
|
|
|
|
|
billNo: null,
|
|
|
|
|
workPlaceCode: null,
|
|
|
|
|
page: 1,
|
|
|
|
|
limit: 10
|
|
|
|
|
},
|
|
|
|
|
this.filterQuery.tagStatus = this.tagStatus
|
|
|
|
|
this.filterQuery.uploadStatus = String(this.status)
|
|
|
|
|
if (this.status == 2) {
|
|
|
|
|
this.filterQuery.uploadStatusName = '已上传'
|
|
|
|
|
}
|
|
|
|
|
this.actDateRange = []
|
|
|
|
|
this.actDateRange = []
|
|
|
|
|
|
|
|
|
|
this.getList()
|
|
|
|
|
},
|
|
|
|
|
onSubmit(_this) {
|
|
|
|
|
if (_this == null)
|
|
|
|
|
if (_this == null) {
|
|
|
|
|
_this = this
|
|
|
|
|
}
|
|
|
|
|
_this.filterQuery.page = 1
|
|
|
|
|
_this.getList()
|
|
|
|
|
},
|
|
|
|
|
@ -493,11 +501,11 @@ export default {
|
|
|
|
|
getList() {
|
|
|
|
|
this.loading = true
|
|
|
|
|
if (this.actDateRange !== null) {
|
|
|
|
|
this.filterQuery.startTime = this.actDateRange[0];
|
|
|
|
|
this.filterQuery.endTime = this.actDateRange[1];
|
|
|
|
|
this.filterQuery.startTime = this.actDateRange[0]
|
|
|
|
|
this.filterQuery.endTime = this.actDateRange[1]
|
|
|
|
|
} else {
|
|
|
|
|
this.filterQuery.startTime = null;
|
|
|
|
|
this.filterQuery.endTime = null;
|
|
|
|
|
this.filterQuery.startTime = null
|
|
|
|
|
this.filterQuery.endTime = null
|
|
|
|
|
}
|
|
|
|
|
orderFinish(this.filterQuery).then(res => {
|
|
|
|
|
this.loading = false
|
|
|
|
|
@ -549,35 +557,34 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
orderUpload(_this, row) {
|
|
|
|
|
let params = row;
|
|
|
|
|
_this.$confirm("该订单将上传到外部系统，是否继续?", "提示", {
|
|
|
|
|
confirmButtonText: "确定",
|
|
|
|
|
cancelButtonText: "取消",
|
|
|
|
|
type: "warning",
|
|
|
|
|
let params = row
|
|
|
|
|
_this.$confirm('该订单将上传到外部系统，是否继续?', '提示', {
|
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
|
type: 'warning'
|
|
|
|
|
})
|
|
|
|
|
.then(() => {
|
|
|
|
|
orderUpload({billNo: params.billNo})
|
|
|
|
|
orderUpload({ billNo: params.billNo })
|
|
|
|
|
.then((response) => {
|
|
|
|
|
if (response.code == 20000) {
|
|
|
|
|
_this.getList();
|
|
|
|
|
_this.getList()
|
|
|
|
|
_this.$message({
|
|
|
|
|
type: "success",
|
|
|
|
|
message: "上传成功！",
|
|
|
|
|
});
|
|
|
|
|
type: 'success',
|
|
|
|
|
message: '上传成功！'
|
|
|
|
|
})
|
|
|
|
|
} else if (response.code == 520) {
|
|
|
|
|
_this.$message.error(response.message);
|
|
|
|
|
_this.getList();
|
|
|
|
|
_this.$message.error(response.message)
|
|
|
|
|
_this.getList()
|
|
|
|
|
} else {
|
|
|
|
|
_this.$message.error(response.message);
|
|
|
|
|
_this.getList();
|
|
|
|
|
_this.$message.error(response.message)
|
|
|
|
|
_this.getList()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
wangwei
9 months ago