From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:15 +0800
Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue
---
src/views/quality/finishedProductInspection/index.vue | 250 ++++++++++++++++++++++++--------------------------
1 files changed, 120 insertions(+), 130 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 1ab2496..821a642 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -12,27 +12,42 @@
<template #toolbar></template>
</ttable>
</basic-container>
+ <el-dialog
+ top="10vh"
+ title="鎵撳嵃棰勮"
+ :visible.sync="printDialogVisible"
+ width="70%">
+ <div style="width:100%;height: 60vh;overflow-y: scroll;">
+ <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="()=>{printDialogVisible = false;printFormData=null}">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</div>
</template>
-
<script>
import ttable from '@/views/common/ztt-table.vue'
import * as fecha from 'element-ui/lib/utils/date'
- import finishedProductInspectionAdd from './finishedProductInspectionAdd'
- import finishedProductInspectionUp from './finishedProductInspectionUp'
- import finishedProductInspectionLook from './finishedProductInspectionLook'
- import { page } from '@/api/quality/finishedProduct'
+ import finishedProductInspectionAdd from './finishedProduct-form'
+ import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
+ import { transform } from '@/util/fileTransform'
+ import printTemplate from './finishedProducter-print.vue'
+ import PrintJS from 'print-js'
+ import { title } from 'process'
export default {
components: {
finishedProductInspectionAdd,
- finishedProductInspectionUp,
- finishedProductInspectionLook,
- ttable
+ ttable,
+ printTemplate
},
data() {
return {
+ printFormData: null,
+ printDialogVisible: false,
result:[{label:'鍏ㄩ儴',value: ''},{label:'鍚堟牸',value: '1'},{label:'涓嶅悎鏍�',value: '0'}],
type: [1],
prelang: 'finishedProduct',
@@ -58,14 +73,22 @@
data: [],
// 鏍囬
column: [
- {
+ {
minWidth: '120',
- prop: 'orderNumber',
- label: '璁㈠崟鍙�',
+ prop: 'finInsNo',
+ label: '浜у搧妫�楠岀紪鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
render: { fun: this.addOrUpdateHandle }
+ },
+ {
+ minWidth: '120',
+ prop: 'orderNumber',
+ label: '鎶ュ伐鍗曞彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -84,6 +107,14 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -149,22 +180,29 @@
},
],
toolbar: [
- {
+ /* {
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- },
- {
- text: '鍒犻櫎',
- },
+ }, */
{
text: '瀵煎嚭',
+ type: 'primary',
+ fun: this.exportExcel
}
],
operator: [{
text: '鎵撳嵃',
type: 'text',
size: 'small',
+ fun: this.showPrint,
+ show: {
+ val: [
+ '1',
+ '0'
+ ],
+ key: 'result'
+ }
},{
text: '浣滃簾',
type: 'text',
@@ -178,73 +216,76 @@
minWidth: 100
},
},
-
-
-
-
-
-
- searchData: {
- result: '',
- material: '',
- },
- // 涓绘満宸ヤ笅鎷夋
- usernameOptions: [],
- inspectionTable: [],
- rowInfo: {},
- pageParams: {
- countSize: 10, //姣忛〉鏁伴噺
- pageSize: 1, // 褰撳墠椤电爜
- total: 0
- },
- showAddPage: false,
- showAdd: false,
- showLook: false,
- showUp: false,
- showDetail: false,
- addInspectionform: [{
- number: '',
- username: '',
- projectname: '',
- tracenumber: '',
- code: '',
- class: '',
- specificationmodel: '',
- unit: '',
- quantity: '',
- group: '',
- worker: '',
- machine: ''
- }],
- inspectionItems: [{
- project: '甯冮殕杩�',
- unit: '鍚�',
- standardVal: '8219384314',
- controlVal: '9823401',
- detectionVal: '11111',
- device: '',
- conclusion: '鍚堟牸'
- }],
- inspectionResultForm: [{
- id: '274024',
- name: '111',
- inspecter: '111',
- conclusion: '',
- operation: ''
- }],
- finishedInsInfo: {}
}
},
- created() {
- this.init()
- // this.getInspectionTableData()
- },
+ created() { },
+ watch:{
+ printFormData(newVal){
+ if(newVal){
+ this.printFormData = newVal
+ }
+ }
+ },
methods: {
+ //鎵撳嵃鎸夐挳
+ printFun() {
+ const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 榛戜綋;!important;}' ;
+ PrintJS({
+ printable: "printRaw",
+ type: "html",
+ scanStyles: false,
+ maxWidth: 1200,
+ header: "浜у搧妫�娴嬫姤鍛�",
+ style:style,
+ css:'./title.css',
+ targetStyles: ["*"],
+ ignoreElements: ["no-ignore"],
+ orientation: 'portrait'
+ });
+ },
+ //鏌ョ湅鎶ュ憡鎸夐挳
+ showPrint(row){
+ queryById(row.id).then(res=>{
+ this.printFormData = res.data.data
+ this.printFormData.createTime = row.createTime
+ this.printFormData.updateTime = row.updateTime
+ this.printDialogVisible = true
+ }).catch(error=>{
+ })
+ },
+ exportExcel(){
+ let queryParam=this.$refs.finishedProduct.getQueryParam();
+ delete queryParam.criteria
+ exportExaminationProducts(queryParam).then((res)=>{
+ transform(res)
+ })
+ },
+ deleteHandle(row){
+ this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(()=>{
+ deletePro(row.id).then(res=>{
+ if(res.data.code == 0){
+ this.$message.success("鍒犻櫎鎴愬姛")
+ }else{
+ this.$message.error("鍒犻櫎澶辫触")
+ }
+ this.getData()
+ })
+ })
+ },
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
this.$router.push({
name: 'finishedProductForm',
- query: { id: row == null ? null : row.id }
+ query: {
+ id: row == null ? null : row.id,
+ },
+ params: {
+ resultVal: row == null ? null : row.result
+ }
})
},
formatResult(row, column, cellValue){
@@ -259,61 +300,10 @@
formatDateTime(row, column, cellValue) {
return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
},
- handleSelectionChange(){
-
- },
- // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
- handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
- this.currentPage = 1
- this.pageSize = val
+ handleSelectionChange(){ },
+ getData() {
+ this.$refs.finishedProduct.getDataList()
},
- // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
- handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
- this.currentPage = val
- },
- handleAddNew() {
- this.showAdd = true
- },
- // async getInspectionTableData() {
- // const {
- // data: {
- // row,
- // total
- // }
- // } = await this.$axios.get(this.$api.url.finishedInsListPage, {
- // params: {
- // ...this.pageParams,
- // ...this.searchData
- // }
- // })
- // this.inspectionTable = row
- // this.pageParams.total = total
- // },
- goToDetail(row) {
- this.rowInfo = row
- this.showLook = true
- },
- goUp(row) {
- this.rowInfo = row
- this.showUp = true
- },
- async init() {
- // const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
- // this.usernameOptions = data
-
- },
- comBackMain(val) {
- this.showAdd = false
- this.showLook = false
- this.showUp = false
- this.init()
- // this.getInspectionTableData()
- if (val) {
- this.$parent.removeAllTab()
- }
- }
}
}
--
Gitblit v1.9.3