UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领用相关问题修改

Browse Source
20231126-yw
anthonywj 1 year ago
parent a35856b0ed
commit 499779d04f
5 changed files with 145 additions and 92 deletions

2
.env.development
Unescape Escape View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
VUE_APP_BASE_API = 'http://192.168.0.166:9991'
VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"

4
src/store/modules/permission.js
Unescape Escape View File

@ -123,11 +123,11 @@ export function filterDynamicRoutes(routes) {
export const loadView = (view) => {
if (process.env.NODE_ENV === 'development') {
return (resolve) => require([`@/views/${view}.vue`], resolve)
return (resolve) => require([`@/views/${view}`], resolve)
} else {
// 使用 import 实现生产环境的路由懒加载
// return () => import(`@/views/${view}`)
return (resolve) => require([`@/views/${view}.vue`], resolve)
return (resolve) => require([`@/views/${view}`], resolve)
}
}

154
src/views/inout/receive/receiveAdd.vue
Unescape Escape View File

@ -1,59 +1,59 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" label-width="100px" v-show="showSearch">
<el-form :model="filterQuery" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8" >
<el-form-item label="领用单号:">
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
</el-form-item>
<el-col :span="8">
<el-form-item label="领用单号:">
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
<el-option
v-for="item in invList"
:key="item.code"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
<el-option
v-for="item in invList"
:key="item.code"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
:label="item.name"
:value="item.name">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="往来信息:">
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
:label="item.name"
:value="item.name">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="领用类型:">-->
<!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="领用类型:">-->
<!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
@ -80,15 +80,16 @@
<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-search" @click="onSubmitFind">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">
新增单据
</el-button>
</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%" highlight-current-row="true" border @current-change="handleDetail"
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border
@current-change="handleDetail"
:default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="领用单号" prop="billNo"></el-table-column>
@ -104,10 +105,15 @@
</el-table-column>
<el-table-column label="创建时间" prop="createTime"
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
<!-- <el-table-column label="领用类型" prop="billType"></el-table-column>-->
<!-- <el-table-column label="领用类型" prop="billType"></el-table-column>-->
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.status==3 " @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
<el-button type="text" size="small" :disabled="scope.row.status==3 "
@click.native="newDistributionForm(scope.$index, scope.row)">编辑
</el-button>
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"
>打印
</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
</template>
</el-table-column>
@ -160,7 +166,7 @@ import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {filterDetailByKey} from "@/api/basic/basicThirdSys";
import {selectIp} from "@/api/param/systemParamConfig";
import thrOrderNew from "./DialogNewReceive";
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import {getBusChange} from "@/api/basic/busTypeChange";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
@ -175,13 +181,13 @@ export default {
page: 1,
limit: 10,
type: 1,
invCode:'',
invCode: '',
editStatus: 1,
thirdPartyDate: 2,
startDate: null,
endDate: null,
},
invList:[],
invList: [],
formName: null,
formMap: {
add: "新增领用单据",
@ -207,7 +213,7 @@ export default {
uploadData: {
thirdSys: "thirdId",
},
invCodebe:null,
invCodebe: null,
closeConfirm: false,
loading: false,
actDateRange: [],
@ -299,7 +305,7 @@ export default {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
this.detailList=[]
this.detailList = []
} else {
this.$message.error(response.message);
}
@ -311,7 +317,7 @@ export default {
},
handleDetail(row) {
var query={};
var query = {};
query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码
.then((response) => {
@ -339,7 +345,7 @@ export default {
if (response.code == 20000) {
this.$message.success("删除成功");
this.getList();
this.detailList=null;
this.detailList = null;
} else {
this.$message.error(response.message);
}
@ -391,20 +397,36 @@ export default {
findInvByUser(query)
.then((response) => {
this.invList = response.data || [];
if(this.invList.length>0){
this.filterQuery.invCode=this.invList[0].code
this.invCodebe=this.filterQuery.invCode
if (this.invList.length > 0) {
this.filterQuery.invCode = this.invList[0].code
this.invCodebe = this.filterQuery.invCode
}
this.getList();
})
.catch(() => {
});
},
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
printOrder(row) {
printOrder(row)
.then((response) => {
const binaryData = [];
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
this.getList();
})
.catch(() => {
});
},
finCorpList(val) {
let query = {
name: val,
page: 1,
limit: 10,
}
filterSubAll(query)
.then((response) => {
@ -426,7 +448,7 @@ export default {
created() {
this.finCurInv();
this.getBusType();
// this.finCorpList();
// this.finCorpList();
},
};
</script>

56
src/views/inout/receive/receiveAudit.vue
Unescape Escape View File

@ -9,8 +9,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="当前仓库:">
<el-select v-model="filterQuery.targetInvCode" placeholder="请选择当前仓库" style="width: 100%;">
<el-form-item label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库"
filterable
clearable
remote
reserve-keyword
:remote-method="finCurInv"
style="width: 100%;">
<el-option
v-for="item in invList"
:key="item.code"
@ -85,11 +91,11 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
@current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange">
@current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="领用单号" prop="billNo"></el-table-column>
<el-table-column label="领用部门" prop="deptName"></el-table-column>
<el-table-column label="当前仓库" prop="invName"></el-table-column>
<el-table-column label="领用仓库" prop="invName"></el-table-column>
<!--<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="单据状态" prop="status">
<template slot-scope="scope">
@ -106,6 +112,9 @@
@click.native.stop="auditDialog(scope.row)"
>审核
</el-button>
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"
>打印
</el-button>
</template>
</el-table-column>
</el-table>
@ -149,7 +158,7 @@
</template>
<script>
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
@ -244,7 +253,7 @@ export default {
page: 1,
limit: 10,
corpName: null,
targetInvCode: this.invCodebe,
targetInvCode: null,
type: 2,
editStatus: 2,
};
@ -272,8 +281,22 @@ export default {
this.filterQuery.orderBy = column.prop;
this.getList();
},
printOrder(row) {
printOrder(row)
.then((response) => {
const binaryData = [];
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
this.getList();
})
.catch(() => {
});
},
getList() {
if (this.actDateRange != null) {
@ -338,7 +361,7 @@ export default {
});
},
finCurInv() {
finCurInv(keyWord) {
this.filterQuery = {
billNo: "",
thirdSysFk: "",
@ -349,23 +372,24 @@ export default {
page: 1,
limit: 10,
corpName: null,
targetInvCode: this.invCodebe,
targetInvCode: null,
type: 2,
editStatus: 2,
};
this.invList = [];
let query = {
filter: 3
filter: 3,
name: keyWord,
};
findInvByUser(query)
.then((response) => {
this.invList = response.data || [];
if (this.invList.length > 0) {
this.filterQuery.targetInvCode = this.invList[0].code
this.invCodebe = this.filterQuery.targetInvCode
}
this.getList();
// if (this.invList.length > 0) {
// this.filterQuery.targetInvCode = this.invList[0].code
// this.invCodebe = this.filterQuery.targetInvCode
// }
// this.getList();
})
.catch(() => {
});

21
src/views/inout/receive/receiveSearch.vue
Unescape Escape View File

@ -10,7 +10,13 @@
</el-col>
<el-col :span="8">
<el-form-item label="领用仓库:">
<el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 90%;">
<el-select v-model="filterQuery.targetInvCode"
filterable
clearable
remote
reserve-keyword
:remote-method="finCurInv"
placeholder="请选择领用仓库" style="width: 90%;">
<el-option
v-for="item in invList"
:key="item.code"
@ -416,19 +422,20 @@ export default {
});
},
finCurInv() {
finCurInv(keyWord) {
this.invList = [];
let query = {
name: keyWord,
filter: 3
};
findInvByUser(query)
.then((response) => {
this.invList = response.data || [];
if (this.invList.length > 0) {
this.filterQuery.targetInvCode = this.invList[0].code
this.invCodebe = this.filterQuery.targetInvCode
}
this.getList();
// if (this.invList.length > 0) {
// this.filterQuery.targetInvCode = this.invList[0].code
// this.invCodebe = this.filterQuery.targetInvCode
// }
// this.getList();
})
.catch(() => {
});

Write Preview
Loading…
Cancel
Save