From 6533c141c2bdad73219a7ecec02186a833820e55 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 07 十二月 2023 17:30:32 +0800
Subject: [PATCH] 修复bug
---
src/views/plan/manufacturingorder/index.vue | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 3e3d4fc..09b4935 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -105,6 +105,12 @@
:loading="loadingExcel"
>瀵煎嚭
</el-button>
+ <el-button
+ @click="labelPrint"
+ type="primary"
+ style="margin-left:10px;"
+ >鏍囩鎵撳嵃
+ </el-button>
<!-- <el-button
v-if="permissions.manufacturingorder_update_orderno"
@click="updateOrderNo"
@@ -190,6 +196,31 @@
</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>
@@ -218,9 +249,14 @@
import DelMatUnIssueVue from './DelMatUnIssue.vue'
import { getStore } from '@/util/store.js'
import { getObj as getSysParam } from '@/api/admin/sys-public-param'
+import vueQr from 'vue-qr'
export default {
data() {
return {
+ checkList: [],
+ qrData: [],
+ orderDatalist:[],
+ diaPrintTab:false,
showCustomerorder: false,
paramObj: { customerList: null },
customerOrder: null,
@@ -421,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,
@@ -895,7 +940,8 @@
AutoOperationtask,
IssueMaterialForm,
OrderMergeForm,
- DelMatUnIssueVue
+ DelMatUnIssueVue,
+ vueQr
},
created() {
this.getManufactureAttrs()
@@ -996,7 +1042,6 @@
}
})
},
-
computed: {
...mapGetters(['permissions'])
},
@@ -1123,6 +1168,7 @@
getByMoIds([this.orderPlan.id]).then((repsonse) => {
const resData = repsonse.data.data
const resCode = repsonse.data.code
+ console.log("resData-----",repsonse);
if (resCode === 0) {
const _that = this
for (const key in resData) {
@@ -1354,8 +1400,36 @@
}
}
},
+ //鍒濆鍖栦簩缁寸爜鏍囩鏁版嵁
+ 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,"涓�琛�");
+ let orderData = []
+ orderData =val.map( el =>{
+ return{
+ moNo:el.moNo,
+ qtyRequired: el.qtyRequired,
+ scrapQty: el.scrapQty
+ }
+ })
+ this.orderDatalist = orderData
+ this.initQrData(orderData[0])
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
var stateArr = val.map(function(value, index) {
@@ -1647,6 +1721,13 @@
} else {
this.$message.error('涓婁紶澶辫触')
}
+ },
+ labelPrint(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ this.diaPrintTab = true
}
}
}
--
Gitblit v1.9.3