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

单据类型，飞书相关bug修改，汇总统计修改

Browse Source
20231126-yw
anthonywj 2 years ago
parent 4d5c58454d
commit 84751e92e9
11 changed files with 100 additions and 55 deletions
Show Stats Download Patch File Download Diff File

2
.env.production
Unescape Escape View File

@ -9,7 +9,7 @@ ENV = 'production'
#林纪裕cd #林纪裕cd
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
刘恩典 刘恩典

4
src/api/inout/statData.js
Unescape Escape View File

@ -40,12 +40,12 @@ export function filterYearList(params) {
}); });
} }
export function excelImport(params) { export function excelImport(params) {
return axios({ return axios({
url: "/udiwms/inv/excelExportOut", url: "/udiwms/inv/excelExportOut",
method: "get", method: "get",
responseType: 'blob', responseType: 'blob',
params: params params: params
}); });
} }

51
src/views/basic/busType/busTypeAdvancedSettings.vue
Unescape Escape View File

@ -156,23 +156,23 @@
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-divider direction="horizontal"></el-divider>--> <!-- <el-divider direction="horizontal"></el-divider>-->
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col span="5">--> <!-- <el-col span="5">-->
<!-- <span class="sptext">允许供应商使用</span>--> <!-- <span class="sptext">允许供应商使用</span>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-divider direction="vertical"></el-divider>--> <!-- <el-divider direction="vertical"></el-divider>-->
<!-- <el-col span="5">--> <!-- <el-col span="5">-->
<!-- <el-select v-model="inputQuery.spUse" style="width: 65%" placeholder="是否允许" clearable>--> <!-- <el-select v-model="inputQuery.spUse" style="width: 65%" placeholder="是否允许" clearable>-->
<!-- <el-option label="允许" :value="true"></el-option>--> <!-- <el-option label="允许" :value="true"></el-option>-->
<!-- <el-option label="不允许" :value="false"></el-option>--> <!-- <el-option label="不允许" :value="false"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-divider direction="vertical"></el-divider>--> <!-- <el-divider direction="vertical"></el-divider>-->
<!-- <el-col span="13">--> <!-- <el-col span="13">-->
<!-- <span class="sptext">是否允许供应商使用此单据类型</span>--> <!-- <span class="sptext">是否允许供应商使用此单据类型</span>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-divider></el-divider>--> <!-- <el-divider></el-divider>-->
<el-row> <el-row>
<el-col span="5"> <el-col span="5">
@ -311,6 +311,23 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">预验收是否带回</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.inPreInBack" style="width: 65%;margin-top: 4px" placeholder="是否带回">
<el-option label="带回" :value=1></el-option>
<el-option label="不带回" :value=2></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">预验收是否带回</span>
</el-col>
</el-row>
<el-divider></el-divider>
<div> <div>

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

@ -263,11 +263,11 @@ export default {
checkVailDate: 0, //校验近效期 checkVailDate: 0, //校验近效期
checkExpire: true, //校验过期 checkExpire: true, //校验过期
checkCertExpire: false,//校验证书过期 checkCertExpire: false,//校验证书过期
editType:2, editType: 2,
checkReview: null, checkReview: null,
secCheckReview: null, secCheckReview: null,
thrCheckReview: null, thrCheckReview: null,
inPreInBack: 1,
}, },
enableMap: { enableMap: {
true: '是', true: '是',
@ -551,9 +551,10 @@ export default {
checkVailDate: 0, //校验近效期 checkVailDate: 0, //校验近效期
checkExpire: 2, //校验过期 checkExpire: 2, //校验过期
checkCertExpire: 0, //校验证书过期 checkCertExpire: 0, //校验证书过期
editType:2, editType: 2,
backPreinType: 1, backPreinType: 1,
sortNum: 999 sortNum: 999,
inPreInBack: 1,
} }
this.addDialogVisible = true this.addDialogVisible = true
}, },

21
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -302,7 +302,7 @@
</el-col> </el-col>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用"> <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%;margin-top: 4px" placeholder="是否启用">
<el-option label="无需校验" :value=0></el-option> <el-option label="无需校验" :value=0></el-option>
<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>
@ -314,6 +314,25 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row v-if="inputQuery.actionType==2">
<el-col span="5">
<span class="sptext">预验收是否带回</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.inPreInBack" style="width: 65%;margin-top: 4px" placeholder="是否带回">
<el-option label="带回" :value=1></el-option>
<el-option label="不带回" :value=2></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">预验收是否带回</span>
</el-col>
</el-row>
<el-divider></el-divider>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'"> <el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'">

2
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -665,7 +665,7 @@ export default {
corpType: 0, corpType: 0,
genUnit: false, genUnit: false,
checkWebNew: null, checkWebNew: null,
mainAction:null, mainAction: null,
}, },
fromOptions: [], fromOptions: [],
isCodeAlive: true, isCodeAlive: true,

46
src/views/inout/DialogCreateOrderSelect.vue
Unescape Escape View File

@ -3,14 +3,13 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form <el-form
:model="filterQuery" :model="filterQuery"
class="query-form"
size="mini" size="mini"
label-width="100px" label-width="100px"
v-show="showSearch" v-show="showSearch"
> >
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="预验收单号:"> <el-form-item label="预验收单号:">
<el-input <el-input
v-model="filterQuery.billNo" v-model="filterQuery.billNo"
placeholder="请输入单号" placeholder="请输入单号"
@ -40,17 +39,23 @@
</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 label="过滤已选入">
<el-select v-model="filterQuery.filterSelected"> <el-select v-model="filterQuery.filterSelected" style="width: 90%">
<el-option :value="true" label="是"></el-option> <el-option :value="true" label="是"></el-option>
<el-option :value="false" label="否"></el-option> <el-option :value="false" label="否"></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-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item label="预验收带回">
<el-select v-model="filterQuery.inPreInBack" clearable style="width: 90%">
<el-option :value="1" label="带回"></el-option>
<el-option :value="2" label="不带回"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -66,7 +71,7 @@
</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 label="备注:">
<el-input <el-input
v-model="filterQuery.remark" v-model="filterQuery.remark"
placeholder="请输入备注" placeholder="请输入备注"
@ -117,31 +122,34 @@
<el-table-column <el-table-column
type="selection" type="selection"
:selectable="checkSelection" :selectable="checkSelection"
width="55" width="45"
></el-table-column> ></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column <el-table-column
label="单据号" label="单据号"
prop="billNo" prop="billNo"
width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
width="140"
label="单据类型" label="单据类型"
prop="billTypeName" prop="billTypeName"
></el-table-column> ></el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220"> <el-table-column label="往来单位" prop="fromName" width="180">
</el-table-column> </el-table-column>
<el-table-column label="所属部门" prop="deptName" width="120"> <el-table-column label="所属部门" prop="deptName" width="90">
</el-table-column> </el-table-column>
<el-table-column label="所属仓库" prop="invName" width="120"> <el-table-column label="所属仓库" prop="invName" width="90">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="来源订单号" label="来源订单号"
prop="corpOrderId" prop="corpOrderId"
width="140"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="来源" prop="fromType"> <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>
@ -155,7 +163,8 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
prop="createTime" prop="createTime" width="140"
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -212,7 +221,7 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span> <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-form :inline="true" :model="bizQuery" class="query-form" size="mini"> <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item label="物资名称:">
<el-input <el-input
v-model="bizQuery.productName" v-model="bizQuery.productName"
placeholder="请输入物资名称" placeholder="请输入物资名称"
@ -349,6 +358,7 @@ export default {
startTime: null, startTime: null,
endTime: null, endTime: null,
filterSelected: true, filterSelected: true,
inPreInBack: 1,
}, },
fromInvOptions: [], fromInvOptions: [],
checkStatus: { checkStatus: {
@ -474,6 +484,7 @@ export default {
startTime: null, startTime: null,
endTime: null, endTime: null,
filterSelected: true, filterSelected: true,
inPreInBack: 1,
}; };
this.actDateRange = null this.actDateRange = null
this.getList(); this.getList();
@ -820,6 +831,3 @@ export default {
}; };
</script> </script>
<style type="text/scss" lang="scss">
</style>

2
src/views/inout/stat/IoStatDaySearch.vue
Unescape Escape View File

@ -46,7 +46,7 @@
@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="仓库" type="invName"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>

2
src/views/inout/stat/IoStatMonthSearch.vue
Unescape Escape View File

@ -42,7 +42,7 @@
@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="仓库" type="invName"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>

2
src/views/inout/stat/IoStatQuarterSearch.vue
Unescape Escape View File

@ -42,7 +42,7 @@
@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="仓库" type="invName"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>

2
src/views/inout/stat/IoStatYearSearch.vue
Unescape Escape View File

@ -42,7 +42,7 @@
@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="仓库" type="invName"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>

Write Preview
Loading…
Cancel
Save