From df85764203947543c0ced0a0cdf8b7299f6b40ff Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:28:22 +0800
Subject: [PATCH] 优化
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 5 +++--
src/views/plan/manufacturingorder/index.vue | 10 +++++++---
src/views/accounting/jmreport/index.vue | 20 ++++++++++++++++++--
src/views/quality/Packaging_ledger/index.vue | 4 ++--
4 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/views/accounting/jmreport/index.vue b/src/views/accounting/jmreport/index.vue
index ec36143..bcc7044 100644
--- a/src/views/accounting/jmreport/index.vue
+++ b/src/views/accounting/jmreport/index.vue
@@ -18,6 +18,7 @@
import { mapGetters } from 'vuex'
import ttable from '@/views/common/ztt-table.vue'
import { pageList } from '@/api/accounting/personReport'
+import { remote } from '@/api/admin/dict'
export default {
components: {
ttable
@@ -65,8 +66,10 @@
prop: 'workShop',
label: '杞﹂棿',
isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
+ isSearch: true,searchInfoType:'select',
+ optList: () => {
+ return this.workShopList
+ }
},
{
minWidth: '100',
@@ -123,13 +126,26 @@
operator: null
},
prelang: "operation",
+ workShopList:[],
}
+ },
+ mounted(){
+ this.getWorkShopList()
},
methods:{
// table鑷甫浜嬩欢
handleSelectionChange(val) {
this.multipleSelection = val
},
+ getWorkShopList(){
+ remote('work_shop').then((response) => {
+ if (response.data.code === 0) {
+ this.workShopList = response.data.data
+ } else {
+ this.workShopList = []
+ }
+ })
+ }
}
}
</script>
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index e3a8654..94c4bfd 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -223,14 +223,17 @@
</el-col>
</div>
<div style="margin-left: 50px;width: 100%;">
- <el-row style="margin-top: 10px;">
+ <el-row>
<el-col style="font-weight: bold;font-size: 14px;"><span>鎵� 娆� 鍙�: </span>{{ item.code.moNo2 }}</el-col>
</el-row>
- <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-row style="margin-top: 6px;font-size: 14px;">
<el-col style="font-weight: bold;"><span>璁� 鍗� 鍙�: </span>{{ item.orderNo }}</el-col>
</el-row>
- <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-row style="margin-top: 6px;font-size: 14px;">
<el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 6px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>闆� 浠� 鍙�: </span>{{ item.partNo }}</el-col>
</el-row>
</div>
</div>
@@ -1135,6 +1138,7 @@
}
let no = (i+"").padStart(3,'0')
obj.code.moNo2 = data.moNo + no
+ obj.partNo = data.partNo
this.qrData.push(obj)
}
}
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index ba7bbbb..f1a80aa 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -190,8 +190,8 @@
<tr class="x1111113">
<td class="x1111114" colspan=6>
<div style="height: 75px;" >
- <p><span lang="EN-US" class="x1111112">鍦板潃锛氭睙鑻忕渷鍗楅�氱粡娴庢妧鏈紑鍙戝尯甯稿叴璺�96鍙�</span></p>
- <p><span lang="EN-US" class="x1111112">鐢佃瘽/浼犵湡锛�0513鈥�89191125</span></p>
+ <p style="margin-top: 0;margin-bottom: 0;"><span lang="EN-US" class="x1111112">鍦板潃锛氭睙鑻忕渷鍗楅�氱粡娴庢妧鏈紑鍙戝尯甯稿叴璺�96鍙�</span></p>
+ <p style="margin-top: 0;margin-bottom: 0;"><span lang="EN-US" class="x1111112">鐢佃瘽/浼犵湡锛�0513鈥�89191125</span></p>
</div>
</td>
</tr>
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index b23a817..ce9ef7b 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -301,7 +301,7 @@
</div>
<el-table :data="processConfigFileTableData" height="260px">
<el-table-column
- prop="rawInsNo"
+ prop="no"
align="center"
width="120"
label="鍘熸潗鏂欐楠岀紪鍙�"
@@ -331,11 +331,12 @@
></el-table-column>
<el-table-column align="center" label="鎿嶄綔">
<template slot-scope="scope">
+ <!-- :disabled="(resultVal!=null && resultVal!='')" -->
<el-button
@click="delProcessConfigFile(scope.row)"
type="text"
size="small"
- :disabled="(resultVal!=null && resultVal!='')"
+
>鍒犻櫎</el-button
>
<el-button
--
Gitblit v1.9.3