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 b8865d7584
commit d5c8fc7410
10 changed files with 464 additions and 234 deletions
Show Stats Download Patch File Download Diff File

8
.env.production
Unescape Escape View File

@ -4,7 +4,13 @@ VUE_APP_TITLE = 供应商自助管理系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
#林纪裕
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
# 平潭
VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'

38
src/views/basic/busType/bussinessType.vue
Unescape Escape View File

@ -223,11 +223,12 @@ export default {
originAction: null, originAction: null,
checkBalance: null, checkBalance: null,
secCheckBalance: null, secCheckBalance: null,
preInBack: null, preInBack: true,
vailDispatch: null, vailDispatch: null,
vailGroupBuy: null, vailGroupBuy: null,
inStock: null, inStock: false,
actionType: null, actionType: 0,
fillCodeRel: false,
thrCheckEnable: null, thrCheckEnable: null,
thrCheckWebNew: null, thrCheckWebNew: null,
@ -239,7 +240,9 @@ export default {
thrCheckChange: null, thrCheckChange: null,
thrCheckBalance: null, thrCheckBalance: null,
thrCheckCopy: null, thrCheckCopy: null,
checkVailDate:true, //校验近效期
checkExpire:true, //校验过期
checkCertExpire:true, //校验证书过期
}, },
enableMap: { enableMap: {
@ -330,10 +333,10 @@ export default {
this.$message.error("请选择是否更改库存！"); this.$message.error("请选择是否更改库存！");
return; return;
} }
if (isBlank(this.inputQuery.busType)) { // if (isBlank(this.inputQuery.busType)) {
this.$message.error("请选择特定页面！"); // this.$message.error("请选择特定页面！");
return; // return;
} // }
insertBusType(this.inputQuery) insertBusType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -371,10 +374,10 @@ export default {
this.$message.error("请选择是否更改库存！"); this.$message.error("请选择是否更改库存！");
return; return;
} }
if (isBlank(this.inputQuery.busType)) { // if (isBlank(this.inputQuery.busType)) {
this.$message.error("请选择特定页面！"); // this.$message.error("请选择特定页面！");
return; // return;
} // }
updateBusType(this.inputQuery) updateBusType(this.inputQuery)
.then((response) => { .then((response) => {
@ -464,11 +467,12 @@ export default {
advanceType: null, advanceType: null,
preIn: null, preIn: null,
originAction: null, originAction: null,
preInBack: null, preInBack: true,
vailDispatch: null, vailDispatch: null,
vailGroupBuy: null, vailGroupBuy: null,
inStock: null, inStock: false,
actionType: null, actionType: 0,
fillCodeRel: false,
thrCheckEnable: null, thrCheckEnable: null,
thrCheckWebNew: null, thrCheckWebNew: null,
thrCheckPdaUn: null, thrCheckPdaUn: null,
@ -479,6 +483,10 @@ export default {
thrCheckChange: null, thrCheckChange: null,
thrCheckBalance: null, thrCheckBalance: null,
thrCheckCopy: null, thrCheckCopy: null,
checkVailDate:true, //校验近效期
checkExpire:true, //校验过期
checkCertExpire:true, //校验证书过期
} }
this.addDialogVisible = true; this.addDialogVisible = true;
}, },

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

@ -58,6 +58,33 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8" v-if="showSup">
<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="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
@ -118,7 +145,7 @@
<!-- </el-table-column>--> <!-- </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="fromName" width="220" v-if="showSup"> <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTimem" width="150" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTimem" width="150" show-overflow-tooltip>
</el-table-column> </el-table-column>
@ -326,6 +353,7 @@ import InvoiceRegister from "@/views/inout/InvoiceRegister";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
const formJson = { const formJson = {
@ -352,6 +380,10 @@ export default {
endTime: null, endTime: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}, },
corpLoading: false,
fromOptions: [],
formName: 1, formName: 1,
formMap: { formMap: {
1: "发票登记" 1: "发票登记"
@ -629,6 +661,24 @@ 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;
})
},
deleteDialog(row) { deleteDialog(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",

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

@ -4,34 +4,8 @@
<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="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="8">
<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%"
@ -39,7 +13,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <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%"
@ -55,7 +29,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <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.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%" style="width: 90%"
@ -72,18 +46,43 @@
</el-col> </el-col>
</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
<el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%"> v-model="filterQuery.fromCorp"
<el-option label="全部" value=""></el-option> filterable
<el-option label="已审核" :value="7"></el-option> remote
<el-option label="待审核" :value="10"></el-option> 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-select>
</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-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已审核" :value="7"></el-option>-->
<!-- <el-option label="待审核" :value="10"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<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"
@ -100,22 +99,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="8">-->
<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"-->
v-model="auditDateRange" <!-- v-model="auditDateRange"-->
type="daterange" <!-- type="daterange"-->
format="yyyy 年 MM 月 dd 日" <!-- format="yyyy 年 MM 月 dd 日"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
range-separator="至" <!-- range-separator="至"-->
start-placeholder="开始日期" <!-- start-placeholder="开始日期"-->
end-placeholder="结束日期" <!-- end-placeholder="结束日期"-->
style="width: 90%" <!-- style="width: 90%"-->
> <!-- >-->
</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">

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

@ -37,6 +37,8 @@
</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 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="请选择单据类型"
@ -56,14 +58,39 @@
<el-row> <el-row>
<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.status" placeholder="请选择出入库类型" style="width: 90%"> <el-select
<el-option label="全部" value=""></el-option> v-model="filterQuery.fromCorp"
<el-option label="已审核" :value="7"></el-option> filterable
<el-option label="待审核" :value="10"></el-option> 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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="审核状态:">-->
<!-- <el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已审核" :value="7"></el-option>-->
<!-- <el-option label="待审核" :value="10"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </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="创建时间:">
@ -122,7 +149,7 @@
<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="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="fromName" width="220"> <el-table-column label="往来单位" prop="fromName" width="220">
</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">
@ -508,6 +535,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 = {
@ -535,6 +563,10 @@ export default {
endTime: null, endTime: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}, },
corpLoading: false,
fromOptions: [],
customerId: this.$store.getters.customerId, customerId: this.$store.getters.customerId,
checkStatus: { checkStatus: {
1: "草稿", 1: "草稿",
@ -738,7 +770,7 @@ export default {
let query = { let query = {
code: this.filterQuery.invCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
busType: 2,//默认只能选择送货单 // busType: 2,//默认只能选择送货单
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
@ -816,6 +848,22 @@ 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;
})
},
deleteDialog(row) { deleteDialog(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",

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

@ -117,6 +117,12 @@
<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">
<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">
@ -699,7 +705,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) => {

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

@ -10,21 +10,21 @@
clearable="true"></el-input> clearable="true"></el-input>
</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.action" placeholder="请选择单据类型" <!-- <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
style="width: 90%" <!-- style="width: 90%"-->
clearable> <!-- clearable>-->
<el-option <!-- <el-option-->
v-for="item in busTypes" <!-- v-for="item in busTypes"-->
:key="item.name" <!-- :key="item.name"-->
:label="item.name" <!-- :label="item.name"-->
:value="item.action"> <!-- :value="item.action">-->
<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-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.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
@ -51,18 +51,42 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="showSup">
</el-row> <el-form-item class="query-form-item" label="供应商:">
<el-row> <el-select
<el-col :span="8"> v-model="filterQuery.fromCorp"
<el-form-item label="审核状态:"> filterable
<el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择审核状态"> remote
<el-option label="全部" value=""></el-option> clearable="true"
<el-option label="已审核" :value="7"></el-option> reserve-keyword
<el-option label="未审核" :value="10"></el-option> 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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="审核状态:">-->
<!-- <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择审核状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已审核" :value="7"></el-option>-->
<!-- <el-option label="未审核" :value="10"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </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-date-picker <el-date-picker
@ -79,7 +103,6 @@
</el-date-picker> </el-date-picker>
</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-date-picker <el-date-picker
@ -120,6 +143,8 @@
<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="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="fromName" width="220" v-if="showSup">
</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>
@ -133,8 +158,7 @@
<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 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">
@ -167,6 +191,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
v-if="customerId == 110"
@click.native.stop="rollback(scope.row)" @click.native.stop="rollback(scope.row)"
>撤回 >撤回
</el-button </el-button
@ -174,7 +199,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
v-if="customerId == 110 && scope.row.status == 5" v-if="scope.row.status == 10"
@click.native.stop="reviewOrder(scope.row)" @click.native.stop="reviewOrder(scope.row)"
>审核 >审核
</el-button </el-button
@ -485,6 +510,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 = {
@ -514,6 +540,9 @@ export default {
status: 10, status: 10,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}, },
corpLoading: false,
fromOptions: [],
customerId: this.$store.getters.customerId, customerId: this.$store.getters.customerId,
checkStatus: { checkStatus: {
1: "草稿", 1: "草稿",
@ -622,6 +651,7 @@ export default {
resultDetailList: [], resultDetailList: [],
acceptQuery: null, acceptQuery: null,
acceptOrderVisible: false, acceptOrderVisible: false,
showSup: false,
}; };
}, },
components: {AcceptOrder}, components: {AcceptOrder},
@ -644,6 +674,24 @@ export default {
}; };
this.getList(); this.getList();
}, },
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;
})
},
onSubmit() { onSubmit() {
this.loading = true; this.loading = true;
if (this.actDateRange !== null) { if (this.actDateRange !== null) {
@ -977,6 +1025,12 @@ export default {
} }
, ,
created() { created() {
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;
}
this.getInvList(); this.getInvList();
this.getBusType(); this.getBusType();
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {

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

@ -597,7 +597,7 @@ export default {
let query = { let query = {
code: this.filterQuery.invCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
busType: 2,//默认只能选择送货单 spUse: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
@ -637,7 +637,6 @@ export default {
this.loading = true; this.loading = true;
this.currentRow = {billNo: ""}; this.currentRow = {billNo: ""};
this.clearDetailList(); this.clearDetailList();
this.filterQuery.busType = 2;
getOrderList(this.filterQuery) getOrderList(this.filterQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

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

@ -41,6 +41,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<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.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
@ -56,8 +59,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<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-date-picker <el-date-picker
@ -74,22 +76,22 @@
</el-date-picker> </el-date-picker>
</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-date-picker <!-- <el-date-picker-->
:picker-options="pickerOptions" <!-- :picker-options="pickerOptions"-->
v-model="auditDateRange" <!-- v-model="auditDateRange"-->
type="daterange" <!-- type="daterange"-->
format="yyyy 年 MM 月 dd 日" <!-- format="yyyy 年 MM 月 dd 日"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
range-separator="至" <!-- range-separator="至"-->
start-placeholder="开始日期" <!-- start-placeholder="开始日期"-->
end-placeholder="结束日期" <!-- end-placeholder="结束日期"-->
style="width: 90%" <!-- style="width: 90%"-->
> <!-- >-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
</el-form> </el-form>

68
src/views/purchase/purOrder/purOrderSearch.vue
Unescape Escape View File

@ -37,7 +37,31 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8" v-if="showSup">
<el-form-item class="query-form-item" label="供应商:">
<el-select
v-model="filterQuery.supId"
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="8"> <el-col :span="8">
<el-form-item label="发布时间:"> <el-form-item label="发布时间:">
<el-date-picker <el-date-picker
@ -70,7 +94,9 @@
@current-change="handleDetail"> @current-change="handleDetail">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="采购订单号" prop="billNo" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="采购订单号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="发布时间" prop="auditTime" width="180" 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="supName" show-overflow-tooltip="true" width="180"
v-if="showSup"></el-table-column>
<el-table-column label="处理状态" prop="emergency" width="120"> <el-table-column label="处理状态" prop="emergency" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dealStatus[scope.row.emergency] }} {{ dealStatus[scope.row.emergency] }}
@ -112,8 +138,9 @@
<el-table-column label="计划数量" prop="planCount" width="100"></el-table-column> <el-table-column label="计划数量" prop="planCount" width="100"></el-table-column>
<el-table-column label="订单数量" prop="count" width="100"></el-table-column> <el-table-column label="订单数量" prop="count" width="100"></el-table-column>
<el-table-column label="计量单位" prop="spec" show-overflow-tooltip="true" width="100"></el-table-column> <el-table-column label="计量单位" prop="spec" show-overflow-tooltip="true" width="100"></el-table-column>
<!-- <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true" width="160"></el-table-column> <el-table-column label=" 生产企业
" prop="manufactory" show-overflow-tooltip="true" width="160"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true" width="160"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true" width="160"></el-table-column>
<!-- <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>--> <!-- <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>-->
</el-table> </el-table>
@ -142,6 +169,7 @@
import purPlanEdit from "./purOrderDetailDialog"; import purPlanEdit from "./purOrderDetailDialog";
import {delApply, listOrder, listOrderDetail, delOrderDetailAll} from "@/api/purchase/purOrder"; import {delApply, listOrder, listOrderDetail, delOrderDetailAll} from "@/api/purchase/purOrder";
import {selectAuthMenu} from "@/api/system/sysMenuHelp"; import {selectAuthMenu} from "@/api/system/sysMenuHelp";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
export default { export default {
@ -159,6 +187,10 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
}, },
corpLoading: false,
fromOptions: [],
Menustatus: null, Menustatus: null,
filePath: "", filePath: "",
createTimes: null, createTimes: null,
@ -186,7 +218,7 @@ export default {
2: "未处理", 2: "未处理",
3: "作废", 3: "作废",
}, },
showSup: false,
invList: {}, invList: {},
deptList: {}, deptList: {},
idQuery: {}, idQuery: {},
@ -385,6 +417,25 @@ export default {
} }
}) })
}, },
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;
})
},
closeDialog() { closeDialog() {
this.newSpDistributionVisible = false; this.newSpDistributionVisible = false;
this.getList(); this.getList();
@ -434,6 +485,13 @@ export default {
} }
, ,
created() { created() {
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;
}
this.selectAuthMenu(); this.selectAuthMenu();
let end = new Date(); let end = new Date();

Write Preview
Loading…
Cancel
Save