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/processInspect/index.vue |   38 ++++++++++----------------------------
 1 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 349f765..7059180 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -12,19 +12,6 @@
                 <template #toolbar></template>
                 </ttable>
             </basic-container>
-            <el-dialog
-            top="10vh"
-            title="鎵撳嵃棰勮"
-            :visible.sync="printDialogVisible"
-            width="60%">
-            <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;this.printFormData=null}">鍙� 娑�</el-button>
-                <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
-            </span>
-            </el-dialog>
 		</div>
 	</div>
 </template>
@@ -35,17 +22,13 @@
 	import processInspectForm from './processInspect-form'
     import { transform } from '@/util/fileTransform'
     import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect'
-    import printTemplate from './processInspect-print.vue'
 	export default {
 		components: {
 			processInspectForm,
             ttable,
-            printTemplate
 		},
 		data() {
 			return {
-                printFormData: null,
-                printDialogVisible: false,
                 result:[{label:'鍏ㄩ儴',value: ''},{label:'鍚堟牸',value: '1'},{label:'涓嶅悎鏍�',value: '0'}],
                 type: [1],
                 prelang: 'processInspect',
@@ -73,12 +56,20 @@
                     column: [
                         {
                             minWidth: '120',
-                            prop: 'orderNumber',
-                            label: '璁㈠崟缂栧彿',
+                            prop: 'proInsNo',
+                            label: '杩囩▼妫�楠岀紪鍙�',
                             isTrue: true,
                             isSearch: true,
                             searchInfoType: 'text',
                             render: { fun: this.addOrUpdateHandle }
+                        },
+                        {
+                            minWidth: '120',
+                            prop: 'orderNumber',
+                            label: '璁㈠崟缂栧彿',
+                            isTrue: true,
+                            isSearch: true,
+                            searchInfoType: 'text'
                         },
                         {
                             minWidth: '120',
@@ -175,11 +166,6 @@
                     }
                     ],
                     operator: [{
-                        text: '鎵撳嵃',
-                        type: 'text',
-                        size: 'small',
-                        fun: this.showPrint
-                    },{
                         text: '浣滃簾',
                         type: 'text',
                         size: 'small',
@@ -196,13 +182,9 @@
 		},
 		created() { },
 		methods: {
-            showPrint(){
-                this.printDialogVisible = true
-            },
             exportExcel(){
                 let queryParam=this.$refs.processInspect.getQueryParam();
                 delete queryParam.criteria
-                console.log(queryParam);
                 exportProcessInsProduct(queryParam).then((res)=>{
                     transform(res)
                 })

--
Gitblit v1.9.3