From bd54d5d5f292fe398599199b8ca2658b2549777d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 21 七月 2022 11:07:49 +0800
Subject: [PATCH] 1.工序检验开发完成
---
/dev/null | 25 ---
src/permission.js | 2
src/views/zlgl/gxjy.vue | 230 +++++++++++++++++++++-----------
src/views/zlgl/wljy.vue | 38 -----
src/views/kb/index.vue | 42 ++++++
src/components/ImportPicker/index.vue | 59 ++++---
src/layout/components/Sidebar/index.vue | 2
src/router/index.js | 5
8 files changed, 230 insertions(+), 173 deletions(-)
diff --git a/src/api/all.js b/src/api/all.js
deleted file mode 100644
index da1845a..0000000
--- a/src/api/all.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function DownLoadExcel(params) {
- return request({
- url: 'ImportExcel/DownLoadExcel',
- method: 'GET',
- params: params
- })
-}
-
-export function ExcelCheckData(params) {
- return request({
- url: 'ImportExcel/ExcelCheckData',
- method: 'POST',
- data: params
- })
-}
-
-export function ExcelImportSubmit(params) {
- return request({
- url: 'ImportExcel/ExcelImportSubmit',
- method: 'POST',
- data: params
- })
-}
diff --git a/src/components/ImportPicker/index.vue b/src/components/ImportPicker/index.vue
index d4f3bb9..1b42c4b 100644
--- a/src/components/ImportPicker/index.vue
+++ b/src/components/ImportPicker/index.vue
@@ -47,7 +47,7 @@
<el-button class="but_style" icon="el-icon-upload2" size="small">{{ button_name }}</el-button>
</el-upload>
璇风偣鍑�
- <el-button type="text" icon="el-icon-download" @click="clickDown(code)">涓嬭浇鏁版嵁妯＄増</el-button>
+ <el-button type="text" style="font-size: 14px;cursor: pointer" icon="el-icon-download" @click="clickDown(code)">涓嬭浇鏁版嵁妯＄増</el-button>
, 骞舵寜鐓фā鐗堢紪杈戝鍏ユ暟鎹�
</div>
<p v-if="div1">{{ file_name }}</p>
@@ -124,7 +124,8 @@
</el-dialog>
</template>
<script>
-import all from '@/api/all'
+
+import { DownLoadExcel, ExcelModelCheck } from '@/api/Excel'
export default {
props: {
@@ -231,31 +232,34 @@
}
},
ExcelImportSubmit(data) {
- all.ExcelImportSubmit(data).then((res) => {
- if (res.statusCode === '200') {
- this.div3 = true
- this.num += 2
- this.button_text = '瀹屾垚'
- this.disState = false
- } else {
- this.num += 1
- this.div3_sb = true
- this.disState = true
- this.error_message = res.message
- }
- })
+ // all.ExcelImportSubmit(data).then((res) => {
+ // if (res.statusCode === '200') {
+ // this.div3 = true
+ // this.num += 2
+ // this.button_text = '瀹屾垚'
+ // this.disState = false
+ // } else {
+ // this.num += 1
+ // this.div3_sb = true
+ // this.disState = true
+ // this.error_message = res.message
+ // }
+ // })
},
ExcelCheckData(data) {
- all.ExcelCheckData(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
- }
+ // all.ExcelCheckData(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
+ // }
+ // })
+ ExcelModelCheck(data).then(res => {
+
})
},
beforeUpload(file) {
@@ -334,7 +338,10 @@
const data = {
FileCode: code
}
- all.DownLoadExcel(data).then((res) => {
+ // all.DownLoadExcel(data).then((res) => {
+ // window.location.href = res
+ // })
+ DownLoadExcel(data).then(res => {
window.location.href = res
})
}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 7f829fe..c6baec2 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -26,7 +26,7 @@
</el-scrollbar>
<div style="position: absolute;bottom: 20px;left: 30px;">
<div>
- <el-button type="text">鏂板嚡杩埗閫燰1.0.01</el-button>
+ <el-button type="text" style="font-size: 14px;cursor: pointer">鏂板嚡杩埗閫燰1.0.01</el-button>
<!-- <el-button type="text"><a href="http://www.ykxkd.com/" target="_blank">鏂板嚡杩埗閫燰1.0.01</a></el-button>-->
</div>
</div>
diff --git a/src/permission.js b/src/permission.js
index eec90e4..c74144e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
NProgress.configure({ showSpinner: false }) // NProgress Configuration
-const whiteList = ['/login'] // no redirect whitelist
+const whiteList = ['/login', '/kb'] // no redirect whitelist
router.beforeEach(async(to, from, next) => {
// start progress bar
diff --git a/src/router/index.js b/src/router/index.js
index c761e9e..4b3d3c3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,6 +32,11 @@
*/
export const commonRoutes = [
{
+ path: '/kb',
+ component: () => import('@/views/kb/index'),
+ hidden: true
+ },
+ {
path: '/login',
component: () => import('@/views/login/index'),
hidden: true
diff --git a/src/views/kb/index.vue b/src/views/kb/index.vue
new file mode 100644
index 0000000..b6835c0
--- /dev/null
+++ b/src/views/kb/index.vue
@@ -0,0 +1,42 @@
+<template>
+ <div>
+ <div style="margin: 100px;">
+ <el-button type="primary" @click="click">璇风偣鍑绘垜</el-button>
+ <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+ </div>
+ </div>
+</template>
+
+<script>
+import ImportPicker from '@/components/ImportPicker'
+
+export default {
+ name: 'Wljy',
+ components: {
+ ImportPicker
+ },
+ data() {
+ return {
+ title_value: '鏁版嵁瀵煎叆 / 鐢ㄦ埛瑙掕壊',
+ code: '2',
+ shows: false
+ }
+ },
+ mounted() {
+
+ },
+ methods: {
+ click() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index d208458..2249042 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -89,7 +89,7 @@
</div>
<div style="margin-top: 10px">
<el-table
- ref="tableDataRef"
+ ref="multipleTable"
:data="JYTableData"
:height="(tableHeight-195)+'px'"
border
@@ -98,6 +98,7 @@
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ @selection-change="handleSelectionChange"
>
<el-table-column
type="index"
@@ -111,7 +112,7 @@
<!-- />-->
<el-table-column
prop="code"
- label="妫�楠岄」鐩悕绉�(鍚嶇О)"
+ label="妫�楠岄」鐩紪鐮�(鍚嶇О)"
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0" style="display: flex;">
@@ -147,20 +148,42 @@
</el-table-column>
<el-table-column
- prop="reslut"
+ prop="result"
label="妫�楠岀粨鏋�"
+ width="100"
>
<template slot-scope="{row}">
- <el-radio-group v-model="row.reslut" size="small" @change="a=>changeRadioValue(a,row)">
- <el-radio-button style="box-shadow: none" :label="0" @click.native.prevent="clickRadio(0,row)">
- 鍚堟牸
- </el-radio-button>
- <el-radio-button style="box-shadow: none" :label="1" @click.native.prevent="clickRadio(1,row)">
- 涓嶈壇
- </el-radio-button>
- </el-radio-group>
+ <div v-if="row.result==='OK'">鍚堟牸</div>
+ <div v-if="row.result==='NG'">涓嶈壇</div>
</template>
+
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-radio-group-->
+ <!-- v-model="row.result"-->
+ <!-- size="small"-->
+ <!-- @change="a=>changeRadioValue(a,row)"-->
+ <!-- >-->
+ <!-- <el-radio-->
+ <!-- :label="0"-->
+ <!-- @change="clickRadio(0,row)"-->
+ <!-- >-->
+ <!-- 鍚堟牸-->
+ <!-- </el-radio>-->
+ <!-- <el-radio-->
+ <!-- :label="1"-->
+ <!-- @change="clickRadio(1,row)"-->
+ <!-- >-->
+ <!-- 涓嶈壇-->
+ <!-- </el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </template>-->
+
</el-table-column>
+
+ <el-table-column
+ type="selection"
+ width="55"
+ />
<el-table-column
label="鎿嶄綔"
@@ -202,10 +225,10 @@
</div>
<div style="display: flex;margin: 30px 0;align-items: center">
- <el-button type="primary">棣栨淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">宸℃淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">瀹屽伐妫�淇濆瓨</el-button>
- <el-button type="info" style="margin-left: 50px">鍙栨秷</el-button>
+ <el-button type="primary" @click="submitButton('FirstCheck')">棣栨淇濆瓨</el-button>
+ <el-button type="primary" style="margin-left: 50px" @click="submitButton('PatroCheck')">宸℃淇濆瓨</el-button>
+ <el-button type="primary" style="margin-left: 50px" @click="submitButton('EndCheck')">瀹屽伐妫�淇濆瓨</el-button>
+ <el-button type="info" style="margin-left: 50px" @click="submitButton('Cancel')">鍙栨秷</el-button>
</div>
</div>
</div>
@@ -219,9 +242,10 @@
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
import $ from 'jquery'
import {
+ DeleteStepCheckStaned,
MesOrderStepCheckItemList,
MesOrderStepCheckSearch,
- MesOrderStepCheckSelect,
+ MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
StepCheckItemSelect
} from '@/api/zlgl'
import { MesOrderSelectUser } from '@/api/scgl'
@@ -236,7 +260,8 @@
mainHeight: 0,
tableHeight: 0,
form: { // 宸ュ簭
- orderstepqrcode: 'MO-2022-07-0001_1;001', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ // MO-2022-07-0001_1;001
+ orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
wo_code: '', // 宸ュ崟缂栫爜
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -257,10 +282,8 @@
JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
- JYSelectedArr: [] // 宸查�夋楠岄」鐩暟缁�
- // checkresultArr:[
- // {''}
- // ]
+ JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
+ multipleSelection: []// 琛ㄦ牸澶氶�夋
}
},
created() {
@@ -306,63 +329,42 @@
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- item.reslut = 0 // 0鍚堟牸 1涓嶈壇
+ // item.result = 0 // 0鍚堟牸 1涓嶈壇
+ item.result = 'NG'
item.isVisible = 0
item.number = number
this.JYSelectedArr.push(item.code)
})
},
- changeRadioValue(val, row) {
- console.log(val, row)
- },
- clickRadio(e, row) {
- console.log(e, row, 1)
- row.reslut = row.reslut === 0 ? 1 : 0
- // this.JYTableData.forEach(item => {
- // if (row.code === item.code) {
- // item.reslut = row.reslut === 0 ? 1 : 0
- // }
- // })
- // e === row.reslut ? row.reslut = null : row.reslut = e
- // this.$nextTick(() => {
- // row.reslut = row.reslut === 0 ? 1 : 0
- // })
- //
- // this.$forceUpdate()
-
- // this.$refs.tableDataRef.toggleRowSelection(row, false)
- },
-
- reslutChange(val, row) {
-
- },
- xxxx(val) {
- console.log(val)
- },
- changeSelect(val, row) {
- console.log(val, row)
- },
- changSwitch(val, row) {
- console.log(val)
- // row.result = val
- // this.JYTableData.forEach(item => {
- // if (row.code === item.code) {
- // item.reslut = val === 'NG' ? 'OK' : 'NG'
- // }
- // })
-
- // row.reslut = !row.reslut
- // this.handleValue(row)
- },
- handleValue(row) {
- this.JYTableData.forEach(item => {
- if (item.code === row.code) {
- item.reslut = item.reslut === 'OK' ? 'NG' : 'OK'
+ // changeRadioValue(val, row) {
+ // console.log(val, row.result, 20000)
+ // },
+ // clickRadio(e, row) {
+ // console.log(e, row.result, 10000)
+ // row.result = e
+ // },
+ handleSelectionChange(val) {
+ this.multipleSelection = val
+ const arr = this.multipleSelection.map(i => i.number)
+ this.JYTableData.forEach(it => {
+ if (arr.includes(it.number)) {
+ it.result = 'OK'
+ } else {
+ it.result = 'NG'
}
})
+ if (this.multipleSelection.length > 0) {
+ if (this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
+ } else {
+ this.checkResult = 'NG'
+ }
+ } else {
+ this.checkResult = ''
+ }
},
- //
+ // 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
changeCode(val, row) {
row.stepcheckitem_desc = this.JYSelectArr.find(it => it.code === val).descr
row.name = this.JYSelectArr.find(it => it.code === val).name
@@ -388,37 +390,40 @@
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- const data = { code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
+ const data = { result: 'NG', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
this.JYTableData.push(data)
},
// 纭
confirm(row) {
if (row.code === '') {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
}
if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
+ return this.$message.info('妫�楠岄」鐩紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
} else {
this.JYSelectedArr.push(row.code)
}
-
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
item.isVisible = 0
- this.JYTableData.splice(index, 1, {
- number: row.number,
- code: row.code,
- name: row.name,
- isVisible: 0,
- reslut: row.reslut,
- stepcheckitem_desc: row.stepcheckitem_desc
- })
+ item.code = row.code
+ item.name = row.name
+ item.result = row.result
+ item.stepcheckitem_desc = row.stepcheckitem_desc
}
})
- console.log(this.JYTableData)
+ if (this.multipleSelection.length > 0) {
+ if (this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
+ } else {
+ this.checkResult = 'NG'
+ }
+ } else {
+ this.checkResult = ''
+ }
},
// 鍙栨秷
cancel(row) {
@@ -448,6 +453,67 @@
}
})
},
+ // 鎻愪氦
+ submitButton(val) {
+ console.log(val)
+ if (val !== 'Cancel') {
+ const text = val === 'FirstCheck' ? '棣栨淇濆瓨' : (val === 'PatroCheck' ? '宸℃淇濆瓨' : '瀹屽伐妫�淇濆瓨')
+ this.$confirm('鏄惁纭' + text + '?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const arr = []
+ this.JYTableData.forEach((item, index) => {
+ arr.push({
+ code: item.code,
+ name: item.name,
+ seq: (index + 1),
+ descr: item.stepcheckitem_desc,
+ checkresult: item.result
+ })
+ })
+ const data = {
+ 'mesordercode': this.form.wo_code, // 宸ュ崟缂栧彿
+ 'partcode': this.form.partcode, // 浜у搧缂栫爜
+ 'stepcode': this.form.stepcode, // 宸ュ簭缂栫爜
+ 'checkstanedcode': this.checkStandard, // 妫�楠屾爣鍑嗙紪鐮�
+ 'checkusercode': this.checkUser, // 妫�楠屼汉鍛樼紪鐮�
+ 'checktypecode': val, // 妫�楠岀被鍨嬬紪鐮�
+ 'checkresult': this.checkResult, // 妫�楠岀粨鏋�(OK(鍚堟牸) NG(涓嶈壇))
+ 'checkdescr': this.checkdescr, // 妫�楠屾弿杩�
+ 'data': arr
+ }
+ const res = SaveMesOrderStepCheckItem(data)
+ if (res.code === '200') {
+ this.$message.success(text + '鎴愬姛锛�')
+ this.clearContent()
+ this.getFocus()
+ }
+ }).catch(() => {
+ this.$message.info('宸插彇娑堜繚瀛�')
+ })
+ } else {
+ this.clearContent()
+ this.getFocus()
+ }
+ },
+ // 娓呯┖椤甸潰鍐呭
+ clearContent() {
+ this.JYTableData = []
+ this.multipleSelection = []
+ this.checkdescr = ''
+ this.checkUser = ''
+ this.checkResult = ''
+ this.checkStandard = ''
+ this.form.orderstepqrcode = ''
+ this.form.wo_code = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.stepcode = ''
+ this.form.stepname = ''
+ },
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
diff --git a/src/views/zlgl/wljy.vue b/src/views/zlgl/wljy.vue
index 21dc8c2..e69de29 100644
--- a/src/views/zlgl/wljy.vue
+++ b/src/views/zlgl/wljy.vue
@@ -1,38 +0,0 @@
-<!--<template>-->
-<!-- <div>-->
-<!-- <div style="margin: 100px;">-->
-<!-- <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />-->
-<!-- </div>-->
-<!-- </div>-->
-<!--</template>-->
-
-<!--<script>-->
-<!--import ImportPicker from '@/components/ImportPicker'-->
-
-<!--export default {-->
-<!-- name: 'Wljy',-->
-<!-- components: {-->
-<!-- ImportPicker-->
-<!-- },-->
-<!-- data() {-->
-<!-- return {-->
-<!-- title_value: '鏁版嵁瀵煎叆 / 鐢ㄦ埛瑙掕壊',-->
-<!-- code: '2',-->
-<!-- shows: false-->
-<!-- }-->
-<!-- },-->
-<!-- mounted() {-->
-<!-- this.shows = true-->
-<!-- this.$refs.importPickerFunc.newDataFunc()-->
-<!-- },-->
-<!-- methods: {-->
-<!-- colos() {-->
-<!-- this.shows = false-->
-<!-- }-->
-<!-- }-->
-<!--}-->
-<!--</script>-->
-
-<!--<style scoped>-->
-
-<!--</style>-->
--
Gitblit v1.9.3