From 99dba28400362f9e1d63616581ca2b3c1ddb8cfc Mon Sep 17 00:00:00 2001 From: myTest383
Date: Mon, 20 Jan 2025 13:51:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=20=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statement/monthlyReport/claimFormRate.js | 25 ++ .../monthlyReport/essentialDetails.js | 17 ++ .../statement/monthlyReport/oneTimeRate.js | 25 ++ .../claimFormRate/claimFormRate.vue | 205 +++++++++++++++- .../claimFormRate/claimFormRateDetail.vue | 91 +++++++ .../essentialDetails/essentialDetails.vue | 223 +++++++++++++++++- .../inventoryManagement.vue | 6 +- .../inventoryManagementDetail.vue | 88 ++++++- .../monthlyReport/oneTimeRate/oneTimeRate.vue | 205 +++++++++++++++- .../oneTimeRate/oneTimeRateDetail.vue | 218 +++++++++++++++++ 10 files changed, 1081 insertions(+), 22 deletions(-) create mode 100644 yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js create mode 100644 yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js create mode 100644 yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js create mode 100644 yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue create mode 100644 yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue diff --git a/yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js b/yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js new file mode 100644 index 0000000000..46ee2943d9 --- /dev/null +++ b/yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +// 月度报表 三包索赔单生效率统计表 +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/claimFormRate/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 查询详情 + getDetail: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/claimFormRate/getDetail/' + params, + method: 'get', + + }) + } +} diff --git a/yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js b/yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js new file mode 100644 index 0000000000..bb2eea89c6 --- /dev/null +++ b/yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' +// 月度报表 必备件明细 +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/essentialDetails/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + +} diff --git a/yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js b/yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js new file mode 100644 index 0000000000..a7961b1c7c --- /dev/null +++ b/yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +// 月度报表 配件库房一次性满足率统计表 +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/oneTimeRate/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 查询详情 + getDetail: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/oneTimeRate/getDetail/' + params, + method: 'get', + + }) + } +} diff --git a/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue index 02409e35d2..cf2ac47074 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue @@ -1,8 +1,207 @@ + import Pagination from '@/components/pagination' + import pageye from '@/components/pagination/pageye' + import ButtonBar from '@/components/ButtonBar' + import req from '@/api/statement/monthlyReport/claimFormRate' + import divinfo from './claimFormRateDetail.vue' + + export default { + name: 'claimFormRate', + components: { + Pagination, + pageye, + ButtonBar, + divinfo + }, + data() { + return { + btndisabled: false, + btnList: [{ + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + }], + isSearchShow: false, + searchxianshitit: '显示查询条件', + viewState: 1, // 1、列表 2、新增 3、编辑 4、查看 + tableKey: 0, + list: [], + sids: [], // 用于导出的时候保存已选择的SIDs + listLoading: false, + // 翻页 + listQuery: { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + } + }, + created() { + // 初始化变量 + this.getList() + }, + mounted() { + this.$refs['btnbar'].setButtonList(this.btnList) + }, + methods: { + handle(row) { + console.log('handle ' + row.sid) - \ No newline at end of file + this.viewState = 4 + this.$refs['divinfo'].showAdd(row) + + }, + resetState() { + this.viewState = 1 + this.getList() + }, + // 搜索条件效果 + clicksearchShow() { + this.isSearchShow = !this.isSearchShow + if (this.isSearchShow) { + this.searchxianshitit = '隐藏查询条件' + } else { + this.searchxianshitit = '显示查询条件' + } + }, + btnHandle(btnKey) { + console.log('XXXXXXXXXXXXXXX ' + btnKey) + switch (btnKey) { + case 'doClose': + this.doClose() + break + default: + break + } + }, + // 信息条数 获取点击时当前的sid + handleSelectionChange(row) { + const aa = [] + row.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa + }, + // 表中序号 + indexMethod(index) { + var pagestart = (this.listQuery.current - 1) * this.listQuery.size + var pageindex = index + 1 + pagestart + return pageindex + }, + // 查询列表信息 + getList() { + this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path + req.listPage(this.listQuery).then((response) => { + this.listLoading = false + if (response.success) { + this.list = response.data.records + this.listQuery.total = response.data.total + } else { + this.list = [] + this.listQuery.total = 0 + } + }) + }, + // 查询按钮 + handleFilter() { + this.listQuery.current = 1 + this.getList() + }, + // 点击重置 + handleReset() { + this.listQuery = { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + this.getList() + }, + doClose() { + this.$store.dispatch('tagsView/delView', this.$route) + this.$router.go(-1) + } + + } + } + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue new file mode 100644 index 0000000000..7c2045c267 --- /dev/null +++ b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue b/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue index 02409e35d2..859c66699d 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue @@ -1,8 +1,225 @@ + import Pagination from '@/components/pagination' + import pageye from '@/components/pagination/pageye' + import ButtonBar from '@/components/ButtonBar' + import req from '@/api/statement/monthlyReport/essentialDetails' + + export default { + name: 'essentialDetails', + components: { + Pagination, + pageye, + ButtonBar, + }, + data() { + return { + btndisabled: false, + btnList: [{ + type: 'success', + size: 'small', + icon: '', + btnKey: 'doExport', + btnLabel: '导出' + }, { + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + }], + isSearchShow: false, + searchxianshitit: '显示查询条件', + viewState: 1, // 1、列表 2、新增 3、编辑 4、查看 + tableKey: 0, + list: [], + sids: [], // 用于导出的时候保存已选择的SIDs + listLoading: false, + // 翻页 + listQuery: { + current: 1, + size: 10, + total: 0, + params: { + "createOrgName": "", + "deptName": "", + "accessoryName": "", + "goodsCode": "", + "userSid": "", + "orgPath": "", + "menuUrl": "" + } + } + } + }, + created() { + // 初始化变量 + this.getList() + }, + mounted() { + this.$refs['btnbar'].setButtonList(this.btnList) + }, + methods: { + handle(row) { + console.log('handle ' + row.sid) - \ No newline at end of file + this.viewState = 4 + this.$refs['divinfo'].showAdd(row) + + }, + resetState() { + this.viewState = 1 + this.getList() + }, + // 搜索条件效果 + clicksearchShow() { + this.isSearchShow = !this.isSearchShow + if (this.isSearchShow) { + this.searchxianshitit = '隐藏查询条件' + } else { + this.searchxianshitit = '显示查询条件' + } + }, + btnHandle(btnKey) { + console.log('XXXXXXXXXXXXXXX ' + btnKey) + switch (btnKey) { + case 'doClose': + this.doClose() + break + default: + break + } + }, + // 信息条数 获取点击时当前的sid + handleSelectionChange(row) { + const aa = [] + row.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa + }, + // 表中序号 + indexMethod(index) { + var pagestart = (this.listQuery.current - 1) * this.listQuery.size + var pageindex = index + 1 + pagestart + return pageindex + }, + // 查询列表信息 + getList() { + this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path + req.listPage(this.listQuery).then((response) => { + this.listLoading = false + if (response.success) { + this.list = response.data.records + this.listQuery.total = response.data.total + } else { + this.list = [] + this.listQuery.total = 0 + } + }) + }, + // 查询按钮 + handleFilter() { + this.listQuery.current = 1 + this.getList() + }, + // 点击重置 + handleReset() { + this.listQuery = { + current: 1, + size: 10, + total: 0, + params: { + "createOrgName": "", + "deptName": "", + "accessoryName": "", + "goodsCode": "", + "userSid": "", + "orgPath": "", + "menuUrl": "" + } + } + this.getList() + }, + doClose() { + this.$store.dispatch('tagsView/delView', this.$route) + this.$router.go(-1) + } + + } + } + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue index ae127a234a..653d70091e 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue @@ -11,10 +11,10 @@ + type="month" placeholder="开始月份"> 至 + type="month" placeholder="结束月份"> @@ -28,7 +28,7 @@
-
指标完成情况
+
服务站列表
diff --git a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue index 2887ec0dad..04951f695f 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue @@ -153,8 +153,8 @@ list: [], title: "", mergeObj: {}, // 用来记录需要合并行的下标 - // mergeArr: ['品牌', '服务站名称', '软件系统', '品名', '库存当量出库金额', '库存当量出库占比', '库存当量入库金额', '库存当量入库占比'], // 表格中的列名 - mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名 + mergeArr: ['品牌', '服务站名称', '软件系统', '品名', '库存当量出库金额', '库存当量出库占比', '库存当量入库金额', '库存当量入库占比'], // 表格中的列名 + // mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名 } }, @@ -178,7 +178,6 @@ } } - // 判断列的属性 if (this.mergeArr.indexOf(column.property) !== -1) { // 判断其值是不是为0 @@ -190,6 +189,43 @@ } } + // var columnIndex1 = 1 + // var columnIndex2 = 1 + // var columnIndex3 = 1 + + // for (var i = 0; i < this.list.length; i++) { + // for (var j = 0; j < this.list.length; j++) { + + // if (this.list[i].品牌 == this.list[j].品牌) { + // columnIndex1 += 1 + // } + // if (this.list[i].服务站名称 == this.list[j].服务站名称) { + // columnIndex2 += 1 + // } + // if (this.list[i].软件系统 == this.list[j].软件系统) { + // columnIndex3 += 1 + // } + // } + // } + + // console.log('>>>>>>>>>1', columnIndex1) + // console.log('>>>>>>>>>2', columnIndex2) + // console.log('>>>>>>>>>3', columnIndex3) + + // if (columnIndex === 1) { + // //定位到6行4列的ID，告诉该单元格合并1行2列 + // return [columnIndex1, 1] + // } + + // if (columnIndex === 2) { + // //定位到6行4列的ID，告诉该单元格合并1行2列 + // return [columnIndex2, 1] + // } + // if (columnIndex === 3) { + // //定位到6行4列的ID，告诉该单元格合并1行2列 + // return [columnIndex3, 1] + // } + }, @@ -218,19 +254,51 @@ if (index === 0) { this.mergeObj[key].push(1); } else { - console.log('>>>>>>>>>commodityCurrentChange', item) - console.log('>>>>>>>>>commodityCurrentChange', key) - console.log('>>>>>>>>>commodityCurrentChange', item[key]) - console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key]) + // console.log('>>>>>>>>>commodityCurrentChange', item) + // console.log('>>>>>>>>>commodityCurrentChange', key) + // console.log('>>>>>>>>>commodityCurrentChange', item[key]) + // console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key]) // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位 - if (item[key] === data[index - 1][key]) { - this.mergeObj[key][count] += 1; - this.mergeObj[key].push(0); + if (item.品牌 == data[index - 1].品牌) { + + if (item.服务站名称 == data[index - 1].服务站名称) { + + if (item.软件系统 == data[index - 1].软件系统) { + if (item.品名 == data[index - 1].品名) { + if (item[key] === data[index - 1][key]) { + this.mergeObj[key][count] += 1; + this.mergeObj[key].push(0); + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + } else { // 如果当前行和上一行其值不相等 count = index; // 记录当前位置 this.mergeObj[key].push(1); // 重新push 一个 1 } + + + + } }) }) diff --git a/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue index 02409e35d2..dbd3e01261 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue @@ -1,8 +1,207 @@ + import Pagination from '@/components/pagination' + import pageye from '@/components/pagination/pageye' + import ButtonBar from '@/components/ButtonBar' + import req from '@/api/statement/monthlyReport/oneTimeRate' + import divinfo from './oneTimeRateDetail.vue' + + export default { + name: 'oneTimeRate', + components: { + Pagination, + pageye, + ButtonBar, + divinfo + }, + data() { + return { + btndisabled: false, + btnList: [{ + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + }], + isSearchShow: false, + searchxianshitit: '显示查询条件', + viewState: 1, // 1、列表 2、新增 3、编辑 4、查看 + tableKey: 0, + list: [], + sids: [], // 用于导出的时候保存已选择的SIDs + listLoading: false, + // 翻页 + listQuery: { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + } + }, + created() { + // 初始化变量 + this.getList() + }, + mounted() { + this.$refs['btnbar'].setButtonList(this.btnList) + }, + methods: { + handle(row) { + console.log('handle ' + row.sid) - \ No newline at end of file + this.viewState = 4 + this.$refs['divinfo'].showAdd(row) + + }, + resetState() { + this.viewState = 1 + this.getList() + }, + // 搜索条件效果 + clicksearchShow() { + this.isSearchShow = !this.isSearchShow + if (this.isSearchShow) { + this.searchxianshitit = '隐藏查询条件' + } else { + this.searchxianshitit = '显示查询条件' + } + }, + btnHandle(btnKey) { + console.log('XXXXXXXXXXXXXXX ' + btnKey) + switch (btnKey) { + case 'doClose': + this.doClose() + break + default: + break + } + }, + // 信息条数 获取点击时当前的sid + handleSelectionChange(row) { + const aa = [] + row.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa + }, + // 表中序号 + indexMethod(index) { + var pagestart = (this.listQuery.current - 1) * this.listQuery.size + var pageindex = index + 1 + pagestart + return pageindex + }, + // 查询列表信息 + getList() { + this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path + req.listPage(this.listQuery).then((response) => { + this.listLoading = false + if (response.success) { + this.list = response.data.records + this.listQuery.total = response.data.total + } else { + this.list = [] + this.listQuery.total = 0 + } + }) + }, + // 查询按钮 + handleFilter() { + this.listQuery.current = 1 + this.getList() + }, + // 点击重置 + handleReset() { + this.listQuery = { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + this.getList() + }, + doClose() { + this.$store.dispatch('tagsView/delView', this.$route) + this.$router.go(-1) + } + + } + } + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue new file mode 100644 index 0000000000..f67b23da76 --- /dev/null +++ b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue @@ -0,0 +1,218 @@ + + + + +