From d9493eb7905545e5509689eae73a450c576418e0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 26 八月 2022 17:16:02 +0800
Subject: [PATCH] 1.修改bug2.新增工序检验记录
---
src/views/sbgl/djbw.vue | 2
src/views/zzmx/chda.vue | 35
src/views/scgl/scdd.vue | 4
src/views/zlgl/gxjy.vue | 206 +++-
src/views/jcsz/wldw.vue | 16
src/views/scgl/gd.vue | 601 ++++++++++++++++
src/views/zlgl/gxjyjl.vue | 655 ++++++++++++++++++
src/views/sbgl/sbqd.vue | 9
src/views/scgl/sckbg.vue | 65 +
src/views/sbgl/djbz.vue | 263 ++++++
src/router/index.js | 6
src/views/sbgl/bybw.vue | 10
src/api/zlgl.js | 25
src/views/jcsz/yhqd.vue | 10
src/views/zlgl/qxdy.vue | 2
src/views/jcsz/jsqd.vue | 9
src/views/wlgl/ckdy.vue | 17
src/views/zlgl/gxjybz.vue | 205 +++--
18 files changed, 1,877 insertions(+), 263 deletions(-)
diff --git a/src/api/zlgl.js b/src/api/zlgl.js
index e33151c..f5416c3 100644
--- a/src/api/zlgl.js
+++ b/src/api/zlgl.js
@@ -132,3 +132,28 @@
})
}
+// 宸ュ簭妫�楠岃褰曞垪琛ㄦ煡璇�
+export function StepCheckTableSearch(data) {
+ return request({
+ url: 'QualityManagement/StepCheckTableSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 宸ュ簭妫�楠岃褰曞垪琛ㄦ煡璇�
+export function StepCheckTableSubSearch(data) {
+ return request({
+ url: 'QualityManagement/StepCheckTableSubSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 宸ュ簭妫�楠岃褰曞鍑�
+export function StepCheckTableOutExcel(data) {
+ return request({
+ url: 'QualityManagement/StepCheckTableOutExcel',
+ method: 'get',
+ params: data
+ })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 7a23416..d65648e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -474,6 +474,12 @@
code: '1086',
component: () => import('@/views/zlgl/gxjyxm'),
meta: { code: '1086', title: '宸ュ簭妫�楠岄」鐩�', icon: '', keepAlive: true }
+ }, {
+ path: 'gxjyjl',
+ name: 'GXJYJLCancel',
+ code: '1087',
+ component: () => import('@/views/zlgl/gxjyjl'),
+ meta: { code: '1087', title: '宸ュ簭妫�楠岃褰�', icon: '', keepAlive: true }
}
]
},
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 73891d7..85e6a2f 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -2,10 +2,13 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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-setting" @click="settingButton">璁剧疆</el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
+ <div style="display: flex">
+ <el-button icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 6a394b8..1cf702c 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -2,14 +2,16 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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-refresh-right"
- @click="syncSeaveSearchPartner"
- >鍚屾寰�鏉ュ崟浣�
- </el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <div style="display: flex">
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchPartner"
+ >鍚屾寰�鏉ュ崟浣�
+ </el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 043fc47..031ec44 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,10 +1,14 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
+ <div style="display: flex">
+ <el-button icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index 367e671..682e563 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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>
</div>
@@ -114,8 +114,12 @@
>
<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>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i 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)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
diff --git a/src/views/sbgl/djbw.vue b/src/views/sbgl/djbw.vue
index 45dab0e..d67d3e7 100644
--- a/src/views/sbgl/djbw.vue
+++ b/src/views/sbgl/djbw.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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>
</div>
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index bb1d835..e4d0130 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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>
</div>
@@ -61,31 +61,52 @@
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="code"
label="鏍囧噯缂栫爜"
sortable="custom"
/>
<el-table-column
- prop="org_name"
+ prop="name"
label="鏍囧噯鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="description"
label="鏍囧噯鎻忚堪"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="iscontr"
label="鐐规绠℃帶"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.iscontr==='Y'">
+ <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.iscontr==='N'">
+ <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ 鍚�
+ </div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="parentorg_name"
+ prop="is_checkeqp"
label="鍏宠仈璁惧"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <i v-if="row.is_checkeqp==='Y'" class="el-icon-share" @click="checkeqpClick(row)" />
+ <i
+ v-if="row.is_checkeqp==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185)"
+ @click="checkeqpClick(row)"
+ />
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
@@ -99,11 +120,17 @@
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="120"
>
<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>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i 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)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -241,7 +268,7 @@
label="閫夋嫨鎵爜"
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.isscan==='Y'?'鏄�':'鍚�' }}</div>
+ <div v-if="row.isVisible===0">{{ row.isscan === 'Y' ? '鏄�' : '鍚�' }}</div>
<el-select
v-if="row.isVisible===1"
v-model="row.isscan"
@@ -261,7 +288,7 @@
label="鐐规鍛ㄦ湡"
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.cycle==='D'?'鏃�':'' }}</div>
+ <div v-if="row.isVisible===0">{{ row.cycle === 'D' ? '鏃�' : '' }}</div>
<el-select
v-if="row.isVisible===1"
v-model="row.cycle"
@@ -301,6 +328,74 @@
</span>
</el-dialog>
+ <!-- 鍏宠仈璁惧-->
+ <el-dialog
+ title="鍏宠仈璁惧"
+ :visible.sync="dialogVisibleEqp"
+ width="800px"
+ top="10vh"
+ :close-on-click-modal="false"
+ class="dialogVisibleEqp"
+ @closed="handleCloseEqp"
+ @close="handleCloseEqp"
+ >
+ <!-- @opened="handleOpenedRoles"-->
+
+ <div>
+ <i class="el-icon-s-comment" style="color:#42b983;" /> 鏍囧噯鍚嶇О锛歿{ dialogFormEqp.name }}
+ </div>
+ <el-divider />
+ <div>
+ <div style="margin-bottom:20px">
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 璁惧鎵�灞炶溅闂撮泦鍚堬細
+ </div>
+ <div class="myCheckboxGroup">
+ <div
+ v-for="item in dialogFormEqp.eqpArr"
+ :key="item.code"
+ :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ class="myCheckbox"
+ @click="myCheckboxClick(item)"
+ >
+ <input
+ class="myCheckboxInput"
+ type="checkbox"
+ :value="item.code"
+ :name="item.name"
+ :style="{color:item.isSelected2?'#42b983':'#fff'}"
+ @click="myCheckboxInputClick(item)"
+ >{{ item.name }}
+ <!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
+ <!-- onClick="event.cancelBubble = true"-->
+ </div>
+ </div>
+ </div>
+ <el-divider />
+ <div>
+ <div style="margin-bottom:20px">
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊锛�
+ </div>
+ <el-tree
+ ref="roleTree"
+ :data="dialogFormEqp.eqpTree"
+ show-checkbox
+ node-key="code"
+ default-expand-all
+ style="height: 300px"
+ :props="defaultPropsOfEqpTree"
+ @check="checkBoxClick"
+ />
+ <!-- @check-change="checkChange"-->
+
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="eqpDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="eqpDialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
<!--瀵煎叆缁勪欢-->
<import-picker
ref="importPickerFunc"
@@ -319,7 +414,12 @@
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
-import { AddUpdateDeviceCheckStandArd, DeviceCheckItemSelect, DeviceCheckStandArdSearch } from '@/api/sbgl'
+import {
+ AddUpdateDeviceCheckStandArd,
+ DeviceCheckItemSelect,
+ DeviceCheckStandArdSearch,
+ ViewDeviceCheckStanedSearch
+} from '@/api/sbgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -390,6 +490,19 @@
tableDataDialog: [], // 琛ㄦ牸鏁版嵁
tableDataDialogSelected: [], // 宸查�塩ode
checkItemSelectArr: [],
+
+ dialogVisibleEqp: false,
+
+ dialogFormEqp: {
+ name: '',
+ eqpArr: [],
+ eqpTree: []
+ },
+ defaultPropsOfEqpTree: {
+ value: 'code',
+ label: 'name',
+ children: 'children'
+ },
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
code: '4',
@@ -475,9 +588,10 @@
this.$refs.tableDataDialogRef.doLayout()
})
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.code = row.code
+ this.dialogForm.name = row.name
+ this.dialogForm.enable = row.enable
+ this.dialogForm.description = row.description
})
},
// 鍒犻櫎鎸夐挳
@@ -497,6 +611,10 @@
this.$message.info('宸插彇娑堝垹闄�')
})
},
+ // 淇敼鍓嶈姹傛帴鍙�
+ // async getViewDeviceCheckStanedSearch(checkstand_code) {
+ // const { data: res } = await ViewDeviceCheckStanedSearch()
+ // },
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
this.dialogForm.code = ''
@@ -545,16 +663,22 @@
},
selectChange(val, row) {
- row.checkitem_descr = this.checkItemSelectArr.find(item => {
+ const res = this.checkItemSelectArr.find(item => {
return item.code === val || item.name === val
- }).description
-
- row.checkitem_code = this.checkItemSelectArr.find(item => {
- return item.code === val || item.name === val
- }).code
- row.checkitem_name = this.checkItemSelectArr.find(item => {
- return item.code === val || item.name === val
- }).name
+ })
+ row.checkitem_descr = res.description
+ row.checkitem_code = res.code
+ row.checkitem_name = res.name
+ // row.checkitem_descr = this.checkItemSelectArr.find(item => {
+ // return item.code === val || item.name === val
+ // }).description
+ //
+ // row.checkitem_code = this.checkItemSelectArr.find(item => {
+ // return item.code === val || item.name === val
+ // }).code
+ // row.checkitem_name = this.checkItemSelectArr.find(item => {
+ // return item.code === val || item.name === val
+ // }).name
},
// 鏂板琛�
addRow() {
@@ -619,7 +743,6 @@
console.log(this.tableDataDialog)
},
cancelRow(row) {
- console.log(row, 111)
this.tableDataDialog.forEach((item, index) => {
if (item.checkitem_code === row.checkitem_code && item.isVisible === 1) {
console.log(item)
@@ -637,6 +760,30 @@
},
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
+ },
+ // 鍏宠仈璁惧
+ checkeqpClick(row) {
+ this.dialogVisibleEqp = true
+ },
+ handleCloseEqp() {
+
+ },
+ // 澶х洅瀛愮偣鍑�
+ myCheckboxClick() {
+
+ },
+ // 灏忕洅瀛愮偣鍑�
+ myCheckboxInputClick() {
+
+ },
+ checkBoxClick() {
+
+ },
+ eqpDialogVisibleCancel() {
+ this.dialogVisibleEqp = false
+ },
+ eqpDialogVisibleConfirm() {
+ this.dialogVisibleEqp = false
}
}
}
@@ -645,6 +792,67 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+
+.dialogVisibleEqp {
+ .myCheckboxGroup {
+ display: flex;
+ flex-wrap: wrap;
+
+ .myCheckbox {
+ //border: 1px solid $main_color;
+ border: 1px solid #eee;
+ display: flex;
+ min-width: 100px;
+ padding: 10px;
+ margin: 10px 30px 0 0;
+ border-radius: 5px;
+ cursor: default;
+
+ .myCheckboxInput {
+ margin: 1px 5px 0 0;
+ cursor: pointer;
+ }
+
+ }
+
+ //.myCheckbox{
+ // border: 1px solid $main_color;
+ //}
+
+ input[type=checkbox] {
+ cursor: pointer;
+ position: relative;
+ width: 14px;
+ height: 14px;
+ font-size: 14px;
+ }
+
+ input[type=checkbox]::after {
+ position: absolute;
+ top: 0;
+ //color: rgb(130, 35, 35);
+ color: $main_color;
+ width: 14px;
+ height: 14px;
+ display: inline-block;
+ visibility: visible;
+ padding-left: 0px;
+ text-align: center;
+ content: ' ';
+ border-radius: 3px
+ }
+
+ input[type=checkbox]:checked::after {
+ //content: "鉁�";
+ content: "鈭�";
+ color: #fff;
+ font-size: 12px;
+ font-weight: bold;
+ background-color: $main_color;
+ }
+ }
+}
+
::v-deep .el-button--text {
font-size: 14px;
cursor: pointer;
@@ -740,7 +948,8 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-::v-deep .el-select__caret{
+
+::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 7a0a7d5..0e390ec 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -2,10 +2,13 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
- <el-button icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+ <div style="display: flex">
+ <el-button icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
+ <el-button icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+ </div>
+
<!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 829dbfb..46c4574 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -2,9 +2,12 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <div style="display: flex">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>
+ </div>
+
<el-button icon="el-icon-switch-button" @click="orderClose">宸ュ崟鍏抽棴</el-button>
</div>
@@ -37,6 +40,24 @@
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
+ <el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
+ <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
+ <el-select
+ v-model="form.ordertype"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @change="mesordertypeChange"-->
+ <el-option
+ v-for="item in ordertypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select> </el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<!-- <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">-->
<!-- <el-option-->
@@ -157,6 +178,24 @@
min-width="160"
/>
<el-table-column
+ prop="m_po"
+ label="婧愬崟鍗曞彿"
+ sortable="custom"
+ min-width="160"
+ />
+ <el-table-column
+ prop="wotype"
+ label="鍗曟嵁绫诲瀷"
+ sortable="custom"
+ min-width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wotype==='PO'">鏍囧噯宸ュ崟</div>
+ <div v-else-if="row.wotype==='FO'">鎶ュ簾琛ュ崟</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
@@ -263,7 +302,11 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="宸ュ簭浠诲姟" placement="top">
- <i class="el-icon-tickets" style="cursor: pointer;color: #42b983;margin-right: 15px" @click="check(row)" />
+ <i
+ class="el-icon-tickets"
+ style="cursor: pointer;color: #42b983;margin-right: 15px"
+ @click="check(row)"
+ />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
<i class="el-icon-delete" @click="del(row)" />
@@ -325,6 +368,41 @@
<el-form-item label="宸ュ崟缂栧彿" prop="mesordercode">
<el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
+ <div style="display: flex">
+ <el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
+ <el-select
+ v-model="dialogForm.ordertype"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ :disabled="operation!=='add'"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @change="mesordertypeChange"-->
+ <el-option
+ v-for="item in ordertypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <div style="display: flex;flex-wrap: nowrap">
+ <el-form-item label="婧愬崟鍗曞彿">
+ <el-input
+ v-model="dialogForm.sourceorder"
+ :disabled="dialogForm.ordertype==='PO'"
+ style="width: 172px"
+ />
+ </el-form-item>
+ <el-button
+ type="primary"
+ style="padding: 0 10px;margin-left: -8px;margin-top: 3px"
+ class="el-icon-search"
+ :disabled="operation!=='add'"
+ @click="mesordertsourcesearchclick"
+ />
+ </div>
+ </div>
<el-form-item label="宸ュ崟鏁伴噺" prop="mesqty">
<el-input
v-model="dialogForm.mesqty"
@@ -386,7 +464,7 @@
</el-form-item>
<el-button
type="primary"
- style="padding: 0 10px;margin-left: -8px;margin-top: 5px"
+ style="padding: 0 10px;margin-left: -8px;margin-top:3px"
class="el-icon-search"
@click="searchClick"
/>
@@ -509,7 +587,7 @@
</span>
</el-dialog>
- <!-- 宸ュ簭浠诲姟瀵硅瘽妗�-->
+ <!-- 宸ュ簭浠诲姟瀵硅瘽妗�-->
<el-dialog
title="宸ュ簭浠诲姟"
:visible.sync="dialogVisibleTask"
@@ -523,7 +601,8 @@
style="margin-bottom: 15px"
type="primary"
@click="supplementClick"
- >琛ユ墦</el-button>
+ >琛ユ墦
+ </el-button>
<el-table
:data="taskTableData"
border
@@ -596,6 +675,298 @@
</span>
</el-dialog>
+ <!-- 婧愬崟鍗曞彿瀵硅瘽妗�-->
+ <el-dialog
+ title="婧愬崟鍗曞彿"
+ :visible.sync="dialogVisibleSource"
+ width="1200px"
+ top="5vh"
+ class="dialogVisibleSearch"
+ :close-on-click-modal="false"
+ @close="dialogVisibleSourceClose"
+ >
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="sourceForm"
+ :model="sourceForm"
+ label-width="100px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-select
+ v-model="sourceForm.erporderstus"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in erporderstusArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+
+ <el-form-item v-show="isExpand" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpand" label="浜у搧瑙勬牸" style=" display: flex;">
+ <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpand" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item
+ v-show="isExpand"
+ label="棰勮寮�宸ユ椂闂�"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;margin-top: 3px"
+ >
+ <el-date-picker
+ v-model="sourceForm.paystartdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 250px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ <!-- :picker-options="expireTimeOption"-->
+
+ </el-form-item>
+ <el-form-item
+ v-show="isExpand"
+ label="棰勮瀹屽伐鏃堕棿"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;margin-top: 3px"
+ >
+ <el-date-picker
+ v-model="sourceForm.payenddate"
+ type="daterange"
+ :clearable="false"
+ class="timeMini"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 250px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
+ />
+ </el-form-item>
+
+ </div>
+ <div>
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
+ <el-button type="primary" icon="el-icon-search" @click="sourceSearch">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="sourceReset">閲嶇疆</el-button>
+ </div>
+ </div>
+ </el-form>
+ </div>
+ <el-tooltip :content="!isExpand?'鐐瑰嚮灞曠ず鏇村':'鏀惰捣'" placement="bottom">
+ <div
+ style="display:flex;justify-content: center;
+ align-items:center;background-color:#eee;cursor: pointer"
+ @click="isExpand=!isExpand"
+ >
+ <i
+ :class="!isExpand?'el-icon-arrow-down':'el-icon-arrow-up'"
+ :style="{color:'#42B983'}"
+ /></div>
+ </el-tooltip>
+ <div class="elTableDiv">
+ <el-table
+ :data="sourceTableData"
+ :height="(tableHeight-100)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:(tableHeight-100)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sourceSortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ width="50"
+ fixed
+ >
+ <template slot-scope="{row}">
+ <el-radio
+ v-model="radioSelectedId"
+ :label="row.id"
+ style="color: transparent;padding-left: 15px; margin-right: -25px;"
+ @change.native="getCurrentRowSource(row.id)"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="status"
+ label="璁㈠崟鐘舵��"
+ sortable="custom"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
+ <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
+ <div v-if="row.status==='CLOSED'">宸插叧闂�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo"
+ label="璁㈠崟缂栧彿"
+ sortable="custom"
+ min-width="150"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ sortable="custom"
+ min-width="150"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ sortable="custom"
+ min-width="150"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ sortable="custom"
+ min-width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="qty"
+ label="璁㈠崟鏁伴噺"
+ width="150"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="relse_qty"
+ label="宸蹭笅鍗曟暟閲�"
+ width="150"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ sortable="custom"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planstartdate"
+ label="棰勮寮�宸ユ椂闂�"
+ sortable="custom"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planenddate"
+ label="棰勮瀹屽伐鏃堕棿"
+ sortable="custom"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="createuser"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.createuser">{{ row.createuser }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="createdate"
+ label="鍒涘缓鏃堕棿"
+ width="130"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- fixed="right"-->
+ <!-- width="80"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">-->
+ <!-- <!– <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>–>-->
+ <!-- <i-->
+ <!-- class="el-icon-bottom"-->
+ <!-- style="color:#42b983;cursor: pointer;margin-left: 5px"-->
+ <!-- @click="edit('edit',row)"-->
+ <!-- />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="sourceFormTotal"
+ :page.sync="sourceForm.page"
+ :limit.sync="sourceForm.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getErpOrderSearch"
+ />
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleSourceBack">杩� 鍥�</el-button>
+ <el-button type="primary" @click="dialogVisibleSourceConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
<!--鎵撳嵃棰勮瀵硅瘽妗� 澶ф爣绛�-->
<el-dialog
title=""
@@ -622,6 +993,9 @@
<div class="elForm">
<el-form-item label="宸ュ崟缂栧彿锛�" class="formContent">
{{ formApprove.mesordercode }}
+ </el-form-item>
+ <el-form-item label="婧愬崟鍗曞彿锛�" class="formContent">
+ {{ formApprove.m_po }}
</el-form-item>
<el-form-item label="浜у搧缂栫爜锛�" class="formContent">
{{ formApprove.partcode }}
@@ -658,7 +1032,9 @@
<!-- <div id="qrCode0" ref="qrCodeDiv0" />-->
</div>
<div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0" />
- <div style="z-index: 10;background-color:transparent;width: 120px;height:120px; position: absolute;right: 21px" />
+ <div
+ style="z-index: 10;background-color:transparent;width: 120px;height:120px; position: absolute;right: 21px"
+ />
</div>
<!-- <div style="width:100%;height: 30px;border-bottom: 1px solid #eee;margin-bottom: 20px" />-->
@@ -758,7 +1134,9 @@
>
<div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
</div>
- <div style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center">
+ <div
+ style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
<div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
{{ qrForm.startqty }}
</div>
@@ -818,7 +1196,7 @@
import {
AddUpdateMesOrder,
ClosedMesOrder,
- DeleteMesOrder,
+ DeleteMesOrder, ErpOrderSearch,
MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
SelectRouteStep
} from '@/api/scgl'
@@ -856,6 +1234,8 @@
mesorderstus: '', // 宸ュ崟鐘舵�佺爜
mesordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
+ ordertype: '', // ordertype
+ sourceorder: '', // 婧愬崟鍗曞彿
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
@@ -886,6 +1266,9 @@
mesorderstus: 'NEW', // 宸ュ崟鐘舵�佺爜
mesordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
+
+ ordertype: 'PO', // 宸ュ崟绫诲瀷
+ sourceorder: '', // 婧愬崟鍗曞彿
mesqty: '', // 宸ュ崟鏁伴噺
routecode: '', // 宸ヨ壓璺嚎缂栫爜
@@ -896,6 +1279,10 @@
OperType: '' // 鎿嶄綔绫诲瀷
},
+ ordertypeArr: [// 宸ュ崟绫诲瀷
+ { code: 'PO', name: '鏍囧噯宸ュ崟' },
+ { code: 'FO', name: '鎶ュ簾琛ュ崟' }
+ ],
partArr: [], // 浜у搧淇℃伅
wkshopArr: [], // 鐢熶骇杞﹂棿鏁扮粍
routeArr: [], // 宸ヨ壓璺嚎鏁扮粍
@@ -964,6 +1351,7 @@
},
formApprove: {
+ m_po: '', // 婧愬崟鍗曞彿
mesordercode: '',
partcode: '',
partname: '',
@@ -1004,7 +1392,28 @@
nextstepname: '',
operator: '', // 鎿嶄綔浜�
operatorTime: ''// 鎿嶄綔鏃堕棿
- }
+ },
+ dialogVisibleSource: false,
+ sourceTableData: [],
+ sourceForm: {
+ erporderstus: '', // 璁㈠崟鐘舵�佺爜
+ erpordercode: '', // 璁㈠崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ creatuser: '', // 鍒涘缓浜哄憳
+ // paystartdate: '', // 浜や粯鏃堕棿
+ paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ payenddate: '', // 棰勮瀹屽伐鏃堕棿
+ createdate: '', // 鍒涘缓鏃堕棿
+ prop: 'createdate', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ sourceFormTotal: 10,
+ radioSelectedId: '',
+ isExpand: false// 鏄惁寮犲紑锛岄粯璁や笉灞曞紑
}
},
created() {
@@ -1041,6 +1450,8 @@
partname: this.form.partname, // 浜у搧鍚嶇О
partspec: this.form.partspec, // 浜у搧瑙勬牸
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+ sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
+ ordertype: this.form.ordertype, // 鍗曟嵁绫诲瀷
createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
@@ -1076,6 +1487,18 @@
this.form.prop = prop
this.getMesOrderSearch()
},
+ sourceSortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.sourceForm.order = order
+ this.sourceForm.prop = prop
+ this.getErpOrderSearch()
+ },
// 鏌ヨ
search() {
this.getMesOrderSearch()
@@ -1090,7 +1513,9 @@
this.form.partspec = ''
this.form.paydate = ''
this.form.creatuser = ''
- this.form.createdate = ''
+ this.form.sourceorder = ''
+ this.form.creatuser = ''
+ this.form.ordertype = ''
this.getMesOrderSearch()
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
@@ -1139,10 +1564,14 @@
},
// 宸ュ簭浠诲姟
async check(row) {
- this.dialogVisibleTask = true
const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
this.taskTableData = res
+
+ if (this.taskTableData.length === 0) {
+ return this.$message.info('鏃犵敓浜т换鍔℃暟鎹紒')
+ }
this.dialogForm.mesordercode = res[0].wo_code
+ this.dialogVisibleTask = true
},
dialogVisibleBack() {
this.dialogVisibleTask = false
@@ -1168,6 +1597,9 @@
this.dialogForm.partname = row.partname
this.dialogForm.mesqty = row.plan_qty
this.dialogForm.partspec = row.partspec
+ this.dialogForm.sourceorder = row.sourceorder
+ this.dialogForm.ordertype = row.ordertype
+
// this.routecodeChange(this.dialogForm.routecode)
this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
@@ -1262,6 +1694,9 @@
this.dialogForm.partcode = '' // 浜у搧缂栫爜
this.dialogForm.mesqty = '' // 宸ュ崟鏁伴噺
+ this.dialogForm.ordertype = 'PO' // 宸ュ崟绫诲瀷
+ this.dialogForm.sourceorder = '' // 婧愬崟鍗曞彿
+
this.dialogForm.routecode = '' // 宸ヨ壓璺嚎缂栫爜
this.dialogForm.wkshopcode = '' // 鐢熶骇杞﹂棿缂栫爜
this.dialogForm.planstartdate = '' // 璁″垝寮�濮嬫椂闂�
@@ -1278,6 +1713,9 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ if (this.dialogForm.ordertype === 'FO' && this.dialogForm.sourceorder.toString().trim().length <= 0) {
+ return this.$message.info('婧愬崟鍗曞彿涓嶈兘涓虹┖锛�')
+ }
const data = {
// partname: this.dialogForm.partname, // 浜у搧鍚嶇О
// partspec: this.dialogForm.partspec, // 浜у搧瑙勬牸
@@ -1288,7 +1726,8 @@
mesordercode: this.dialogForm.mesordercode, // 宸ュ崟缂栧彿
partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
mesqty: this.dialogForm.mesqty, // 宸ュ崟鏁伴噺
-
+ ordertype: this.dialogForm.ordertype, // 鍗曟嵁绫诲瀷
+ sourceorder: this.dialogForm.sourceorder, // 婧愬崟鍗曞彿
routecode: this.dialogForm.routecode, // 宸ヨ壓璺嚎缂栫爜
wkshopcode: this.dialogForm.wkshopcode, // 鐢熶骇杞﹂棿缂栫爜
planstartdate: this.dialogForm.planstartdate, // 璁″垝寮�濮嬫椂闂�
@@ -1373,6 +1812,7 @@
this.tableDataPrint = res3
this.formApprove.mesordercode = res3[0].wo_code
+ this.formApprove.m_po = res3[0].m_po
this.formApprove.partcode = res3[0].partcode
this.formApprove.partname = res3[0].partname
this.formApprove.partspec = res3[0].partspec
@@ -1449,6 +1889,7 @@
dialogVisibleConfirmClose() {
// this.dialogForm.mesordercode = ''
this.formApprove.mesordercode = ''
+ this.formApprove.m_po = ''
this.formApprove.partcode = ''
this.formApprove.partname = ''
this.formApprove.partspec = ''
@@ -1514,6 +1955,95 @@
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
})
+ },
+ // 鎶ュ簾琛ュ崟鎯呭喌涓嬪彲鐐瑰嚮閫夋嫨
+ mesordertsourcesearchclick() {
+ if (this.dialogForm.ordertype === 'PO') {
+ return this.$message.info('宸ュ崟绫诲瀷涓烘姤搴熻ˉ鍗曟儏鍐典笅鍙�夋嫨锛�')
+ }
+
+ this.getErpOrderSearch()
+
+ this.dialogVisibleSource = true
+ },
+ async getErpOrderSearch() {
+ let tempDate2 = this.sourceForm.paystartdate
+ if (tempDate2.length > 0) {
+ tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ }
+
+ let tempDate = this.sourceForm.payenddate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+
+ const data = {
+ erporderstus: this.sourceForm.erporderstus, // 璁㈠崟鐘舵�佺爜
+ erpordercode: this.sourceForm.erpordercode, // 璁㈠崟缂栧彿
+ partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
+ partname: this.sourceForm.partname, // 浜у搧鍚嶇О
+ partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
+ paystartdate: tempDate2, // 浜や粯鏃堕棿
+ payenddate: tempDate, // 浜や粯鏃堕棿
+ creatuser: this.sourceForm.creatuser, // 鍒涘缓浜哄憳
+
+ prop: this.sourceForm.prop, // 鎺掑簭瀛楁
+ order: this.sourceForm.order, // 鎺掑簭瀛楁
+ page: this.sourceForm.page, // 绗嚑椤�
+ rows: this.sourceForm.rows // 姣忛〉澶氬皯鏉�
+
+ }
+
+ const res = await ErpOrderSearch(data)
+ this.sourceTableData = res.data
+ this.sourceFormTotal = res.count
+ },
+ // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+ getCurrentRowSource(id) {
+ this.radioSelectedId = id
+ },
+ sourceSearch() {
+ this.getErpOrderSearch()
+ },
+ sourceReset() {
+ this.sourceForm.erporderstus = ''
+ this.sourceForm.erpordercode = ''
+ this.sourceForm.partcode = ''
+ this.sourceForm.partname = ''
+ this.sourceForm.partspec = ''
+ this.sourceForm.paystartdate = ''
+ this.sourceForm.payenddate = ''
+ this.sourceForm.creatuser = ''
+ this.sourceForm.createdate = ''
+ this.getErpOrderSearch()
+ },
+ dialogVisibleSourceClose() {
+ this.radioSelectedId = ''
+
+ this.sourceForm.erporderstus = ''
+ this.sourceForm.erpordercode = ''
+ this.sourceForm.partcode = ''
+ this.sourceForm.partname = ''
+ this.sourceForm.partspec = ''
+ this.sourceForm.paystartdate = ''
+ this.sourceForm.payenddate = ''
+ this.sourceForm.creatuser = ''
+ this.sourceForm.createdate = ''
+
+ this.isExpand = false
+ this.sourceTableData = []
+ },
+ dialogVisibleSourceBack() {
+ this.dialogVisibleSource = false
+ },
+ dialogVisibleSourceConfirm() {
+ console.log(this.radioSelectedId)
+ this.sourceTableData.forEach(item => {
+ if (item.id === this.radioSelectedId) {
+ this.dialogForm.sourceorder = item.wo
+ }
+ })
+ this.dialogVisibleSource = false
}
}
@@ -1523,9 +2053,10 @@
<style lang="scss" scoped>
$main_color: #42b983;
-.el-date-editor{
+.el-date-editor {
font-size: 14px;
}
+
::v-deep .el-dialog__body {
padding: 20px 100px !important;
}
@@ -1582,12 +2113,13 @@
// //outline: #000 solid 2px !important;
//}
-.tableDataPrint ::v-deep div.cell{
+.tableDataPrint ::v-deep div.cell {
display: flex !important;
align-items: center !important;
justify-content: center !important;
}
-.formContent{
+
+.formContent {
width: 240px;
}
@@ -1602,18 +2134,37 @@
</style>
<style>
-.formContent .el-form-item__label{
-color: #000 !important;
+.formContent .el-form-item__label {
+ color: #000 !important;
}
</style>
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+::v-deep .el-range-input{
+ font-size: 14px !important;
+}
+::v-deep .el-range__icon{
+ line-height: 28px !important;
+}
+::v-deep .el-range-separator{
+ line-height: 28px !important;
+}
+::v-deep .el-range-input{
+ font-size: 14px ;
+}
+::v-deep .el-range-separator{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -1674,8 +2225,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -1691,6 +2242,7 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
@@ -1705,9 +2257,10 @@
align-items: center !important;
}
- ::v-deep .el-input__prefix{
+ ::v-deep .el-input__prefix {
margin-top: -3px;
}
+
//::v-deep .el-range__icon{
// line-height: 28px;
//}
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 3d51997..3ddcfb9 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -447,7 +447,6 @@
{ code: 'CLOSED', name: '宸插叧闂�' }
],
total: 10,
- radioSelected: '',
radioSelectedId: '',
tableData: [],
dialogVisible: false,
@@ -596,8 +595,6 @@
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
getCurrentRow(id) {
- // console.log(row, 2)
- // this.radioSelected = row.wo
this.radioSelectedId = id
},
// 璁㈠崟鍏抽棴
@@ -619,7 +616,6 @@
if (res.code === '200') {
this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
this.getErpOrderSearch()
- // this.radioSelected = ''
}
})
}).catch(() => {
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 1da7ea2..2641e18 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -632,6 +632,20 @@
<!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐浜哄憳锛�">-->
<!-- <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />-->
<!-- </el-form-item>-->
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐浜猴細">
+ <el-select
+ v-model="dialogForm.operation"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in OperationArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="澶囨敞锛�">
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
@@ -829,6 +843,20 @@
:key="item.code"
:label="item.name"
:value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡浜猴細">
+ <el-select
+ v-model="dialogForm.operation"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in OperationArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
/>
</el-select>
</el-form-item>
@@ -1204,6 +1232,7 @@
startqtySum: '', // 涓嶈兘瓒呰繃鐨勬暟鍊�
+ operation: getCookie('navTabId'), // 鎶ュ伐浜猴紙鏀舵枡浜猴級
remarks: ''// 澶囨敞
},
@@ -1327,6 +1356,8 @@
})
// webapp_urlprotocol_startup()
// webapp_ws_autoupdate(true)
+
+ this.getMesOrderSelectUserAll() // 鑾峰彇鎵�鏈変汉鍛�
},
methods: {
tableRowClassName({ row, rowIndex }) {
@@ -1730,7 +1761,7 @@
this.dialogForm.nextstepcode = '' // 涓嬮亾宸ュ簭缂栫爜
this.dialogForm.remarks = '' // 澶囨敞
-
+ this.dialogForm.operation = getCookie('navTabId') // 鎶ュ伐浜猴紙鏀舵枡浜猴級
this.userTableData = [] // 浜哄憳鍒楄〃
this.$refs.dialogForm.clearValidate()
@@ -1796,12 +1827,12 @@
SavaMesOrderStepIn(data).then(res => {
if (res.code === '200') {
this.$message.success('鏀舵枡鎴愬姛锛�')
- this.dialogVisible = false
if (this.dialogForm.nextstepcode !== '') {
- this.WXprint2()
+ this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.operation).username)
this.dialogVisible2 = true
}
+ this.dialogVisible = false
this.tabClick()
} else {
this.$message.error('鏀舵枡澶辫触!')
@@ -1872,13 +1903,13 @@
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
this.$message.success('鎶ュ伐鎴愬姛锛�')
- this.dialogVisible = false
console.log(this.dialogForm.nextstepcode, 1)
if (this.dialogForm.nextstepcode !== '') {
- this.ZZprint2()
+ this.ZZprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.operation).username)
this.dialogVisible2 = true
}
+ this.dialogVisible = false
this.tabClick()
} else {
this.$message.error('鎶ュ伐澶辫触!')
@@ -1901,27 +1932,27 @@
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
})
},
- ZZprint2() {
+ ZZprint2(username) {
this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
this.qrForm.startqty = this.dialogForm.startqty
this.qrForm.wo_code = this.dialogForm.wo_code
this.qrForm.partcode = this.dialogForm.partcode
this.qrForm.partname = this.dialogForm.partname
this.qrForm.nextstepname = this.dialogForm.nextstepname
- this.qrForm.operator = getCookie('username')
+ this.qrForm.operator = username
this.qrForm.operatorTime = handleDatetime2(new Date())
this.$nextTick(() => {
this.bindQRCode(this.qrForm.qrvalue)
})
},
- WXprint2() {
+ WXprint2(username) {
this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
this.qrForm.startqty = this.dialogForm.sqty
this.qrForm.wo_code = this.dialogForm.wo_code
this.qrForm.partcode = this.dialogForm.partcode
this.qrForm.partname = this.dialogForm.partname
this.qrForm.nextstepname = this.dialogForm.nextstepname
- this.qrForm.operator = getCookie('username')
+ this.qrForm.operator = username
this.qrForm.operatorTime = handleDatetime2(new Date())
this.$nextTick(() => {
this.bindQRCode(this.qrForm.qrvalue)
@@ -1994,12 +2025,12 @@
this.badDialogForm.operation = getCookie('navTabId')
this.badTableDataDialog = []
},
+ async getMesOrderSelectUserAll() {
+ const { data: res } = await MesOrderSelectUser({ usercode: '' })
+ this.OperationArr = res
+ },
// 鐐瑰嚮缁翠慨澶勭悊鎸夐挳 鎴� 鎵弿鏉＄爜鐨勬壂鎻忓洖杞︿簨浠�
async repairHandle(row) {
- const { data: res1 } = await MesOrderSelectUser({ usercode: '' })
- this.OperationArr = res1
-
- console.log(row)
let data
if (row.wo_code) {
data = {
@@ -2065,10 +2096,6 @@
})
},
badSave(row) {
- console.log(row, 1)
- // console.log(parseFloat(row.bad_qty) + parseFloat(row.repair_qty), 2)
- // console.log(parseFloat(row.ng_qty), 2)
- // console.log(parseFloat(row.bad_qty) + parseFloat(row.repair_qty) > parseFloat(row.ng_qty), 2)
if (parseFloat(row.bad_qty) + parseFloat(row.repair_qty) > parseFloat(row.ng_qty)) {
this.badCancel(row)
return this.$message.info('缁翠慨鏁伴噺涓庢姤搴熸暟閲忎箣鍜屼笉鑳藉ぇ浜庝笉鑹暟閲忥紒')
@@ -2076,8 +2103,8 @@
this.badTableDataDialog.forEach((item, index) => {
if (item.id === row.id && item.m_id === row.m_id) {
this.badTableDataDialog.splice(index, 1, {
- bad_qty: row.bad_qty,
- repair_qty: row.repair_qty,
+ bad_qty: parseFloat(row.bad_qty),
+ repair_qty: parseFloat(row.repair_qty),
isVisible: 0,
defect_code: row.defect_code,
defect_name: row.defect_name,
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 0e9d923..23e9d8d 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -2,14 +2,17 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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-refresh-right"
- @click="syncSeaveSearchWhareHouseLocation"
- >鍚屾浠撳簱/搴撲綅
- </el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <div style="display: flex">
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchWhareHouseLocation"
+ >鍚屾浠撳簱/搴撲綅
+ </el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
+
</div>
<div class="bodyTopFormGroup">
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 153339e..e5ef964 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -124,7 +124,42 @@
:value="item.usercode"
/>
</el-select>
+ <div style="width: 90px;margin-left: 50px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屾暟閲忥細
+ </div>
+ <el-input v-model="checkCount" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</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: center">
+ <div style="width: 90px">妫�楠屽娉細</div>
+ <el-input v-model="checkdescr" style="width: 540px" placeholder="璇疯緭鍏�" />
+ </div>
+
+ </div>
+
<div style="margin: 15px 0;font-size: 14px">
<i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
</div>
@@ -151,38 +186,80 @@
width="100"
fixed
/>
+
<!-- <el-table-column-->
<!-- prop="code"-->
- <!-- label="妫�楠岄」鐩紪鐮�"-->
- <!-- sortable="custom"-->
- <!-- />-->
+ <!-- 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-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="code"
- label="妫�楠岄」鐩紪鐮�(鍚嶇О)"
+ 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>
-
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
<el-select
v-if="row.isVisible===1"
v-model="row.code"
- filterable
- style="width: 400px;"
+ style="width: 200px;"
placeholder="璇烽�夋嫨"
- @change="val=>changeCode(val,row)"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.name"
+ :label="item.code"
+ :value="item.name"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="妫�楠屾爣鍑嗗悕绉�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.name"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
>
<el-option
v-for="item in JYSelectArr"
:key="item.code"
- :label="item.code+''+item.name"
+ :label="item.name"
:value="item.code"
/>
</el-select>
</template>
</el-table-column>
+
<el-table-column
prop="stepcheckitem_desc"
label="妫�楠屾爣鍑嗘弿杩�"
@@ -242,6 +319,7 @@
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -252,34 +330,6 @@
</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: center">
- <div style="width: 90px">妫�楠屽娉細</div>
- <el-input v-model="checkdescr" style="width: 300px" placeholder="璇疯緭鍏�" />
- </div>
-
</div>
<div style="display: flex;margin: 30px 0;align-items: center">
@@ -330,6 +380,7 @@
checkStandard: '', // 妫�楠屾爣鍑�
checkStandardSelect: [], // 妫�楠屾爣鍑嗕笅鎷夋暟缁�
checkUser: '', // 妫�楠屼汉鍛�
+ checkCount: 0, // 妫�楠屾暟閲�
checkUserSelect: [], // 妫�楠屼汉鍛樹笅鎷夋暟缁�
checkResult: '', // 妫�楠岀粨鏋�
checkResultSelect: [
@@ -340,7 +391,8 @@
JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
- JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
+ // JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
+ JYIsCancel: true,
multipleSelection: [], // 琛ㄦ牸澶氶�夋
tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
@@ -390,10 +442,14 @@
},
// 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
async changeCheckStandard(val) {
+ await this.getJYSelectArr()
this.isCancel = false
- this.JYSelectedArr = []
+
const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
this.JYTableData = res
+
+ // let arr = [鈥].filter(x => [鈥].every(y => y.id !== x.id));
+ this.JYSelectArr = [...this.JYSelectArr].filter(x => [...this.JYTableData].every(y => y.code !== x.code))
this.JYTableData.forEach(item => {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
@@ -404,7 +460,6 @@
item.isVisible = 0
item.number = number
- this.JYSelectedArr.push(item.code)
})
this.$refs.multipleTable.toggleAllSelection()
},
@@ -436,9 +491,13 @@
}
},
// 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
- changeCode(val, row) {
- row.stepcheckitem_desc = this.JYSelectArr.find(it => it.code === val).descr
- row.name = this.JYSelectArr.find(it => it.code === val).name
+ changeName(val, row) {
+ const res = this.JYSelectArr.find(item => {
+ return item.code === val || item.name === val
+ })
+ row.code = res.code
+ row.name = res.name
+ row.stepcheckitem_desc = res.descr
},
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
@@ -455,6 +514,9 @@
// 鏂板
add() {
+ if (this.JYTableData.length === 0) {
+ return this.$message.info('璇峰厛閫夋嫨妫�楠屾爣鍑嗭紒')
+ }
if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
return this.$message.info('璇峰厛纭畾鎴栧彇娑堟湰鏉¤褰曪紒')
}
@@ -464,19 +526,25 @@
const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
this.JYTableData.push(data)
this.$refs.multipleTable.toggleRowSelection(data, true)
+
+ this.JYIsCancel = false
},
// 纭
confirm(row) {
if (row.code === '') {
- return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ return this.$message.info('妫�楠岄」鐩紪鐮佷笉鑳戒负绌猴紒')
+ }
+ if (row.name === '') {
+ return this.$message.info('妫�楠岄」鐩悕绉颁笉鑳戒负绌猴紒')
}
- if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
- return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
- } else {
- this.JYSelectedArr.push(row.code)
- }
+ this.JYSelectArr.forEach((item, index) => {
+ if (item.code === row.code) {
+ this.JYSelectArr.splice(index, 1)
+ }
+ })
+
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
item.isVisible = 0
@@ -501,24 +569,27 @@
}
})
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
- })
+ if (this.JYIsCancel && row.code.toString().length > 0) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.stepcheckitem_desc
+ })
+ }
+ this.JYIsCancel = true
},
// 鍒犻櫎
del(row) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.stepcheckitem_desc
+ })
+
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)
}
})
},
@@ -533,6 +604,9 @@
}
if (this.checkUser.length < 1) {
return this.$message.info('妫�楠屼汉鍛樹笉鑳戒负绌猴紒')
+ }
+ if (parseFloat(this.checkCount) > 0) {
+ return this.$message.info('妫�楠屾暟閲忓繀椤昏澶т簬闆讹紒')
}
if (this.JYTableData.length < 1) {
return this.$message.info('妫�楠岄」淇℃伅涓嶈兘涓虹┖锛�')
@@ -573,6 +647,7 @@
this.$message.success(text + '鎴愬姛锛�')
this.clearContent()
this.getFocus()
+ this.getJYSelectArr()
}
})
}).catch(() => {
@@ -581,15 +656,16 @@
} else {
this.clearContent()
this.getFocus()
+ this.getJYSelectArr()
}
},
// 娓呯┖椤甸潰鍐呭
clearContent() {
this.JYTableData = []
this.multipleSelection = []
- this.JYSelectedArr = []
this.checkdescr = ''
this.checkUser = ''
+ this.checkCount = 0
this.checkResult = ''
this.checkStandard = ''
this.form.orderstepqrcode = ''
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 60806ff..59176f3 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -90,9 +90,12 @@
>
<template slot-scope="{row}">
<div class="operationClass">
-
<el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
- <i class="el-icon-view" style="color: #42b983;cursor: pointer;margin-right: 15px;" @click="check('check',row)" />
+ <i
+ class="el-icon-view"
+ style="color: #42b983;cursor: pointer;margin-right: 15px;"
+ @click="check('check',row)"
+ />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i class="el-icon-edit-outline" @click="edit('edit',row)" />
@@ -144,7 +147,12 @@
<el-input v-model="dialogForm.name" :disabled="operation==='check'" style="width: 200px" />
</el-form-item>
<el-form-item label="鎻忚堪">
- <el-input v-model="dialogForm.description" :disabled="operation==='check'" type="textarea" style="width: 200px" />
+ <el-input
+ v-model="dialogForm.description"
+ :disabled="operation==='check'"
+ type="textarea"
+ style="width: 200px"
+ />
</el-form-item>
</el-form>
<div style="margin-bottom: 10px">
@@ -171,58 +179,77 @@
width="100"
fixed
/>
- <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-select
- v-if="row.isVisible===1"
- v-model="row.code"
- filterable
- :popper-append-to-body="false"
- 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="name"-->
- <!-- label="妫�楠屾爣鍑嗗悕绉�"-->
+ <!-- prop="code"-->
+ <!-- label="妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)"-->
<!-- >-->
<!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.isVisible===0">{{ row.name }}</div>-->
+ <!-- <div v-if="row.isVisible===0" style="display: flex;">-->
+ <!-- <div>{{ row.code }}</div>-->
+ <!-- <div style="margin-left: 10px">{{ row.name }}</div>-->
+ <!-- </div>-->
<!-- <el-select-->
<!-- v-if="row.isVisible===1"-->
- <!-- v-model="row.name"-->
+ <!-- v-model="row.code"-->
<!-- filterable-->
<!-- :popper-append-to-body="false"-->
- <!-- style="width: 200px;"-->
+ <!-- style="width: 400px;"-->
<!-- placeholder="璇烽�夋嫨"-->
- <!-- @change="val=>changeName(val,row)"-->
+ <!-- @change="val=>changeCode(val,row)"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in JYSelectArr"-->
<!-- :key="item.code"-->
- <!-- :label="item.name"-->
+ <!-- :label="item.code+''+item.name"-->
<!-- :value="item.code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
+ <el-table-column
+ prop="code"
+ label="妫�楠屾爣鍑嗙紪鐮�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.name"
+ :label="item.code"
+ :value="item.name"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="妫�楠屾爣鍑嗗悕绉�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.name"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
<el-table-column
prop="descr"
label="妫�楠屾弿杩版弿杩�"
@@ -235,6 +262,7 @@
<el-table-column
v-if="operation!=='check'"
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -326,7 +354,7 @@
},
JYTableData: [], // 瀵硅瘽妗嗘楠屼俊鎭〃鏍�
JYSelectArr: [], // 妫�楠岄」鐩笅鎷夋暟缁�
- JYSelectedArr: [] // 宸查�夋楠岄」鐩暟缁�
+ JYIsCancel: true
}
},
created() {
@@ -413,7 +441,6 @@
item.isVisible = 0
item.descr = item.stepcheckitem_desc
item.number = number
- this.JYSelectedArr.push(item.code)
})
this.$nextTick(() => {
this.$refs.JYTableData.doLayout()
@@ -443,7 +470,7 @@
this.dialogForm.enable = ''
this.dialogForm.description = ''
this.JYTableData = []
- this.JYSelectedArr = []
+ this.getStepCheckItemSelect()
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -498,15 +525,19 @@
this.JYSelectArr = res
},
// 妫�楠屾爣鍑嗙紪鐮佸�兼敼鍙�
- changeCode(val, row) {
- row.name = this.JYSelectArr.find(it => it.code === val).name
- row.descr = this.JYSelectArr.find(it => it.code === val).descr
- },
- // 妫�楠屾爣鍑嗗悕绉板�兼敼鍙�
- // changeName(val, row) {
- // row.code = this.JYSelectArr.find(it => it.code === val).code
+ // changeCode(val, row) {
+ // row.name = this.JYSelectArr.find(it => it.code === val).name
// row.descr = this.JYSelectArr.find(it => it.code === val).descr
// },
+ // 妫�楠屾爣鍑嗗悕绉板�兼敼鍙�
+ changeName(val, row) {
+ const res = this.JYSelectArr.find(item => {
+ return item.code === val || item.name === val
+ })
+ row.code = res.code
+ row.name = res.name
+ row.descr = res.descr
+ },
// 妫�楠屾柊澧�
JYadd() {
if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
@@ -517,46 +548,54 @@
number = number === 0 ? (10 + Math.random()) : number
const data = { code: '', name: '', descr: '', isVisible: 1, number }
this.JYTableData.push(data)
+ this.JYIsCancel = false
},
JYedit(row) {
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
+ this.JYIsCancel = false
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
})
this.JYTableData.forEach((item, index) => {
- if (item.code === row.code) {
- item.isVisible = 1
+ if (item.code === row.code && item.number === row.number) {
+ this.JYTableData.splice(index, 1, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr,
+ isVisible: 1,
+ number: row.number
+ })
}
})
},
JYdel(row) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
+ })
+
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)
- }
- })
},
JYsave(row) {
if (row.code === '') {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ return this.$message.info('妫�楠屾爣鍑嗙紪鐮佷笉鑳戒负绌猴紒')
}
- // if (row.name === '') {
- // return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
- // }
+ if (row.name === '') {
+ return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
+ }
- if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
- } else {
- this.JYSelectedArr.push(row.code)
- }
+ this.JYSelectArr.forEach((item, index) => {
+ if (item.code === row.code) {
+ this.JYSelectArr.splice(index, 1)
+ }
+ })
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
@@ -577,12 +616,15 @@
this.JYTableData.splice(index, 1)
}
})
-
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
- })
+ console.log(this.JYIsCancel)
+ if (this.JYIsCancel && row.code.toString().length > 0) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
+ })
+ }
+ this.JYIsCancel = true
}
}
}
@@ -591,21 +633,23 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.el-button--text{
+.el-button--text {
font-size: 14px;
cursor: pointer;
}
+
::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
}
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -666,8 +710,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -683,6 +727,7 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
new file mode 100644
index 0000000..f217996
--- /dev/null
+++ b/src/views/zlgl/gxjyjl.vue
@@ -0,0 +1,655 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup">
+ <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ <!-- <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>-->
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <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.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
+ <el-input v-model="form.partapec" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.standname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="妫�楠岀被鍨�" style=" display: flex;">
+ <el-select v-model="form.checktype" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in checktypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="妫�楠岀粨鏋�" style=" display: flex;">
+ <el-select v-model="form.checkresult " style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in checkresultArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+
+ </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>
+ </el-form>
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :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"-->
+ <!-- fixed-->
+ <!-- />-->
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ label="搴忓彿"
+ fixed
+ />
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栫爜"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partcode"
+ width="160"
+ label="浜у搧缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ width="160"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }} </div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="step_code"
+ label="宸ュ簭缂栫爜"
+ width="120"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭鍚嶇О"
+ width="120"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="checkstaned_code"
+ label="鏍囧噯缂栫爜"
+ width="120"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="checkstaned_name"
+ label="鏍囧噯鍚嶇О"
+ width="120"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="check_type"
+ label="妫�楠岀被鍨�"
+ sortable="custom"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.check_type==='FirstCheck'">棣栨</div>
+ <div v-if="row.check_type==='PatroCheck'">宸℃</div>
+ <div v-if="row.check_type==='EndCheck'">瀹屽伐妫�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="check_result"
+ label="妫�楠岀粨鏋�"
+ sortable="custom"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
+ <div v-if="row.check_result==='OK'"> <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="check_descr"
+ label="妫�楠屽娉�"
+ width="120"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.check_descr">{{ row.check_descr }} </div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="check_qty"
+ label="妫�楠屾暟閲�"
+ width="120"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_user"
+ label="妫�楠屼汉鍛�"
+ sortable="custom"
+ width="120"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="妫�楠屾椂闂�"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ fixed="right"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button type="text" @click="check(row)">鏌ョ湅</el-button>
+ <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getStepCheckTableSearch"
+ />
+ </div>
+
+ <el-dialog
+ title="宸ュ簭妫�楠屾槑缁�"
+ :visible.sync="dialogVisible"
+ width="900px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <div class="elTableDiv">
+ <el-table
+ :data="tableDataDialog"
+ :height="(tableHeight-100)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:(tableHeight-100)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- fixed-->
+ <!-- />-->
+ <el-table-column
+ type="index"
+ width="50"
+ label="搴忓彿"
+ fixed
+ />
+
+ <el-table-column
+ prop="checkitem_code"
+ label="妫�楠岄」鐩紪鍙�"
+ width="120"
+ />
+ <el-table-column
+ prop="checkitem_name"
+ label="妫�楠岄」鐩悕绉�"
+ />
+ <el-table-column
+ prop="checkitem_descr"
+ label="妫�楠岄」鐩弿杩�"
+ />
+ <el-table-column
+ prop="check_result"
+ label="妫�楠岀粨鏋�"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
+ <div v-if="row.check_result==='OK'"> <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_user"
+ label="妫�楠屼汉鍛�"
+ width="120"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="妫�楠屾椂闂�"
+ width="160"
+ />
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- fixed="right"-->
+ <!-- width="120"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-button type="text" @click="check(row)">鏌ョ湅</el-button>-->
+ <!-- <!– <el-button type="text" @click="del(row)">鍒犻櫎</el-button>–>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ </el-table>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <!-- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+ <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button @click="dialogVisibleBack">杩� 鍥�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import ImportPicker from '@/components/ImportPicker'
+import { StepCheckTableOutExcel, StepCheckTableSearch, StepCheckTableSubSearch } from '@/api/zlgl'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination, ImportPicker
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ const validateTypeCode = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨涓婄骇'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ wocode: '', // 宸ュ崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partapec: '', // 浜у搧瑙勬牸
+ stepname: '', // 宸ュ簭鍚嶇О
+ standname: '', // 鏍囧噯鍚嶇О
+ checktype: '', // 妫�楠岀被鍨�
+ checkresult: '', // 妫�楠岀被鍨�
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ checktypeArr: [
+ { code: 'FirstCheck', name: '棣栨' },
+ { code: 'PatroCheck', name: '宸℃' },
+ { code: 'EndCheck', name: '瀹屽伐妫�' }
+ ],
+ checkresultArr: [
+ { code: 'OK', name: '鍚堟牸' },
+ { code: 'NG', name: '涓嶈壇' }
+ ],
+
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ tableDataDialog: [],
+ title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
+ code: '4',
+ shows: false
+
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getStepCheckTableSearch()
+ }
+ }
+ },
+ created() {
+ this.getStepCheckTableSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getStepCheckTableSearch() {
+ const res = await StepCheckTableSearch(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.getStepCheckTableSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getStepCheckTableSearch()
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.wocode = '', // 宸ュ崟缂栧彿
+ this.form.partcode = '', // 浜у搧缂栫爜
+ this.form.partname = '', // 浜у搧鍚嶇О
+ this.form.partapec = '', // 浜у搧瑙勬牸
+ this.form.stepname = '', // 宸ュ簭鍚嶇О
+ this.form.standname = '', // 鏍囧噯鍚嶇О
+ this.form.checktype = '', // 妫�楠岀被鍨�
+ this.form.checkresult = '', // 妫�楠岀被鍨�
+ this.getStepCheckTableSearch()
+ },
+
+ async check(row) {
+ // this.operation = operation
+ console.log(row, 1)
+ const res = await StepCheckTableSubSearch({ id: row.id })
+ this.tableDataDialog = res.data
+ this.dialogVisible = true
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.OrgCode = row.org_code
+ this.dialogForm.OrgName = row.org_name
+ this.dialogForm.SupUnit = row.parent_id
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgid: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getStepCheckTableSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ 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.getStepCheckTableSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 240
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
+ async download() {
+ const { data: res } = await StepCheckTableOutExcel(this.form)
+ window.location.href = res
+ },
+ dialogVisibleBack() {
+ this.dialogVisible = false
+ }
+ }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+}
+//::v-deep .el-dialog__body {
+// padding: 20px 100px !important;
+//}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 719934d..8da1d50 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -2,7 +2,7 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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>
</div>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 86f1001..e681478 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -2,24 +2,27 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <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 type="primary" icon="el-icon-office-building" @click="office">鍗曚綅</el-button>-->
- <el-button
- icon="el-icon-refresh-right"
- @click="syncSeaveSearchUnit"
- >鍚屾璁￠噺鍗曚綅
- </el-button>
- <el-button
- icon="el-icon-refresh-right"
- @click="syncInventoryFileSelect"
- >鍚屾瀛樿揣妗ｆ
- </el-button>
- <el-button
- icon="el-icon-refresh-right"
- @click="syncStockTypeSelect"
- >鍚屾瀛樿揣绫诲瀷
- </el-button>
+ <div style="display: flex">
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchUnit"
+ >鍚屾璁￠噺鍗曚綅
+ </el-button>
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="syncInventoryFileSelect"
+ >鍚屾瀛樿揣妗ｆ
+ </el-button>
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="syncStockTypeSelect"
+ >鍚屾瀛樿揣绫诲瀷
+ </el-button>
+ </div>
<!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
--
Gitblit v1.9.3