diff --git a/src/api/business/bench/bench.ts b/src/api/business/bench/bench.ts new file mode 100644 index 0000000..c59c5dd --- /dev/null +++ b/src/api/business/bench/bench.ts @@ -0,0 +1,11 @@ +// 工作台 +// import request from '../../index' + +// 部门产值分析列表 +// export function getDepOutputAnalysisList(data: IListQuery) { +// // return request({ +// // url: '/business/board/deptOutput', +// // method: 'post', +// // data, +// // }) +// } diff --git a/src/api/business/bench/bench.ts b/src/api/business/bench/bench.ts new file mode 100644 index 0000000..c59c5dd --- /dev/null +++ b/src/api/business/bench/bench.ts @@ -0,0 +1,11 @@ +// 工作台 +// import request from '../../index' + +// 部门产值分析列表 +// export function getDepOutputAnalysisList(data: IListQuery) { +// // return request({ +// // url: '/business/board/deptOutput', +// // method: 'post', +// // data, +// // }) +// } diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index 02487d5..9fcbb50 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -200,8 +200,8 @@ ]) // 当前进行中样品状态数据 const statusData = ref([ - { name: '待收样', number: '256' }, - { name: '待领样', number: '167' }, + { name: '待收入', number: '256' }, + { name: '待分发', number: '167' }, { name: '检测中', number: '135' }, { name: '成编制报告', number: '135' }, ]) @@ -299,30 +299,36 @@ - -
+ +
- {{ item.text }} -
-
- -
-
-
- {{ item.number }} -
-
- {{ item.name }} -
-
+
+ {{ item.text }}
+ +
@@ -390,31 +396,20 @@ - - -
-
- 人员A -
-
- - - - -
-
- -
- -
-
- 人员A -
-
- - - - + + +
+
+
+ {{ item.number }} +
+
+ {{ item.name }} +
+
@@ -475,33 +470,24 @@ } } -.bench-right-top { - width: 100%; - height: 100%; - padding: 0 10px; +.right-top-box { + width: calc(33% - 20px); + height: 20%; + padding: 10px; + margin: 5px; + border-radius: 5px; + white-space: nowrap; + // text-align: center; + // font-size: 14px; + color: #fff; + cursor: pointer; + background-color: #3d7eff; display: flex; - flex-wrap: wrap; + justify-content: center; align-items: center; - box-sizing: border-box; - .right-top-box { - width: calc(33% - 10px); - height: calc(50% - 10px); - padding: 10px; - margin: 5px; - border-radius: 5px; - text-align: center; - font-size: 14px; - color: #fff; - cursor: pointer; - background-color: #3d7eff; - display: flex; - justify-content: center; - align-items: center; - - &:hover { - background-color: #286ffd; - } + &:hover { + background-color: #286ffd; } } diff --git a/src/api/business/bench/bench.ts b/src/api/business/bench/bench.ts new file mode 100644 index 0000000..c59c5dd --- /dev/null +++ b/src/api/business/bench/bench.ts @@ -0,0 +1,11 @@ +// 工作台 +// import request from '../../index' + +// 部门产值分析列表 +// export function getDepOutputAnalysisList(data: IListQuery) { +// // return request({ +// // url: '/business/board/deptOutput', +// // method: 'post', +// // data, +// // }) +// } diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index 02487d5..9fcbb50 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -200,8 +200,8 @@ ]) // 当前进行中样品状态数据 const statusData = ref([ - { name: '待收样', number: '256' }, - { name: '待领样', number: '167' }, + { name: '待收入', number: '256' }, + { name: '待分发', number: '167' }, { name: '检测中', number: '135' }, { name: '成编制报告', number: '135' }, ]) @@ -299,30 +299,36 @@
- -
+ +
- {{ item.text }} -
-
- -
-
-
- {{ item.number }} -
-
- {{ item.name }} -
-
+
+ {{ item.text }}
+ +
@@ -390,31 +396,20 @@ - - -
-
- 人员A -
-
- - - - -
-
- -
- -
-
- 人员A -
-
- - - - + + +
+
+
+ {{ item.number }} +
+
+ {{ item.name }} +
+
@@ -475,33 +470,24 @@ } } -.bench-right-top { - width: 100%; - height: 100%; - padding: 0 10px; +.right-top-box { + width: calc(33% - 20px); + height: 20%; + padding: 10px; + margin: 5px; + border-radius: 5px; + white-space: nowrap; + // text-align: center; + // font-size: 14px; + color: #fff; + cursor: pointer; + background-color: #3d7eff; display: flex; - flex-wrap: wrap; + justify-content: center; align-items: center; - box-sizing: border-box; - .right-top-box { - width: calc(33% - 10px); - height: calc(50% - 10px); - padding: 10px; - margin: 5px; - border-radius: 5px; - text-align: center; - font-size: 14px; - color: #fff; - cursor: pointer; - background-color: #3d7eff; - display: flex; - justify-content: center; - align-items: center; - - &:hover { - background-color: #286ffd; - } + &:hover { + background-color: #286ffd; } } diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index 43772fb..c20379d 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -107,7 +107,8 @@ { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' }, { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' }, { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' }, - { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } }, + // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } }, + { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' }, { text: '生成时间', value: 'createTime', align: 'center', width: '165px' }, ]) // 表格数据 @@ -251,7 +252,8 @@ // 打印 const bindLabel = (row: ICerPrintList) => { // 判断状态第一次可以直接打印,之后的打印需要审批 - if (row.printNum == 0) { + // if (row.printNum == 0) { + if (row.printStatusName === '可打印') { ElMessageBox.confirm( '确定要打印吗？', '确认操作', @@ -324,38 +326,38 @@ }) } } -var printObj = ref({ - // asyncUrl : 'http://111.198.10.15:21408/test/测试_1680242558223_1681889965885.pdf', - // asyncUrl(reslove) { - // getPhotoUrl(row.printFileName as string).then((res) => { - // const url = res.data - // console.log(url) +// var printObj = ref({ +// // asyncUrl : 'http://111.198.10.15:21408/test/测试_1680242558223_1681889965885.pdf', +// // asyncUrl(reslove) { +// // getPhotoUrl(row.printFileName as string).then((res) => { +// // const url = res.data +// // console.log(url) - // pdfUrl.value = res.data - // console.log(pdfUrl.value) - // reslove('http://111.198.10.15:21408/test/测试_1680242558223_1681889965885.pdf') - // // printPdf(res.data) +// // pdfUrl.value = res.data +// // console.log(pdfUrl.value) +// // reslove('http://111.198.10.15:21408/test/测试_1680242558223_1681889965885.pdf') +// // // printPdf(res.data) - // // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' - // // proxy.$refs.pdf.print() - // // download(url, row.printFileName as string) - // }) - // }, - // id: 'printBox', // 这里的id就是上面我们的打印区域id，实现指哪打哪 - // popTitle: '配置页眉标题', // 打印配置页上方的标题 - // extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割 - // preview: false, // 是否启动预览模式，默认是false - // previewTitle: '预览的标题', // 打印预览的标题 - // previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印 - // zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高 - // previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback - // previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback - // beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback - // openCallback() { console.log('执行打印了！') }, // 调用打印时的callback - // closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消) - // clickMounted() { console.log('点击v-print绑定的按钮了！') }, +// // // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' +// // // proxy.$refs.pdf.print() +// // // download(url, row.printFileName as string) +// // }) +// // }, +// // id: 'printBox', // 这里的id就是上面我们的打印区域id，实现指哪打哪 +// // popTitle: '配置页眉标题', // 打印配置页上方的标题 +// // extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割 +// // preview: false, // 是否启动预览模式，默认是false +// // previewTitle: '预览的标题', // 打印预览的标题 +// // previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印 +// // zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高 +// // previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback +// // previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback +// // beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback +// // openCallback() { console.log('执行打印了！') }, // 调用打印时的callback +// // closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消) +// // clickMounted() { console.log('点击v-print绑定的按钮了！') }, -}) +// }) // 打印列表 function printList() { // 打印列 @@ -464,7 +466,10 @@ 详情 - + + 打印