From 9b825939b7f0a7439d704b379812362dd95697fc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 11 七月 2022 17:49:26 +0800
Subject: [PATCH] 1.优化代码2.修改实施部提出的bug3.生产开报工外协列表自动弹窗实现部分
---
src/views/jcsz/zzjg.vue | 9
src/views/zzmx/chda.vue | 37 ++
src/views/scgl/scdd.vue | 46 +-
src/views/jcsz/wldw.vue | 2
src/views/scgl/gd.vue | 62 +++-
src/views/zzmx/gylx.vue | 1
src/views/sbgl/sbqd.vue | 117 +++++++-
src/views/scgl/sckbg.vue | 241 ++++++++++++-----
src/layout/components/TagsView/index.vue | 26 +
src/views/template.vue | 2
src/utils/global.js | 20 +
src/views/jcsz/yhqd.vue | 109 +++++++
src/views/zzmx/jpgj.vue | 16 +
src/views/jcsz/jsqd.vue | 43 ++
src/api/sbgl.js | 8
src/views/wlgl/ckdy.vue | 2
src/views/xtsz/bmgz.vue | 1
src/views/zzmx/gxdy.vue | 5
src/views/wlgl/kwdy.vue | 22 +
src/views/zzmx/wllx.vue | 4
20 files changed, 584 insertions(+), 189 deletions(-)
diff --git a/src/api/sbgl.js b/src/api/sbgl.js
index 6c02711..3d45d0a 100644
--- a/src/api/sbgl.js
+++ b/src/api/sbgl.js
@@ -102,3 +102,11 @@
params: data
})
}
+// 鐢熶骇寮�鎶ュ伐锛氬彂鏂�/鏀舵枡鏃惰幏鍙栧鍗忎笅鎷夊垪琛�
+export function MesOrderStepSelectWX(data) {
+ return request({
+ url: 'DeviceManager/MesOrderStepSelectWX',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index fc7779b..7e6971b 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -29,6 +29,7 @@
import ScrollPane from './ScrollPane'
import path from 'path'
import { getCookie } from '@/utils/auth'
+import $ from 'jquery'
export default {
components: { ScrollPane },
@@ -95,6 +96,15 @@
}
},
isActive(route) {
+ if (this.$route.path === '/scgl/sckbg') {
+ const time = setInterval(() => {
+ this.$nextTick(() => {
+ $("input[name='produceCode']")[0].focus()
+ $("input[name='WXproduceCode']")[0].focus()
+ clearInterval(time)
+ })
+ })
+ }
return route.path === this.$route.path
},
isAffix(tag) {
@@ -226,13 +236,14 @@
</script>
<style lang="scss" scoped>
-$main_color :#42b983;
+$main_color: #42b983;
.tags-view-container {
height: 34px;
width: 100%;
background: #fff;
border-bottom: 1px solid #d8dce5;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+
.tags-view-wrapper {
.tags-view-item {
display: inline-block;
@@ -247,16 +258,20 @@
font-size: 12px;
margin-left: 5px;
margin-top: 4px;
+
&:first-of-type {
margin-left: 15px;
}
+
&:last-of-type {
margin-right: 15px;
}
+
&.active {
- background-color:$main_color;
+ background-color: $main_color;
color: #fff;
- border-color:$main_color;
+ border-color: $main_color;
+
&::before {
content: '';
background: #fff;
@@ -270,6 +285,7 @@
}
}
}
+
.contextmenu {
margin: 0;
background: #fff;
@@ -282,10 +298,12 @@
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+
li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
+
&:hover {
background: #eee;
}
@@ -306,11 +324,13 @@
text-align: center;
transition: all .3s cubic-bezier(.645, .045, .355, 1);
transform-origin: 100% 50%;
+
&:before {
transform: scale(.6);
display: inline-block;
vertical-align: -3px;
}
+
&:hover {
background-color: #b4bccc;
color: #fff;
diff --git a/src/utils/global.js b/src/utils/global.js
index 6e641e8..310c12a 100644
--- a/src/utils/global.js
+++ b/src/utils/global.js
@@ -36,3 +36,23 @@
return { RightCode: res.data[0], numvalue: res.data[1] }
}
}
+
+// 閫掑綊娓呴櫎鏁扮粍姣忎釜鍏冪礌涓嬬殑children涓虹┖鐨勬暟缁�
+const clearAllChildren = (items, childrenName = 'children') => {
+ for (let i = 0; i < items.length; i++) {
+ const item = items[i]
+ // 褰撳墠瀵硅薄瀛樺湪children
+ if (item && item[childrenName]) {
+ // children涓虹┖鏁扮粍鏃跺垹闄�
+ if (item[childrenName].length === 0) {
+ delete item[childrenName]
+ } else {
+ // 閫掑綊褰撳墠children鏁扮粍
+ clearAllChildren(item[childrenName], childrenName)
+ }
+ }
+ }
+ return items
+}
+
+export default clearAllChildren
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index db1b229..3c2a826 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -23,6 +23,7 @@
filterable
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @focus="getRoleTypeSearch2"
>
<el-option
v-for="item in RoleTypeCodeArr2"
@@ -53,8 +54,9 @@
<el-table
:data="tableData"
border
+
stripe
- :height="tableHeight"
+ :height="tableHeight+'px'"
:style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -309,6 +311,7 @@
:options="StuOrgArr"
:props="defaultProps"
style="width: 200px;"
+ @focus="getUserOrganization"
@change="dialogCascaderChange"
/>
@@ -632,8 +635,8 @@
},
created() {
this.getRoleSearch()
- this.getRoleTypeSearch2()
- this.getUserOrganization()
+ // this.getRoleTypeSearch2()
+ // this.getUserOrganization()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -990,7 +993,7 @@
pcIsSelected2 = true
const interval = setInterval(() => {
- if ($('input:checkbox').length > 0) {
+ if ($("input[name='PC']").length > 0) {
waitFlag = true
}
if (waitFlag) {
@@ -1010,7 +1013,7 @@
appIsSelected2 = true
const interval = setInterval(() => {
- if ($('input:checkbox').length > 0) {
+ if ($("input[name='APP']").length > 0) {
waitFlag = true
}
if (waitFlag) {
@@ -1031,7 +1034,7 @@
appIsSelected2 = true
const interval = setInterval(() => {
- if ($('input:checkbox').length > 0) {
+ if ($("input[name='PC']").length > 0) {
waitFlag = true
}
if (waitFlag) {
@@ -1250,12 +1253,20 @@
const currentCode = this.dialogFormRight.rightCurrentCode// 鏉冮檺鎿嶄綔绔痗ode
// 1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂
if (checkedKeys.length === 0 && halfCheckedKeys.length === 0) {
- console.log('1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂')
+ console.log('1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂1111')
this.dialogFormRight.rightOperationArr.forEach((item, index) => {
if (item.code === currentCode) {
item.isSelected2 = false
+
this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (item.name === 'PC') {
+ $("input[name='PC']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ if (item.name === 'APP') {
+ $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ // $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ // $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
})
@@ -1274,7 +1285,13 @@
if (item.code === currentCode) {
item.isSelected2 = true
this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (item.name === 'PC') {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ if (item.name === 'APP') {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ // $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
})
@@ -1294,7 +1311,13 @@
if (item.code === currentCode) {
item.isSelected2 = true
this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (item.name === 'PC') {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ if (item.name === 'APP') {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ // $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
})
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 3b1de99..a0fb450 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -46,7 +46,7 @@
<el-table
:data="tableData"
border
- :height="tableHeight"
+ :height="tableHeight+'px'"
stripe
highlight-current-row
:header-cell-style="this.$headerCellStyle"
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 3f5badf..4ad0f23 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -23,13 +23,13 @@
popper-class="elCascader"
:options="StuOrgArr"
:props="defaultProps"
+ @focus="getUserOrganization"
@change="cascaderChange"
/>
</el-form-item>
<el-form-item label="宸ヨ祫绫诲瀷" style=" display: flex;">
<el-select v-model="form.wagetype" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
-
v-for="item in wagetypeArr"
:key="item.value"
:label="item.label"
@@ -66,7 +66,7 @@
:data="tableData"
border
stripe
- :height="tableHeight"
+ :height="tableHeight+'px'"
highlight-current-row
:style="{width: 100+'%',height:tableHeight+'px'}"
:header-cell-style="this.$headerCellStyle"
@@ -121,12 +121,22 @@
prop="mobile"
label="鑱旂郴鏂瑰紡"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.mobile===''">/</div>
+ <div v-else>{{ row.mobile }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="email"
label="鐢靛瓙閭"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.email===''">/</div>
+ <div v-else>{{ row.email }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop=""
label="鍦ㄨ亴鐘舵��"
@@ -223,11 +233,27 @@
key="cascaderKey"
filterable
popper-class="elCascader"
- :options="StuOrgArr"
+ :options="StuOrgArr2"
:props="defaultProps"
style="width: 200px;"
@change="dialogCascaderChange"
/>
+ </el-form-item>
+ <el-form-item label="鎵�灞炵彮缁�" prop="groupcode">
+ <el-select
+ v-model="dialogForm.groupcode"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in usergroupArr"
+ :key="item.group_code"
+ :label="item.group_name"
+ :value="item.group_code"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
<el-select
@@ -245,11 +271,10 @@
/>
</el-select>
</el-form-item>
-
- <el-form-item label="鑱旂郴鏂瑰紡">
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="Mobile">
<el-input v-model="dialogForm.Mobile" style="width: 200px" />
</el-form-item>
- <el-form-item label="鐢靛瓙閭">
+ <el-form-item label="鐢靛瓙閭" prop="Email">
<el-input v-model="dialogForm.Email" style="width: 200px" />
</el-form-item>
</el-form>
@@ -442,6 +467,8 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
+import clearAllChildren from '@/utils/global'
+import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -461,6 +488,36 @@
}
}
}
+ const validateMobile = (rule, value, callback) => {
+ if (!value) {
+ callback()
+ // return callback(new Error('璇疯緭鍏ョ數璇濆彿鐮�'))
+ } else {
+ const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // 闀垮彿
+ const mobile2 = /^[0-9]{6}$/ // 鐭彿
+ if (mobile.test(value) || mobile2.test(value)) {
+ callback()
+ // return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+ } else {
+ return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+ // callback()
+ }
+ }
+ }
+ const validateEmail = (rule, value, callback) => {
+ if (!value) {
+ callback()
+ // return callback(new Error('璇疯緭鍏ョ數瀛愰偖绠�'))
+ } else {
+ const email = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(.[a-zA-Z0-9_-]+)+$/
+ if (email.test(value)) {
+ callback()
+ } else {
+ return callback(new Error('鐢靛瓙閭涓嶇鍚堣鍒�'))
+ }
+ }
+ }
+
return {
isFullscreen: false,
mainHeight: 0,
@@ -477,6 +534,7 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
StuOrgArr: [], // 鎵�灞炵粍缁囨暟缁�
+ StuOrgArr2: [], // 鎵�灞炵粍缁囨暟缁� 瀵硅瘽妗�
defaultProps: {
checkStrictly: true,
value: 'code',
@@ -499,10 +557,12 @@
StuOrg: '',
Mobile: '',
Email: '',
+ groupcode: '',
Operator: '',
OperType: '',
wagetype: ''
},
+ usergroupArr: [], // 鐢熶骇鐝粍鏁扮粍
wagetypeArr: [
{ value: '2', label: '璁′欢鍒�' },
{ value: '1', label: '璁℃椂鍒�' }
@@ -526,7 +586,17 @@
],
wagetype: [
{ required: true, message: '璇烽�夋嫨宸ヨ祫绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ groupcode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炵彮缁�', trigger: ['blur', 'change'] }
+ ],
+ Mobile: [
+ { required: false, validator: validateMobile, trigger: ['blur', 'change'] }
+ ],
+ Email: [
+ { required: false, validator: validateEmail, trigger: ['blur', 'change'] }
]
+
},
dialogVisibleRoles: false,
dialogFormRoles: {
@@ -556,7 +626,7 @@
},
created() {
this.getUserSearch()
- this.getUserOrganization()
+ // this.getUserOrganization()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -572,7 +642,12 @@
// 鑾峰彇鎵�灞炵粍缁�
async getUserOrganization() {
const { data: res } = await UserOrganization()
- this.StuOrgArr = res
+ this.StuOrgArr = clearAllChildren(res)
+ },
+ // 鑾峰彇鎵�灞炵粍缁囧璇濇
+ async getUserOrganization2() {
+ const { data: res } = await UserOrganization()
+ this.StuOrgArr2 = clearAllChildren(res)
},
// 瀵煎叆鎸夐挳
upload() {
@@ -612,10 +687,17 @@
dialogCascaderChange(val) {
this.dialogForm.StuOrg = val[val.length - 1]
},
+ // 鑾峰彇涓嬫媺鐢熶骇鐝粍
+ async getMesOrderStepReportSelectUserGroup() {
+ const { data: res } = await MesOrderStepReportSelectUserGroup()
+ this.usergroupArr = res
+ },
// 鏂板鎸夐挳
add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.getUserOrganization2()
+ this.getMesOrderStepReportSelectUserGroup()
},
// 淇敼鎸夐挳
edit(operation, row) {
@@ -628,6 +710,7 @@
this.dialogForm.UserCode = row.usercode
this.dialogForm.UserName = row.username
this.dialogForm.Password = row.password
+ this.dialogForm.groupcode = row.group_code
this.dialogForm.Enable = row.enable
this.dialogForm.StuOrg = row.stu_torgcode
this.$refs.dialogCascader.checkedValue = row.stu_torgcode
@@ -635,6 +718,8 @@
this.dialogForm.Email = row.email
this.dialogForm.wagetype = row.wagetype
})
+ this.getMesOrderStepReportSelectUserGroup()
+ this.getUserOrganization2()
},
// 鍒犻櫎鎸夐挳
async del(id) {
@@ -664,6 +749,7 @@
this.dialogForm.StuOrg = ''
this.dialogForm.Mobile = ''
this.dialogForm.Email = ''
+ this.dialogForm.groupcode = ''
this.dialogForm.wagetype = ''
this.$refs.dialogForm.clearValidate()
},
@@ -685,6 +771,7 @@
StuOrg: Array.isArray(this.$refs.dialogCascader.checkedValue) ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
Mobile: this.dialogForm.Mobile,
Email: this.dialogForm.Email,
+ groupcode: this.dialogForm.groupcode,
wagetype: this.dialogForm.wagetype,
OperType: this.operation === 'add' ? 'Add' : 'Update',
Operator: getCookie('admin')
@@ -1010,7 +1097,7 @@
this.workingTableData.splice(index, 1)
}
})
- // this.getUserGroupSearch()
+ this.getMesOrderStepReportSelectUserGroup()
},
// 鐢熶骇鐝粍鎺掑簭
sortChangeOfWorking({ column, prop, order }) {
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 695519f..c0a68ed 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -48,7 +48,7 @@
stripe
:style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
- :height="tableHeight"
+ :height="tableHeight+'px'"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -90,7 +90,12 @@
prop="parentorg_name"
label="涓婄骇鍗曚綅"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.parentorg_name===null">/</div>
+ <div v-else>{{ row.parentorg_name }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 1dbc057..9e80834 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -17,7 +17,13 @@
<el-input v-model="form.DeviceName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.Status" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.Status"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -27,7 +33,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
- <el-select v-model="form.WorkShop" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.WorkShop"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @focus="getWorkShopSelect"
+ >
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -37,7 +50,15 @@
</el-select>
</el-form-item>
<el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
- <el-select v-model="form.DeviceType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="deviceTypeChange">
+ <el-select
+ v-model="form.DeviceType"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ @focus="getDeviceTypeSelect"
+ @change="deviceTypeChange"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -49,6 +70,7 @@
<el-form-item label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
+ filterable
:popper-append-to-body="false"
:disabled="form.DeviceType===''"
style="width: 200px"
@@ -81,7 +103,7 @@
<el-table
:data="tableData"
border
- :height="tableHeight"
+ :height="tableHeight+'px'"
stripe
highlight-current-row
:style="{width: 100+'%',height:(tableHeight-50)+'px'}"
@@ -213,7 +235,14 @@
<el-input v-model="dialogForm.devicename" style="width: 200px" />
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="devicetypecode">
- <el-select v-model="dialogForm.devicetypecode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="devicetypecodeChange">
+ <el-select
+ v-model="dialogForm.devicetypecode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="devicetypecodeChange"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -223,7 +252,14 @@
</el-select>
</el-form-item>
<el-form-item label="璁惧缁�" prop="devicegroupcode">
- <el-select v-model="dialogForm.devicegroupcode" :popper-append-to-body="false" :disabled="dialogForm.devicetypecode===''" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.devicegroupcode"
+ :popper-append-to-body="false"
+ :disabled="dialogForm.devicetypecode===''"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceGroupDialogArr"
:key="item.code"
@@ -242,7 +278,14 @@
/>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" prop="workshopcode">
- <el-select v-model="dialogForm.workshopcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="workshopcodeChange">
+ <el-select
+ v-model="dialogForm.workshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="workshopcodeChange"
+ >
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -252,7 +295,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炰骇绾�" prop="linecode">
- <el-select v-model="dialogForm.linecode" :popper-append-to-body="false" :disabled="dialogForm.workshopcode===''" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.linecode"
+ filterable
+ :popper-append-to-body="false"
+ :disabled="dialogForm.workshopcode===''"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in WorkLineArr"
:key="item.linecode"
@@ -262,7 +312,13 @@
</el-select>
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" prop="status">
- <el-select v-model="dialogForm.status" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.status"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -272,7 +328,8 @@
</el-select>
</el-form-item>
<el-form-item label="绋煎姩鐜�" prop="ratio">
- <el-input v-model="dialogForm.ratio" style="width: 195px" /><span style="margin-left: 10px">%</span>
+ <el-input v-model="dialogForm.ratio" style="width: 195px" />
+ <span style="margin-left: 10px">%</span>
</el-form-item>
</el-form>
@@ -424,7 +481,13 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" :popper-append-to-body="false" placeholder="璇烽�夋嫨">
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.eqptype_code"
+ filterable
+ :popper-append-to-body="false"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -602,9 +665,9 @@
// 鑾峰彇璁惧娓呭崟鍒楄〃
this.getDeviceMangerSearch()
// 鑾峰彇璁惧绫诲瀷涓嬫媺
- this.getDeviceTypeSelect()
+ // this.getDeviceTypeSelect()
// 鑾峰彇鎵�灞炶溅闂翠笅鎷�
- this.getWorkShopSelect()
+ // this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -723,7 +786,7 @@
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗘墍灞炶溅闂翠笅鎷夐�夋嫨鏀瑰彉鏃�
- async workshopcodeChange(val) {
+ async workshopcodeChange(val) {
const { data: res } = await WorkShopSelectLine({ workshopcode: val })
this.WorkLineArr = res
this.dialogForm.linecode = ''
@@ -895,7 +958,15 @@
addDeviceGroup() {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1, number: number })
+ this.DeviceGroupArray.unshift({
+ code: '',
+ name: '',
+ eqptype_code: '',
+ eqptype_name: '',
+ remark: '',
+ isVisible: 1,
+ number: number
+ })
},
// 鎺掑簭
sortChangeOfDeviceGroup({ column, prop, order }) {
@@ -989,9 +1060,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
//background-color: $main_color !important;
height: 30px;
@@ -1121,29 +1194,31 @@
margin: 10px 30px 0px 0;
}
-.body ::v-deep .el-divider{
+.body ::v-deep .el-divider {
border: 1px solid #eee;
width: 99%;
margin: 10px auto;
}
-.body ::v-deep .el-form-item{
+
+.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
</style>
<style lang="scss">
-.dateStyle{
- .el-date-table td.today span{
+.dateStyle {
+ .el-date-table td.today span {
color: #42b983;
}
}
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index ef7ab99..0710533 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -16,6 +16,7 @@
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ filterable
@change="erporderstusChange"
>
<el-option
@@ -102,7 +103,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -278,6 +279,7 @@
<el-select
v-model="dialogForm.mesorderstus"
disabled
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -309,6 +311,7 @@
>
<el-select
v-model="dialogForm.partcode"
+ filterable
:disabled="operation!=='add'"
:popper-append-to-body="false"
style="width: 200px"
@@ -333,29 +336,16 @@
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
<div style="display: flex">
- <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
- <el-select
- v-model="dialogForm.wkshopcode"
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in wkshopArr"
- :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="宸ヨ壓璺嚎" prop="routecode">
<el-select
v-model="dialogForm.routecode"
+ filterable
:disabled="dialogForm.partcode===''"
:popper-append-to-body="false"
- style="width: 160px"
+ style="width: 172px"
placeholder="璇烽�夋嫨"
+ @change="routecodeChange"
>
<el-option
v-for="item in routeArr"
@@ -374,6 +364,23 @@
<!-- :disabled="dialogForm.routecode===''"-->
</div>
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.routecode===''"
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
</div>
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
<el-date-picker
@@ -398,6 +405,7 @@
<el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
<el-select
v-model="dialogForm.orderlev"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -549,7 +557,7 @@
ClosedErpOrder,
ClosedMesOrder,
DeleteMesOrder,
- MesOrderSearch, SearchWorkStep,
+ MesOrderSearch, RouteSelectWkshop, SearchWorkStep,
SelectRouteStep
} from '@/api/scgl'
import { WorkShopSelect } from '@/api/sbgl'
@@ -723,10 +731,6 @@
// 鑾峰彇浜у搧淇℃伅
const { data: res1 } = await PartSelect()
this.partArr = res1
-
- // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
- const { data: res2 } = await WorkShopSelect()
- this.wkshopArr = res2
},
// 璁㈠崟鐘舵�佹敼鍙樻椂
erporderstusChange(val) {
@@ -780,6 +784,18 @@
const { data: res } = await PartSelectRpute({ partcode: val })
this.routeArr = res
this.dialogForm.routecode = ''
+ this.dialogForm.wkshopcode = ''
+ },
+ // 宸ヨ壓璺嚎鍊兼敼鍙�
+ async routecodeChange(val) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode
+ }
+ // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
+ const { data: res2 } = await RouteSelectWkshop(data)
+ this.wkshopArr = res2
+ this.dialogForm.wkshopcode = ''
},
// 宸ュ簭浠诲姟
async check(row) {
@@ -812,7 +828,7 @@
this.dialogForm.mesqty = row.plan_qty
this.dialogForm.partspec = row.partspec
// this.dialogForm.routecode = row.route_code// 宸ヨ壓璺嚎浠ｇ爜
- this.dialogForm.wkshopcode = row.wkshp_code// 鐢熶骇杞﹂棿浠ｇ爜
+ // this.dialogForm.wkshopcode = row.wkshp_code// 鐢熶骇杞﹂棿浠ｇ爜
this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
this.dialogForm.planenddate = row.plan_enddate !== null ? row.plan_enddate : handleDatetime(new Date())
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 1d7193e..9f936fa 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -13,6 +13,7 @@
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.erporderstus"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -56,25 +57,26 @@
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
- <!-- <el-date-picker-->
- <!-- v-model="form.createdate"-->
- <!-- type="daterange"-->
- <!-- :clearable="false"-->
- <!-- range-separator="~"-->
- <!-- start-placeholder="寮�濮嬫棩鏈�"-->
- <!-- end-placeholder="缁撴潫鏃ユ湡"-->
- <!-- size="mini"-->
- <!-- />-->
- <!-- :picker-options="expireTimeOption"-->
<el-date-picker
v-model="form.createdate"
- type="date"
- size="mini"
+ type="daterange"
:clearable="false"
- style="width: 200px;"
- format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 240px"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
/>
+ <!-- :picker-options="expireTimeOption"-->
+ <!-- <el-date-picker-->
+ <!-- v-model="form.createdate"-->
+ <!-- type="date"-->
+ <!-- size="mini"-->
+ <!-- :clearable="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- format="yyyy-MM-dd"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
</el-form-item>
</div>
<div style="min-height: 100px">
@@ -135,7 +137,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -459,10 +461,10 @@
tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
}
- // let tempDate = this.form.createdate
- // if (tempDate.length > 0) {
- // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
- // }
+ let tempDate = this.form.createdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
const data = {
erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
@@ -472,8 +474,8 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
paydate: tempDate2, // 浜や粯鏃堕棿
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
- createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
- // createdate: tempDate,
+ // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+ createdate: tempDate,
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 9c3ac1c..85e1105 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -8,10 +8,10 @@
<div style="display: flex;align-items: center">
<div style="width: 70px">宸ュ簭鐮侊細</div>
<el-input
- v-model="produceCode"
- oninput="value=value.replace(/[^0-9a-zA-Z;]/g,'')"
+ v-model="form.orderstepqrcode"
+ oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
name="produceCode"
- style="width: 500px"
+ style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
</div>
@@ -30,7 +30,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -39,18 +39,19 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- width="50"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <!– <el-radio–>-->
- <!-- <!– v-model="radioSelected"–>-->
- <!-- <!– :label="row.wo"–>-->
- <!-- <!– style="color: #fff;padding-left: 10px; margin-right: -25px;"–>-->
- <!-- <!– @change.native="getCurrentRow(row.wo)"–>-->
- <!-- <!– />–>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-table-column
+ width="50"
+ fixed
+ >
+ <template slot-scope="{row}">
+ <el-radio
+ v-model="radioSelected"
+ :label="row.wo"
+ style="color: #fff;padding-left: 10px; margin-right: -25px;"
+ @change.native="getCurrentRow(row.wo)"
+ />
+ </template>
+ </el-table-column>
<el-table-column
prop="RowNum"
width="50"
@@ -153,12 +154,26 @@
<el-tab-pane label="澶栧崗鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
<div style="display: flex;align-items: center">
- <div style="width: 70px">宸ュ簭鐮侊細</div>
+ <div style="width: 90px;">澶栧崗绫诲瀷锛�</div>
+ <el-select
+ v-model="WXSelected"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in WXSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ <div style="width: 70px;margin-left: 20px">宸ュ簭鐮侊細</div>
<el-input
- v-model="WXproduceCode"
- oninput="value=value.replace(/[^0-9a-zA-Z;]/g,'')"
+ v-model="WXform.orderstepqrcode"
+ oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
name="WXproduceCode"
- style="width: 500px"
+ style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
/>
</div>
@@ -177,27 +192,28 @@
<div class="elTableDiv">
<el-table
:data="WXtableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
- @sort-change="sortChange"
+ @sort-change="WXsortChange"
>
- <!-- <el-table-column-->
- <!-- width="50"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <!– <el-radio–>-->
- <!-- <!– v-model="radioSelected"–>-->
- <!-- <!– :label="row.wo"–>-->
- <!-- <!– style="color: #fff;padding-left: 10px; margin-right: -25px;"–>-->
- <!-- <!– @change.native="getCurrentRow(row.wo)"–>-->
- <!-- <!– />–>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-table-column
+ width="50"
+ fixed
+ >
+ <template slot-scope="{row}">
+ <el-radio
+ v-model="radioSelected"
+ :label="row.wo_code"
+ style="color: #fff;padding-left: 10px; margin-right: -25px;"
+ @change.native="getWXCurrentRow(row.wo_code)"
+ />
+ </template>
+ </el-table-column>
<el-table-column
prop="RowNum"
width="50"
@@ -235,8 +251,8 @@
width="150"
/>
<el-table-column
- prop="seq"
- width="80"
+ prop="stepname"
+ width="100"
label="宸ュ簭"
sortable="custom"
/>
@@ -317,29 +333,29 @@
<div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
<el-form-item label="浜у搧缂栫爜锛�">
- <div style="width: 200px">427100</div>
+ <div style="width: 200px">{{ dialogForm.partcode }}</div>
</el-form-item>
<el-form-item label="浜у搧鍚嶇О锛�">
- <div style="width: 200px">鏈虹鏉垮簳</div>
+ <div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�">
- <div style="width: 200px">鏈虹搴曟澘&1</div>
+ <div style="width: 200px">{{ dialogForm.partspec }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�">
- <div style="width: 200px">婵�鍏夊垏鍓�</div>
+ <div style="width: 200px">{{ dialogForm.stepname }}</div>
</el-form-item>
<el-form-item label="宸ュ簭鎻忚堪锛�">
- <el-tooltip class="item" effect="dark" content="鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱" placement="top-start">
- <div style="width: 200px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
- 鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱
- </div>
- </el-tooltip>
+ <!-- <el-tooltip class="item" effect="dark" content="鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱" placement="top-start">-->
+ <div style="width: 200px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
+ {{ dialogForm.stepdesc }}
+ </div>
+ <!-- </el-tooltip>-->
</el-form-item>
<el-form-item label="浠诲姟鏁伴噺锛�">
- <div style="width: 200px">1000</div>
+ <div style="width: 200px">{{ dialogForm.planqty }}</div>
</el-form-item>
- <el-form-item label="鏈姤/宸叉姤锛�">
- <div style="width: 200px">900/100</div>
+ <el-form-item :label="dialogTitle==='鑷埗寮�濮�'||dialogTitle==='鑷埗鎶ュ伐'?'鏈姤/宸叉姤锛�':'鏈彂/宸插彂锛�'">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="寮�宸ユ暟閲忥細">
@@ -582,10 +598,11 @@
import {
MesOrderGroupSelectUser,
MesOrderStepReportSelectUserGroup,
- MesOrderStepSearch,
+ MesOrderStepSearch, MesOrderStepStart,
MesOrderStepStartSelectEqp,
MesOrderWxStepSearch
} from '@/api/scgl'
+import { MesOrderStepSelectWX } from '@/api/sbgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -617,6 +634,8 @@
tableHeight: 0,
produceCode: '', // 宸ュ簭鐮�
WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
+ radioSelected: '', // 宸ュ簭閫変腑
+ WXradioSelected: '', // 宸ュ簭閫変腑
form: {
orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
prop: 'wo', // 鎺掑簭瀛楁
@@ -627,6 +646,7 @@
total: 10,
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
+ // PO202206280001_4;Step01
orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
prop: 'wo_code', // 鎺掑簭瀛楁
order: 'asc', // 鎺掑簭瀛楁
@@ -636,6 +656,15 @@
WXtotal: 10, // 澶栧崗琛ㄥ崟鎬绘暟
WXtableData: [], // 澶栧崗琛�
+ WXSelectArr: [// 澶栧崗绫诲瀷涓嬫媺鍒楄〃
+ { code: 'OUT', name: '鍙戞枡' },
+ { code: 'IN', name: '鏀舵枡' }
+ ],
+ WXSelected: 'OUT', // 澶栧崗涓嬫媺鍒楄〃閫変腑鍊�
+
+ judgeIsDialog: false, // 鍒ゆ柇鏄惁鑷姩寮圭獥
+ judgeIsDialogNumber: false, // 鍒ゆ柇寮瑰摢涓獥
+
dialogVisible: false,
dialogTitle: '', // 鑷埗寮�濮嬨�佽嚜鍒舵姤宸ャ�佸鍗忓彂鏂欍�佸鍗忔敹鏂�
dialogForm: {
@@ -643,12 +672,21 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
- currentstep: '', // 褰撳墠宸ュ簭
- nextstep: '', // 涓嬩竴閬撳伐搴�
- desr: '', // 宸ュ簭鎻忚堪
- plan_qty: '', // 浠诲姟鏁伴噺
- report_qty: '', // 宸叉姤鏁伴噺
- noreport_qty: '' // 鏈姤鏁伴噺
+ stepname: '', // 褰撳墠宸ュ簭鍚�
+ nextstepname: '', // 涓嬩竴閬撳伐搴忓悕
+ stepdesc: '', // 宸ュ簭鎻忚堪
+ planqty: '', // 浠诲姟鏁伴噺
+ reportqty: '', // 宸叉姤鏁伴噺
+ noreportqty: '', // 鏈姤鏁伴噺
+ startqty: '' // 鍙戞枡鏁伴噺
+
+ // eqpcode: '', // 璁惧缂栫爜
+ // usergroupcode: '', // 鐝粍缂栫爜
+ // reportuser: '', // 鎶ュ伐浜哄憳
+ // taskqty: '', // 浠诲姟鏁伴噺
+ // startqty: '', // 寮�宸ユ暟閲�
+ // reportqty: '', // 鎶ュ伐鏁伴噺
+ // ngqty: '' // 涓嶈壇鏁伴噺
},
userTableData: [
@@ -678,7 +716,8 @@
}
},
created() {
- this.getMesOrderStepSearch()
+ // this.getMesOrderStepSearch()
+ this.tabClick()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -691,13 +730,16 @@
methods: {
async getMesOrderStepSearch() {
const res = await MesOrderStepSearch(this.form)
- this.tableData = res.data
- this.total = res.count
+ if (res.code === '200') {
+ this.tableData = res.data
+ this.total = res.count
+ }
},
- async MesOrderWxStepSearch() {
+ async getMesOrderWxStepSearch() {
const res = await MesOrderWxStepSearch(this.WXform)
- this.WXtableData = res.data
- this.WXtotal = res.count
+ if (res.code === '200') {
+ this.WXtableData = res.data
+ }
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -712,29 +754,52 @@
this.form.prop = prop
this.getMesOrderStepSearch()
},
- getCurrentRow() {
+ // WX鎺掑簭鏀瑰彉鏃�
+ WXsortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.WXform.order = order
+ this.WXform.prop = prop
+ this.getMesOrderWxStepSearch()
+ },
+ // 鑷埗椤电鍘熺偣鐐瑰嚮
+ getCurrentRow(val) {
+ },
+ // 澶栧崗椤电鍘熺偣鐐瑰嚮
+ getWXCurrentRow(val) {
+ console.log(val)
+ this.WXradioSelected = val
},
// tab鎸夐挳鍒囨崲榧犳爣鑷姩鑱氱劍
tabClick(val, d) {
console.log(val, d, 1)
if (this.$refs.elTabs.currentName === '0') {
- this.getMesOrderStepSearch()
this.$nextTick(() => {
$("input[name='produceCode']")[0].focus()
})
}
if (this.$refs.elTabs.currentName === '1') {
- this.MesOrderWxStepSearch()
this.$nextTick(() => {
$("input[name='WXproduceCode']")[0].focus()
})
}
},
+ // 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
console.log(val, belong)
+ // 寮�宸ワ細code="200" count=0
+ // 鎶ュ伐锛歝ode="200" count=1
+ // 鍙戞枡锛歝ode="200" count=2
+ // 鏀舵枡锛歝ode="200" count=3
+ // 璧板垪琛ㄥ舰寮� code="200" count=4
if (belong === 'produceCode') {
- this.ZZreport()
+ // this.ZZreport()
// 鏌ユ壘璁惧
// const {data:res} = await MesOrderStepStartSelectEqp({ orderstepqrcode: this.produceCode })
// this.xxx=res
@@ -742,7 +807,15 @@
// const { data: res2 } = await MesOrderStepReportSelectUserGroup()
}
if (belong === 'WXproduceCode') {
-
+ const data = {
+ OperType: 'WX',
+ orderstepqrcode: this.WXform.orderstepqrcode,
+ SelectType: this.WXSelected// OUT銆両N
+ }
+ const res = await MesOrderStepStart(data)
+ if (res.code === '200' && res.count === 2) {
+ this.WXsend(res.data)
+ }
}
},
// 鏌ヨ
@@ -765,13 +838,29 @@
this.getUserTableData()
},
// 澶栧崗鍙戞枡
- async WXsend() {
+ async WXsend(obj) {
+ if (this.WXradioSelected.length < 1 && obj.length < 1) {
+ return this.$message.info('璇峰厛閫夋嫨宸ュ簭锛�')
+ }
this.dialogTitle = '澶栧崗鍙戞枡'
- this.dialogVisibleTrue()
- // this.dialogVisible = true
+ this.dialogVisible = true
+ console.log(obj, 321)
+ this.dialogForm.wo_code = obj.wo_code
+ this.dialogForm.partcode = obj.partnumber
+ this.dialogForm.partname = obj.partname
+ this.dialogForm.partspec = obj.partspec
+ this.dialogForm.stepname = obj.stepname
+ this.dialogForm.stepdesc = obj.stepdesc
+ this.dialogForm.planqty = obj.planqty
+ this.dialogForm.reportqty = obj.reportqty
+ this.dialogForm.noreportqty = obj.noreportqty
+ this.dialogForm.startqty = obj.startqty
- // const { data: res } = await MesOrderStepReportSelectUserGroup()
- // this.xx = res
+ // const data = {
+ //
+ // }
+ // const res = await MesOrderStepSelectWX(data)
+ // console.log(res)
},
// 澶栧崗鏀舵枡
WXback() {
@@ -780,7 +869,7 @@
// this.dialogVisible = true
},
dialogVisibleTrue() {
- this.dialogVisible = true
+ // this.dialogVisible = true
// this.dialogForm.wo_code=
},
// 鎶ュ伐鏌ヨ鐢ㄦ埛琛�
@@ -1051,12 +1140,16 @@
border-color: $main_color;
}
-.dialogVisible{
+//.dialogVisible{
::v-deep .el-select .el-input .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
}
+//}
+.elTableDiv {
+ ::v-deep .el-radio__label {
+ display: none;
+ }
}
-
</style>
diff --git a/src/views/template.vue b/src/views/template.vue
index a290ca2..bf3846a 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -45,7 +45,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 776c1fb..e845c03 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -40,7 +40,7 @@
:data="tableData"
border
stripe
- :height="tableHeight"
+ :height="tableHeight+'px'"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 8d7bbf3..a5b7c9b 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -23,7 +23,13 @@
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
- <el-select v-model="form.stockcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.stockcode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @focus="getWareHouseSelect"
+ >
<el-option
v-for="item in stockArr"
:key="item.code"
@@ -50,7 +56,7 @@
:data="tableData"
border
stripe
- :height="tableHeight"
+ :height="tableHeight+'px'"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -140,12 +146,14 @@
<el-form-item label="鎵�灞炲簱浣�" prop="stockcode">
<el-select
v-model="dialogForm.stockcode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @focus="getWareHouseSelect2"
>
<el-option
- v-for="item in stockArr"
+ v-for="item in stockArr2"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -204,6 +212,7 @@
},
total: 10,
stockArr: [], // 鎵�灞炰粨搴撴暟缁�
+ stockArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
tableData: [],
dialogVisible: false,
dialogForm: {
@@ -231,7 +240,7 @@
},
created() {
this.getStorageDefSearch()
- this.getWareHouseSelect()
+ // this.getWareHouseSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -247,6 +256,11 @@
const { data: res } = await WareHouseSelect()
this.stockArr = res
},
+ // 瀵硅瘽妗嗕腑鐨�
+ async getWareHouseSelect2() {
+ const { data: res } = await WareHouseSelect()
+ this.stockArr2 = res
+ },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 2dcc68b..a0ad98a 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -139,6 +139,7 @@
<el-select
v-model="dialogForm.filingdate"
style="width: 220px"
+ filterable
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 5d00b84..3c36587 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -22,11 +22,12 @@
<el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">
<el-select
v-model="form.stocktypecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @change="val=>stocktypecodeChange(val,'form')"
>
+ <!-- @change="val=>stocktypecodeChange(val,'form')"-->
<el-option
v-for="item in stocktypeArr"
:key="item.code"
@@ -35,9 +36,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鐗╂枡绫诲瀷" style=" display: flex;">
+ <el-form-item v-if="false" label="鐗╂枡绫诲瀷" style=" display: flex;">
<el-select
v-model="form.materialtypecode"
+ filterable
:disabled="form.stocktypecode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -54,9 +56,11 @@
<el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
<el-select
v-model="form.storehousecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @focus="getWareHouseSelect"
>
<el-option
v-for="item in storehouseArr"
@@ -128,11 +132,11 @@
label="瀛樿揣绫诲瀷"
sortable="custom"
/>
- <el-table-column
- prop="materialtypename"
- label="鐗╂枡绫诲埆"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="materialtypename"-->
+ <!-- label="鐗╂枡绫诲埆"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="stck_name"
label="浠撳簱鍚嶇О"
@@ -220,6 +224,7 @@
<el-form-item label="浣跨敤鍗曚綅" prop="uomcode">
<el-select
v-model="dialogForm.uomcode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -235,12 +240,14 @@
<el-form-item label="鎵�灞炰粨搴�" prop="warehousecode">
<el-select
v-model="dialogForm.warehousecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @focus="getWareHouseSelect2"
>
<el-option
- v-for="item in storehouseArr"
+ v-for="item in storehouseArr2"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -250,11 +257,13 @@
<el-form-item label="瀛樿揣绫诲瀷" prop="stocktypecode">
<el-select
v-model="dialogForm.stocktypecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @change="val=>stocktypecodeChange(val,'dialogForm')"
>
+ <!-- @change="val=>stocktypecodeChange(val,'dialogForm')"-->
+
<el-option
v-for="item in stocktypeArr"
:key="item.code"
@@ -263,11 +272,12 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鐗╂枡绫诲瀷" prop="materialtypecode">
+ <el-form-item v-if="false" label="鐗╂枡绫诲瀷" prop="materialtypecode">
<el-select
v-model="dialogForm.materialtypecode"
:popper-append-to-body="false"
style="width: 200px"
+ filterable
:disabled="dialogForm.stocktypecode===''"
placeholder="璇烽�夋嫨"
>
@@ -558,6 +568,7 @@
stocktypeArr: [], // 瀛樿揣绫诲瀷鏁扮粍
materialtypeArr: [], // 鐗╂枡绫诲瀷鏁扮粍
storehouseArr: [], // 鎵�灞炰粨搴撴暟缁�
+ storehouseArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
tableData: [],
dialogVisible: false,
dialogForm: {
@@ -633,7 +644,7 @@
created() {
this.getInventoryFileSelect()
this.getStockTypeSelect()
- this.getWareHouseSelect()
+ // this.getWareHouseSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -653,6 +664,10 @@
const { data: res } = await WareHouseSelect()
this.storehouseArr = res
},
+ async getWareHouseSelect2() {
+ const { data: res } = await WareHouseSelect()
+ this.storehouseArr2 = res
+ },
async getuomSelect() {
const { data: res } = await UomSelect()
this.uomArr = res
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index 94f8d50..f98d964 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -17,7 +17,7 @@
<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" :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"
@@ -29,6 +29,7 @@
<el-form-item label="宸ュ簭绫诲瀷" style=" display: flex;">
<el-select
v-model="form.steptypecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -187,6 +188,7 @@
<el-form-item prop="steptypecode" label="宸ュ簭绫诲瀷">
<el-select
v-model="dialogForm.steptypecode"
+ filterable
style="width: 200px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
@@ -202,6 +204,7 @@
<el-form-item prop="enable" label="鍚敤鐘舵��">
<el-select
v-model="dialogForm.enable"
+ filterable
style="width: 200px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index d2202be..0b72a13 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -140,6 +140,7 @@
<el-form-item prop="enable" label="浣跨敤鐘舵��" style="margin-right: 20px">
<el-select
v-model="dialogForm.enable"
+ filterable
:disabled="operation==='edit'"
:popper-append-to-body="false"
style="width: 220px"
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 5f98a55..9bd31ba 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -13,9 +13,11 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-select
v-model="form.partcode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @focus="getPartSelect"
@change="partChange"
>
<el-option
@@ -29,6 +31,7 @@
<el-form-item label="宸ヨ壓璺嚎" style=" display: flex;">
<el-select
v-model="form.routecode"
+ filterable
:disabled="form.partcode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -63,6 +66,7 @@
<el-form-item label="鍏宠仈璁惧" style=" display: flex;">
<el-select
v-model="form.eqpcode"
+ filterable
:disabled="form.stepcode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -213,13 +217,15 @@
<el-select
v-show="operation==='add'"
v-model="dialogForm.partcode"
+ filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
+ @focus="getPartSelect2"
@change="partDialogChange"
>
<el-option
- v-for="item in partArr"
+ v-for="item in partArr2"
:key="item.partcode"
:label="item.partname"
:value="item.partcode"
@@ -237,6 +243,7 @@
v-show="operation==='add'"
v-model="dialogForm.routecode"
style="width: 220px"
+ filterable
:disabled="dialogForm.partcode===''"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
@@ -465,6 +472,7 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
partArr: [], // 浜у搧闆嗗悎
+ partArr2: [], // 浜у搧闆嗗悎瀵硅瘽妗�
routeArr: [], // 浜у搧闆嗗悎
stepArr: [], // 浜у搧闆嗗悎
eqpArr: [], // 浜у搧闆嗗悎
@@ -519,7 +527,7 @@
},
created() {
this.getBeatRateSearch()
- this.getPartSelect()
+ // this.getPartSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -552,6 +560,10 @@
const { data: res } = await PartSelect()
this.partArr = res
},
+ async getPartSelect2() {
+ const { data: res } = await PartSelect()
+ this.partArr2 = res
+ },
async partChange(val) {
const { data: res } = await PartSelectRpute({ partcode: val })
this.routeArr = res
diff --git a/src/views/zzmx/wllx.vue b/src/views/zzmx/wllx.vue
index 30a2b38..2d2f014 100644
--- a/src/views/zzmx/wllx.vue
+++ b/src/views/zzmx/wllx.vue
@@ -17,7 +17,7 @@
<el-input v-model="form.materialtypename" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">
- <el-select v-model="form.stocktypecode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in stocktypeArr"
:key="item.code"
@@ -127,7 +127,7 @@
<el-input v-model="dialogForm.materialtypename" style="width: 200px" />
</el-form-item>
<el-form-item label="瀛樿揣绫诲瀷" prop="stocktypecode">
- <el-select v-model="dialogForm.stocktypecode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="dialogForm.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in stocktypeArr"
:key="item.code"
--
Gitblit v1.9.3