From 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 十二月 2023 10:57:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 24 +
vue.config.js | 2
src/views/technology/routing/routing-form.vue | 20
src/views/product/workbench/productoutput-table.vue | 13
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 22 -
src/views/product/workbench/workReportCard.vue | 12
src/views/technology/routing/edit-routing-operation.vue | 12
src/api/quality/rawMaterial.js | 1
src/views/technology/operation/operation-form.vue | 4
src/views/quality/Packaging_ledger/index.vue | 117 ++++++++-
src/views/product/workbench/productInDialog.vue | 6
src/views/plan/manufacturingorder/index.vue | 102 ++++---
src/views/product/workbench/batchproductout-form-new.vue | 31 +-
src/views/product/workbench/feed-pane.vue | 16
src/views/technology/structure/single-structure-form.vue | 8
src/views/technology/operation/index.vue | 28 +-
src/views/warehouse/pallettransports/index.vue | 35 ++
src/views/common/operation.vue | 6
src/views/technology/routing/index.vue | 12
src/views/technology/structure/index.vue | 4
src/views/quality/rawMaterial/index.vue | 7
src/views/product/workbench/productoutput-list.vue | 8
src/views/technology/completeproductstructure/index.vue | 177 +++++++-------
23 files changed, 410 insertions(+), 257 deletions(-)
diff --git a/src/api/quality/rawMaterial.js b/src/api/quality/rawMaterial.js
index 5b8bbd5..abf8b52 100644
--- a/src/api/quality/rawMaterial.js
+++ b/src/api/quality/rawMaterial.js
@@ -34,6 +34,7 @@
return request({
url: '/mes/rawInspect/downloadReport',
method: 'post',
+ data: data,
responseType: 'blob',
})
}
diff --git a/src/views/common/operation.vue b/src/views/common/operation.vue
index cef559f..6c75fdd 100644
--- a/src/views/common/operation.vue
+++ b/src/views/common/operation.vue
@@ -94,8 +94,8 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
- {
+ }/*,
+ {
minWidth: '100',
prop: 'productionCounting',
label: '鏄惁鎶ュ伐',
@@ -159,7 +159,7 @@
optList: () => {
return this.getChangeList()
}
- }
+ } */
]
},
addOrUpdateVisible: false,
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 2b59511..c5911e0 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -19,11 +19,11 @@
@refreshDataList="getData"
></table-form>
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
- <div class="dia_body">
- <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
+ <div class="dia_body" id="printRaw">
+ <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px; font-size: 16px !important;">
<el-row>
<el-col :span="8" :offset="1">搴忓彿锛�</el-col>
- <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="1">缂栧彿锛�</el-col>
@@ -43,7 +43,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
+ <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
</span>
</el-dialog>
</basic-container>
@@ -289,13 +289,23 @@
printFun() {
// this.printDialogVisible = false;
this.diaPrintTab = false;
- console.log(printRaw);
PrintJS({
- printable: "printRaw",//椤甸潰
+ printable: 'printRaw',//椤甸潰
type: "html",//鏂囨。绫诲瀷
maxWidth:450,
targetStyles:['*'],
- style:"@page {margin:0 ;resolution: 300dpi;portrait}",
+ style: `@page {
+ margin:0;
+ size: 360px 175px;
+ }
+ hrml{
+ zoom:100%;
+ }
+ @media print{
+ width: 360px;
+ height: 175px;
+ margin:0;
+ }`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
font_size: '',
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 0b601e1..09b4935 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -109,7 +109,7 @@
@click="labelPrint"
type="primary"
style="margin-left:10px;"
- >鎵撳嵃鏍囩
+ >鏍囩鎵撳嵃
</el-button>
<!-- <el-button
v-if="permissions.manufacturingorder_update_orderno"
@@ -195,38 +195,32 @@
</div>
</span>
</el-dialog>
- <!-- 鏍囩鎵撳嵃 -->
- <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="30%">
- <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
- <el-card class="box-card" v-for="(tem, i) in orderDatalist" :key="i" style="margin-bottom: 15px;">
- <!-- <el-row>
- <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
- </el-row> -->
- <!-- <el-row>
- <el-col :span="10" :offset="3">瀹㈡埛璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ tem.customerOrderNo }}</el-col>
- </el-row> -->
- <el-row style="font-size: 18px;">
- <!-- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col> -->
- <el-col :span="10" :offset="6" style="font-weight: bold;" >{{ tem.partNo }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" style="padding-left: 20px;">
- <vueQr :text="tem.moNo" :size="150" :margin="1"></vueQr>
- </el-col>
- <el-col :span="10" :offset="3" style="font-weight: bold;" >鎵规鍙�: {{ tem.moNo }}</el-col>
- <!-- <el-col :span="10" :offset="4" style="font-weight: bold;" ></el-col> -->
- <!-- <el-col :span="10" :offset="4" style="font-weight: bold;" >{{ tem.partName }}</el-col> -->
- </el-row>
- </el-card>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button>
- </span>
- </el-dialog>
</basic-container>
+ <!-- 鏍囩鎵撳嵃 -->
+ <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
+ <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
+ <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px;width:100%">
+ <el-row>
+ <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">杞﹂棿璁㈠崟鍙凤細</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.moNo2 }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="JSON.stringify(item)" :size="80" :margin="2"></vueQr>
+ </el-col>
+ </el-row>
+ </el-card>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -259,6 +253,8 @@
export default {
data() {
return {
+ checkList: [],
+ qrData: [],
orderDatalist:[],
diaPrintTab:false,
showCustomerorder: false,
@@ -461,6 +457,15 @@
minWidth: '120',
prop: 'lengthRequirement',
label: '鐩橀暱瑕佹眰',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'scrapQty',
+ label: '鎶ュ簾鏁伴噺',
sort: true,
isTrue: true,
isSearch: true,
@@ -1037,7 +1042,6 @@
}
})
},
-
computed: {
...mapGetters(['permissions'])
},
@@ -1396,6 +1400,23 @@
}
}
},
+ //鍒濆鍖栦簩缁寸爜鏍囩鏁版嵁
+ initQrData(data){
+ if(data){
+ let index = Number(data.qtyRequired) + Number(data.scrapQty)
+ if(index>0){
+ for(var i=1;i<= index;i++){
+ let obj = {
+ moNo: data.moNo,
+ moNo2: null,
+ }
+ let no = (i+"").padStart(3,'0')
+ obj.moNo2 = data.moNo + no
+ this.qrData.push(obj)
+ }
+ }
+ }
+ },
// table鑷甫浜嬩欢
handleSelectionChange(val) {
console.log(val,"涓�琛�");
@@ -1403,21 +1424,12 @@
orderData =val.map( el =>{
return{
moNo:el.moNo,
- workShop:el.workShop,
- operationNames:el.operationNames,
- customerOrderNo:el.customerOrderNo,
- customerName:el.customerName,
- mpsNo:el.mpsNo,
- remark:el.remark,
- partNo:el.partNo,
- partName:el.partName,
- unit:el.unit,
- requiredDate:el.requiredDate,
- id:el.id,
+ qtyRequired: el.qtyRequired,
+ scrapQty: el.scrapQty
}
})
this.orderDatalist = orderData
- console.log(orderData,"浜岀淮鐮侀渶瑕佺殑");
+ this.initQrData(orderData[0])
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
var stateArr = val.map(function(value, index) {
diff --git a/src/views/product/workbench/batchproductout-form-new.vue b/src/views/product/workbench/batchproductout-form-new.vue
index d9868e6..11f7e1a 100644
--- a/src/views/product/workbench/batchproductout-form-new.vue
+++ b/src/views/product/workbench/batchproductout-form-new.vue
@@ -57,9 +57,9 @@
><el-col :span="2" class="batch-product-out-form-header-col"
><span>闆朵欢鍚嶇О</span></el-col
>
- <el-col :span="4" class="batch-product-out-form-header-col"
+ <!-- <el-col :span="4" class="batch-product-out-form-header-col"
><span>搴忓垪鍙�</span></el-col
- >
+ > -->
<!-- <el-col :span="2" class="batch-product-out-form-header-col"
><span>杞藉叿缂栧彿</span></el-col
>
@@ -78,9 +78,9 @@
<el-col :span="1" class="batch-product-out-form-header-col"
><span>鍗曚綅</span></el-col
>
- <el-col :span="2" class="batch-product-out-form-header-col"
+ <!-- <el-col :span="2" class="batch-product-out-form-header-col"
><span>WDR鍙�</span></el-col
- >
+ > -->
<!-- <el-col :span="1" class="batch-product-out-form-header-col"
><span>鍒嗘鎻忚堪</span></el-col
> -->
@@ -133,11 +133,11 @@
<span class="inline-el-hidden">{{ item.partName }}</span>
</el-tooltip>
</el-col>
- <el-col :span="4" class="batch-product-out-form-body-col l-mes">
+ <!-- <el-col :span="4" class="batch-product-out-form-body-col l-mes"> -->
<!-- <span>{{ item.outBatchNo }}</span> -->
- <el-input v-model="item.outBatchNo">
+ <!-- <el-input v-model="item.outBatchNo">
</el-input>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="2" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.reelNumber"></el-input>
</el-col>
@@ -156,17 +156,22 @@
<el-col :span="1" class="batch-product-out-form-body-col">
<span>{{ item.unit }}</span>
</el-col>
- <el-col :span="2" class="batch-product-out-form-body-col l-mes">
+ <!-- <el-col :span="2" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.wdr"></el-input>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.segmentDesc"></el-input>
</el-col> -->
<el-col :span="2" class="batch-product-out-form-body-col l-mes">
- <el-input v-model="item.outNum"></el-input>
+ <span v-text="item.outNum"></span>
</el-col>
<el-col :span="2" class="batch-product-out-form-body-col l-mes">
- <el-input v-model="item.scrapQty"></el-input>
+ <el-select v-model="item.scrapQty">
+ <el-option label="0" value="0">
+ </el-option>
+ <el-option label="1" value="1">
+ </el-option>
+ </el-select>
</el-col>
<!-- <el-col :span="1" class="batch-product-out-form-body-col l-mes">
<el-input v-model="item.reelWeight"></el-input>
@@ -392,6 +397,7 @@
this.products = this.productList
this.products.forEach(item=>{
item.staffName = staffName
+ item.outNum=1
})
}else{
this.products = []
@@ -478,7 +484,8 @@
newProduct.partNo = this.parentInfo.partNo
newProduct.partName = this.parentInfo.partName
newProduct.outBatchNo = oriOutBatchNo
- newProduct.productQty = 0
+ newProduct.productQty = 1
+ newProduct.outNum = 1
newProduct.unit = this.parentInfo.unit
newProduct.productStaffs = productStaffs
newProduct.productStaffIds = productStaffIds
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 0b41376..78fb19e 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -250,9 +250,9 @@
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
+ <el-table-column label="鎵规鍙�" prop="ifsBatchNo" align="center">
<template slot="header">
- <div style="line-height: 14px;">IFS鎵规鍙�</div>
+ <div style="line-height: 14px;">鎵规鍙�</div>
<div class="th" @click.stop>
<el-input
type="text"
@@ -268,7 +268,7 @@
<span>{{ scope.row.ifsBatchNo }}</span>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
+ <!-- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
<template slot="header">
<div style="line-height: 14px;">WDR鍙�</div>
<div class="th" @click.stop>
@@ -285,7 +285,7 @@
<template slot-scope="scope">
<span>{{ scope.row.ifsWdr }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="SN鍙�" prop="partBatchNo" align="center">
<template slot="header">
<div style="line-height: 14px;">SN鍙�</div>
@@ -1242,9 +1242,9 @@
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
+ <el-table-column label="鎵规鍙�" prop="ifsBatchNo" align="center">
<template slot="header" slot-scope="scope">
- <div style="line-height: 14px;">IFS鎵规鍙�</div>
+ <div style="line-height: 14px;">鎵规鍙�</div>
<div class="th" @click.stop>
<el-input
type="text"
@@ -1260,7 +1260,7 @@
<span>{{ scope.row.ifsBatchNo }}</span>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
+ <!-- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;">WDR鍙�</div>
<div class="th" @click.stop>
@@ -1277,7 +1277,7 @@
<template slot-scope="scope">
<span>{{ scope.row.ifsWdr }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="SN鍙�" prop="partBatchNo" align="center">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;">SN鍙�</div>
diff --git a/src/views/product/workbench/productInDialog.vue b/src/views/product/workbench/productInDialog.vue
index ab22650..15c4b15 100644
--- a/src/views/product/workbench/productInDialog.vue
+++ b/src/views/product/workbench/productInDialog.vue
@@ -25,7 +25,7 @@
>
</el-table-column>
<el-table-column
- label="IFS鎵规鍙�"
+ label="鎵规鍙�"
prop="ifsBatchNo"
align="center"
:show-overflow-tooltip="true"
@@ -46,6 +46,10 @@
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
<el-table-column label="鏄惁宸ュ簭搴撳瓨" prop="operationStockStatus" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.operationStockStatus">鏄�</span>
+ <span v-else>鍚�</span>
+ </template>
</el-table-column>
<el-table-column label="鎵�灞炲伐搴�" prop="name" align="center">
</el-table-column>
diff --git a/src/views/product/workbench/productoutput-list.vue b/src/views/product/workbench/productoutput-list.vue
index 1cd3a4f..f4b8989 100644
--- a/src/views/product/workbench/productoutput-list.vue
+++ b/src/views/product/workbench/productoutput-list.vue
@@ -130,7 +130,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '100',
prop: 'checkStatus',
label: '妫�娴嬬姸鎬�',
@@ -152,8 +152,8 @@
optList: () => {
return this.checkStatusOptions
}
- },
- {
+ }, */
+ /* {
minWidth: '140',
prop: 'isQualified',
label: '妫�娴嬫槸鍚﹀悎鏍�',
@@ -198,7 +198,7 @@
optList: () => {
return this.booleanOptions
}
- },
+ }, */
{
minWidth: '140',
prop: 'remark',
diff --git a/src/views/product/workbench/productoutput-table.vue b/src/views/product/workbench/productoutput-table.vue
index b722f1f..db8b726 100644
--- a/src/views/product/workbench/productoutput-table.vue
+++ b/src/views/product/workbench/productoutput-table.vue
@@ -438,6 +438,15 @@
searchInfoType: 'text'
},
{
+ minWidth: '100',
+ prop: 'scrapQty',
+ label: '鎶ュ簾鏁伴噺',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
minWidth: '80',
prop: 'unit',
label: '鍗曚綅',
@@ -446,7 +455,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '100',
prop: 'checkStatus',
label: '妫�娴嬬姸鎬�',
@@ -537,7 +546,7 @@
optList: () => {
return this.booleanOptions
}
- },
+ }, */
{
minWidth: '140',
prop: 'remark',
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index 25a2921..d6c3704 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -256,7 +256,7 @@
}}</template>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="wdr" align="center" width="100">
+ <!-- <el-table-column label="WDR鍙�" prop="wdr" align="center" width="100">
<template slot-scope="scope">
<el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
v-model="scope.row.wdr" placeholder="WDR鍙�"></el-input>
@@ -264,7 +264,7 @@
scope.row.wdr
}}</template>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="鍒嗘鎻忚堪" prop="segmentDesc" align="center">
<template slot-scope="scope">
<el-input
@@ -288,8 +288,8 @@
}}</template>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center" width="120">
- <!-- <template slot="header" slot-scope="scope">
+ <!-- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center" width="120">
+ <template slot="header" slot-scope="scope">
<div style="line-height: 14px;">IFS鎵规鍙�</div>
<div class="th" @click.stop>
<template>
@@ -305,8 +305,8 @@
<template v-if="!scope.row.isIfsBatchNoEdit">{{
scope.row.ifsBatchNo
}}</template>
- </template> -->
- </el-table-column>
+ </template>
+ </el-table-column> -->
<el-table-column label="澶囨敞" prop="remark" align="center">
<template slot-scope="scope">
<el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 45b5115..b4837ac 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -9,10 +9,10 @@
:prelang="prelang"
:ajaxFun="ajaxFun"
:options="options"
- @currentChange="handleCurrentChange"
+ @handleSelectionChange="handleSelectionChange"
ref="processconfiguration"
>
- <template #toolbar></template>
+ <template #toolbar></template>
</ttable>
</el-col>
<el-col :span="13" style="padding-left: 10px">
@@ -101,7 +101,6 @@
<el-input v-model="scope.row.number"></el-input>
</template>
</el-table-column>
- <el-table-column label="鍗曚綅" prop="unit" align="center" />
<el-table-column
fixed="right"
label="鎿嶄綔"
@@ -127,7 +126,31 @@
@handleSelectionChange = "preserve"
>
</packfromadd>
- </basic-container>
+ </basic-container>
+ <el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px">
+ <div id="qrCard" class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
+ <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px;">
+ <el-row>
+ <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">鍖呰缂栧彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="JSON.stringify(item)" :size="120" :margin="1"></vueQr>
+ </el-col>
+ </el-row>
+ </el-card>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -136,9 +159,14 @@
import ttable from '@/views/common/ztt-table.vue'
import packfrom from './pack-from.vue'
import packfromadd from './pack-fromadd.vue'
+import vueQr from 'vue-qr'
+import PrintJS from 'print-js'
export default {
data(){
return {
+ qrData:[],
+ diaPrintTab: false,
+ multipleSelection: [],
isCheck: false,
dataway:{},
goid:'',
@@ -156,7 +184,7 @@
border: true, // 鏄惁鏈夌旱鍚戣竟妗�
lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
- multiSelect: false, //
+ multiSelect: true, //
isEdit:false,
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
@@ -237,6 +265,11 @@
type: 'primary',
fun: this.addOrUpdateHandle
},
+ {
+ text: '鏍囩鎵撳嵃',
+ type: 'primary',
+ fun: this.printLabel
+ },
],
operator: [
{
@@ -263,14 +296,71 @@
}
},
components: {
- ttable,
- packfrom,
- packfromadd
- },
- watch: {
-
- },
+ ttable,
+ packfrom,
+ packfromadd,
+ vueQr
+ },
+ watch: {
+ diaPrintTab(newVal){
+ if(!newVal){
+ this.qrData = []
+ }
+ }
+ },
methods: {
+ //鎵撳嵃鎸夐挳
+ printFun() {
+ this.diaPrintTab = false;
+ PrintJS({
+ printable: "qrCard",
+ type: "html",
+ // header: "鍘熸潗鏂欐娴嬫姤鍛�",
+ targetStyles: ["*"],
+ style: `@page {margin: 0mm 5mm;}
+ html {zoom:100%;}
+ @media print {
+ html,body{
+ width:60mm;
+ height:40mm;
+ }
+ }`,
+ ignoreElements: ["no-ignore"],
+ orientation: 'portrait'
+ });
+ },
+ handleSelectionChange(val){
+ this.multipleSelection = val
+ let lastRow = val[val.length - 1]
+ this.handleCurrentChange(lastRow)
+ },
+ printLabel(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ this.diaPrintTab = true
+ console.log(this.multipleSelection);
+ this.multipleSelection.forEach(item=>{
+ let obj = {
+ packageNo: item.packageNo,
+ contractNo: item.contractNo,
+ boxInfo: []
+ }
+ list({packageBoxId:item.id}).then((res) =>{
+ res.data.data.forEach(ele=>{
+ obj.boxInfo.push({
+ product: ele.product,
+ productNo: ele.productNo,
+ specs: ele.specs,
+ unit: ele.unit,
+ number: ele.number
+ })
+ })
+ })
+ this.qrData.push(obj)
+ })
+ },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
this.$refs.processconfiguration.refreshData()
@@ -315,7 +405,6 @@
},
preserve(datalist){
this.testStandardParams = datalist
-
},
//鍙宠竟淇濆瓨
addpreserve(){
@@ -348,7 +437,5 @@
})
},
},
- computed: {
- },
}
</script>
\ No newline at end of file
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index fcfe4bf..ea1c0a3 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -287,8 +287,11 @@
this.$message.error("鍙兘閫夋嫨宸叉娴嬬殑鏁版嵁")
return
}
- console.log(selection)
- downloadReport().then(res=>{
+ let ids = []
+ selection.forEach(ele=>{
+ ids.push(ele.id)
+ })
+ downloadReport({ids : ids}).then(res=>{
transformZip(res)
}).catch(error=>{
console.log(error)
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index 74b5c07..b0931ef 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -75,32 +75,26 @@
</el-input>
</el-form-item>
- <el-form-item label="鏇夸唬鍙�" prop="alternativeNo">
+ <!-- <el-form-item label="鏇夸唬鍙�" prop="alternativeNo">
<el-input
v-model="treeForm.alternativeNo"
placeholder="鏇夸唬鍙�"
disabled
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
- <el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc">
+ <!-- <el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc">
<el-input
v-model="treeForm.alternativeDesc"
placeholder="鏇夸唬鎻忚堪"
disabled
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
- <el-form-item label="缁濈紭棰滆壊">
- <el-input
- v-model="treeForm.insulationColor"
- placeholder="缁濈紭棰滆壊"
- >
- </el-input>
- </el-form-item>
- <el-form-item label="鎶ゅ棰滆壊">
+ <!-- -->
+ <!-- <el-form-item label="鎶ゅ棰滆壊">
<el-input v-model="treeForm.sheathColor" placeholder="鎶ゅ棰滆壊">
</el-input>
</el-form-item>
@@ -110,7 +104,7 @@
placeholder="鐗规��1"
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -134,7 +128,7 @@
<el-table-column label="闆朵欢鍚嶇О" prop="partName"></el-table-column>
<el-table-column label="鍗曚綅" prop="unit"></el-table-column>
<el-table-column label="鏁伴噺" prop="qpa"></el-table-column>
- <el-table-column label="鐩樻暟" prop="discNum"></el-table-column>
+ <!-- <el-table-column label="鐩樻暟" prop="discNum"></el-table-column> -->
</el-table>
<!-- <el-table
class="tree-select-table"
diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue
index 4af4a00..1be5f56 100644
--- a/src/views/technology/completeproductstructure/index.vue
+++ b/src/views/technology/completeproductstructure/index.vue
@@ -20,12 +20,13 @@
import {
fetchList,
delObj,
- addByStructure
+ addByStructure,
} from '@/api/technology/completeproductstructure'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
import { changeState } from '../../../api/technology/completeproductstructure'
import { remote } from '@/api/admin/dict'
+
export default {
data() {
return {
@@ -34,7 +35,7 @@
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: true,
- url: 'mes/bom/uploadExcel'
+ url: 'mes/bom/uploadExcel',
},
prelang: 'completeProductStructure',
options: {
@@ -49,7 +50,7 @@
isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'id', direction: 'desc' }
+ defaultOrderBy: { column: 'id', direction: 'desc' },
},
table: {
total: 0,
@@ -67,7 +68,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
+ render: { fun: this.addOrUpdateHandle },
},
// 闆朵欢鍚嶇О
{
@@ -77,7 +78,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 闆朵欢鍙�
{
@@ -87,7 +88,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 鐘舵��
@@ -112,7 +113,7 @@
formatVal = '宸插彇娑�'
}
return formatVal
- }
+ },
},
// 绫诲瀷
@@ -127,7 +128,7 @@
formatter: this.formatBomTypeDbType,
optList: () => {
return this.bomTypeDbOptions
- }
+ },
},
// 鐗堟湰鍙�
{
@@ -137,61 +138,61 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 鏇夸唬鍙�
- {
- minWidth: '120',
- prop: 'alternativeNo',
- label: '鏇夸唬鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeNo',
+ // label: '鏇夸唬鍙�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // },
// 鏇夸唬鎻忚堪
- {
- minWidth: '120',
- prop: 'alternativeDesc',
- label: '鏇夸唬鎻忚堪',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeDesc',
+ // label: '鏇夸唬鎻忚堪',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // },
// 缁濈紭棰滆壊
- {
- minWidth: '120',
- prop: 'insulationColor',
- label: '缁濈紭棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'insulationColor',
+ // label: '缁濈紭棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // },
// 鎶ゅ棰滆壊
- {
- minWidth: '120',
- prop: 'sheathColor',
- label: '鎶ゅ棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'sheathColor',
+ // label: '鎶ゅ棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // },
// 鐗规��1
- {
- minWidth: '120',
- prop: 'characteristicOne',
- label: '鐗规��1',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'characteristicOne',
+ // label: '鐗规��1',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // },
// 鍒涘缓浜�
{
minWidth: '120',
@@ -200,7 +201,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 鍒涘缓鏃堕棿
{
@@ -210,8 +211,8 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'datetimerange'
- }
+ searchInfoType: 'datetimerange',
+ },
],
toolbar: [
// {
@@ -226,7 +227,7 @@
text: '浜у搧缁撴瀯鐢熸垚BOM',
fun: this.addByStructureHandle,
disabled: false,
- permitArr: []
+ permitArr: [],
},
{
text: '鎵瑰噯',
@@ -234,7 +235,7 @@
this.approveHandle('ACCEPT')
},
disabled: false,
- permitArr: ['01draft']
+ permitArr: ['01draft'],
},
{
text: '鎾ゅ洖',
@@ -242,7 +243,7 @@
this.approveHandle('REVOKE')
},
disabled: false,
- permitArr: ['02accepted']
+ permitArr: ['02accepted'],
},
{
text: '鎷掔粷',
@@ -250,7 +251,7 @@
this.approveHandle('CANCEL')
},
disabled: false,
- permitArr: ['02accepted']
+ permitArr: ['02accepted'],
},
{
text: '鍒犻櫎',
@@ -258,46 +259,46 @@
this.deleteAll()
},
disabled: false,
- permitArr: []
- }
+ permitArr: [],
+ },
],
operator: [
{
text: '鍒犻櫎',
type: 'text',
size: 'small',
- fun: this.deleteHandle
- }
+ fun: this.deleteHandle,
+ },
],
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
width: 100,
- minWidth: 100
- }
+ minWidth: 100,
+ },
},
stateOptionList: [
{
value: '01draft',
- label: '鑽夌'
+ label: '鑽夌',
},
{
value: '02accepted',
- label: '宸叉帴鍙�'
+ label: '宸叉帴鍙�',
},
{
value: '03cancelled',
- label: '宸插彇娑�'
- }
+ label: '宸插彇娑�',
+ },
],
- bomTypeDbOptions: []
+ bomTypeDbOptions: [],
}
},
components: {
- ttable
+ ttable,
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
activated() {
this.getData()
@@ -334,16 +335,20 @@
addOrUpdateHandle(row) {
this.$router.push({
name: 'completeProductStructure',
- params: { id: row == null ? null : row.id }
+ params: { id: row == null ? null : row.id },
})
},
// 鎸変骇鍝佺粨鏋勭敓鎴怋OM
addByStructureHandle() {
- addByStructure()
- this.$message({
- message: '宸插湪鍚庡彴鐢熸垚BOM锛岃鎵ц缁撴潫鍚庡埛鏂伴〉闈�',
- type: 'success'
+ addByStructure().then((res) => {
+ let result = Array.from(new Set(res.data.data))
+ this.$message.success(result.join(','))
+ this.getData()
})
+ // this.$message({
+ // message: '宸插湪鍚庡彴鐢熸垚BOM锛岃鎵ц缁撴潫鍚庡埛鏂伴〉闈�',
+ // type: 'success',
+ // })
},
// 鍒犻櫎
deleteHandle(row) {
@@ -351,9 +356,9 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
- closeOnClickModal: false
+ closeOnClickModal: false,
})
- .then(function() {
+ .then(function () {
const ids = []
ids.push(row.id)
return delObj(ids)
@@ -375,9 +380,9 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
- closeOnClickModal: false
+ closeOnClickModal: false,
})
- .then(function() {
+ .then(function () {
const ids = that.multipleSelection.map((item) => {
return item.id
})
@@ -428,7 +433,7 @@
handleSelectionChange(val) {
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
- var stateArr = val.map(function(value, index) {
+ var stateArr = val.map(function (value, index) {
return value.state
})
// 閫変腑鐘舵�佹暟缁勫厓绱犲幓閲�
@@ -458,7 +463,7 @@
},
getStateOptionList() {
return this.stateOptionList
- }
- }
+ },
+ },
}
</script>
diff --git a/src/views/technology/operation/index.vue b/src/views/technology/operation/index.vue
index 2aa2d7c..70e46eb 100644
--- a/src/views/technology/operation/index.vue
+++ b/src/views/technology/operation/index.vue
@@ -35,7 +35,7 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/operation/excel/upload'
},
prelang: 'operation',
@@ -186,19 +186,19 @@
// isSearch: true,
// searchInfoType: 'text'
// },
- {
- minWidth: '120',
- prop: 'outsideOpItem',
- label: '澶栭儴宸ュ簭椤圭洰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatOutsideOpItem,
- optList: () => {
- return this.outsideOpItemOptions
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'outsideOpItem',
+ // label: '澶栭儴宸ュ簭椤圭洰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatOutsideOpItem,
+ // optList: () => {
+ // return this.outsideOpItemOptions
+ // }
+ // },
// 澶囨敞
{
minWidth: '120',
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 169365b..d6bd9e4 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -150,7 +150,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row style="padding-top: 10px">
+ <!-- <el-row style="padding-top: 10px">
<el-col :span="24">
<el-form-item label="閰嶇疆椤�">
<el-checkbox-group
@@ -182,7 +182,7 @@
</el-checkbox-group>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
</el-form>
</div>
diff --git a/src/views/technology/routing/edit-routing-operation.vue b/src/views/technology/routing/edit-routing-operation.vue
index afeecf0..9823313 100644
--- a/src/views/technology/routing/edit-routing-operation.vue
+++ b/src/views/technology/routing/edit-routing-operation.vue
@@ -35,7 +35,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb" :rules="disabled ? [{required: false}] : dataRule.runTimeCodeDb">
<el-select
v-model="dataForm.runTimeCodeDb"
@@ -51,9 +51,9 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="12">
<el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor" :rules="disabled ? [{required: false}] : dataRule.machRunFactor">
<el-input
@@ -92,7 +92,7 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-row>
<el-col :span="12">
<el-form-item label="浜哄伐绫诲埆" prop="laborClassNo">
@@ -124,7 +124,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
<el-select
v-model="dataForm.outsideOpItem"
@@ -141,7 +141,7 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12"> </el-col>
</el-row>
</el-form>
diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index 7b31528..e3d7d29 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -196,7 +196,7 @@
noShowTip: false
},
// 鏄惁涓轰富宸ヨ壓
- {
+ /* {
minWidth: '120',
prop: 'master',
label: '涓诲伐鑹�',
@@ -210,7 +210,7 @@
formatter: (row, column, cellValue) => {
return cellValue == true ? '鏄�' : '鍚�'
}
- },
+ }, */
// 鐘舵��
{
minWidth: '120',
@@ -300,7 +300,7 @@
searchInfoType: 'datetimerange'
},
// 鏇夸唬
- {
+ /* {
minWidth: '120',
prop: 'alternativeNo',
label: '鏇夸唬',
@@ -308,9 +308,9 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
// 鏇夸唬鎻忚堪
- {
+ /* {
minWidth: '120',
prop: 'alternativeDesc',
label: '鏇夸唬鎻忚堪',
@@ -318,7 +318,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
// 鏄惁宸插悓姝ヨ嚦IFS
// {
// minWidth: '120',
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index b65541c..38698da 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -58,13 +58,13 @@
style="width: 280px"
></el-input>
</el-form-item>
- <el-form-item prop="wireCore" label="绾胯姱">
+ <!-- <el-form-item prop="wireCore" label="绾胯姱">
<el-input
v-model="dataForm.wireCore"
placeholder="绾胯姱"
style="width: 60px"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="BOM" prop="bomId">
<el-select :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
<el-option
@@ -133,9 +133,9 @@
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
</el-form-item> -->
- <el-form-item label="涓诲伐鑹�" prop="master">
+ <!-- <el-form-item label="涓诲伐鑹�" prop="master">
<el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -277,13 +277,13 @@
<span v-if="!editable">{{ scope.row.operationName }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="outsideOpItem"
label="澶栭儴宸ュ簭椤圭洰"
align="center"
show-overflow-tooltip
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="partName"
label="闆朵欢"
@@ -310,7 +310,7 @@
}}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="runTimeCodeDb"
label="鍥犵礌鍗曚綅"
align="center"
@@ -350,7 +350,7 @@
label="鍔冲姏璁剧疆鏃堕棿"
align="center"
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="laborClassNo"
label="浜哄伐绫诲埆"
@@ -428,7 +428,7 @@
</el-input>
</div>
- <el-divider content-position="left">閰嶇疆椤�</el-divider>
+ <!-- <el-divider content-position="left">閰嶇疆椤�</el-divider>
<div class="node-content-config">
<el-checkbox-group
@@ -462,7 +462,7 @@
>宸ュ崟棰勭暀</el-checkbox-button
>
</el-checkbox-group>
- </div>
+ </div> -->
<!-- <el-divider content-position="left">鑳藉姏</el-divider>
<div class="node-content">
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 996ffb6..74037af 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -235,7 +235,7 @@
}
},
// 鏄惁涓洪粯璁ょ粨鏋�
- {
+ /* {
minWidth: '120',
prop: 'master',
label: '榛樿缁撴瀯',
@@ -249,7 +249,7 @@
formatter: (row, column, cellValue) => {
return cellValue == true ? '鏄�' : '鍚�'
}
- },
+ }, */
// 鎻忚堪
{
minWidth: '120',
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 87eca90..8611912 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -88,9 +88,9 @@
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
</el-form-item> -->
- <el-form-item label="榛樿缁撴瀯" prop="master">
+ <!-- <el-form-item label="榛樿缁撴瀯" prop="master">
<el-checkbox v-model="dataForm.master"></el-checkbox>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -196,7 +196,7 @@
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
- <el-table-column label="鐩樻暟(鐩�)" prop="discNum" align="center">
+ <!-- <el-table-column label="鐩樻暟(鐩�)" prop="discNum" align="center">
<template slot-scope="scope">
<el-input
size="small"
@@ -208,7 +208,7 @@
scope.row.discNum
}}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="鍥惧彿" prop="drawingNumber" align="center">
</el-table-column> -->
<el-table-column align="center" label="鎿嶄綔" width="85px">
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 78fcdff..caff534 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -52,10 +52,15 @@
</div>
</div>
<div>
- <el-table class="pallet-transports-material-table" :data="palletTransportsMaterialData" style="width: 100%;"
- height="350px" border @selection-change="palletTransportsMaterialSelectionChange" stripe
+ <el-table class="pallet-transports-material-table" @current-change="handleCurrentChange" :data="palletTransportsMaterialData" style="width: 100%;"
+ height="350px" border stripe
ref="palletTransportsMaterialTable">
- <el-table-column type="selection" width="55"> </el-table-column>
+ <!--鍗曢�夋 @selection-change="palletTransportsMaterialSelectionChange"-->
+ <el-table-column align="center" width="55" label="鍗曢��">
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.commonChecked" @change="handleCurrentChange(scope.row)" ></el-checkbox>
+ </template>
+ </el-table-column>
<el-table-column prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
@@ -78,10 +83,10 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="100">
<template slot-scope="scope">
- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
- @click="scope.row.canEdit = true">缂栬緫</el-button>
- <el-button v-show="scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
- @click="updateMaterial(scope.row)">淇濆瓨</el-button>
+ <!-- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
+ @click="scope.row.canEdit = true">缂栬緫</el-button> -->
+ <!-- <el-button v-show="scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
+ @click="updateMaterial(scope.row)">淇濆瓨</el-button> -->
<el-button type="text" :disabled="scope.row.detailExistState"
@click="delMaterial(scope.row)">鍒犻櫎</el-button>
</template>
@@ -360,6 +365,19 @@
},
created() { },
methods: {
+ // 鍗曡閫変腑
+ handleCurrentChange(row) {
+ this.palletTransportsMaterialData.forEach((item) => {
+ // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
+ if (item.id !== row.id) {
+ item.commonChecked = false
+ }else{
+ item.commonChecked = true
+ }
+ })
+ this.palletTransportsMaterialSelectionChange([row])
+ console.log(row);
+ },
// 宸ヨ壓绫诲瀷涓枃鏍煎紡鍖�
formatStateType(row, column, cellValue) {
this.stateOptions.forEach((obj) => {
@@ -408,7 +426,8 @@
unit: item.unit,
transportsId: item.transportsId,
detailExistState: item.detailExistState,
- canEdit: false
+ canEdit: false,
+ commonChecked: false
}
this.palletTransportsMaterialData.push(palletTransportsMaterial)
})
diff --git a/vue.config.js b/vue.config.js
index 605ac39..95588b2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,6 +4,8 @@
*/
// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.32.45:9999'
+//const url = 'http://192.168.2.7:9999'
+//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
// const url = 'http://localhost:9999'
--
Gitblit v1.9.3