Browse Source

【nev-pc】报表挂载+bug

ag_report_nev
安虹睿 10 months ago
parent
commit
8091c9bec6
  1. 1
      fe/PC/src/filters/excelOrReportsOption.js
  2. 22
      fe/PC/src/router/index.js
  3. 1
      fe/PC/src/utils/tableColumns/index.js
  4. 1
      fe/PC/src/utils/tabsDesTions/index.js
  5. 21
      fe/PC/src/views/activeReportManage/reportForm/SupplierAndOrderSummary.vue
  6. 4
      fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
  7. 169
      fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
  8. 28
      fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue

1
fe/PC/src/filters/excelOrReportsOption.js

@ -91,6 +91,7 @@ export const reportsAddress = {
depositDetailsReport:reportsUrl + 'depositDetailsReport',//缴库明细报表 depositDetailsReport depositDetailsReport:reportsUrl + 'depositDetailsReport',//缴库明细报表 depositDetailsReport
interfaceError:reportsUrl + 'interfaceError',//接口错误报表 interfaceError interfaceError:reportsUrl + 'interfaceError',//接口错误报表 interfaceError
InventoryBalanceEnRoute:reportsUrl + 'InventoryBalanceEnRoute',//库存余额报表按在途库 InventoryBalanceEnRoute InventoryBalanceEnRoute:reportsUrl + 'InventoryBalanceEnRoute',//库存余额报表按在途库 InventoryBalanceEnRoute
SupplierAndOrderSummary:reportsUrl + 'SupplierAndOrderSummary',//供应商发货订单汇总报表
// InventoryBookDetail:reportsUrl + '202212162111466911.rdlx',//库存流水帐明细 // InventoryBookDetail:reportsUrl + '202212162111466911.rdlx',//库存流水帐明细
// InventoryBookSummary:reportsUrl + '202212162112124488.rdlx',//库存流水帐汇总 // InventoryBookSummary:reportsUrl + '202212162112124488.rdlx',//库存流水帐汇总

22
fe/PC/src/router/index.js

@ -172,22 +172,6 @@ export const constantRoutes = [
} }
}] }]
}, },
{
path: '/',
component: Layout,
redirect: '/isPadForTransferLibJob_pc',
hidden: true,
children: [{
path: 'isPadForTransferLibJob_pc',
component: () => import('@/views/padManage/isPadForTransferLibJob_pc'),
name: 'isPadForTransferLibJob_pc',
meta: {
keepAlive : true,
title: '业务库移(pc版本)',
icon: '系统首页',
}
}]
},
// 【平板】 Kitting组包 // 【平板】 Kitting组包
{ {
path: '/', path: '/',
@ -205,7 +189,7 @@ export const constantRoutes = [
} }
}] }]
}, },
// 下架指导牵引车 // 【平板】下架指导牵引车
{ {
path: '/', path: '/',
component: Layout, component: Layout,
@ -222,7 +206,7 @@ export const constantRoutes = [
} }
}] }]
}, },
// 出库任务完成 // 【平板】出库任务完成
{ {
path: '/', path: '/',
component: Layout, component: Layout,
@ -239,7 +223,7 @@ export const constantRoutes = [
} }
}] }]
}, },
// 回库器具或空器具AGV搬运 // 【平板】回库器具或空器具AGV搬运
{ {
path: '/', path: '/',
component: Layout, component: Layout,

1
fe/PC/src/utils/tableColumns/index.js

@ -1841,6 +1841,7 @@ export const FISDeliverRequest = [
{ label: "客户代码", prop: "customerCode" }, { label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' }, { label: "客户地址", prop: 'customerAddressCode' },
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" }, { label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },

1
fe/PC/src/utils/tabsDesTions/index.js

@ -1182,6 +1182,7 @@ export const FISDeliverRequest = [
{ label: "客户代码", prop: "customerCode" }, { label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' }, { label: "客户地址", prop: 'customerAddressCode' },
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" }, { label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },

21
fe/PC/src/views/activeReportManage/reportForm/SupplierAndOrderSummary.vue

@ -0,0 +1,21 @@
<template>
<!-- 供应商发货订单汇总报表 -->
<popUpPage :openHandle="openHandle"></popUpPage>
</template>
<script>
import popUpPage from "../popUpPage/index.vue"
import { reportsAddress } from "@/filters/excelOrReportsOption";
import { createNewTabs } from '@/utils/index'
export default {
name:"SupplierAndOrderSummary",
components:{popUpPage},
mounted () {
this.openHandle()
},
methods:{
openHandle(){
createNewTabs(reportsAddress.SupplierAndOrderSummary + '?title=' + this.$route.meta.title)
}
}
}
</script>

4
fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue

@ -66,9 +66,7 @@ export default {
// //
currenButtonData: [ currenButtonData: [
// //
this.defaultExportBtn({ this.defaultExportBtn(),
url:"wms/store/deliver-note/export-for-fis"
}),
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//
this.defaultFilterBtn(),// this.defaultFilterBtn(),//

169
fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue

@ -21,7 +21,7 @@
@quicklySearchClick="quicklySearchClick" @quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear" @quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption" :primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick" @overallSearchFormClick="(options)=>{overallSearchFormClick(options,overallSearchFormCallback)}"
:httpOverallSearchData="httpOverallSearchData" :httpOverallSearchData="httpOverallSearchData"
:tableSelection="true" :tableSelection="true"
> >
@ -56,6 +56,22 @@
@importClick="postImportMergeClick(arguments)" @importClick="postImportMergeClick(arguments)"
@postImportDown="importDown('wms/store/deliver-request')" @postImportDown="importDown('wms/store/deliver-request')"
></importFile> ></importFile>
<!-- 批量生成发货单弹窗 -->
<el-dialog
title="批量生成发货单"
:visible="creatDeliverShow"
:append-to-body="true"
>
<el-form :model="creatDeliverForm" :rules="creatDeliverRules" ref="creatDeliverRef">
<el-form-item label="车牌号" prop="truckNumber">
<el-input v-model="creatDeliverForm.truckNumber"></el-input>
</el-form-item>
</el-form>
<div slot="footer">
<el-button @click="creatDeliverClose()"> </el-button>
<el-button type="primary" @click="creatDeliverSure()"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -82,6 +98,18 @@ export default {
mixins, mixins,
], ],
computed: { computed: {
// ()
hideButton_normalSta: function () {
return function (val) {
return this.showFilterSta_normal == val
}
},
// (FIS)
hideButton_FISSta: function () {
return function (val) {
return this.showFilterSta_fis == val
}
},
// //
hideButton: function () { hideButton: function () {
return function (val) { return function (val) {
@ -109,6 +137,34 @@ export default {
name: "creatDeliver", name: "creatDeliver",
size: "mini", size: "mini",
}, },
{
type: "primary",
label: "筛选[普通发货]",
name: "normalSta",
size: "mini",
hide: () => { return this.hideButton_normalSta(true) },
},
{
type: "danger",
label: "重置[普通发货]",
name: "normalSta-reset",
size: "mini",
hide: () => { return this.hideButton_normalSta(false) },
},
{
type: "warning",
label: "筛选[FIS发货]",
name: "FISSta",
size: "mini",
hide: () => { return this.hideButton_FISSta(true) },
},
{
type: "danger",
label: "重置[FIS发货]",
name: "normalSta-reset",
size: "mini",
hide: () => { return this.hideButton_FISSta(false) },
},
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//
this.defaultFilterBtn(),// this.defaultFilterBtn(),//
@ -116,13 +172,47 @@ export default {
DrawerButtonData: [ DrawerButtonData: [
// ...requestData(this) // ...requestData(this)
], ],
showFilterSta_normal:false,//
showFilterSta_fis:false,//fis
//
creatDeliverShow:false,
creatDeliverForm:{
truckNumber:""
},
creatDeliverRules:{
truckNumber: [{ required: true, trigger: "blur", message: "不可为空" }]
}
}; };
}, },
mounted () { mounted () {
this.paging(); this.paging();
}, },
methods:{ methods:{
overallSearchFormCallback(){
this.showFilterSta_normal = false
this.showFilterSta_fis = false
},
// fis
fasterSearchHandle(type){
this.PageListParams.condition.filters = [{
logic: "And",
column: "deliverRequestType",
action: "==",
value: String(type)
}]
this.paging()
this.httpOverallSearchData = null
},
// fis
resetSearchHandle(){
this.showFilterSta_normal = false
this.showFilterSta_fis = false
this.PageListParams.condition.filters = []
this.paging()
this.httpOverallSearchData = null
},
topbuttonHandle(val,item){ topbuttonHandle(val,item){
//
if(val == "creatDeliver"){ if(val == "creatDeliver"){
if(!this.multipleSelection || this.multipleSelection.length <= 0){ if(!this.multipleSelection || this.multipleSelection.length <= 0){
this.$warningMsg("至少选择一条数据") this.$warningMsg("至少选择一条数据")
@ -138,26 +228,25 @@ export default {
this.$errorMsg("所选数据的客户代码必须一致!") this.$errorMsg("所选数据的客户代码必须一致!")
return return
} }
let _ids = [] this.creatDeliverShow = true
this.multipleSelection.forEach(select=>{ _ids.push(select.id) }) }
this.$confirm('是否确定批量生成发货单?', '提示', { //
confirmButtonText: '确定', else if(val == 'normalSta'){
cancelButtonText: '取消', this.showFilterSta_normal = true
type: 'warning' this.showFilterSta_fis = false
}).then(() => { this.fasterSearchHandle('1')
this.Loading.appMainLoading = true }
deliverRequestHandleList(_ids) // fis
.then(res => { else if(val == 'FISSta'){
this.Loading.appMainLoading = false this.showFilterSta_fis = true
this.$refs.FISDeliverRequestTable_Ref.clearSelection() this.showFilterSta_normal = false
this.paging() this.fasterSearchHandle('2')
}).catch(err => { }
this.Loading.appMainLoading = false //
}) else if(val == 'normalSta-reset' || val == 'FISSta-reset'){
}).catch(() => { this.resetSearchHandle()
}
}); else{
}else{
this.topbutton(val,item) this.topbutton(val,item)
} }
}, },
@ -219,6 +308,44 @@ export default {
}else{ }else{
this.drawerbutton(val) this.drawerbutton(val)
} }
},
// -
creatDeliverClose(){
this.creatDeliverForm.truckNumber = ""
this.creatDeliverShow = false
},
// -
creatDeliverSure(){
this.$refs.creatDeliverRef.validate((valid) => {
if (valid) {
this.Loading.appMainLoading = true
let _params = {truckNumber:String(this.creatDeliverForm.truckNumber)}
this.creatDeliverClose()
let _ids = []
this.multipleSelection.forEach(select=>{ _ids.push(select.id) })
deliverRequestHandleList(_ids,_params)
.then(res => {
this.Loading.appMainLoading = false
this.$refs.FISDeliverRequestTable_Ref.clearSelection()
this.paging()
this.$successMsg('操作成功!')
}).catch(err => {
this.Loading.appMainLoading = false
})
} else {
console.log('error submit!!');
return false;
}
});
// this.$confirm('?', '', {
// confirmButtonText: '',
// cancelButtonText: '',
// type: 'warning'
// }).then(() => {
// }).catch(() => {
// });
} }
} }
} }

28
fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue

@ -1,6 +1,7 @@
<template> <template>
<div class="page-box" v-loading="Loading.appMainLoading"> <div class="page-box" v-loading="Loading.appMainLoading">
<tablePagination <tablePagination
ref="tablePagination_Ref"
:currenButtonData="currenButtonData" :currenButtonData="currenButtonData"
:tableData="tableData" :tableData="tableData"
:tableLoading="Loading.tableLoading" :tableLoading="Loading.tableLoading"
@ -49,14 +50,16 @@
:visible="convertReasonShow" :visible="convertReasonShow"
:append-to-body="true" :append-to-body="true"
> >
<el-form :model="convertReasonForm" v-if="convertReasonShow"> <div v-loading="convertReasonLoading">
<el-form-item> <el-form :model="convertReasonForm" v-if="convertReasonShow">
<el-input v-model="convertReasonForm.reason" :rows="3" type="textarea"></el-input> <el-form-item>
</el-form-item> <el-input v-model="convertReasonForm.reason" :rows="3" type="textarea"></el-input>
</el-form> </el-form-item>
<div slot="footer" class="dialog-footer"> </el-form>
<el-button @click="convertClose"> </el-button> <div slot="footer" class="dialog-footer" style="text-align:right">
<el-button type="primary" @click="convertList()"> </el-button> <el-button @click="convertClose"> </el-button>
<el-button type="primary" @click="convertList()"> </el-button>
</div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -102,6 +105,7 @@ export default {
], ],
convertReasonShow:false,// convertReasonShow:false,//
convertReasonForm:{reason:null}, convertReasonForm:{reason:null},
convertReasonLoading:false,
}; };
}, },
mounted () { mounted () {
@ -137,7 +141,8 @@ export default {
}, },
// //
convertList() { convertList() {
this.Loading.appMainLoading = true if(this.convertReasonLoading)return
this.convertReasonLoading = true
let params = { let params = {
tenantId: null, tenantId: null,
remark: this.convertReasonForm.reason, remark: this.convertReasonForm.reason,
@ -207,9 +212,10 @@ export default {
this.$message.success('已成功转为合格') this.$message.success('已成功转为合格')
this.paging() this.paging()
this.convertClose() this.convertClose()
this.Loading.appMainLoading = false this.$refs.tablePagination_Ref.clearSelection()
this.convertReasonLoading = false
}).catch(err => { }).catch(err => {
this.Loading.appMainLoading = false this.convertReasonLoading = false
console.log(err) console.log(err)
}) })
// return this.convertList // return this.convertList

Loading…
Cancel
Save