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

单据界面相关调整

Browse Source
ywj_dev
anthonywj 2 years ago
parent 8b12a179c5
commit b8865d7584
21 changed files with 233 additions and 171 deletions
Show Stats Download Patch File Download Diff File

39
src/layout/components/Navbar.vue
Unescape Escape View File

@ -9,12 +9,16 @@
<template v-if="device!=='mobile'"> <template v-if="device!=='mobile'">
<div class="inv-hos-title"> <div class="inv-hos-title">
<span style="font-weight: bold;color: #303133;">协和医院平潭分院</span> <!-- <span style="font-weight: bold;color: #303133;">协和医院平潭分院</span>-->
<span <span
style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span> style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span>
<span
<span style="font-weight: 500;color:rgb(51 48 48); ">{{this.companyName}}</span> style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库:{{ inv }}</span>
<span style="font-weight: 500;color:rgb(51 48 48);">({{this.userName}})</span> <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户:{{ this.companyName }}</span>
<span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
this.userName
}})</span>
</div> </div>
<search id="header-search" class="right-menu-item"/> <search id="header-search" class="right-menu-item"/>
<screenfull id="screenfull" class="right-menu-item hover-effect"/> <screenfull id="screenfull" class="right-menu-item hover-effect"/>
@ -122,13 +126,14 @@ import router from "@/router";
export default { export default {
data() { data() {
return { return {
deptName: store.getters.locDeptName,
inv: store.getters.locInvName, inv: store.getters.locInvName,
selInvVisible: false, selInvVisible: false,
userInfo: {}, userInfo: {},
deptList: [], deptList: [],
invList: [], invList: [],
userName:'', userName: '',
companyName:'', companyName: '',
formRules: { formRules: {
locDeptCode: [ locDeptCode: [
{required: true, message: "请选择当前部门", trigger: "blur"} {required: true, message: "请选择当前部门", trigger: "blur"}
@ -184,7 +189,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {
location.href = process.env.VUE_APP_CONTEXT_PATH ; location.href = process.env.VUE_APP_CONTEXT_PATH;
}) })
}).catch(() => { }).catch(() => {
}); });
@ -207,7 +212,7 @@ export default {
deptChange() { deptChange() {
this.getInvList(); this.getInvList();
this.userInfo.locInvCode=""; this.userInfo.locInvCode = "";
}, },
getInvList() { getInvList() {
@ -223,7 +228,7 @@ export default {
} }
}) })
.catch(() => { .catch(() => {
this.selInvVisible=true; this.selInvVisible = true;
}); });
}, },
@ -275,13 +280,13 @@ export default {
}, },
created() { created() {
this.userName=this.$store.getters.name; this.userName = this.$store.getters.name;
this.companyName=this.$store.getters.companyName; this.companyName = this.$store.getters.companyName;
this.userInfo = { this.userInfo = {
id: store.getters.adminId, id: store.getters.adminId,
locInvCode: store.getters.locInvCode, locInvCode: store.getters.locInvCode,
locDeptCode: store.getters.locDeptCode, locDeptCode: store.getters.locDeptCode,
}; };
this.getDeptList(); this.getDeptList();

8
src/views/basic/business/stockOrder.vue
Unescape Escape View File

@ -83,8 +83,10 @@
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150"></el-table-column> <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="打印状态" width="100" prop="inCodeStatus"> <el-table-column label="打印状态" width="100" prop="inCodeStatus">
<template slot-scope="scope">
<span>{{ enableMap[scope.row.inCodeStatus] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120"> <el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="收货仓库" prop="invName" width="150"> <el-table-column label="收货仓库" prop="invName" width="150">
@ -222,6 +224,10 @@ export default {
detailTotal: 0, detailTotal: 0,
loading: false, loading: false,
detailLoading: false, detailLoading: false,
enableMap: {
1: "已打印",
0: "未打印",
},
sourceMap: { sourceMap: {
"1": "UDIMS平台", "1": "UDIMS平台",
"2": "网页新增", "2": "网页新增",

27
src/views/inout/InvoiceRegistration.vue
Unescape Escape View File

@ -113,28 +113,29 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip> <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<template slot-scope="scope"> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<i class="el-icon-time"></i> <!-- </el-table-column>-->
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"> <el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column> </el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column> <el-table-column label="供应商" prop="fromName" width="220" v-if="showSup">
<!-- <el-table-column label="送货单位" prop="fromName" width="220">--> </el-table-column>
<!-- </el-table-column>--> <el-table-column label="创建时间" prop="createTimem" width="150" show-overflow-tooltip>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip>
</el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept"> <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
</el-table-column> </el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120"> <el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column> <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120"> <el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span> <span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" prop="status" width="100"> <el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
@ -378,6 +379,8 @@ export default {
loading: false, loading: false,
index: null, index: null,
enableDept: false, enableDept: false,
showSup: false,
fromTypeMap: { fromTypeMap: {
"1": "UDIMS平台", "1": "UDIMS平台",
"2": "网页新增", "2": "网页新增",
@ -751,6 +754,10 @@ export default {
} }
, ,
created() { created() {
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;
}
this.getInvList(); this.getInvList();
this.getDeptList(); this.getDeptList();
this.getBusType(); this.getBusType();

26
src/views/inout/IoArrivalSearchOrder.vue
Unescape Escape View File

@ -108,22 +108,10 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column> <el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220"> <el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"> <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
@ -137,6 +125,16 @@
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100"> <el-table-column label="审核状态" prop="status" width="100">
@ -518,7 +516,7 @@ export default {
6: "校验异常", 6: "校验异常",
7: "已审核", 7: "已审核",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理",10: "待审核", 9: "正在处理", 10: "待审核",
}, },
storageList: [], storageList: [],
invList: [], invList: [],

6
src/views/inout/IoCheckErrorOrder.vue
Unescape Escape View File

@ -101,15 +101,15 @@
border border
@cell-click="handleSelectionChange"> @cell-click="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220"> <el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept"> <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">

4
src/views/inout/IoCreateBusOrder.vue
Unescape Escape View File

@ -112,10 +112,10 @@
border border
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">--> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="采购部门" prop="deptName" width="120"> <el-table-column label="采购部门" prop="deptName" width="120">

4
src/views/inout/IoCreateErrorOrder.vue
Unescape Escape View File

@ -35,8 +35,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="送货仓库:"> <el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="invChange" @change="invChange"
> >

10
src/views/inout/IoCreateOrder.vue
Unescape Escape View File

@ -102,16 +102,18 @@
border border
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept"> <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
</el-table-column> </el-table-column>

7
src/views/inout/IoCreateScanOrder.vue
Unescape Escape View File

@ -102,11 +102,12 @@
border border
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="采购部门" prop="deptName" width="120"> <el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column> </el-table-column>

6
src/views/inout/IoDealOrder.vue
Unescape Escape View File

@ -103,15 +103,15 @@
border border
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220"> <el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept"> <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">

110
src/views/inout/IoDeliveryAuditOrder.vue
Unescape Escape View File

@ -3,7 +3,35 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item class="query-form-item" label="送货单位:">
<el-select
v-model="filterQuery.fromCorp"
filterable
remote
clearable="true"
reserve-keyword
placeholder="供应商名称"
:remote-method="findMethod"
size="mini"
:loading="corpLoading"
style="width: 90%"
>
<el-option
v-for="item in fromOptions"
:key="item.name"
:label="item.name"
:value="item.erpId"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="送货单号:"> <el-form-item class="query-form-item" label="送货单号:">
<el-input v-model="filterQuery.billNo" placeholder="请输入送货单号" <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
style="width: 90%" style="width: 90%"
@ -11,19 +39,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">--> <el-col :span="6">
<!-- <el-form-item class="query-form-item" label="出入库类型:">--> <el-form-item class="query-form-item" label="收货仓库:">
<!-- <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">--> <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="入库" value="WareHouseIn"></el-option>-->
<!-- <el-option label="出库" value="WareHouseOut"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item class="query-form-item" label="送货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="invChange" @change="invChange"
> >
@ -37,7 +55,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
@ -55,7 +73,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="6">
<el-form-item class="query-form-item" label="审核状态:"> <el-form-item class="query-form-item" label="审核状态:">
<el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -65,7 +83,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -82,7 +100,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item class="query-form-item" label="审核时间:"> <el-form-item class="query-form-item" label="审核时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -120,29 +138,16 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column> <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220"> <el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"> <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核时间" prop="createTime" show-overflow-tooltip width="150"> <el-table-column label="审核时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
@ -150,6 +155,17 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100"> <el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -508,6 +524,7 @@ import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code"; import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/DialogReviewOrder"; import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
const formJson = { const formJson = {
@ -527,7 +544,7 @@ export default {
billNo: null, billNo: null,
mainAction: null, mainAction: null,
action: null, action: null,
status:10, status: 10,
page: 1, page: 1,
limit: 10, limit: 10,
startTime: null, startTime: null,
@ -583,6 +600,8 @@ export default {
formData: formJson, formData: formJson,
deleteLoading: false, deleteLoading: false,
busTypes: [], busTypes: [],
corpLoading: false,
fromOptions: [],
currentRow: { currentRow: {
billNo: "" billNo: ""
}, },
@ -660,7 +679,7 @@ export default {
billNo: null, billNo: null,
mainAction: null, mainAction: null,
action: null, action: null,
status:10, status: 10,
page: 1, page: 1,
limit: 10, limit: 10,
startTime: null, startTime: null,
@ -745,6 +764,29 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
findMethod(key) {
this.corpLoading = true;
this.fromOptions = [];
let params = {
key: key,
corpType: 2,
page: 1,
limit: 20
};
getBasicUnitMaintains(params).then((res) => {
this.corpLoading = false;
this.fromOptions = res.data.list || [];
}).catch(() => {
this.corpLoading = false;
})
},
corpChange(value) {
if (!isBlank(value)) {
this.findMethod(value);
}
},
handleSelectionChange(val) { handleSelectionChange(val) {
this.currentRow = val; this.currentRow = val;
this.getOrderDetails(); this.getOrderDetails();

30
src/views/inout/IoDeliverySearchOrder.vue
Unescape Escape View File

@ -22,8 +22,8 @@
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="送货仓库:"> <el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="invChange" @change="invChange"
> >
@ -120,22 +120,10 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column> <el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220"> <el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"> <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
@ -151,6 +139,18 @@
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100"> <el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{

23
src/views/inout/IoInoutSearchOrder.vue
Unescape Escape View File

@ -107,26 +107,27 @@
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="订单号" prop="billNo" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="订单号" prop="billNo" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="来源订单号" prop="corpOrderId" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="来源订单号" prop="corpOrderId" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType" width="120"> <el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span> <span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="当前部门" prop="deptName" width="120"> <el-table-column label="当前部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120"> <el-table-column label="当前仓库" prop="invName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="校验状态" prop="status" width="100"> <el-table-column label="校验状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
@ -511,7 +512,7 @@ export default {
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "审核通过",
8: "审核拒绝", 8: "审核拒绝",
9: "正在处理",10: "待审核", 9: "正在处理", 10: "待审核",
}, },
storageList: [], storageList: [],
invList: [], invList: [],
@ -698,7 +699,7 @@ export default {
let query = { let query = {
code: this.filterQuery.invCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
inStock:true, inStock: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {

28
src/views/inout/IoReturnedSearchOrder.vue
Unescape Escape View File

@ -118,22 +118,8 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column> <el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<!-- <el-table-column label="供应商" prop="fromName" width="220">--> <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<!-- </el-table-column>-->
<el-table-column label="退货部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="退货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"> <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
@ -147,6 +133,18 @@
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="供应商" prop="fromName" width="220">-->
<!-- </el-table-column>-->
<el-table-column label="退货部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="退货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100"> <el-table-column label="审核状态" prop="status" width="100">

8
src/views/inout/IoSupAduitOrder.vue
Unescape Escape View File

@ -101,12 +101,12 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column> <!-- </el-table-column>-->
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
<el-table-column label="采购部门" prop="deptName" width="120"> <el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label=收货仓库 prop="invName" width="120"> <el-table-column label=收货仓库 prop="invName" width="120">

25
src/views/inout/IoSupSearchOrder.vue
Unescape Escape View File

@ -119,18 +119,19 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="140" show-overflow-tooltip> <el-table-column label="审核时间" prop="auditTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column> <!-- </el-table-column>-->
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
<el-table-column label="采购部门" prop="deptName" width="120"> <el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="送货仓库" prop="invName" width="120"> <el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType"> <el-table-column label="来源" prop="fromType">
<template slot-scope="scope"> <template slot-scope="scope">
@ -355,11 +356,11 @@
label="序列号" label="序列号"
prop="serialNo" prop="serialNo"
></el-table-column> ></el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="供应商"--> <!-- label="供应商"-->
<!-- prop="supName"--> <!-- prop="supName"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<el-table-column <el-table-column
label="扫码数量" label="扫码数量"
prop="reCount" prop="reCount"

31
src/views/inout/IoSupSecAuditOrder.vue
Unescape Escape View File

@ -113,18 +113,19 @@
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="140" show-overflow-tooltip> <el-table-column label="审核时间" prop="auditTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">--> <!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="采购部门" prop="deptName" width="120"> <el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column> </el-table-column>
<el-table-column label="送货仓库" prop="invName" width="120"> <el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column> <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType"> <el-table-column label="来源" prop="fromType">
<template slot-scope="scope"> <template slot-scope="scope">
@ -156,14 +157,14 @@
>打印 >打印
</el-button </el-button
> >
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
v-if="scope.row.status == 10" <!-- v-if="scope.row.status == 10"-->
@click.native.stop="reviewOrder(scope.row)" <!-- @click.native.stop="reviewOrder(scope.row)"-->
>审核 <!-- >审核-->
</el-button <!-- </el-button-->
> <!-- >-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -422,7 +423,7 @@ export default {
id: "", id: "",
billNo: null, billNo: null,
// statusType: "audited", // statusType: "audited",
status:10, status: 10,
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
@ -553,7 +554,7 @@ export default {
this.filterQuery = { this.filterQuery = {
id: "", id: "",
billNo: null, billNo: null,
status:10, status: 10,
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,

2
src/views/inventory/InvSupProuducts.vue
Unescape Escape View File

@ -212,8 +212,8 @@ export default {
id: "", id: "",
status: 10, status: 10,
}, },
corpLoading: false,
dialogVisible: false, dialogVisible: false,
corpLoading: false,
fromOptions: [], fromOptions: [],
showSup: false, showSup: false,
detailDialogVisible: false, detailDialogVisible: false,

2
src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
Unescape Escape View File

@ -36,7 +36,7 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="fromCorp" label="送货仓库:"> <el-form-item prop="fromCorp" label="收货仓库:">
<el-input v-model="formData.invName" auto-complete="off" <el-input v-model="formData.invName" auto-complete="off"
disabled disabled
></el-input> ></el-input>

6
src/views/purchase/purDelivery/purDeliveryEditDialog.vue
Unescape Escape View File

@ -32,8 +32,8 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="送货仓库:" prop="invCode"> <el-form-item label="收货仓库:" prop="invCode">
<el-select v-model="formData.invCode" @change="setDeptCode" placeholder="送货仓库信息" style="width: 100%" <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="收货仓库信息" style="width: 100%"
clearable> clearable>
<el-option <el-option
v-for="item in invCodeList" v-for="item in invCodeList"
@ -276,7 +276,7 @@ export default {
return this.$message.error("单据日期不能为空！"); return this.$message.error("单据日期不能为空！");
} }
if (this.formData.invCode == "" || this.formData.invCode == null) { if (this.formData.invCode == "" || this.formData.invCode == null) {
return this.$message.error("送货仓库不能为空！"); return this.$message.error("收货仓库不能为空！");
} }
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {

2
src/views/purchase/purDelivery/purDeliverySearch.vue
Unescape Escape View File

@ -47,7 +47,7 @@
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="createUser"></el-table-column> <el-table-column label="供应商" prop="createUser"></el-table-column>
<el-table-column label="采购部门" prop="deptName"></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="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="状态" prop="status"> <el-table-column label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">

Write Preview
Loading…
Cancel
Save