From 63fce2b793451ee340b7a0f6e0d6ce6c2d470dd0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 21 七月 2022 17:10:22 +0800
Subject: [PATCH] 1.优化代码，2.完成工序缺陷页面3.模板下载功能
---
src/views/jcsz/zzjg.vue | 9 +
src/views/zzmx/chda.vue | 13 +-
src/views/scgl/scdd.vue | 11 +-
src/views/zlgl/gxjy.vue | 76 +++++++++++----
src/views/jcsz/wldw.vue | 21 ++-
src/views/scgl/gd.vue | 10 +-
src/views/zzmx/gylx.vue | 3
src/views/sbgl/sbqd.vue | 9 +
src/views/scgl/sckbg.vue | 20 +++-
src/views/template.vue | 1
src/views/zlgl/gxjyxm.vue | 4
.env.development | 5
src/views/jcsz/yhqd.vue | 40 ++++++-
src/views/zzmx/jpgj.vue | 15 ++
src/views/zlgl/qxdy.vue | 2
src/views/jcsz/jsqd.vue | 9 +
src/components/ImportPicker/index.vue | 18 +++
src/views/wlgl/ckdy.vue | 3
.env.production | 3
src/views/zzmx/gxdy.vue | 22 +++
src/views/wlgl/kwdy.vue | 3
src/views/zlgl/gxjybz.vue | 1
22 files changed, 218 insertions(+), 80 deletions(-)
diff --git a/.env.development b/.env.development
index 2c7f004..26aba89 100644
--- a/.env.development
+++ b/.env.development
@@ -3,5 +3,8 @@
# base api
VUE_APP_BASE_API = '/api/'
-#VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+
+
+# 鏂囦欢涓嬭浇鍦板潃 涓嬭浇鏁版嵁妯℃澘鍦板潃
+VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'
diff --git a/.env.production b/.env.production
index 6dfae28..faf0b1b 100644
--- a/.env.production
+++ b/.env.production
@@ -4,3 +4,6 @@
# base api
VUE_APP_BASE_API = '/apis/'
+
+# 鏂囦欢涓嬭浇鍦板潃 涓嬭浇鏁版嵁妯℃澘鍦板潃
+VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'
diff --git a/src/components/ImportPicker/index.vue b/src/components/ImportPicker/index.vue
index 1b42c4b..c85c1b3 100644
--- a/src/components/ImportPicker/index.vue
+++ b/src/components/ImportPicker/index.vue
@@ -112,7 +112,7 @@
<p>瀵煎叆澶辫触锛屽け璐ョ殑鍘熷洜鏄瘂{ error_message }}锛�</p>
</div>
</div>
- <span slot="footer" class="dialog-footer">
+ <span slot="footer" class="dialog-footer" style="display: flex;">
<el-button v-if="button_text !="瀹屾垚"" @click="colos()">鍙� 娑�</el-button>
<el-button
type="primary"
@@ -259,7 +259,15 @@
// }
// })
ExcelModelCheck(data).then(res => {
-
+ this.div2_state = res.StuCode
+ setTimeout(() => {
+ this.cg4 = true
+ }, 2000)
+ this.error_list = res.list
+ this.total_num = res.Count
+ if (res.StuCode === '200') {
+ this.disState = false
+ }
})
},
beforeUpload(file) {
@@ -342,7 +350,11 @@
// window.location.href = res
// })
DownLoadExcel(data).then(res => {
- window.location.href = res
+ console.log(res.data)
+ console.log(process.env.VUE_APP_BASE_API)
+ console.log(process.env.VUE_APP_BASE_API_FILE)
+ console.log(window.location.origin + res.data)
+ window.location.href = process.env.VUE_APP_BASE_API_FILE + res.data
})
}
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 743c65e..ecc2490 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -54,7 +54,6 @@
<el-table
:data="tableData"
border
-
stripe
:height="tableHeight+'px'"
:style="{width: 100+'%',height:tableHeight+'px'}"
@@ -72,24 +71,29 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="role_code"
label="瑙掕壊缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="role_name"
label="瑙掕壊鍚嶇О"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="roletype_name"
label="瑙掕壊绫诲瀷"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="description"
+ min-width="160"
label="瑙掕壊鎻忚堪"
sortable="custom"
/>
@@ -97,10 +101,12 @@
prop="lm_user"
label="鍒涘缓浜哄憳"
sortable="custom"
+ width="110"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ min-width="160"
sortable="custom"
/>
<el-table-column
@@ -127,6 +133,7 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index b663498..7ac3a5e 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -67,28 +67,30 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
prop="code"
label="鍗曚綅缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="name"
label="鍗曚綅鍚嶇О"
sortable="custom"
- min-width="200px"
+ min-width="160px"
/>
<el-table-column
label="鍗曚綅灞炴��"
- width="150"
+ width="240"
>
<!-- sortable="custom"-->
<el-table-column
prop="mtype"
- width="120"
+ width="80"
>
<template slot-scope="{row}">
<div v-if="row.mtype==='WG'">澶栬喘渚涙柟</div>
@@ -97,7 +99,7 @@
</el-table-column>
<el-table-column
prop="btype"
- width="120"
+ width="80"
>
<template slot-scope="{row}">
<div v-if="row.btype==='WX'">澶栧崗渚涙柟</div>
@@ -106,7 +108,7 @@
</el-table-column>
<el-table-column
prop="htype"
- width="120"
+ width="80"
>
<template slot-scope="{row}">
<div v-if="row.htype==='KH'">瀹㈡埛</div>
@@ -117,31 +119,36 @@
<el-table-column
prop="conttacts"
label="鑱旂郴浜�"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="conttphone"
label="鑱旂郴鏂瑰紡"
+ width="160"
sortable="custom"
/>
<el-table-column
prop="addr"
+ min-width="160"
label="琛ュ厖鎻忚堪"
sortable="custom"
/>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
- width="200"
+ width="160"
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -213,7 +220,7 @@
import {
AddUpdateCurrentUnit, CurrentUnitSearch, DeleteCurrentUnit
} from '@/api/jcsz'
-import { SeaveSearchPartner, SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'
+import { SeaveSearchPartner } from '@/api/ErpSyncMes'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index bd26d4d..ee8c740 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -71,7 +71,7 @@
<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-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
<el-divider />
<div class="elTableDiv">
@@ -94,36 +94,43 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="usercode"
label="鐢ㄦ埛缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="username"
label="鐢ㄦ埛鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="password"
label="鐢ㄦ埛瀵嗙爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="org_name"
label="鎵�灞炵粍缁�"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="wagetype"
label="宸ヨ祫绫诲瀷"
sortable="custom"
+ width="110"
>
<template slot-scope="{row}">
<div v-if="row.wagetype==='1'">璁℃椂鍒�</div>
@@ -133,6 +140,7 @@
<el-table-column
prop="mobile"
label="鑱旂郴鏂瑰紡"
+ min-width="110"
sortable="custom"
>
<template slot-scope="{row}">
@@ -144,6 +152,7 @@
prop="email"
label="鐢靛瓙閭"
sortable="custom"
+ min-width="110"
>
<template slot-scope="{row}">
<div v-if="row.email===''">/</div>
@@ -151,8 +160,9 @@
</template>
</el-table-column>
<el-table-column
- prop=""
+ prop="enable"
label="鍦ㄨ亴鐘舵��"
+ width="110"
sortable="custom"
>
<template slot-scope="{row}">
@@ -163,17 +173,19 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
- width="200"
+ width="160"
sortable="custom"
/>
<el-table-column
prop="is_role"
label="鍏宠仈瑙掕壊"
+ width="110"
>
<template slot-scope="{row}">
<i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
@@ -182,6 +194,7 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -461,16 +474,20 @@
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
+import ImportPicker from '@/components/ImportPicker'
+
import {
AddUpdateUser,
DeleteUser,
- RoleTypeAdd,
- RoleTypeDelete,
SaveUserAssoctRole,
UserAssociationRole,
UserGroupAdd,
@@ -488,7 +505,7 @@
export default {
name: 'YYQD',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
const validateName = (rule, value, callback) => {
@@ -635,7 +652,10 @@
page: 1,
prop: 'group_code',
order: 'desc'
- }
+ },
+ title_value: '鏁版嵁瀵煎叆 / 鐢ㄦ埛娓呭崟',
+ code: '1',
+ shows: false
}
},
created() {
@@ -665,7 +685,11 @@
},
// 瀵煎叆鎸夐挳
upload() {
-
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index c2c86f4..c222506 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -62,20 +62,24 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="org_code"
label="缁勭粐缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="org_name"
label="缁勭粐鍚嶇О"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="description"
label="缁勭粐绫诲瀷"
+ width="110"
sortable="custom"
>
<template slot-scope="{row}">
@@ -90,6 +94,7 @@
prop="parentorg_name"
label="涓婄骇鍗曚綅"
sortable="custom"
+ min-widt="110"
>
<template slot-scope="{row}">
<div v-if="row.parentorg_name===null">/</div>
@@ -99,14 +104,17 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
+ fixed="right"
label="鎿嶄綔"
>
<template slot-scope="{row}">
@@ -192,7 +200,6 @@
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
-import { getNewEncodingRules } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index f4f4875..c1cff22 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -120,25 +120,30 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
label="璁惧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="name"
label="璁惧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="eqptype_name"
label="璁惧绫诲瀷"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="eqpgroup_name"
label="璁惧缁�"
+ min-width="110"
sortable="custom"
/>
<el-table-column
@@ -166,6 +171,7 @@
prop="wksp_name"
label="鐢熶骇杞﹂棿"
sortable="custom"
+ min-width="120"
/>
<!-- <el-table-column-->
<!-- prop="Line_name"-->
@@ -190,11 +196,13 @@
/>
<el-table-column
prop="lm_date"
+ width="160"
label="鍒涘缓鏃堕棿"
sortable="custom"
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
width="100"
>
<template slot-scope="{row}">
@@ -547,7 +555,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { getCookie } from '@/utils/auth'
import {
AddUpdateDeviceGroup, AddUpdateDeviceManger,
AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index fcb9cb6..261f83d 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -132,6 +132,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="status"
@@ -152,14 +153,13 @@
prop="wo_code"
label="宸ュ崟缂栧彿"
sortable="custom"
-
- width="160"
+ min-width="160"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
- width="120"
+ min-width="120"
/>
<el-table-column
prop="partname"
@@ -189,7 +189,7 @@
prop="route_name"
label="宸ヨ壓璺嚎"
sortable="custom"
- width="130"
+ min-width="130"
/>
<el-table-column
@@ -564,7 +564,7 @@
import { handleDatetime } from '@/utils/global'
import { getCookie } from '@/utils/auth'
import { MesOrderPrintSearch1 } from '@/api/utils'
-import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
+import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index f68e8db..f04d867 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -164,6 +164,7 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -183,25 +184,25 @@
prop="wo"
label="璁㈠崟缂栧彿"
sortable="custom"
- width="150"
+ min-width="150"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
- width="150"
+ min-width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
- width="150"
+ min-width="150"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
sortable="custom"
- width="110"
+ min-width="110"
/>
<el-table-column
prop="qty"
@@ -365,7 +366,7 @@
<script>
import Pagination from '@/components/Pagination'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
-import { handleDatatime, handleDatetime } from '@/utils/global'
+import { handleDatetime } from '@/utils/global'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index ce1b3ed..5984778 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -56,6 +56,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="status"
@@ -73,32 +74,37 @@
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="partname"
+ min-width="110"
label="浜у搧鍚嶇О"
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭"
+ min-width="80"
sortable="custom"
/>
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
- width="150"
+ min-width="150"
sortable="custom"
/>
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="110"
sortable="custom"
/>
<el-table-column
@@ -212,6 +218,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="status"
@@ -229,32 +236,37 @@
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭"
+ min-width="80"
sortable="custom"
/>
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
- width="150"
+ min-width="150"
sortable="custom"
/>
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="110"
sortable="custom"
/>
<el-table-column
@@ -267,7 +279,6 @@
prop="ng_qty"
label="涓嶈壇鏁伴噺"
width="150"
-
sortable="custom"
/>
<el-table-column
@@ -665,8 +676,7 @@
SavaMesOrderStepStart,
SavaMesOrderStepReport
} from '@/api/scgl'
-import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
-import { UserGroupDelete } from '@/api/jcsz'
+import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/template.vue b/src/views/template.vue
index 18c02c9..8338413 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -99,6 +99,7 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 1663744..beabeaa 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -86,6 +86,7 @@
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
+ width="160"
/>
<el-table-column
label="鎿嶄綔"
@@ -145,7 +146,7 @@
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateWareHouseDef, DeleteWareHouseDef, WareHouseDefSearch } from '@/api/wlgl'
-import { SeaveSearchInventoryClass, SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'
+import { SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 5611c7b..0a794c7 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -101,6 +101,7 @@
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
+ width="160"
/>
<el-table-column
label="鎿嶄綔"
@@ -176,7 +177,7 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateStorageDef, DeleteStorageDef, StorageDefSearch, WareHouseDefSearch, WareHouseSelect } from '@/api/wlgl'
+import { AddUpdateStorageDef, DeleteStorageDef, StorageDefSearch, WareHouseSelect } from '@/api/wlgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 09ff2c6..bcab59c 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -98,7 +98,9 @@
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"
@@ -141,9 +143,17 @@
prop="stepcheckitem_desc"
label="妫�楠屾爣鍑嗘弿杩�"
>
- <template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.stepcheckitem_desc" placeholder="璇疯緭鍏�" />
- <div v-else> {{ row.stepcheckitem_desc }}</div>
+ <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>
@@ -242,7 +252,6 @@
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
import $ from 'jquery'
import {
- DeleteStepCheckStaned,
MesOrderStepCheckItemList,
MesOrderStepCheckSearch,
MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
@@ -283,7 +292,9 @@
JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
- multipleSelection: []// 琛ㄦ牸澶氶�夋
+ multipleSelection: [], // 琛ㄦ牸澶氶�夋
+ tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
+ tabClickLabel: '' // 褰撳墠鐐瑰嚮鐨勫垪鍚�
}
},
created() {
@@ -330,12 +341,13 @@
number = number === 0 ? (10 + Math.random()) : number
// item.result = 0 // 0鍚堟牸 1涓嶈壇
- item.result = 'NG'
+ item.result = 'OK'
item.isVisible = 0
item.number = number
this.JYSelectedArr.push(item.code)
})
+ this.$refs.multipleTable.toggleAllSelection()
},
// changeRadioValue(val, row) {
// console.log(val, row.result, 20000)
@@ -354,14 +366,11 @@
it.result = 'NG'
}
})
- if (this.multipleSelection.length > 0) {
- if (this.multipleSelection.length === this.JYTableData.length) {
- this.checkResult = 'OK'
- } else {
- this.checkResult = 'NG'
- }
+
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
} else {
- this.checkResult = ''
+ this.checkResult = 'NG'
}
},
// 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
@@ -390,8 +399,9 @@
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- const data = { result: 'NG', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
+ const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
this.JYTableData.push(data)
+ this.$refs.multipleTable.toggleRowSelection(data, true)
},
// 纭
@@ -415,14 +425,10 @@
}
})
- if (this.multipleSelection.length > 0) {
- if (this.multipleSelection.length === this.JYTableData.length) {
- this.checkResult = 'OK'
- } else {
- this.checkResult = 'NG'
- }
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
} else {
- this.checkResult = ''
+ this.checkResult = 'NG'
}
},
// 鍙栨秷
@@ -439,6 +445,7 @@
}
})
},
+
// 鍒犻櫎
del(row) {
this.JYTableData.forEach((item, index) => {
@@ -530,6 +537,33 @@
this.form.stepcode = ''
this.form.stepname = ''
},
+
+ // 鍗曞厓鏍艰鐐瑰嚮鏃�
+ 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() {
this.$nextTick(() => {
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index c20637e..e061160 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -246,7 +246,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { DeleteOrganization } from '@/api/jcsz'
import {
AddUpdateStepCheckStaned, DeleteStepCheckStaned,
EditStepCheckStanedSearch,
diff --git a/src/views/zlgl/gxjyxm.vue b/src/views/zlgl/gxjyxm.vue
index 7dd00fc..798e448 100644
--- a/src/views/zlgl/gxjyxm.vue
+++ b/src/views/zlgl/gxjyxm.vue
@@ -135,9 +135,7 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { AddUpdateStepCheckItem, DedectSearch, DeleteStepCheckItem, StepCheckItemSearch } from '@/api/zlgl'
+import { AddUpdateStepCheckItem, DeleteStepCheckItem, StepCheckItemSearch } from '@/api/zlgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 790ef95..0f6a717 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -136,8 +136,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import { AddUpdateDedect, DedectSearch, DeleteDedect } from '@/api/zlgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 92c73c2..b8fe8a1 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -122,14 +122,17 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="partcode"
label="鐗╂枡缂栫爜"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partname"
+ min-width="160"
label="鐗╂枡鍚嶇О"
sortable="custom"
/>
@@ -149,6 +152,7 @@
prop="stocktypename"
label="瀛樿揣绫诲瀷"
sortable="custom"
+ min-width="110"
/>
<!-- <el-table-column-->
<!-- prop="materialtypename"-->
@@ -159,6 +163,7 @@
prop="stck_name"
label="浠撳簱鍚嶇О"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="maxqty"
@@ -198,6 +203,7 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -560,11 +566,6 @@
<script>
import Pagination from '@/components/Pagination'
-import {
- AddUpdateOrganization,
- DeleteOrganization
-} from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import { WareHouseSelect } from '@/api/wlgl'
import {
AddUpdateInventoryFile, DeleteInventoryFile, InventoryFileAssociationRoute,
@@ -576,7 +577,7 @@
UomSearch, UomSelect
} from '@/api/zzmx'
import $ from 'jquery'
-import { SeaveSearchErpOrder, SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'
+import { SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index ed86682..fc5e496 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -17,7 +17,13 @@
<el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍚敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.enable" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.enable"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in enableArr"
:key="item.code"
@@ -78,19 +84,23 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
+ min-width="150"
sortable="custom"
/>
<el-table-column
prop="stepname"
+ min-width="150"
label="宸ュ簭鍚嶇О"
sortable="custom"
/>
<el-table-column
prop="flwtype"
+ min-width="150"
label="宸ュ簭绫诲瀷"
sortable="custom"
>
@@ -103,12 +113,14 @@
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
+ min-width="180"
sortable="custom"
/>
<el-table-column
prop="enable"
label="鍚敤鐘舵��"
sortable="custom"
+ width="110"
>
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">鏄�</div>
@@ -118,6 +130,7 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
sortable="custom"
/>
<el-table-column
@@ -129,6 +142,7 @@
<el-table-column
label="鍏宠仈宸ヤ綔绔�"
prop="is_eqp"
+ width="110"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -140,6 +154,7 @@
<el-table-column
label="鍏宠仈缂洪櫡"
prop="is_defect"
+ width="110"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -150,6 +165,7 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -363,8 +379,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import {
AddUpdateStep,
DeleteStep, SaveStepAssociationDefect,
@@ -914,7 +928,7 @@
this.defectDialogVisible = false
},
// 纭
- async defectDialogVisibleConfirm() {
+ async defectDialogVisibleConfirm() {
const nodeKey = this.$refs.defectTree.getCheckedKeys()
const data = []
this.defectTree[0].children.forEach(item => {
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 6add50d..30c979c 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -90,6 +90,7 @@
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
+ width="160"
/>
<el-table-column
label="鎿嶄綔"
@@ -258,7 +259,7 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateRoute, DeleteRoute, RouteSearch, RouteSelect, StepSelect, ViewRoute } from '@/api/zzmx'
+import { AddUpdateRoute, DeleteRoute, RouteSearch, StepSelect, ViewRoute } from '@/api/zzmx'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index e685e1c..b12b1f8 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -114,41 +114,48 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="partcode"
+ min-width="160"
label="浜у搧缂栫爜"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
- width="110"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="wksp_name"
label="鐢熶骇杞﹂棿"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="route_name"
label="宸ヨ壓璺嚎"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="stepname"
label="鍔犲伐宸ュ簭"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="eqp_name"
label="鍔犲伐璁惧"
+ min-width="110"
sortable="custom"
/>
<el-table-column
@@ -178,6 +185,7 @@
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -308,16 +316,19 @@
prop="eqpcode"
label="璁惧缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="eqpname"
label="璁惧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="wksp_name"
sortable="custom"
label="鐢熶骇杞﹂棿"
+ min-width="110"
/>
<el-table-column
sortable="custom"
@@ -423,8 +434,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import {
BeatRateSearch, DeleteBeatRate,
PartSelect,
--
Gitblit v1.9.3