From 6208ba6872cc54ccbd2b2ff3b67a1a2f054af41d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 19 九月 2023 14:52:15 +0800
Subject: [PATCH] 1.生产入库实现
---
src/views/scgl/gd.vue | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index aa6466c..2ef34f7 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -182,7 +182,12 @@
label="婧愬崟鍗曞彿"
sortable="custom"
min-width="160"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.m_po">{{ row.m_po }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wotype"
label="鍗曟嵁绫诲瀷"
@@ -321,7 +326,7 @@
<!-- @click="check(row)"-->
<!-- />-->
<i
- class="el-icon-tickets"
+ class="el-icon-printer"
style="cursor: pointer;color: #42b983;margin-right: 15px"
@click="handlePrint(row.wo_code)"
/>
@@ -415,7 +420,7 @@
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
<i
- class="el-icon-tickets"
+ class="el-icon-printer"
style="cursor: pointer;color: #42b983;margin-right: 15px"
@click="supplementSmallClick(row)"
/>
@@ -594,6 +599,8 @@
v-model="dialogForm.planstartdate"
type="date"
:clearable="false"
+ :picker-options="pickerOptions"
+
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -604,6 +611,7 @@
v-model="dialogForm.planenddate"
type="date"
:clearable="false"
+ :picker-options="pickerOptions"
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -1212,15 +1220,15 @@
/>
</el-table>
- <!-- <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">-->
- <!-- <div style="font-size: 18px;font-weight: bolder">婧愬崟鍗曞彿锛�</div>-->
- <!-- <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden" />-->
- <!-- </div>-->
+ <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">
+ <div style="font-size: 18px;font-weight: bolder">婧愬崟鍗曞彿锛�</div>
+ <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden" />
+ </div>
- <!-- <div v-if="formApprove.m_po" style="margin-top: 5px;">-->
- <!-- <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">-->
- <!-- <div style="font-size: 18px;font-weight: bolder;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛岀敤PDA鎵弿姝や簩缁寸爜</div>-->
- <!-- </div>-->
+ <div v-if="formApprove.m_po" style="margin-top: 5px;">
+ <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">
+ <div style="font-size: 18px;font-weight: bolder;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛岀敤PDA鎵弿姝や簩缁寸爜</div>
+ </div>
</div>
<span slot="footer" class="dialog-footer">
@@ -1810,7 +1818,12 @@
// { code: 3, name: '50*40' },
// { code: 4, name: '50*80' },
// { code: 5, name: '40*30' }
- ]
+ ],
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
+ }
}
},
created() {
@@ -2234,9 +2247,9 @@
// div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
+ this.dialogVisibleApprove = true
}
})
- this.dialogVisibleApprove = true
},
dialogVisibleTaskClose() {
this.dialogForm.mesordercode = ''
@@ -2346,6 +2359,11 @@
this.$nextTick(() => {
console.log(this.qrForm.qrvalue, 3333)
this.bindQRCode2(this.qrForm.qrvalue)
+
+ const div = document.getElementById('qrCode2')
+ // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
+ div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+ // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
--
Gitblit v1.9.3