Merge remote-tracking branch 'origin/master'
schry
2 years ago
commit
b4cf299f8c
@ -1,513 +1,521 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card class="el-card">
|
<el-card class="el-card">
|
||||||
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
|
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="申购单号">
|
<el-form-item label="申购单号">
|
||||||
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
|
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="申购部门">
|
<el-form-item label="申购部门">
|
||||||
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList" style="width: 90%">
|
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList"
|
||||||
<el-option
|
style="width: 90%">
|
||||||
v-for="item in deptList"
|
<el-option
|
||||||
:key="item.code"
|
v-for="item in deptList"
|
||||||
:label="item.name"
|
:key="item.code"
|
||||||
:value="item.code"
|
:label="item.name"
|
||||||
>
|
:value="item.code"
|
||||||
<span style="float: left">{{ item.name }}</span>
|
>
|
||||||
</el-option>
|
<span style="float: left">{{ item.name }}</span>
|
||||||
</el-select>
|
</el-option>
|
||||||
</el-form-item>
|
</el-select>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="申购仓库">
|
<el-form-item label="申购仓库">
|
||||||
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
|
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in invList"
|
v-for="item in invList"
|
||||||
:key="item.name"
|
:key="item.name"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.code">
|
:value="item.code">
|
||||||
<span style="float: left">{{ item.name }}</span>
|
<span style="float: left">{{ item.name }}</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="紧急程度：" prop="emergency">
|
<el-form-item label="紧急程度：" prop="emergency">
|
||||||
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
|
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
|
||||||
<el-option label="正常" :value=1></el-option>
|
<el-option label="正常" :value=1></el-option>
|
||||||
<el-option label="较急" :value=2></el-option>
|
<el-option label="较急" :value=2></el-option>
|
||||||
<el-option label="特急" :value=3></el-option>
|
<el-option label="特急" :value=3></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="创建时间:">
|
<el-form-item label="创建时间:">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
:picker-options="pickerOptions"
|
:picker-options="pickerOptions"
|
||||||
v-model="actDateRange"
|
v-model="actDateRange"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
format="yyyy 年 MM 月 dd 日"
|
format="yyyy 年 MM 月 dd 日"
|
||||||
style="width: 90%"
|
style="width: 90%"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始日期"
|
start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期"
|
end-placeholder="结束日期"
|
||||||
>
|
>
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<div class="top-right-btn">
|
<div class="top-right-btn">
|
||||||
<el-button-group style="display:flex;">
|
<el-button-group style="display:flex;">
|
||||||
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
|
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
|
||||||
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
|
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
|
||||||
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
|
||||||
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据</el-button>
|
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据
|
||||||
</el-button-group>
|
</el-button>
|
||||||
</div>
|
</el-button-group>
|
||||||
|
</div>
|
||||||
|
|
||||||
<el-divider style="margin: 15px"></el-divider>
|
<el-divider style="margin: 15px"></el-divider>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border highlight-current-row
|
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border
|
||||||
:default-sort="defaultSort" @sort-change="handleSortChange">
|
highlight-current-row
|
||||||
<el-table-column label="序号" type="index" width="60"></el-table-column>
|
:default-sort="defaultSort" @sort-change="handleSortChange">
|
||||||
<el-table-column label="申购单号" prop="billNo"></el-table-column>
|
<el-table-column label="序号" type="index" width="60"></el-table-column>
|
||||||
<el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
|
<el-table-column label="申购单号" prop="billNo"></el-table-column>
|
||||||
<el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
|
<el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
|
||||||
<el-table-column label="紧急程度" prop="emergency" >
|
<el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
|
||||||
<template slot-scope="scope">
|
<el-table-column label="紧急程度" prop="emergency">
|
||||||
{{ emergencyMap[scope.row.emergency] }}
|
<template slot-scope="scope">
|
||||||
</template>
|
{{ emergencyMap[scope.row.emergency] }}
|
||||||
</el-table-column>
|
</template>
|
||||||
<el-table-column label="到货截止" prop="arrivalTime" ></el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="单据状态" prop="status">
|
<el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
|
||||||
<template slot-scope="scope">
|
<el-table-column label="单据状态" prop="status">
|
||||||
<el-tag :type="(scope.row.status) | statusFilterType">
|
<template slot-scope="scope">
|
||||||
{{ statusMap[scope.row.status] }}
|
<el-tag :type="(scope.row.status) | statusFilterType">
|
||||||
</el-tag>
|
{{ statusMap[scope.row.status] }}
|
||||||
</template>
|
</el-tag>
|
||||||
</el-table-column>
|
</template>
|
||||||
<el-table-column label="备注" prop="remark"></el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="创建时间" prop="createTime"
|
<el-table-column label="备注" prop="remark"></el-table-column>
|
||||||
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
|
<el-table-column label="创建时间" prop="createTime"
|
||||||
<el-table-column label="操作" width="120px">
|
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
|
||||||
<template slot-scope="scope">
|
<el-table-column label="操作" width="120px">
|
||||||
<el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
|
<template slot-scope="scope">
|
||||||
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
|
<el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
|
||||||
</template>
|
</el-button>
|
||||||
</el-table-column>
|
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
|
||||||
</el-table>
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
:total="total"
|
:total="total"
|
||||||
:page.sync="filterQuery.page"
|
:page.sync="filterQuery.page"
|
||||||
:limit.sync="filterQuery.limit"
|
:limit.sync="filterQuery.limit"
|
||||||
@pagination="handleCurrentChange"
|
@pagination="handleCurrentChange"
|
||||||
|
|
||||||
></pagination>
|
></pagination>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<el-card class="el-card">
|
<el-card class="el-card">
|
||||||
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
|
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
|
||||||
<el-table-column label="序号" type="index" width="60"></el-table-column>
|
<el-table-column label="序号" type="index" width="60"></el-table-column>
|
||||||
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
|
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
|
||||||
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
|
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
|
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
|
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
|
||||||
<el-table-column label="申购数量" prop="count"></el-table-column>
|
<el-table-column label="申购数量" prop="count"></el-table-column>
|
||||||
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
|
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
|
||||||
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
|
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
|
||||||
<el-table-column label="供应商" prop="supName"></el-table-column>
|
<el-table-column label="供应商" prop="supName"></el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
:title="formMap[formName]"
|
:title="formMap[formName]"
|
||||||
:visible.sync="newSpDistributionVisible"
|
:visible.sync="newSpDistributionVisible"
|
||||||
width="80%"
|
width="80%"
|
||||||
v-if="newSpDistributionVisible"
|
v-if="newSpDistributionVisible"
|
||||||
@close='closeDialog'
|
@close='closeDialog'
|
||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
:close-on-press-escape="false"
|
:close-on-press-escape="false"
|
||||||
:before-close ="handleClose"
|
:before-close="handleClose"
|
||||||
>
|
>
|
||||||
<pureApplyEdit
|
<pureApplyEdit
|
||||||
:closeDialog="closeDialog"
|
:closeDialog="closeDialog"
|
||||||
:idQuery="idQuery"
|
:idQuery="idQuery"
|
||||||
v-on:cancelDialog="getId"
|
v-on:cancelDialog="getId"
|
||||||
:isChang="isChang"
|
:isChang="isChang"
|
||||||
></pureApplyEdit>
|
></pureApplyEdit>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import pureApplyEdit from "./purApplyEditDiaolog";
|
import pureApplyEdit from "./purApplyEditDiaolog";
|
||||||
import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
|
import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
|
||||||
import { getInvListByUser } from '@/api/system/invWarehouse'
|
import {getInvListByUser} from '@/api/system/invWarehouse'
|
||||||
import { getDeptListByUser } from '@/api/auth/authDept'
|
import {filterDepts, getDeptListByUser} from '@/api/auth/authDept'
|
||||||
import {filterSubAll} from "@/api/system/invSubWarehouse";
|
import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
defaultSort: {prop: 'createTime', order: 'desc'},
|
defaultSort: {prop: 'createTime', order: 'desc'},
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
pId:null,
|
pId: null,
|
||||||
filterQuery: {
|
filterQuery: {
|
||||||
billAction: null,
|
billAction: null,
|
||||||
billNo: "",
|
billNo: "",
|
||||||
originType: null,
|
originType: null,
|
||||||
thirdSysFk: "",
|
thirdSysFk: "",
|
||||||
page: 1,
|
page: 1,
|
||||||
limit: 10,
|
limit: 10,
|
||||||
corpName: null,
|
corpName: null,
|
||||||
type: 1,
|
type: 1,
|
||||||
editStatus: 1,
|
editStatus: 1,
|
||||||
emergency:'',
|
emergency: '',
|
||||||
targetDeptCode:'',
|
targetDeptCode: '',
|
||||||
targetInvCode:null
|
targetInvCode: null
|
||||||
},
|
},
|
||||||
isChang:false,
|
isChang: false,
|
||||||
formName: null,
|
formName: null,
|
||||||
formMap: {
|
formMap: {
|
||||||
add: "新增申购单据",
|
add: "新增申购单据",
|
||||||
update: "编辑申购单据",
|
update: "编辑申购单据",
|
||||||
},
|
},
|
||||||
statusMap: {
|
statusMap: {
|
||||||
1: "草稿",
|
1: "草稿",
|
||||||
2: "未审核",
|
2: "未审核",
|
||||||
3: "已审核",
|
3: "已审核",
|
||||||
4: "已拒绝"
|
4: "已拒绝"
|
||||||
|
},
|
||||||
|
emergencyMap: {
|
||||||
|
1: "正常",
|
||||||
|
2: "较急",
|
||||||
|
3: "特急",
|
||||||
|
},
|
||||||
|
idQuery: {},
|
||||||
|
total: 0,
|
||||||
|
thirdSys: [],
|
||||||
|
invList: {},
|
||||||
|
invCodebe: null,
|
||||||
|
deptList: {},
|
||||||
|
thirdSysDetail: null,
|
||||||
|
busTypes: [],
|
||||||
|
originTypes: [],
|
||||||
|
list: [],
|
||||||
|
createTimes: null,
|
||||||
|
detailLoading: false,
|
||||||
|
detailList: [],
|
||||||
|
loading: false,
|
||||||
|
actDateRange: [],
|
||||||
|
newSpDistributionVisible: false,
|
||||||
|
pickerOptions: {
|
||||||
|
shortcuts: [
|
||||||
|
{
|
||||||
|
text: "最近一周",
|
||||||
|
onClick(picker) {
|
||||||
|
const end = new Date();
|
||||||
|
const start = new Date();
|
||||||
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||||
|
picker.$emit("pick", [start, end]);
|
||||||
},
|
},
|
||||||
emergencyMap:{
|
},
|
||||||
1: "正常",
|
{
|
||||||
2: "较急",
|
text: "最近一个月",
|
||||||
3: "特急",
|
onClick(picker) {
|
||||||
|
const end = new Date();
|
||||||
|
const start = new Date();
|
||||||
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
||||||
|
picker.$emit("pick", [start, end]);
|
||||||
},
|
},
|
||||||
idQuery: {},
|
},
|
||||||
total: 0,
|
{
|
||||||
thirdSys: [],
|
text: "最近三个月",
|
||||||
invList:{},
|
onClick(picker) {
|
||||||
invCodebe:null,
|
const end = new Date();
|
||||||
deptList:{},
|
const start = new Date();
|
||||||
thirdSysDetail: null,
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
||||||
busTypes: [],
|
picker.$emit("pick", [start, end]);
|
||||||
originTypes: [],
|
|
||||||
list: [],
|
|
||||||
createTimes:null,
|
|
||||||
detailLoading: false,
|
|
||||||
detailList: [],
|
|
||||||
loading: false,
|
|
||||||
actDateRange: [],
|
|
||||||
newSpDistributionVisible: false,
|
|
||||||
pickerOptions: {
|
|
||||||
shortcuts: [
|
|
||||||
{
|
|
||||||
text: "最近一周",
|
|
||||||
onClick(picker) {
|
|
||||||
const end = new Date();
|
|
||||||
const start = new Date();
|
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
|
||||||
picker.$emit("pick", [start, end]);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: "最近一个月",
|
|
||||||
onClick(picker) {
|
|
||||||
const end = new Date();
|
|
||||||
const start = new Date();
|
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
|
||||||
picker.$emit("pick", [start, end]);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: "最近三个月",
|
|
||||||
onClick(picker) {
|
|
||||||
const end = new Date();
|
|
||||||
const start = new Date();
|
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
||||||
picker.$emit("pick", [start, end]);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
};
|
},
|
||||||
},
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
onReset() {
|
onReset() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: "",
|
path: "",
|
||||||
});
|
});
|
||||||
let deptCode = this.filterQuery.targetDeptCode
|
let deptCode = this.filterQuery.targetDeptCode
|
||||||
this.filterQuery = {
|
this.filterQuery = {
|
||||||
billNo: "",
|
billNo: "",
|
||||||
thirdSysFk: "",
|
thirdSysFk: "",
|
||||||
billFlag: null,
|
billFlag: null,
|
||||||
billAction: null,
|
billAction: null,
|
||||||
startDate: null,
|
startDate: null,
|
||||||
endDate: null,
|
endDate: null,
|
||||||
page: 1,
|
page: 1,
|
||||||
limit: 10,
|
limit: 10,
|
||||||
corpName: null,
|
corpName: null,
|
||||||
type: 1,
|
type: 1,
|
||||||
editStatus: 1,
|
editStatus: 1,
|
||||||
targetDeptCode: this.invCodebe,
|
targetDeptCode: this.invCodebe,
|
||||||
targetInvCode:null
|
targetInvCode: null
|
||||||
};
|
};
|
||||||
this.initActDateRange()
|
this.initActDateRange()
|
||||||
if(deptCode!=this.invCodebe){
|
if (deptCode != this.invCodebe) {
|
||||||
this.getInvList()
|
this.getInvList()
|
||||||
}
|
}
|
||||||
this.actDateRange = [];
|
this.actDateRange = [];
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
getId(id){
|
getId(id) {
|
||||||
if( this.formName=='add' && id!=null){
|
if (this.formName == 'add' && id != null) {
|
||||||
var data={
|
var data = {
|
||||||
id:id
|
id: id
|
||||||
}
|
|
||||||
this.pId=id
|
|
||||||
//当在新增时取消添加操作删除掉这次的数据
|
|
||||||
delApplyDetailAll(data).then((response)=>{
|
|
||||||
if(response.code==20000){
|
|
||||||
this.newSpDistributionVisible=false
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}else{
|
|
||||||
this.newSpDistributionVisible=false
|
|
||||||
}
|
}
|
||||||
|
this.pId = id
|
||||||
|
//当在新增时取消添加操作删除掉这次的数据
|
||||||
|
delApplyDetailAll(data).then((response) => {
|
||||||
|
if (response.code == 20000) {
|
||||||
|
this.newSpDistributionVisible = false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.newSpDistributionVisible = false
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
onSubmitFind() {
|
onSubmitFind() {
|
||||||
this.filterQuery.page = 1;
|
this.filterQuery.page = 1;
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
hideSearch() {
|
hideSearch() {
|
||||||
this.showSearch = !this.showSearch;
|
this.showSearch = !this.showSearch;
|
||||||
},
|
},
|
||||||
|
|
||||||
handleSortChange(column, prop, order) {
|
handleSortChange(column, prop, order) {
|
||||||
if (column.order === 'descending') {
|
if (column.order === 'descending') {
|
||||||
this.filterQuery.sort = 'desc'
|
this.filterQuery.sort = 'desc'
|
||||||
} else {
|
} else {
|
||||||
this.filterQuery.sort = 'asc'
|
this.filterQuery.sort = 'asc'
|
||||||
}
|
}
|
||||||
this.filterQuery.orderBy = column.prop;
|
this.filterQuery.orderBy = column.prop;
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
|
|
||||||
getList() {
|
getList() {
|
||||||
if (this.actDateRange != null) {
|
if (this.actDateRange != null) {
|
||||||
this.filterQuery.startDate = this.actDateRange[0];
|
this.filterQuery.startDate = this.actDateRange[0];
|
||||||
this.filterQuery.endDate = this.actDateRange[1];
|
this.filterQuery.endDate = this.actDateRange[1];
|
||||||
} else {
|
} else {
|
||||||
this.filterQuery.startDate = null;
|
this.filterQuery.startDate = null;
|
||||||
this.filterQuery.endDate = null;
|
this.filterQuery.endDate = null;
|
||||||
}
|
}
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
console.log(this.filterQuery)
|
console.log(this.filterQuery)
|
||||||
listApply(this.filterQuery)
|
listApply(this.filterQuery)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
if (response.code == 20000) {
|
if (response.code == 20000) {
|
||||||
this.list = response.data.list || [];
|
this.list = response.data.list || [];
|
||||||
this.total = response.data.total || 0;
|
this.total = response.data.total || 0;
|
||||||
this.detailList=[]
|
this.detailList = []
|
||||||
} else {
|
} else {
|
||||||
this.$message.error(response.message);
|
this.$message.error(response.message);
|
||||||
}
|
|
||||||
this.loading = false;
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
this.loading = false;
|
|
||||||
this.list = [];
|
|
||||||
this.total = 0;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleDetail(row) {
|
|
||||||
let query = {orderIdFk: row.id};
|
|
||||||
this.detailLoading = true;
|
|
||||||
listApplyDetail(query) //查找该单号下的所有条码
|
|
||||||
.then((response) => {
|
|
||||||
this.detailList = response.data.list || [];
|
|
||||||
this.detailLoading = false;
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
this.detailLoading = false;
|
|
||||||
this.detailList = [];
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleClose(){
|
|
||||||
if( this.formName=='add'){
|
|
||||||
this.isChang=!this.isChang
|
|
||||||
}else{
|
|
||||||
this.newSpDistributionVisible=false
|
|
||||||
}
|
}
|
||||||
},
|
this.loading = false;
|
||||||
submitOrder(row) {
|
})
|
||||||
this.loading = true;
|
.catch(() => {
|
||||||
let tQuery = {
|
this.loading = false;
|
||||||
editStatus: 2,
|
this.list = [];
|
||||||
purApplyEntity: row,
|
this.total = 0;
|
||||||
}
|
});
|
||||||
inserThrOrderWeb(tQuery)
|
},
|
||||||
.then(response => {
|
handleDetail(row) {
|
||||||
this.loading = false;
|
let query = {orderIdFk: row.id};
|
||||||
if (response.code === 20000) {
|
this.detailLoading = true;
|
||||||
this.$message.success("提交成功！");
|
listApplyDetail(query) //查找该单号下的所有条码
|
||||||
this.getList();
|
.then((response) => {
|
||||||
} else {
|
this.detailList = response.data.list || [];
|
||||||
this.$message.error(response.message);
|
this.detailLoading = false;
|
||||||
}
|
})
|
||||||
})
|
.catch(() => {
|
||||||
.catch(() => {
|
this.detailLoading = false;
|
||||||
this.loading = false;
|
this.detailList = [];
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
deleteDialog(row) {
|
handleClose() {
|
||||||
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
|
if (this.formName == 'add') {
|
||||||
confirmButtonText: "确定",
|
this.isChang = !this.isChang
|
||||||
cancelButtonText: "取消",
|
} else {
|
||||||
type: "warning",
|
this.newSpDistributionVisible = false
|
||||||
})
|
}
|
||||||
.then(() => {
|
},
|
||||||
delApply(row.id)
|
submitOrder(row) {
|
||||||
.then((response) => {
|
this.loading = true;
|
||||||
this.loading = false;
|
let tQuery = {
|
||||||
if (response.code == 20000) {
|
editStatus: 2,
|
||||||
this.$message.success("删除成功");
|
purApplyEntity: row,
|
||||||
this.getList();
|
}
|
||||||
} else {
|
inserThrOrderWeb(tQuery)
|
||||||
this.$message.error(response.message);
|
.then(response => {
|
||||||
}
|
this.loading = false;
|
||||||
})
|
if (response.code === 20000) {
|
||||||
.catch(() => {
|
this.$message.success("提交成功！");
|
||||||
this.loading = false;
|
|
||||||
});
|
|
||||||
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleCurrentChange(val) {
|
|
||||||
this.filterQuery.page = val.page;
|
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
} else {
|
||||||
|
this.$message.error(response.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
this.loading = false;
|
||||||
|
})
|
||||||
|
},
|
||||||
|
deleteDialog(row) {
|
||||||
|
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
|
||||||
|
confirmButtonText: "确定",
|
||||||
|
cancelButtonText: "取消",
|
||||||
|
type: "warning",
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
delApply(row.id)
|
||||||
|
.then((response) => {
|
||||||
|
this.loading = false;
|
||||||
|
if (response.code == 20000) {
|
||||||
|
this.$message.success("删除成功");
|
||||||
|
this.getList();
|
||||||
|
} else {
|
||||||
|
this.$message.error(response.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
|
||||||
closeDialog() {
|
})
|
||||||
this.newSpDistributionVisible = false;
|
.catch(() => {
|
||||||
this.getList();
|
});
|
||||||
this.detailList = [];
|
},
|
||||||
},
|
handleCurrentChange(val) {
|
||||||
|
this.filterQuery.page = val.page;
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
|
||||||
|
closeDialog() {
|
||||||
|
this.newSpDistributionVisible = false;
|
||||||
|
this.getList();
|
||||||
|
this.detailList = [];
|
||||||
|
},
|
||||||
|
|
||||||
newDistributionForm(index, row) {
|
|
||||||
this.idQuery.id = '';
|
|
||||||
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
|
|
||||||
this.idQuery.id = row.id;
|
|
||||||
this.idQuery.formData = row;
|
|
||||||
this.formName = "update";
|
|
||||||
} else
|
|
||||||
this.formName = "add";
|
|
||||||
this.newSpDistributionVisible = true;
|
|
||||||
},
|
|
||||||
getInvList() {
|
|
||||||
var query={
|
|
||||||
parentId:this.filterQuery.targetDeptCode
|
|
||||||
}
|
|
||||||
this.filterQuery.targetInvCode = null
|
|
||||||
this.$forceUpdate()
|
|
||||||
filterSubAll(query).then((res) => {
|
|
||||||
this.invList = res.data || [];
|
|
||||||
})
|
|
||||||
},
|
|
||||||
getDeptList() {
|
|
||||||
getDeptListByUser().then((res) => {
|
|
||||||
this.deptList = res.data || [];
|
|
||||||
if(this.deptList.length>0){
|
|
||||||
this.filterQuery.targetDeptCode=this.deptList[0].code
|
|
||||||
this.invCodebe=this.filterQuery.targetDeptCode
|
|
||||||
}
|
|
||||||
this.getList();
|
|
||||||
this. getInvList();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
initActDateRange(){
|
|
||||||
|
|
||||||
let end = new Date();
|
newDistributionForm(index, row) {
|
||||||
let start = new Date();
|
this.idQuery.id = '';
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
|
||||||
this.actDateRange = [start, end];
|
this.idQuery.id = row.id;
|
||||||
|
this.idQuery.formData = row;
|
||||||
|
this.formName = "update";
|
||||||
|
} else
|
||||||
|
this.formName = "add";
|
||||||
|
this.newSpDistributionVisible = true;
|
||||||
|
},
|
||||||
|
getInvList() {
|
||||||
|
var query = {
|
||||||
|
parentId: this.filterQuery.targetDeptCode,
|
||||||
|
spUse: true,
|
||||||
|
}
|
||||||
|
this.filterQuery.targetInvCode = null
|
||||||
|
this.$forceUpdate()
|
||||||
|
filterGroupBySpuse(query).then((res) => {
|
||||||
|
this.invList = res.data || [];
|
||||||
|
})
|
||||||
|
},
|
||||||
|
getDeptList() {
|
||||||
|
let query = {
|
||||||
|
spUse: true,
|
||||||
|
};
|
||||||
|
filterDepts(query).then((res) => {
|
||||||
|
this.deptList = res.data || [];
|
||||||
|
if (this.deptList.length > 0) {
|
||||||
|
this.filterQuery.targetDeptCode = this.deptList[0].code
|
||||||
|
this.invCodebe = this.filterQuery.targetDeptCode
|
||||||
}
|
}
|
||||||
|
this.getList();
|
||||||
|
this.getInvList();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
initActDateRange() {
|
||||||
|
|
||||||
|
let end = new Date();
|
||||||
|
let start = new Date();
|
||||||
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||||
|
this.actDateRange = [start, end];
|
||||||
}
|
}
|
||||||
,
|
|
||||||
components: {
|
}
|
||||||
pureApplyEdit,
|
,
|
||||||
}
|
components: {
|
||||||
,
|
pureApplyEdit,
|
||||||
filters: {
|
}
|
||||||
statusFilterType(status) {
|
,
|
||||||
const statusMap = {
|
filters: {
|
||||||
1: "warning",
|
statusFilterType(status) {
|
||||||
2: "success",
|
const statusMap = {
|
||||||
};
|
1: "warning",
|
||||||
return statusMap[status];
|
2: "success",
|
||||||
}
|
};
|
||||||
,
|
return statusMap[status];
|
||||||
}
|
|
||||||
,
|
|
||||||
mounted() {
|
|
||||||
}
|
|
||||||
,
|
|
||||||
created() {
|
|
||||||
this.initActDateRange()
|
|
||||||
this.getDeptList();
|
|
||||||
}
|
}
|
||||||
,
|
,
|
||||||
|
}
|
||||||
|
,
|
||||||
|
mounted() {
|
||||||
|
}
|
||||||
|
,
|
||||||
|
created() {
|
||||||
|
this.initActDateRange()
|
||||||
|
this.getDeptList();
|
||||||
|
}
|
||||||
|
,
|
||||||
}
|
}
|
||||||
;
|
;
|
||||||
</script>
|
</script>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.itemTag {
|
.itemTag {
|
||||||
float: left;
|
float: left;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
width: 25%;
|
width: 25%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text {
|
.text {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-family: "Microsoft YaHei";
|
font-family: "Microsoft YaHei";
|
||||||
}
|
}
|
||||||
|
|
||||||
.query-form-item {
|
.query-form-item {
|
||||||
display: block !important;
|
display: block !important;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-row {
|
.el-row {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-col {
|
.el-col {
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue