From 458f6714f335938fce80690c037ffca0ccfaa50c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 03 八月 2022 16:31:52 +0800
Subject: [PATCH] 1.综合看板渲染数据，完成一个版本
---
src/views/zlgl/gxjy.vue | 846 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 552 insertions(+), 294 deletions(-)
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 52716fe..a62f8b9 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -1,328 +1,576 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
- <el-form
- ref="form"
- :model="form"
- label-width="80px"
- inline
- style="display: flex;justify-content: space-between"
- >
- <div class="elForm">
- <el-form-item label="椤圭洰缂栫爜" style=" display: flex;">
- <el-input v-model="form.defectcode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О" style=" display: flex;">
- <el-input v-model="form.itemname" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
+ <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
+ <div style="margin-bottom: 15px;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>鎵弿鏉＄爜锛�</div>
+ <el-input
+ v-model="form.orderstepqrcode"
+ name="GXproduceCode"
+ style="width: 300px"
+ @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
+ />
+ </div>
+ <!-- 鍏」淇℃伅 -->
+ <div style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
+ <div style="display: flex;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.wo_code }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧缂栫爜锛�</div>
+ <div style="width: 100px">{{ form.partcode }}</div>
+ </div>
+ </div>
+ <div style="display: flex;margin-left: 30px;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+ <div style="width: 100px">{{ form.partname }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+ <div style="width: 100px">{{ form.partspec }}</div>
+ </div>
+ </div>
+ <div style=" display: flex;margin-left: 30px;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+ <div>{{ form.stepcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+ <div>{{ form.stepname }}</div>
+ </div>
+ </div>
+ </div>
+ <div style="margin: 15px 0;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>妫�楠屾爣鍑嗭細</div>
+ <el-select
+ v-model="checkStandard"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="changeCheckStandard"
+ >
+ <el-option
+ v-for="item in checkStandardSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ <div style="width: 90px;margin-left: 50px;display: flex"><div style="color: red;width:10px">*</div>妫�楠屼汉鍛橈細</div>
+ <el-select
+ v-model="checkUser"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checkUserSelect"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </div>
+ <div style="margin: 15px 0;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
+ </div>
+ <div>
+ <el-button type="primary" @click="add">鏂板</el-button>
+ </div>
+ <div style="margin-top: 10px">
+ <el-table
+ ref="multipleTable"
+ :data="JYTableData"
+ :height="(tableHeight-195)+'px'"
+ border
+ stripe
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ :row-class-name="tableRowClassName"
+ @selection-change="handleSelectionChange"
+ @cell-dblclick="cellDblclick"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="100"
+ />
+ <!-- <el-table-column-->
+ <!-- prop="code"-->
+ <!-- label="妫�楠岄」鐩紪鐮�"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <el-table-column
+ prop="code"
+ label="妫�楠岄」鐩紪鐮�(鍚嶇О)"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0" style="display: flex;">
+ <div>{{ row.code }}</div>
+ <div style="margin-left: 10px">{{ row.name }}</div>
+ </div>
- <el-form-item label="椤圭洰鎻忚堪" style=" display: flex;">
- <el-input v-model="form.itemdescr" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ filterable
+ style="width: 400px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeCode(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.code"
+ :label="item.code+''+item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="stepcheckitem_desc"
+ label="妫�楠屾爣鍑嗘弿杩�"
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-if="scope.row.isVisible===1||scope.row.index === tabClickIndex && tabClickLabel === '妫�楠屾爣鍑嗘弿杩�'"
+ v-model="scope.row.stepcheckitem_desc"
+ placeholder="璇疯緭鍏�"
+ @keyup.enter.native="val=>keyUpEnterNative(val,scope.row)"
+ />
+ <div
+ v-else
+ > {{ scope.row.stepcheckitem_desc }}</div>
+
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="result"
+ label="妫�楠岀粨鏋�"
+ width="100"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.result==='OK'">鍚堟牸</div>
+ <div v-if="row.result==='NG'">涓嶈壇</div>
+ </template>
+
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-radio-group-->
+ <!-- v-model="row.result"-->
+ <!-- size="small"-->
+ <!-- @change="a=>changeRadioValue(a,row)"-->
+ <!-- >-->
+ <!-- <el-radio-->
+ <!-- :label="0"-->
+ <!-- @change="clickRadio(0,row)"-->
+ <!-- >-->
+ <!-- 鍚堟牸-->
+ <!-- </el-radio>-->
+ <!-- <el-radio-->
+ <!-- :label="1"-->
+ <!-- @change="clickRadio(1,row)"-->
+ <!-- >-->
+ <!-- 涓嶈壇-->
+ <!-- </el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </template>-->
+
+ </el-table-column>
+
+ <el-table-column
+ type="selection"
+ width="55"
+ />
+
+ <el-table-column
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">纭</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
+ <div style="display: flex;margin-top: 20px;align-items: center">
+
+ <div style="display: flex;margin-right: 50px;align-items: center">
+ <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>妫�楠岀粨鏋滐細</div>
+ <el-select
+ v-model="checkResult"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checkResultSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">妫�楠屽娉細</div>
+ <el-input v-model="checkdescr" style="width: 300px" placeholder="璇疯緭鍏�" />
</div>
- </el-form>
+
+ </div>
+
+ <div style="display: flex;margin: 30px 0;align-items: center">
+ <el-button type="primary" @click="submitButton('FirstCheck')">棣栨淇濆瓨</el-button>
+ <el-button type="primary" style="margin-left: 50px" @click="submitButton('PatroCheck')">宸℃淇濆瓨</el-button>
+ <el-button type="primary" style="margin-left: 50px" @click="submitButton('EndCheck')">瀹屽伐妫�淇濆瓨</el-button>
+ <el-button type="info" style="margin-left: 50px" @click="submitButton('Cancel')">鍙栨秷</el-button>
+ </div>
</div>
- <el-divider />
- <div style="margin-left: 10px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
- </div>
- <el-divider />
- <div class="elTableDiv">
- <el-table
- :data="tableData"
- :height="tableHeight+'px'"
- border
- stripe
- :style="{width: 100+'%',height:tableHeight+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="sortChange"
- >
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- />
- <el-table-column
- prop="org_code"
- label="缁勭粐缂栫爜"
- sortable="custom"
- />
- <el-table-column
- prop="org_name"
- label="缁勭粐鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="description"
- label="缁勭粐绫诲瀷"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.description==='F'">宸ュ巶</div>
- <div v-if="row.description==='D'">閮ㄩ棬</div>
- <div v-if="row.description==='W'">杞﹂棿</div>
- <div v-if="row.description==='K'">绉戝</div>
- <div v-if="row.description==='L'">鐢熶骇绾�</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="parentorg_name"
- label="涓婄骇鍗曚綅"
- sortable="custom"
- />
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- sortable="custom"
- />
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!--鍒嗛〉-->
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getDedectSearch"
- />
</div>
- <el-dialog
- :title="operation==='add'?'鏂板':'缂栬緫'"
- :visible.sync="dialogVisible"
- width="800px"
- top="15vh"
- @closed="handleClose"
- @close="handleClose"
- >
- <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="椤圭洰绫诲瀷" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 200px" />
- </el-form-item>
- <el-form-item label="椤圭洰鎻忚堪" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" type="textarea" style="width: 200px" />
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
- </div>
- </span>
- </el-dialog>
</div>
</template>
<script>
-import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { DedectSearch } from '@/api/zlgl'
+// import Pagination from '@/components/Pagination'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+// const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import $ from 'jquery'
+import {
+ MesOrderStepCheckItemList,
+ MesOrderStepCheckSearch,
+ MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
+ StepCheckItemSelect
+} from '@/api/zlgl'
+import { MesOrderSelectUser } from '@/api/scgl'
+
export default {
- name: 'GXJY',
- components: {
- Pagination
- },
+ name: 'QXDY',
+ // components: {
+ // Pagination
+ // },
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
mainHeight: 0,
tableHeight: 0,
- form: {
- itemcode: '', // 椤圭洰浠ｇ爜
- itemname: '', // 椤圭洰鍚嶇О
- itemdescr: '', // 椤圭洰鎻忚堪
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
- page: 1, // 绗嚑椤�
- rows: 20 // 姣忛〉澶氬皯鏉�
+ form: { // 宸ュ簭
+ // MO-2022-07-0001_1;001
+ orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ wo_code: '', // 宸ュ崟缂栫爜
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ stepcode: '', // 宸ュ簭缂栫爜
+ stepname: ''// 宸ュ簭鍚嶇О
},
- OrgTypeArr: [
- { label: '宸ュ巶', value: 'F' },
- { label: '閮ㄩ棬', value: 'D' },
- { label: '杞﹂棿', value: 'W' },
- { label: '绉戝', value: 'K' },
- { label: '鐢熶骇绾�', value: 'L' }
- ],
+ checkStandard: '', // 妫�楠屾爣鍑�
+ checkStandardSelect: [], // 妫�楠屾爣鍑嗕笅鎷夋暟缁�
+ checkUser: '', // 妫�楠屼汉鍛�
+ checkUserSelect: [], // 妫�楠屼汉鍛樹笅鎷夋暟缁�
+ checkResult: '', // 妫�楠岀粨鏋�
+ checkResultSelect: [
+ { code: 'OK', name: '鍚堟牸' },
+ { code: 'NG', name: '涓嶈壇' }
+ ], // 妫�楠岀粨鏋滀笅鎷夋暟缁�
+ checkdescr: '', // 妫�楠屽娉紙鎻忚堪锛�
- total: 10,
- tableData: [],
- dialogVisible: false,
- dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
- },
- operation: '',
- dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ]
-
- }
-
+ JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
+ JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
+ JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
+ multipleSelection: [], // 琛ㄦ牸澶氶�夋
+ tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
+ tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
+ isCancel: false// 鏄惁鐐瑰嚮鍙栨秷鎸夐挳
}
},
created() {
- this.getDedectSearch()
+ this.getMesOrderStepCheckSelect()
+ this.getMesOrderSelectUser()
+ this.getJYSelectArr()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+
+ this.getFocus()
},
methods: {
- async getDedectSearch() {
- const res = await DedectSearch(this.form)
- this.tableData = res.data
- this.total = res.count
- },
- // 鎺掑簭鏀瑰彉鏃�
- sortChange({ column, prop, order }) {
- if (order === 'descending') {
- order = 'desc'
- } else if (order === 'ascending') {
- order = 'asc'
- } else {
- order = 'desc'
- }
- this.form.order = order
- this.form.prop = prop
- this.getDedectSearch()
- },
- // 鏌ヨ
- search() {
- this.getDedectSearch()
- },
- upload() {
-
- },
- // 閲嶇疆
- reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
- this.getDedectSearch()
- },
-
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
+ // 鑾峰彇鑱氱劍
+ getFocus() {
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ $("input[name='GXproduceCode']")[0].focus()
})
},
- // 鍒犻櫎鎸夐挳
- async del(row) {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- DeleteOrganization({ orgid: row.code }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- this.getDedectSearch()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
+ // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋暟缁�
+ async getMesOrderStepCheckSelect() {
+ const { data: res } = await MesOrderStepCheckSelect()
+ this.checkStandardSelect = res
+ },
+ // 鑾峰彇妫�楠屼汉鍛樹笅鎷�
+ async getMesOrderSelectUser() {
+ const { data: res } = await MesOrderSelectUser()
+ this.checkUserSelect = res
+ },
+ // 鑾峰彇妫�楠岄」涓嬫媺鏁扮粍
+ async getJYSelectArr() {
+ const { data: res } = await StepCheckItemSelect()
+ this.JYSelectArr = res
+ },
+ // 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
+ async changeCheckStandard(val) {
+ this.isCancel = false
+ this.JYSelectedArr = []
+ const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
+ this.JYTableData = res
+
+ this.JYTableData.forEach(item => {
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+
+ // item.result = 0 // 0鍚堟牸 1涓嶈壇
+ item.result = 'OK'
+
+ item.isVisible = 0
+ item.number = number
+ this.JYSelectedArr.push(item.code)
})
+ this.$refs.multipleTable.toggleAllSelection()
},
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- AddUpdateOrganization(data).then(res => {
- if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.dialogVisible = false
- this.getDedectSearch()
- } else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- }
- })
+ // changeRadioValue(val, row) {
+ // console.log(val, row.result, 20000)
+ // },
+ // clickRadio(e, row) {
+ // console.log(e, row.result, 10000)
+ // row.result = e
+ // },
+ handleSelectionChange(val) {
+ this.multipleSelection = val
+ const arr = this.multipleSelection.map(i => i.number)
+ this.JYTableData.forEach(it => {
+ if (arr.includes(it.number)) {
+ it.result = 'OK'
+ } else {
+ it.result = 'NG'
}
})
+
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
+ } else {
+ this.checkResult = 'NG'
+ }
+ if (this.isCancel) {
+ this.checkResult = ''
+ }
+ },
+ // 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
+ changeCode(val, row) {
+ row.stepcheckitem_desc = this.JYSelectArr.find(it => it.code === val).descr
+ row.name = this.JYSelectArr.find(it => it.code === val).name
+ },
+ // 鎵爜閿洏鍥炶溅浜嬩欢
+ async enterNative(val, belong) {
+ if (belong === 'GXproduceCode') {
+ const res = await MesOrderStepCheckSearch({ orderstepqrcode: this.form.orderstepqrcode })
+ this.form.wo_code = res.data[0].wo_code
+ this.form.partcode = res.data[0].partcode
+ this.form.partname = res.data[0].partname
+ this.form.partspec = res.data[0].partspec
+ this.form.stepcode = res.data[0].stepcode
+ this.form.stepname = res.data[0].stepname
+ }
+ },
+
+ // 鏂板
+ add() {
+ if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
+ return this.$message.info('璇峰厛纭畾鎴栧彇娑堟湰鏉¤褰曪紒')
+ }
+
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
+ this.JYTableData.push(data)
+ this.$refs.multipleTable.toggleRowSelection(data, true)
+ },
+
+ // 纭
+ confirm(row) {
+ if (row.code === '') {
+ return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ }
+
+ if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
+ return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
+ } else {
+ this.JYSelectedArr.push(row.code)
+ }
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ item.isVisible = 0
+ item.code = row.code
+ item.name = row.name
+ item.result = row.result
+ item.stepcheckitem_desc = row.stepcheckitem_desc
+ }
+ })
+
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
+ } else {
+ this.checkResult = 'NG'
+ }
+ },
+ // 鍙栨秷
+ cancel(row) {
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.JYTableData.splice(index, 1)
+ }
+ })
+
+ this.JYSelectedArr.forEach((item, index) => {
+ if (item === row.code) {
+ this.JYSelectedArr.splice(index, 1)
+ }
+ })
+ },
+
+ // 鍒犻櫎
+ del(row) {
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.JYTableData.splice(index, 1)
+ }
+ })
+
+ this.JYSelectedArr.forEach((item, index) => {
+ if (item === row.code) {
+ this.JYSelectedArr.splice(index, 1)
+ }
+ })
+ },
+ // 鎻愪氦
+ submitButton(val) {
+ if (val !== 'Cancel') {
+ if (this.form.orderstepqrcode.length < 1) {
+ return this.$message.info('鎵弿鏉＄爜涓嶈兘涓虹┖锛�')
+ }
+ if (this.checkStandard.length < 1) {
+ return this.$message.info('妫�楠屾爣鍑嗕笉鑳戒负绌猴紒')
+ }
+ if (this.checkUser.length < 1) {
+ return this.$message.info('妫�楠屼汉鍛樹笉鑳戒负绌猴紒')
+ }
+ if (this.JYTableData.length < 1) {
+ return this.$message.info('妫�楠岄」淇℃伅涓嶈兘涓虹┖锛�')
+ }
+ if (this.checkResult.length < 1) {
+ return this.$message.info('妫�楠岀粨鏋滀笉鑳戒负绌猴紒')
+ }
+
+ const text = val === 'FirstCheck' ? '棣栨淇濆瓨' : (val === 'PatroCheck' ? '宸℃淇濆瓨' : '瀹屽伐妫�淇濆瓨')
+ this.$confirm('鏄惁纭' + text + '?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const arr = []
+ this.JYTableData.forEach((item, index) => {
+ arr.push({
+ code: item.code,
+ name: item.name,
+ seq: (index + 1),
+ descr: item.stepcheckitem_desc,
+ checkresult: item.result
+ })
+ })
+ const data = {
+ 'mesordercode': this.form.wo_code, // 宸ュ崟缂栧彿
+ 'partcode': this.form.partcode, // 浜у搧缂栫爜
+ 'stepcode': this.form.stepcode, // 宸ュ簭缂栫爜
+ 'checkstanedcode': this.checkStandard, // 妫�楠屾爣鍑嗙紪鐮�
+ 'checkusercode': this.checkUser, // 妫�楠屼汉鍛樼紪鐮�
+ 'checktypecode': val, // 妫�楠岀被鍨嬬紪鐮�
+ 'checkresult': this.checkResult, // 妫�楠岀粨鏋�(OK(鍚堟牸) NG(涓嶈壇))
+ 'checkdescr': this.checkdescr, // 妫�楠屾弿杩�
+ 'data': arr
+ }
+ SaveMesOrderStepCheckItem(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(text + '鎴愬姛锛�')
+ this.clearContent()
+ this.getFocus()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堜繚瀛�')
+ })
+ } else {
+ this.clearContent()
+ this.getFocus()
+ }
+ },
+ // 娓呯┖椤甸潰鍐呭
+ clearContent() {
+ this.JYTableData = []
+ this.multipleSelection = []
+ this.JYSelectedArr = []
+ this.checkdescr = ''
+ this.checkUser = ''
+ this.checkResult = ''
+ this.checkStandard = ''
+ this.form.orderstepqrcode = ''
+ this.form.wo_code = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.stepcode = ''
+ this.form.stepname = ''
+
+ this.isCancel = true
+ },
+
+ // 鍗曞厓鏍艰鐐瑰嚮鏃�
+ cellDblclick(row, column, cell, event) {
+ console.log(row, column, cell, event)
+ console.log(column.label)
+ console.log(row.index)
+ switch (column.label) {
+ case '妫�楠屾爣鍑嗘弿杩�':
+ this.tabClickIndex = row.index
+ this.tabClickLabel = column.label
+ break
+ // case '鍒よ矗閲戦(鍏�)':
+ // this.tabClickIndex = row.index
+ // this.tabClickLabel = column.label
+ // break
+ default: return
+ }
+ },
+ // 鍥炶溅浜嬩欢
+ keyUpEnterNative(val, row) {
+ this.tabClickLabel = ''
+ },
+
+ tableRowClassName({ row, rowIndex }) {
+ // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row
+ row.index = rowIndex
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
@@ -346,9 +594,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
height: 30px;
display: flex;
@@ -404,6 +654,7 @@
height: 30px;
line-height: 30px;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
@@ -480,18 +731,25 @@
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
-::v-deep .el-checkbox__inner:hover{
- border-color: $main_color;
-}
-::v-deep .el-textarea__inner:focus{
+
+::v-deep .el-checkbox__inner:hover {
border-color: $main_color;
}
+::v-deep .el-textarea__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
</style>
--
Gitblit v1.9.3