From 3d73201f0830320c703cfb3d36b47976eb3d94e7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:34:21 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/views/qualityManager/qualityPlaning.vue | 283 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 211 insertions(+), 72 deletions(-)
diff --git a/src/views/qualityManager/qualityPlaning.vue b/src/views/qualityManager/qualityPlaning.vue
index cc8a126..fd9ece9 100644
--- a/src/views/qualityManager/qualityPlaning.vue
+++ b/src/views/qualityManager/qualityPlaning.vue
@@ -89,7 +89,12 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
+ :key="tableTimeStampKey"
ref="tableDataRef"
class="tableFixed"
:data="tableData"
@@ -102,80 +107,119 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- width="50"-->
+ <!-- fixed-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="code"-->
+ <!-- label="璐ㄦ鏂规缂栫爜"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- label="璐ㄦ鏂规鍚嶇О"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="status"-->
+ <!-- label="鏈夋晥鐘舵��"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.status==='Y'"><i-->
+ <!-- class="el-icon-success"-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- style="margin-right:5px"-->
+ <!-- />鏄�-->
+ <!-- </div>-->
+ <!-- <div v-else-if="row.status==='N'"><i class="el-icon-info" style="margin-right: 5px" />鍚�</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="checktype"-->
+ <!-- label="璐ㄦ绫诲瀷"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.checktype">{{ checktypeArr.find(i => i.code === row.checktype).name }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="sampmethod"-->
+ <!-- label="鎶芥牱鏂瑰紡"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.sampmethod">{{ sampltypeArr.find(i => i.code === row.sampmethod).name }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="suitobject"-->
+ <!-- label="閫傜敤瀵硅薄"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.suitobject">{{ suitobjectArr.find(i => i.code === row.suitobject).name }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+
+ <!-- <el-table-column-->
+ <!-- prop="username"-->
+ <!-- label="鍒涘缓浜哄憳"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_date"-->
+ <!-- label="鍒涘缓鏃堕棿"-->
+ <!-- width="160"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+
<el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="code"
- label="璐ㄦ鏂规缂栫爜"
- sortable="custom"
- />
- <el-table-column
- prop="name"
- label="璐ㄦ鏂规鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="status"
- label="鏈夋晥鐘舵��"
- sortable="custom"
+ 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.status==='Y'"><i
- class="el-icon-success"
- :style="{color:$store.state.settings.theme}"
- style="margin-right:5px"
- />鏄�
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='checktype'">
+ {{ checktypeArr.find(i=>i.code===row[item.prop]).name }}
</div>
- <div v-else-if="row.status==='N'"><i class="el-icon-info" style="margin-right: 5px" />鍚�</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="checktype"
- label="璐ㄦ绫诲瀷"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.checktype">{{ checktypeArr.find(i => i.code === row.checktype).name }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="sampmethod"
- label="鎶芥牱鏂瑰紡"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.sampmethod">{{ sampltypeArr.find(i => i.code === row.sampmethod).name }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="suitobject"
- label="閫傜敤瀵硅薄"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.suitobject">{{ suitobjectArr.find(i => i.code === row.suitobject).name }}</div>
- <div v-else>/</div>
+ <div v-else-if="item.prop==='sampmethod'">
+ {{ sampltypeArr.find(i=>i.code===row[item.prop]).name }}
+ </div>
+ <!-- 閫傜敤瀵硅薄-->
+ <div v-else-if="item.prop==='suitobject'">
+ {{ suitobjectArr.find(i => i.code === row.suitobject).name }}
+ </div>
+ <div v-else-if="item.prop==='status'">
+ <div v-if="row.status==='Y'"><i
+ class="el-icon-success"
+ :style="{color:$store.state.settings.theme}"
+ style="margin-right:5px"
+ />鏄�
+ </div>
+ <div v-else-if="row.status==='N'"><i class="el-icon-info" style="margin-right: 5px" />鍚�</div>
+ <div v-else>/</div>
+ </div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="username"
- label="鍒涘缓浜哄憳"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- width="160"
- sortable="custom"
- />
<el-table-column
label="鎿嶄綔"
width="120"
@@ -285,7 +329,7 @@
</el-form-item>
<el-form-item
prop="suitpart"
- :label="dialogForm.suitobject==='Y'?'閫傜敤鐗╂枡':'閫傜敤鐗╂枡绫诲埆'"
+ :label="dialogForm.suitobject==='P'?'閫傜敤鐗╂枡':'閫傜敤鐗╂枡绫诲埆'"
>
<el-select
v-model="dialogForm.suitpart"
@@ -506,7 +550,7 @@
placeholder="璇烽�夋嫨"
:disabled="row.numberjudge==='N'"
/>
- <div v-else>{{ row.unit?row.unit:'/' }}</div>
+ <div v-else>{{ row.unit ? row.unit : '/' }}</div>
</template>
</el-table-column>
<el-table-column
@@ -586,6 +630,7 @@
<el-table-column
prop="stepcheckitem_desc"
label="鎻忚堪"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input
@@ -605,7 +650,8 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-button v-if="row.isVisible===1" v-waves type="text" @click="saveZjlbRow(row)">纭</el-button>
- <el-button v-if="row.isVisible===1&&isCancel" v-waves type="text" @click="cancelZjlbRow(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===1&&isCancel" v-waves type="text" @click="cancelZjlbRow(row)">鍙栨秷
+ </el-button>
<el-button v-if="row.isVisible!==1" v-waves type="text" @click="editZjlbRow(row)">缂栬緫</el-button>
<el-button v-if="row.isVisible!==1" v-waves type="text" @click="delZjlbRow(row)">鍒犻櫎</el-button>
</div>
@@ -644,11 +690,12 @@
QualityInspectionSearch, QualityInspectionSeeEdit,
StepCheckItemSelect
} from '@/api/qualityManager'
+import TableColumnSettings from '@/components/TableColumnSettings'
export default {
name: 'Zzjg',
components: {
- Pagination
+ Pagination, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -686,6 +733,90 @@
],
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: 130,
+ width: false,
+ prop: 'code',
+ label: '璐ㄦ鏂规缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 130,
+ width: false,
+ prop: 'name',
+ label: '璐ㄦ鏂规鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'status',
+ label: '鏈夋晥鐘舵��',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'checktype',
+ label: '璐ㄦ绫诲瀷',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'sampmethod',
+ label: '鎶芥牱鏂瑰紡',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'suitobject',
+ label: '閫傜敤瀵硅薄',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 160,
+ width: false,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
dialogForm: {
qualityinsptcode: '', // 璐ㄦ鏂规缂栫爜
@@ -755,6 +886,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
handleRequest() {
this.getQualityInspectionSearch().then(res => {
if (res.code === '200') {
@@ -834,7 +972,7 @@
})
},
// 淇敼鎸夐挳
- async edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
@@ -1024,6 +1162,7 @@
this.isCancel = true
this.checkitem = []
+ this.CheckItemSelectArr = JSON.parse(JSON.stringify(this.CheckItemSelectAllArr))
this.$refs.dialogForm.clearValidate()
},
--
Gitblit v1.9.3