From b012ab3a1e5495be068c543eb8f0482124db13b5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 31 十二月 2022 16:48:22 +0800
Subject: [PATCH] 1.登录页文字跟随系统变化
---
src/views/zzmx/wlqd.vue | 74 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/src/views/zzmx/wlqd.vue b/src/views/zzmx/wlqd.vue
index 5d127fd..e954931 100644
--- a/src/views/zzmx/wlqd.vue
+++ b/src/views/zzmx/wlqd.vue
@@ -3,7 +3,7 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
</div>
<div class="bodyTopFormGroup">
@@ -159,11 +159,11 @@
>
<template slot-scope="{row}">
<div v-if="row.status==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
鏄�
</div>
<div v-if="row.status==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <i class="el-icon-info" style="margin-right: 2px" />
鍚�
</div>
</template>
@@ -172,6 +172,7 @@
prop="startdate"
label="鍚敤鏃ユ湡"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -196,6 +197,7 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
>
@@ -212,15 +214,16 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="棰勮" placement="top">
<i
class="el-icon-view"
- style="margin-left:15px;cursor: pointer;color:#42b983 "
+ :style="{color:$store.state.settings.theme}"
+ style="margin-left:15px;cursor: pointer;"
@click="edit('preview',row)"
/>
</el-tooltip>
@@ -251,7 +254,7 @@
@close="handleClose"
>
<div>
- <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />姣嶄欢淇℃伅锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />姣嶄欢淇℃伅锛�
</div>
<div style="width: 800px;">
<el-form
@@ -269,6 +272,7 @@
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
:disabled="operation!=='add'"
+ filterable
@change="partSelectChange"
>
<el-option
@@ -284,6 +288,7 @@
v-model="dialogForm.parentpartname"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ filterable
:disabled="operation!=='add'"
:popper-append-to-body="false"
@change="partSelectChange"
@@ -312,24 +317,10 @@
<!-- />-->
<!-- </el-select>-->
</el-form-item>
- <el-form-item label="璁￠噺鍗曚綅" prop="uomcode">
- <el-select
- v-model="dialogForm.uomcode"
- disabled
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- :popper-append-to-body="false"
- >
- <el-option
- v-for="item in openTypeArr"
- :key="item.partcode"
- :label="item.uom_code"
- :value="item.partcode"
- />
- </el-select>
- <!-- <el-input v-model="dialogForm.uomcode" readonly style="width: 200px" />-->
+ <el-form-item label="璁￠噺鍗曚綅">
+ <el-input v-model="dialogForm.uomname" disabled style="width: 200px" />
</el-form-item>
- <!-- <el-form-item label="瀛樿揣绫诲瀷" prop="uomcode">-->
+ <!-- <el-form-item label="瀛樿揣绫诲瀷">-->
<!-- <el-input v-model="dialogForm.chlx" readonly style="width: 200px" />-->
<!-- </el-form-item>-->
<el-form-item label="鍩虹鏁伴噺" prop="quantity">
@@ -344,6 +335,7 @@
<el-select
v-model="dialogForm.status"
style="width: 200px"
+ filterable
placeholder="璇烽�夋嫨"
:disabled="operation==='preview'"
:popper-append-to-body="false"
@@ -374,7 +366,7 @@
</div>
<div>
- <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 10px 0" />瀛愪欢淇℃伅锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 10px 0" />瀛愪欢淇℃伅锛�
</div>
<el-button
v-if="operation!=='preview'"
@@ -412,6 +404,7 @@
<el-select
v-if="row.isVisible===1"
v-model="row.SMATERIRL_CODE"
+ filterable
placeholder="璇烽�夋嫨"
@change="val=>tableChange(val,row)"
>
@@ -428,7 +421,7 @@
<el-table-column
prop="SMATERIRL_NAME"
label="瀛愪欢鍚嶇О"
-
+ filterable
show-tooltip-when-overflow
>
@@ -456,14 +449,16 @@
show-tooltip-when-overflow
/>
<el-table-column
- prop="uomcode"
+ prop="uomname"
label="璁￠噺鍗曚綅"
width="110"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="BASE_QUANTITY"
label="鍩烘湰鐢ㄩ噺"
width="110"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input
@@ -479,6 +474,7 @@
<el-table-column
prop="LOSS_QUANTITY"
label="鎹熻�楃巼%"
+ show-tooltip-when-overflow
width="110"
>
<template slot-scope="{row}">
@@ -495,11 +491,13 @@
<el-table-column
prop="TOTAL_QUANTITY"
label="瀹為檯鐢ㄩ噺"
+ show-tooltip-when-overflow
width="110"
/>
<el-table-column
prop="PN_TYPE"
label="灞炴��"
+ show-tooltip-when-overflow
width="110"
>
<template slot-scope="{row}">
@@ -618,6 +616,7 @@
parentpartname: '',
parentpartspec: '',
uomcode: '',
+ uomname: '',
// chlx: '',
quantity: '',
status: '',
@@ -641,9 +640,6 @@
quantity: [
{ required: true, message: '璇疯緭鍏ュ熀纭�鏁伴噺', trigger: ['blur', 'change'] }
],
- // uomcode: [
- // { required: true, message: '璇疯緭鍏ヨ閲忓崟浣�', trigger: ['blur', 'change'] }
- // ],
// version: [
// { required: true, message: '璇疯緭鍏ョ増鏈彿', trigger: ['blur', 'change'] }
// ],
@@ -660,8 +656,8 @@
{ code: 'F', name: '杈呮枡' }
],
- title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
- code: '4',
+ title_value: '鏁版嵁瀵煎叆 / 鐗╂枡娓呭崟',
+ code: '21',
shows: false
}
@@ -731,7 +727,8 @@
this.dialogForm.parentpartcode = res.partcode
this.dialogForm.parentpartname = res.partname
this.dialogForm.parentpartspec = res.partspec
- this.dialogForm.uomcode = res.uom_code
+ // this.dialogForm.uomcode = res.uom_code
+ this.dialogForm.uomname = res.uom_name
if (this.PartSelectArrTemp.length > 0) {
this.PartSelectArr.unshift(this.PartSelectArrTemp[0])
@@ -795,7 +792,6 @@
this.getPartSelect()
this.dialogForm.startdate = handleDatetime(new Date())
- console.log(this.dialogForm.startdate, 7)
},
// 淇敼鎸夐挳
async edit(operation, row) {
@@ -821,7 +817,8 @@
SMATERIRL_CODE: item.partcode,
SMATERIRL_NAME: item.partname,
SMATERIRL_SPEC: item.partspec,
- uomcode: item.uom_name,
+ uomcode: item.uom_code,
+ uomname: item.uom_name,
BASE_QUANTITY: item.base_quantity,
LOSS_QUANTITY: item.loss_quantity,
TOTAL_QUANTITY: item.total_quantity,
@@ -836,6 +833,7 @@
this.dialogForm.parentpartname = row.partname
this.dialogForm.parentpartspec = row.partspec
this.dialogForm.uomcode = row.uom_code
+ this.dialogForm.uomname = row.uom_name
this.dialogForm.startdate = row.startdate
this.dialogForm.status = row.status
this.dialogForm.quantity = row.quantity
@@ -859,6 +857,7 @@
row.SMATERIRL_NAME = res.partname
row.SMATERIRL_SPEC = res.partspec
row.uomcode = res.uom_code
+ row.uomname = res.uom_name
// this.PartSelectArr.forEach((item, index) => {
// this.PartSelectArr.splice(index, 1)
@@ -885,6 +884,7 @@
SMATERIRL_NAME: '',
SMATERIRL_SPEC: '',
uomcode: '',
+ uomname: '',
BASE_QUANTITY: '',
LOSS_QUANTITY: '',
TOTAL_QUANTITY: '',
@@ -961,6 +961,7 @@
this.dialogForm.parentpartname = ''
this.dialogForm.parentpartspec = ''
this.dialogForm.uomcode = ''
+ this.dialogForm.uomname = ''
// this.dialogForm.chlx = ''
this.dialogForm.quantity = ''
this.dialogForm.status = ''
@@ -989,7 +990,7 @@
parentpartcode: this.dialogForm.parentpartcode,
parentpartname: this.dialogForm.parentpartname,
parentpartspec: this.dialogForm.parentpartspec,
- uomcode: this.dialogForm.uomcode,
+ uomcode: this.PartSelectArrTemp.length > 0 ? this.PartSelectArrTemp[0].uom_code : this.dialogForm.uomcode,
quantity: this.dialogForm.quantity,
status: this.dialogForm.status,
startdate: this.dialogForm.startdate,
@@ -997,6 +998,7 @@
worklist: this.dialogTableDataArr,
opertype: this.operation === 'add' ? 'Add' : 'Update'
}
+ // console.log(data)
this.$store.state.app.buttonIsDisabled = true
AddUpdateBoIventory(data).then(res => {
--
Gitblit v1.9.3