From 542834fb4325dea2a4a1de5a7abd268e79d131f4 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:40:04 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/scgl/gd.vue | 111 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 47 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 72adc10..e235e64 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -38,10 +38,10 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px"/>
+ <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
- <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
<el-select
@@ -60,16 +60,16 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
<!-- <el-date-picker-->
@@ -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="鍗曟嵁绫诲瀷"
@@ -231,6 +236,7 @@
label="鐢熶骇杞﹂棿"
sortable="custom"
width="120"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
@@ -326,7 +332,7 @@
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)"/>
+ <i class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -464,7 +470,7 @@
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" prop="mesordercode">
- <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px"/>
+ <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<div style="display: flex">
<el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
@@ -533,13 +539,13 @@
</el-select>
</el-form-item>
<el-form-item v-if="operation!=='add'" label="浜у搧鍚嶇О" prop="partname">
- <el-input v-model="dialogForm.partname" disabled style="width: 200px"/>
+ <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜">
- <el-input v-model="dialogForm.partcode" disabled style="width: 200px"/>
+ <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
- <el-input v-model="dialogForm.partspec" disabled style="width: 200px"/>
+ <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
<div style="display: flex">
<div style="display: flex;flex-wrap: nowrap">
@@ -593,6 +599,8 @@
v-model="dialogForm.planstartdate"
type="date"
:clearable="false"
+ :picker-options="pickerOptions"
+
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -603,6 +611,7 @@
v-model="dialogForm.planenddate"
type="date"
:clearable="false"
+ :picker-options="pickerOptions"
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -851,20 +860,20 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandDialog" label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px"/>
+ <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
@@ -1140,7 +1149,7 @@
>
<!-- <div id="qrCode0" ref="qrCodeDiv0" />-->
</div>
- <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0"/>
+ <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0" />
<div
style="z-index: 10;background-color:transparent;width: 120px;height:120px; position: absolute;right: 21px"
/>
@@ -1171,7 +1180,7 @@
align="center"
>
<template slot-scope="{row}">
- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn"/>
+ <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn" />
</template>
</el-table-column>
<el-table-column
@@ -1211,18 +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 id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden" />
</div>
- <div v-if="formApprove.m_po" style="margin-top: 10px;">
-<!-- <svg-icon icon-class="UP" style="color:#000;margin-left: 130px;font-size: 50px;background-color: #FFFFFF"></svg-icon>-->
- <img src="../../assets/images/UP.png" alt="" style="margin-left: 92px;">
- <div style="font-size: 18px;font-weight: bolder;margin-left: 4px;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛屾壂鎻忔浜岀淮鐮�</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">
@@ -1277,8 +1283,10 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2"
- style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
/>
</div>
<div
@@ -1336,8 +1344,10 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2"
- style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
/>
</div>
<div
@@ -1395,8 +1405,10 @@
style="display: flex;height: 60px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2"
- style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
/>
</div>
<div
@@ -1467,11 +1479,11 @@
@close="handleCloseRoute"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;"/> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
+ <i class="el-icon-s-comment" style="color:#42b983;" /> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
</div>
- <el-divider/>
+ <el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;"/> 宸ヨ壓璺嚎闆嗗悎
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヨ壓璺嚎闆嗗悎
</div>
<div class="myCheckboxGroup">
@@ -1495,9 +1507,9 @@
</div>
</div>
- <el-divider/>
+ <el-divider />
<div>
- <i class="el-icon-s-operation" style="color:#42b983;"/> 榛樿宸ヨ壓璺嚎
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 榛樿宸ヨ壓璺嚎
</div>
<div style="margin-top: 20px">
<el-select
@@ -1515,9 +1527,9 @@
/>
</el-select>
</div>
- <el-divider/>
+ <el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;"/> 宸ュ簭鍒楄〃
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ュ簭鍒楄〃
</div>
<div style="overflow-y: scroll">
<el-table
@@ -1551,11 +1563,11 @@
>
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px"/>
+ <svg-icon icon-class="circleYes" style="margin-right: 2px" />
鏄�
</div>
<div v-if="row.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px"/>
+ <svg-icon icon-class="circleNo" style="margin-right: 2px" />
鍚�
</div>
</template>
@@ -1806,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() {
@@ -2230,9 +2247,9 @@
// div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
+ this.dialogVisibleApprove = true
}
})
- this.dialogVisibleApprove = true
},
dialogVisibleTaskClose() {
this.dialogForm.mesordercode = ''
@@ -2285,12 +2302,12 @@
})
}
},
- //鐢熸垚婧愬崟鍗曞彿浜岀淮鐮�
- bindQRCodeSource(text){
+ // 鐢熸垚婧愬崟鍗曞彿浜岀淮鐮�
+ bindQRCodeSource(text) {
new QRCode(this.$refs['qrCodeSource'], {
text: text,
- width: 130 ,
- height: 130 ,
+ width: 130,
+ height: 130,
// colorDark: '#333333', // 浜岀淮鐮侀鑹�
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
--
Gitblit v1.9.3