From 8e5a40d8a40dec6d44c00f3cbc5f2699b88bdd9d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 十二月 2023 17:31:14 +0800
Subject: [PATCH] modified: src/views/plan/manufacturingorder/index.vue modified: src/views/quality/Packaging_ledger/index.vue
---
src/views/plan/manufacturingorder/index.vue | 90 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 9d42d58..b1bc910 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,36 +195,32 @@
</div>
</span>
</el-dialog>
- <!-- 鏍囩鎵撳嵃 -->
- <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="(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>
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ tem.partName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(tem)" :size="200" :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>
</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>
@@ -257,6 +253,8 @@
export default {
data() {
return {
+ checkList: [],
+ qrData: [],
orderDatalist:[],
diaPrintTab:false,
showCustomerorder: false,
@@ -1044,7 +1042,6 @@
}
})
},
-
computed: {
...mapGetters(['permissions'])
},
@@ -1403,26 +1400,35 @@
}
}
},
+ //鍒濆鍖栦簩缁寸爜鏍囩鏁版嵁
+ 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) {
let orderData = []
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,
+ qtyRequired: el.qtyRequired,
+ scrapQty: el.scrapQty
}
})
this.orderDatalist = orderData
- console.log(orderData,"澶氳閫変腑");
+ this.initQrData(orderData[0])
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
var stateArr = val.map(function(value, index) {
--
Gitblit v1.9.3