From a93255e0a0334b51ecbaf3d8f496ad0fae1ed747 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 07 六月 2023 10:38:00 +0800
Subject: [PATCH] 1.生产入库有源单提交测试OK
---
src/views/makeModel/meterPrice.vue | 404 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 299 insertions(+), 105 deletions(-)
diff --git a/src/views/makeModel/meterPrice.vue b/src/views/makeModel/meterPrice.vue
index 045c598..f8c506f 100644
--- a/src/views/makeModel/meterPrice.vue
+++ b/src/views/makeModel/meterPrice.vue
@@ -16,7 +16,7 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label="浜у搧鍚嶇О/缂栫爜" style=" display: flex;">
<el-select
v-model="form.partcode"
filterable
@@ -30,7 +30,7 @@
<el-option
v-for="item in partArr"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partname+'/'+item.partcode"
:value="item.partcode"
/>
</el-select>
@@ -102,8 +102,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampArrayKey"
class="tableFixed"
:data="tableData"
:height="tableHeight"
@@ -115,108 +120,130 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
+ <el-table-column
+ v-for="item in tableColumnSettingsArray"
+ v-if="item.show"
+ :key="item.id"
+ :sortable="item.sortable"
+ :prop="item.prop"
+ :min-width="item.minWidth"
+ :label="item.label"
+ :width="item.width"
+ show-tooltip-when-overflow
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+ >
+ <template slot-scope="{row}">
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='eqp_value'||item.prop==='stand_value'">
+ {{ row[item.prop] }} 绉�
+ </div>
+ <div v-else>{{ row[item.prop] }}</div>
+ </template>
+ </el-table-column>
+
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="50"-->
<!-- />-->
- <el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- fixed
- />
- <el-table-column
- prop="partcode"
- min-width="160"
- show-tooltip-when-overflow
- label="浜у搧缂栫爜"
- sortable="custom"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- show-tooltip-when-overflow
- min-width="160"
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- min-width="110"
- sortable="custom"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wksp_name"
- label="鐢熶骇杞﹂棿"
- min-width="110"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="route_name"
- label="宸ヨ壓璺嚎"
- sortable="custom"
- min-width="120"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="stepname"
- label="鍔犲伐宸ュ簭"
- sortable="custom"
- min-width="110"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="eqp_name"
- label="鍔犲伐璁惧"
- show-tooltip-when-overflow
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="eqp_value"
- label="璁惧鑺傛媿"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.eqp_value">{{ row.eqp_value }} <span style="margin-left: 2px">绉�</span></div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="stand_value"
- label="鐢熶骇鑺傛媿"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.stand_value">{{ row.stand_value }} <span style="margin-left: 2px">绉�</span></div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="cavity_qty"
- label="鍨嬭厰鏁�"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="unprice"
- width="110"
- label="璁′欢鍗曚环"
- show-tooltip-when-overflow
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- width="50"-->
+ <!-- label="搴忓彿"-->
+ <!-- fixed-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partcode"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="浜у搧缂栫爜"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partname"-->
+ <!-- label="浜у搧鍚嶇О"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="160"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="浜у搧瑙勬牸"-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="wksp_name"-->
+ <!-- label="鐢熶骇杞﹂棿"-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="route_name"-->
+ <!-- label="宸ヨ壓璺嚎"-->
+ <!-- sortable="custom"-->
+ <!-- min-width="120"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="stepname"-->
+ <!-- label="鍔犲伐宸ュ簭"-->
+ <!-- sortable="custom"-->
+ <!-- min-width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="eqp_name"-->
+ <!-- label="鍔犲伐璁惧"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="eqp_value"-->
+ <!-- label="璁惧鑺傛媿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.eqp_value">{{ row.eqp_value }} <span style="margin-left: 2px">绉�</span></div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="stand_value"-->
+ <!-- label="鐢熶骇鑺傛媿"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.stand_value">{{ row.stand_value }} <span style="margin-left: 2px">绉�</span></div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="cavity_qty"-->
+ <!-- label="鍨嬭厰鏁�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="unprice"-->
+ <!-- width="110"-->
+ <!-- label="璁′欢鍗曚环"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
label="鎿嶄綔"
@@ -256,16 +283,16 @@
v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="1000px"
+ width="1100px"
:top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="100px">
<div style="display: flex;align-items: center">
<i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin-top: -20px" />
- <el-form-item prop="partcode" label="浜у搧鍚嶇О">
+ <el-form-item prop="partcode" label="浜у搧鍚嶇О/缂栫爜">
<el-select
v-show="operation==='add'"
v-model="dialogForm.partcode"
@@ -279,7 +306,7 @@
<el-option
v-for="item in partArr2"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partname+'/'+item.partcode"
:value="item.partcode"
/>
</el-select>
@@ -518,11 +545,12 @@
import ImportPicker from '@/components/ImportPicker'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
export default {
name: 'JPGJ',
components: {
- Pagination, ImportPicker
+ Pagination, ImportPicker, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -547,6 +575,152 @@
eqpArr: [], // 浜у搧闆嗗悎
total: 10,
tableData: [],
+ tableColumnSettingsArray: [
+ // { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
+ { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partcode',
+ label: '浜у搧缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partname',
+ label: '浜у搧鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partspec',
+ label: '浜у搧瑙勬牸',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 130,
+ prop: 'wksp_code',
+ label: '鐢熶骇杞﹂棿缂栫爜',
+ id: 6,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'wksp_name',
+ label: '鐢熶骇杞﹂棿',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 130,
+ prop: 'route_code',
+ label: '宸ヨ壓璺嚎缂栫爜',
+ id: 8,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'route_name',
+ label: '宸ヨ壓璺嚎',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 130,
+ prop: 'stepcode',
+ label: '鍔犲伐宸ュ簭缂栫爜',
+ id: 10,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'stepname',
+ label: '鍔犲伐璁惧',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 130,
+ prop: 'eqp_code',
+ label: '鍔犲伐璁惧缂栫爜',
+ id: 12,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_name',
+ label: '鍔犲伐宸ュ簭',
+ id: 13,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'eqp_value',
+ label: '璁惧鑺傛媿',
+ id: 14,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'stand_value',
+ label: '鐢熶骇鑺傛媿',
+ id: 15,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'cavity_qty',
+ label: '鑵斿瀷鏁�',
+ id: 16,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'cavity_qty',
+ label: '璁′欢鍗曚环',
+ id: 17,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+
+ ],
+ tableTimeStampArrayKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
dialogForm: {
partcode: '', // 浜у搧缂栫爜
@@ -603,6 +777,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampArrayKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
@@ -688,7 +869,11 @@
radioChange(val) {
this.isEqpTableEdit = true
+ this.eqpTable.page = 1
+ this.eqpTable.rows = 10
+
this.radioChangeTempValue = val
+ console.log(val, 'val')
// this.dialogForm.stepcode = this.stepDialogArr.find(item => item.name === val).code
this.getEqpTable(val)
},
@@ -705,12 +890,21 @@
this.getEqpTable()
},
async getEqpTable(val) {
+ console.log(val)
+ console.log(typeof val)
if (typeof val === 'string') {
this.eqpTable.steptype = this.stepDialogArr.find(item => item.name === val).flag
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
// } else if (typeof val === 'number') {
+ } else if (typeof val === 'object') {
+ const index = this.stepDialogArr.findIndex(i => i.name === this.radioChangeTempValue)
+ this.eqpTable.steptype = this.stepDialogArr[index].flag
+ this.eqpTable.partcode = this.dialogForm.partcode
+ this.eqpTable.routecode = this.dialogForm.routecode
+ this.eqpTable.stepcode = this.stepDialogArr[index].code
+ this.dialogForm.stepcode = this.stepDialogArr[index].name
} else {
this.eqpTable.steptype = this.stepDialogArr[0].flag
this.eqpTable.partcode = this.dialogForm.partcode
--
Gitblit v1.9.3