From bd3410da8a13682ec0bc888539dc35209a2196ba Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 14 七月 2022 16:10:58 +0800
Subject: [PATCH] 1.生产开报工页面开发
---
src/views/jcsz/zzjg.vue | 39
src/views/zzmx/chda.vue | 16
public/static/grf/外协收料标签.grf | 310 +++++++++++
src/views/scgl/gd.vue | 39 +
src/views/sbgl/sbqd.vue | 11
src/views/scgl/sckbg.vue | 993 +++++++++++++++++++++++++----------
src/api/scgl.js | 18
src/router/index.js | 102 +-
src/views/scgl/gdpg.vue | 6
src/utils/request.js | 4
src/views/jcsz/yhqd.vue | 5
src/views/zzmx/jpgj.vue | 9
src/views/jcsz/jsqd.vue | 10
src/api/sbgl.js | 8
src/views/zzmx/gxdy.vue | 1
src/views/wlgl/kwdy.vue | 18
16 files changed, 1,178 insertions(+), 411 deletions(-)
diff --git "a/public/static/grf/\345\244\226\345\215\217\346\224\266\346\226\231\346\240\207\347\255\276.grf" "b/public/static/grf/\345\244\226\345\215\217\346\224\266\346\226\231\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..5d4f40b
--- /dev/null
+++ "b/public/static/grf/\345\244\226\345\215\217\346\224\266\346\226\231\346\240\207\347\255\276.grf"
@@ -0,0 +1,310 @@
+锘縶
+ "Version":"6.8.5.5",
+ "Title":"浣犵殑鎶ヨ〃鏍囬",
+ "PrintAsDesignPaper":false,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":52500,
+ "Weight":400,
+ "Charset":134
+ },
+ "WatermarkAlignment":"BottomRight",
+ "Printer":{
+ "Size":256,
+ "Width":4,
+ "Height":7.5,
+ "Oriention":"Landscape",
+ "LeftMargin":0.1,
+ "TopMargin":0,
+ "RightMargin":0.1,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "CenterView":true,
+ "Border":{
+ "Pen":{
+ "Width":1.5
+ }
+ },
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"宸ュ崟缂栧彿",
+ "DBFieldName":"wo_code"
+ },
+ {
+ "Name":"浜у搧缂栫爜",
+ "DBFieldName":"partcode"
+ },
+ {
+ "Name":"浜у搧鍚嶇О",
+ "DBFieldName":"partname"
+ },
+ {
+ "Name":"涓嬮亾宸ュ簭",
+ "DBFieldName":"next_stepname"
+ },
+ {
+ "Name":"鏁伴噺",
+ "DBFieldName":"qty"
+ },
+ {
+ "Name":"浜岀淮鐮�",
+ "DBFieldName":"qrcode"
+ }
+ ]
+ },
+ "ColumnContent":{
+ "Height":0,
+ "AdjustRowHeight":false
+ },
+ "ColumnTitle":{
+ "Height":0,
+ "RepeatStyle":"OnPage"
+ }
+ },
+ "Parameter":[
+ {
+ "Name":"Parameter1"
+ },
+ {
+ "Name":"Parameter2"
+ }
+ ],
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":3.20146,
+ "Control":[
+ {
+ "Type":"Line",
+ "Name":"Line1",
+ "Left":0.211667,
+ "Top":0.105833,
+ "Width":6.91333
+ },
+ {
+ "Type":"Line",
+ "Name":"Line2",
+ "Left":0.21,
+ "Top":3.09563,
+ "Width":6.90729
+ },
+ {
+ "Type":"Line",
+ "Name":"Line3",
+ "Left":0.2,
+ "Top":0.105833,
+ "Height":2.99
+ },
+ {
+ "Type":"Line",
+ "Name":"Line4",
+ "Left":7.1,
+ "Top":0.105833,
+ "Height":2.98979
+ },
+ {
+ "Type":"Line",
+ "Name":"Line5",
+ "Left":2.40771,
+ "Top":0.105833,
+ "Height":2.98979
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":0.423333,
+ "Top":0.291042,
+ "Width":1.82563,
+ "Height":1.66688,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "Text":"[#浜岀淮鐮�#]"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line6",
+ "Left":2.40771,
+ "Top":0.873125,
+ "Width":4.68229
+ },
+ {
+ "Type":"Line",
+ "Name":"Line7",
+ "Left":2.40771,
+ "Top":1.64042,
+ "Width":4.68229
+ },
+ {
+ "Type":"Line",
+ "Name":"Line8",
+ "Left":0.21,
+ "Top":2.38125,
+ "Width":6.88
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":0.396875,
+ "Top":2.51354,
+ "Width":1.00542,
+ "Height":0.423333,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"鏁伴噺:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":1.34938,
+ "Top":2.51354,
+ "Width":0.978958,
+ "Height":0.4,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"[#鏁伴噺#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":2.51,
+ "Top":0.185208,
+ "Width":1.69333,
+ "Height":0.635,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"宸ュ崟缂栧彿:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox2",
+ "Left":4.20688,
+ "Top":0.185208,
+ "Width":2.75,
+ "Height":0.66,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"[#宸ュ崟缂栧彿#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox3",
+ "Left":2.51,
+ "Top":0.9525,
+ "Width":1.69333,
+ "Height":0.635,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"浜у搧缂栫爜:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":4.23333,
+ "Top":0.9525,
+ "Width":2.75,
+ "Height":0.66,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"[#浜у搧缂栫爜#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox4",
+ "Left":2.54,
+ "Top":1.71979,
+ "Width":1.69,
+ "Height":0.58,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"浜у搧鍚嶇О:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":4.25979,
+ "Top":1.71979,
+ "Width":2.75167,
+ "Height":0.582083,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"[#浜у搧鍚嶇О#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox5",
+ "Left":2.56646,
+ "Top":2.48708,
+ "Width":1.69333,
+ "Height":0.529167,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"涓嬮亾宸ュ簭:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox5",
+ "Left":4.28625,
+ "Top":2.48708,
+ "Width":2.75,
+ "Height":0.53,
+ "PaddingTop":0,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"[#涓嬮亾宸ュ簭#]"
+ }
+ ],
+ "RepeatOnPage":true
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/api/sbgl.js b/src/api/sbgl.js
index 3d45d0a..6c02711 100644
--- a/src/api/sbgl.js
+++ b/src/api/sbgl.js
@@ -102,11 +102,3 @@
params: data
})
}
-// 鐢熶骇寮�鎶ュ伐锛氬彂鏂�/鏀舵枡鏃惰幏鍙栧鍗忎笅鎷夊垪琛�
-export function MesOrderStepSelectWX(data) {
- return request({
- url: 'DeviceManager/MesOrderStepSelectWX',
- method: 'get',
- params: data
- })
-}
diff --git a/src/api/scgl.js b/src/api/scgl.js
index 633ee34..e2136e8 100644
--- a/src/api/scgl.js
+++ b/src/api/scgl.js
@@ -184,3 +184,21 @@
params: data
})
}
+
+// 鐢熶骇寮�鎶ュ伐锛氫汉鍛樹笅鎷夊垪琛�
+export function MesOrderSelectUser(data) {
+ return request({
+ url: 'ProductionManagement/MesOrderSelectUser',
+ method: 'get',
+ params: data
+ })
+}
+
+// 鐢熶骇寮�鎶ュ伐锛氬彂鏂�/鏀舵枡鏃惰幏鍙栧鍗忎笅鎷夊垪琛�
+export function MesOrderStepSelectWX(data) {
+ return request({
+ url: 'ProductionManagement/MesOrderStepSelectWX',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 8101a7a..2ff74dc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -78,31 +78,31 @@
children: [
{
path: 'zzjg',
- name: 'ZZJG',
+ name: 'ZZJGCancel',
code: '1010',
component: () => import('@/views/jcsz/zzjg'),
meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
}, {
path: 'yhqd',
- name: 'YYQD',
+ name: 'YYQDCancel',
code: '1011',
component: () => import('@/views/jcsz/yhqd'),
meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
}, {
path: 'jsqd',
- name: 'JSQD',
+ name: 'JSQDCancel',
code: '1012',
component: () => import('@/views/jcsz/jsqd'),
meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '', keepAlive: true }
}, {
path: 'wldw',
- name: 'WLDW',
+ name: 'WLDWCancel',
code: '1013',
component: () => import('@/views/jcsz/wldw'),
meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
}, {
path: 'adsz',
- name: 'ADZZ',
+ name: 'ADZZCancel',
code: '1014',
component: () => import('@/views/jcsz/adsz'),
meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
@@ -120,68 +120,68 @@
children: [
{
path: 'sblx',
- name: 'SBLX',
+ name: 'SBLXCancel',
code: '1020',
component: () => import('@/views/sbgl/sblx'),
meta: { code: '1020', title: '璁惧绫诲瀷', icon: '', keepAlive: true }
},
{
path: 'wxjl',
- code: '1029',
+ code: '1029Cancel',
name: 'WXJL',
component: () => import('@/views/sbgl/wxjl'),
meta: { code: '1029', title: '缁翠慨璁板綍', icon: '', keepAlive: true }
}, {
path: 'sbz',
- name: 'SBZ',
+ name: 'SBZCancel',
code: '1021',
component: () => import('@/views/sbgl/sbz'),
meta: { code: '1021', title: '璁惧缁�', icon: '', keepAlive: true }
}, {
path: 'sbqd',
- name: '璁惧娓呭崟',
+ name: '璁惧娓呭崟Cancel',
code: '1022',
component: () => import('@/views/sbgl/sbqd'),
meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
},
{
path: 'djbz',
- name: 'DJBZ',
+ name: 'DJBZCancel',
code: '1023',
component: () => import('@/views/sbgl/djbz'),
meta: { code: '1023', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
},
{
path: 'djbw',
- name: 'DJBW',
+ name: 'DJBWCancel',
code: '1024',
component: () => import('@/views/sbgl/djbw'),
meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
},
{
path: 'bybz',
- name: 'BYBZ',
+ name: 'BYBZCancel',
code: '1025',
component: () => import('@/views/sbgl/bybz'),
meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
},
{
path: 'bybw',
- name: 'BYBW',
+ name: 'BYBWCancel',
code: '1026',
component: () => import('@/views/sbgl/bybw'),
meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
},
{
path: 'djjl',
- name: 'DJJL',
+ name: 'DJJLCancel',
code: '1027',
component: () => import('@/views/sbgl/djjl'),
meta: { code: '1027', title: '鐐规璁板綍', icon: '', keepAlive: true }
},
{
path: 'byjl',
- name: 'BYJL',
+ name: 'BYJLCancel',
code: '1028',
component: () => import('@/views/sbgl/byjl'),
meta: { code: '1028', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
@@ -199,67 +199,67 @@
children: [
{
path: 'gzlx',
- name: 'GZLX',
+ name: 'GZLXCancel',
code: '1030',
component: () => import('@/views/gzgl/gzlx'),
meta: { code: '1030', title: '宸ヨ绫诲瀷', icon: '', keepAlive: true }
}, {
path: 'sjxj',
- name: 'SJXJ',
+ name: 'SJXJCancel',
code: '1039',
component: () => import('@/views/gzgl/sjxj'),
meta: { code: '1039', title: '涓婃満涓嬫満', icon: '', keepAlive: true }
}, {
path: 'ckrk',
- name: 'CKRK',
+ name: 'CKRKCancel',
code: '1040',
component: () => import('@/views/gzgl/ckrk'),
meta: { code: '1040', title: '鍑哄簱鍏ュ簱', icon: '', keepAlive: true }
}, {
path: 'gzqd',
- name: 'GZQD',
+ name: 'GZQDCancel',
code: '1031',
component: () => import('@/views/gzgl/gzqd'),
meta: { code: '1031', title: '宸ヨ娓呭崟', icon: '', keepAlive: true }
}, {
path: 'djbz',
- name: 'DJBZ',
+ name: 'DJBZCancel',
code: '1032',
component: () => import('@/views/gzgl/djbz'),
meta: { code: '1032', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
}, {
path: 'djbw',
- name: 'DJBW',
+ name: 'DJBWCancel',
code: '1033',
component: () => import('@/views/gzgl/djbw'),
meta: { code: '1033', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
}, {
path: 'bybz',
- name: 'BYBZ',
+ name: 'BYBZCancel',
code: '1034',
component: () => import('@/views/gzgl/bybz'),
meta: { code: '1034', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
}, {
path: 'bybw',
- name: 'BYBW',
+ name: 'BYBWCancel',
code: '1035',
component: () => import('@/views/gzgl/bybw'),
meta: { code: '1035', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
}, {
path: 'djjl',
- name: 'DJJL',
+ name: 'DJJLCancel',
code: '1036',
component: () => import('@/views/gzgl/djjl'),
meta: { code: '1036', title: '鐐规璁板綍', icon: '', keepAlive: true }
}, {
path: 'byjl',
- name: 'BYJL',
+ name: 'BYJLCancel',
code: '1037',
component: () => import('@/views/gzgl/byjl'),
meta: { code: '1037', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
}, {
path: 'gzwx',
- name: 'GZWX',
+ name: 'GZWXCancel',
code: '1038',
component: () => import('@/views/gzgl/gzwx'),
meta: { code: '1038', title: '宸ヨ缁翠慨', icon: '', keepAlive: true }
@@ -277,38 +277,38 @@
children: [
{
path: 'ckdy',
- name: 'CKDY',
+ name: 'CKDYCancel',
code: '1050',
component: () => import('@/views/wlgl/ckdy'),
meta: { code: '1050', title: '浠撳簱瀹氫箟', icon: '', keepAlive: true }
},
{
path: 'kwdy',
- name: 'KWDY',
+ name: 'KWDYCancel',
code: '1051',
component: () => import('@/views/wlgl/kwdy'),
meta: { code: '1051', title: '搴撲綅瀹氫箟', icon: '', keepAlive: true }
}, {
path: 'rqlx',
- name: 'RYLX',
+ name: 'RYLXCancel',
code: '1052',
component: () => import('@/views/wlgl/rqlx'),
meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '', keepAlive: true }
}, {
path: 'rqqd',
- name: 'RQQD',
+ name: 'RQQDCancel',
code: '1053',
component: () => import('@/views/wlgl/rqqd'),
meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '', keepAlive: true }
}, {
path: 'crkjl',
- name: 'CRKJL',
+ name: 'CRKJLCancel',
code: '1054',
component: () => import('@/views/wlgl/crkjl'),
meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '', keepAlive: true }
}, {
path: 'kccx',
- name: 'KCCX',
+ name: 'KCCXCancel',
code: '1055',
component: () => import('@/views/wlgl/kccx'),
meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '', keepAlive: true }
@@ -326,40 +326,40 @@
children: [
{
path: 'wllx',
- name: 'WLLX',
+ name: 'WLLXCancel',
code: '1060',
component: () => import('@/views/zzmx/wllx'),
meta: { code: '1060', title: '鐗╂枡绫诲瀷', icon: '', keepAlive: true }
},
{
path: 'chda',
- name: 'CHDA',
+ name: 'CHDACancel',
code: '1061',
component: () => import('@/views/zzmx/chda'),
meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
}, {
path: 'wlqd',
- name: 'WLQD',
+ name: 'WLQDCancel',
code: '1062',
component: () => import('@/views/zzmx/wlqd'),
meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
},
{
path: 'gylx',
- name: 'GYLX',
+ name: 'GYLXCancel',
code: '1063',
component: () => import('@/views/zzmx/gylx'),
meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '', keepAlive: true }
}, {
path: 'gxdy',
- name: 'GXDY',
+ name: 'GXDYCancel',
code: '1064',
component: () => import('@/views/zzmx/gxdy'),
meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '', keepAlive: true }
},
{
path: 'jpgj',
- name: 'JPGJ',
+ name: 'JPGJCancel',
code: '1065',
component: () => import('@/views/zzmx/jpgj'),
meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '', keepAlive: true }
@@ -377,25 +377,25 @@
children: [
{
path: 'scdd',
- name: 'SCDD',
+ name: 'SCDDCancel',
code: '1070',
component: () => import('@/views/scgl/scdd'),
meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
}, {
path: 'gd',
- name: 'GD',
+ name: 'GDCancel',
code: '1071',
component: () => import('@/views/scgl/gd'),
meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
}, {
path: 'gdpg',
- name: 'GDPD',
+ name: 'GDPDCancel',
code: '1072',
component: () => import('@/views/scgl/gdpg'),
meta: { code: '1072', title: '宸ュ崟娲惧伐', icon: '', keepAlive: true }
}, {
path: 'sckbg',
- name: 'SCKBG',
+ name: 'SCKBGCancel',
code: '1073',
component: () => import('@/views/scgl/sckbg'),
meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '', keepAlive: true }
@@ -413,31 +413,31 @@
children: [
{
path: 'zjbz',
- name: 'ZJBZ',
+ name: 'ZJBZCancel',
code: '1080',
component: () => import('@/views/zlgl/zjbz'),
meta: { code: '1080', title: '璐ㄦ鏍囧噯', icon: '', keepAlive: true }
}, {
path: 'qxdy',
- name: 'QXDY',
+ name: 'QXDYCancel',
code: '1081',
component: () => import('@/views/zlgl/qxdy'),
meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '', keepAlive: true }
}, {
path: 'gxjy',
- name: 'GXDY',
+ name: 'GXDYCancel',
code: '1082',
component: () => import('@/views/zlgl/gxjy'),
meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
}, {
path: 'wljy',
- name: 'WLJY',
+ name: 'WLJYCancel',
code: '1083',
component: () => import('@/views/zlgl/wljy'),
meta: { code: '1083', title: '鐗╂祦妫�楠�', icon: '', keepAlive: true }
}, {
path: 'qxsj',
- name: 'QXSJ',
+ name: 'QXSJCancel',
code: '1084',
component: () => import('@/views/zlgl/qxsj'),
meta: { code: '1084', title: '缂洪櫡缁熻', icon: '', keepAlive: true }
@@ -455,25 +455,25 @@
children: [
{
path: 'bmgz',
- name: 'BMGZ',
+ name: 'BMGZCancel',
code: '1101',
component: () => import('@/views/xtsz/bmgz'),
meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
}, {
path: 'mmxg',
- name: 'MMXG',
+ name: 'MMXGCancel',
code: '1102',
component: () => import('@/views/xtsz/mmxg'),
meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
}, {
path: 'xtrz',
- name: 'XTRZ',
+ name: 'XTRZCancel',
code: '1103',
component: () => import('@/views/xtsz/xtrz'),
meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '', keepAlive: true }
}, {
path: 'sc',
- name: 'SC',
+ name: 'SCCancel',
code: '1104',
component: () => import('@/views/xtsz/sc'),
meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
diff --git a/src/utils/request.js b/src/utils/request.js
index b96d3dd..061a8ee 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -55,7 +55,7 @@
Message({
message: res.Message || 'Error',
type: 'error',
- duration: 10 * 1000
+ duration: 5 * 1000
})
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
@@ -81,7 +81,7 @@
Message({
message: error.message,
type: 'error',
- duration: 10 * 1000
+ duration: 5 * 1000
})
return Promise.reject(error)
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 3c2a826..0202f7d 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -23,8 +23,8 @@
filterable
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getRoleTypeSearch2"
>
+ <!-- @focus="getRoleTypeSearch2"-->
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -311,10 +311,10 @@
:options="StuOrgArr"
:props="defaultProps"
style="width: 200px;"
- @focus="getUserOrganization"
+
@change="dialogCascaderChange"
/>
-
+ <!-- @focus="getUserOrganization"-->
</el-form-item>
<el-form-item label="鍏宠仈瑙掕壊">
<el-select
@@ -635,8 +635,8 @@
},
created() {
this.getRoleSearch()
- // this.getRoleTypeSearch2()
- // this.getUserOrganization()
+ this.getRoleTypeSearch2()
+ this.getUserOrganization()
},
mounted() {
window.addEventListener('resize', this.getHeight)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 4ad0f23..5427e4b 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -23,9 +23,10 @@
popper-class="elCascader"
:options="StuOrgArr"
:props="defaultProps"
- @focus="getUserOrganization"
@change="cascaderChange"
/>
+ <!-- @focus="getUserOrganization"-->
+
</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="璇烽�夋嫨">
@@ -626,7 +627,7 @@
},
created() {
this.getUserSearch()
- // this.getUserOrganization()
+ this.getUserOrganization()
},
mounted() {
window.addEventListener('resize', this.getHeight)
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index c0a68ed..d6cecf4 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -79,11 +79,11 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.description==='F'">宸ュ巶</div>
+ <!-- <div v-if="row.description==='F'">宸ュ巶</div>-->
<div v-if="row.description==='D'">閮ㄩ棬</div>
<div v-if="row.description==='W'">杞﹂棿</div>
- <div v-if="row.description==='K'">绉戝</div>
- <div v-if="row.description==='L'">鐢熶骇绾�</div>
+ <!-- <div v-if="row.description==='K'">绉戝</div>-->
+ <!-- <div v-if="row.description==='L'">鐢熶骇绾�</div>-->
</template>
</el-table-column>
<el-table-column
@@ -160,7 +160,8 @@
<el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
<el-input v-model="dialogForm.OrgName" style="width: 200px" />
</el-form-item>
- <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
+ <!-- <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">-->
+ <el-form-item v-if="dialogFormOrgTypeSelected!=='D'" prop="SupUnit" label="涓婄骇鍗曚綅">
<el-select
v-model="dialogForm.SupUnit"
style="width: 200px"
@@ -235,11 +236,11 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
OrgTypeArr: [
- { label: '宸ュ巶', value: 'F' },
+ // { label: '宸ュ巶', value: 'F' },
{ label: '閮ㄩ棬', value: 'D' },
- { label: '杞﹂棿', value: 'W' },
- { label: '绉戝', value: 'K' },
- { label: '鐢熶骇绾�', value: 'L' }
+ { label: '杞﹂棿', value: 'W' }
+ // { label: '绉戝', value: 'K' },
+ // { label: '鐢熶骇绾�', value: 'L' }
],
total: 10,
@@ -347,7 +348,8 @@
} else {
this.dialogFormOrgTypeSelected = val
}
- if (this.dialogFormOrgTypeSelected !== 'F') {
+ // if (this.dialogFormOrgTypeSelected !== 'F') {
+ if (this.dialogFormOrgTypeSelected !== 'D') {
const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
this.SupUnitArr = res
}
@@ -366,17 +368,19 @@
edit(operation, row) {
this.operation = operation
this.dialogVisible = true
- if (row.description === 'F') {
- this.dialogForm.OrgType = '宸ュ巶'
- } else if (row.description === 'D') {
+ // if (row.description === 'F') {
+ // this.dialogForm.OrgType = '宸ュ巶'
+ // } else
+ if (row.description === 'D') {
this.dialogForm.OrgType = '閮ㄩ棬'
} else if (row.description === 'W') {
this.dialogForm.OrgType = '杞﹂棿'
- } else if (row.description === 'K') {
- this.dialogForm.OrgType = '绉戝'
- } else if (row.description === 'L') {
- this.dialogForm.OrgType = '鐢熶骇绾�'
}
+ // else if (row.description === 'K') {
+ // this.dialogForm.OrgType = '绉戝'
+ // } else if (row.description === 'L') {
+ // this.dialogForm.OrgType = '鐢熶骇绾�'
+ // }
this.$nextTick(() => {
this.changeRadio(this.dialogForm.OrgType)
this.dialogForm.OrgCode = row.org_code
@@ -425,7 +429,8 @@
numvalue: '',
// RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
// numvalue: this.operation === 'add' ? this.numvalue : '',
- SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+ // SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+ SupUnit: this.dialogFormOrgTypeSelected === 'D' ? '0' : this.dialogForm.SupUnit,
OperType: this.operation === 'add' ? 'Add' : 'Update',
Operator: getCookie('admin')
}
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 9e80834..52a6f3e 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -39,8 +39,8 @@
filterable
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getWorkShopSelect"
>
+ <!-- @focus="getWorkShopSelect"-->
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -56,9 +56,10 @@
style="width: 200px"
filterable
placeholder="璇烽�夋嫨"
- @focus="getDeviceTypeSelect"
+
@change="deviceTypeChange"
>
+ <!-- @focus="getDeviceTypeSelect"-->
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -286,6 +287,8 @@
placeholder="璇烽�夋嫨"
@change="workshopcodeChange"
>
+ <!-- @focus="getWorkShopSelect"-->
+
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -665,9 +668,9 @@
// 鑾峰彇璁惧娓呭崟鍒楄〃
this.getDeviceMangerSearch()
// 鑾峰彇璁惧绫诲瀷涓嬫媺
- // this.getDeviceTypeSelect()
+ this.getDeviceTypeSelect()
// 鑾峰彇鎵�灞炶溅闂翠笅鎷�
- // this.getWorkShopSelect()
+ this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 0710533..f1325f4 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -424,10 +424,11 @@
<el-dialog
title="宸ュ簭"
:visible.sync="dialogVisibleSearch"
- width="540px"
- top="25vh"
+ width="840px"
+ top="20vh"
class="dialogVisibleSearch"
append-to-body
+ :close-on-click-modal="false"
>
<el-table
:data="searchTableData"
@@ -470,7 +471,8 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-else type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
@@ -563,6 +565,9 @@
import { WorkShopSelect } from '@/api/sbgl'
import { PartSelect, PartSelectRpute } from '@/api/zzmx'
import { handleDatetime } from '@/utils/global'
+import { getCookie } from '@/utils/auth'
+import { MesOrderPrintSearch1 } from '@/api/utils'
+import { urlAddRandomNo, webapp_ws_ajax_run } from '@/utils/grwebapp'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -787,7 +792,7 @@
this.dialogForm.wkshopcode = ''
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
- async routecodeChange(val) {
+ async routecodeChange(val) {
const data = {
partcode: this.dialogForm.partcode,
routecode: this.dialogForm.routecode
@@ -798,7 +803,7 @@
this.dialogForm.wkshopcode = ''
},
// 宸ュ簭浠诲姟
- async check(row) {
+ async check(row) {
this.dialogVisibleTask = true
const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
this.taskTableData = res
@@ -956,9 +961,11 @@
orderlev: this.dialogForm.orderlev, // 宸ュ崟绛夌骇
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- console.log(data, 1)
AddUpdateMesOrder(data).then(res => {
if (res.code === '200') {
+ if (this.operation !== 'add') {
+ // this.sendPrint()
+ }
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
this.dialogVisible = false
this.getMesOrderSearch()
@@ -968,6 +975,25 @@
})
}
})
+ },
+ // 娲惧彂鎵撳嵃
+ async sendPrint() {
+ const data = {
+ username: getCookie('admin'),
+ mesordercode: this.dialogForm.mesordercode
+ }
+ const res = await MesOrderPrintSearch1(data)
+ if (res.code === '200') {
+ // 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+ var args = {
+ type: 'print', // preview print
+ showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),
+ data: res.data
+ }
+
+ webapp_ws_ajax_run(args)
+ }
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
@@ -1048,6 +1074,7 @@
::v-deep .el-dialog__body {
padding: 20px 100px !important;
}
+
.dialogVisibleSearch ::v-deep .el-dialog__body {
padding: 20px 20px !important;
}
diff --git a/src/views/scgl/gdpg.vue b/src/views/scgl/gdpg.vue
index 127a2b2..1b99633 100644
--- a/src/views/scgl/gdpg.vue
+++ b/src/views/scgl/gdpg.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div v-if="false">
<h3>鎶ヨ〃鐩存帴鎵撳嵃锛岄�氳繃AJAX鏂瑰紡鑾峰彇鎶ヨ〃妯℃澘涓庢姤琛ㄦ暟鎹�</h3>
<p><a href="javascript:void" @click.prevent="printClick">鐩存帴鎵撳嵃</a></p>
</div>
@@ -29,7 +29,7 @@
mesordercode: 'PO202206280001_4'
}
const res = await MesOrderPrintSearch1(data)
- this.OBJ = res.data
+ console.log(this.OBJ = res.data, 8989)
if (res.code === '200') {
this.ws_ajax_print()
}
@@ -38,7 +38,7 @@
ws_ajax_print() {
// 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
var args = {
- type: 'print', // preview
+ type: 'preview', // preview print
showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),
data: this.OBJ
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 85e1105..77bc27d 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -6,7 +6,7 @@
<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: 70px">鎵爜锛�</div>
<el-input
v-model="form.orderstepqrcode"
oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
@@ -15,7 +15,7 @@
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
</div>
- <div style="display: flex;padding-right: 10px">
+ <div v-if="false" style="display: flex;padding-right: 10px">
<el-button @click="ZZstart">
<svg-icon icon-class="start_time" style="margin-right: 2px" />
寮�濮�
@@ -39,19 +39,19 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <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-->
+ <!-- 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"
@@ -74,23 +74,19 @@
prop="wo_code"
label="宸ュ崟鍙�"
sortable="custom"
- width="160"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
- width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
- width="150"
/>
<el-table-column
- prop="seq"
- width="80"
+ prop="stepname"
label="宸ュ簭"
sortable="custom"
/>
@@ -103,14 +99,13 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="150"
sortable="custom"
/>
<el-table-column
prop="good_qty"
- label="宸叉姤宸ユ暟閲�"
+ label="宸叉姤宸ユ暟閲�(鑹搧)"
sortable="custom"
- width="150"
+ width="160"
/>
<el-table-column
prop="ng_qty"
@@ -168,7 +163,7 @@
:value="item.code"
/>
</el-select>
- <div style="width: 70px;margin-left: 20px">宸ュ簭鐮侊細</div>
+ <div style="width: 70px;margin-left: 20px">鎵爜锛�</div>
<el-input
v-model="WXform.orderstepqrcode"
oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
@@ -177,7 +172,7 @@
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
/>
</div>
- <div style="display: flex;padding-right: 10px">
+ <div v-if="false" style="display: flex;padding-right: 10px">
<el-button @click="WXsend">
<svg-icon icon-class="start_time" style="margin-right: 2px" />
鍙戞枡
@@ -201,19 +196,19 @@
:cell-style="this.$cellStyle"
@sort-change="WXsortChange"
>
- <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-->
+ <!-- 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"
@@ -228,31 +223,27 @@
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂拌鍗�</div>
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
- <div v-if="row.status==='START'">寮�宸�</div>
- <div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ <div v-if="row.status==='START'">宸插彂鏂�</div>
+ <div v-if="row.status==='CLOSED'">宸叉敹鏂�</div>
</template>
</el-table-column>
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
sortable="custom"
- width="160"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
- width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
- width="150"
/>
<el-table-column
prop="stepname"
- width="100"
label="宸ュ簭"
sortable="custom"
/>
@@ -265,14 +256,13 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="150"
sortable="custom"
/>
<el-table-column
prop="good_qty"
- label="宸叉姤宸ユ暟閲�"
+ label="宸叉敹鏂欐暟閲�(鑹搧)"
sortable="custom"
- width="150"
+ width="160"
/>
<el-table-column
prop="ng_qty"
@@ -328,7 +318,13 @@
@close="handleClose"
@closed="handleClose"
>
- <el-form ref="dialogForm" inline :model="dialogForm" label-width="110px">
+ <el-form
+ ref="dialogForm"
+ inline
+ :rules="dialogFormRules"
+ :model="dialogForm"
+ label-width="110px"
+ >
<el-form-item label="宸ュ崟缂栧彿锛�">
<div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
@@ -354,75 +350,89 @@
<el-form-item label="浠诲姟鏁伴噺锛�">
<div style="width: 200px">{{ dialogForm.planqty }}</div>
</el-form-item>
- <el-form-item :label="dialogTitle==='鑷埗寮�濮�'||dialogTitle==='鑷埗鎶ュ伐'?'鏈姤/宸叉姤锛�':'鏈彂/宸插彂锛�'">
+
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
-
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
+ </el-form-item>
+ <!--鑷埗寮�濮�-->
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="寮�宸ユ暟閲忥細">
- <div style="width: 200px">1000</div>
+ <div style="width: 200px">{{ dialogForm.startqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鐢熶骇璁惧锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" prop="eqpcode" label="鐢熶骇璁惧锛�">
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.eqpcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in ZZeqpArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
+ <!-- 鑷埗鎶ュ伐 -->
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
- <div style="width: 200px">B宸ュ簭</div>
+ <div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="usergroupcode" label="鐢熶骇鐝粍锛�">
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.usergroupcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ @change="usergroupChange"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鐢熶骇鐝粍锛�">
- <el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in options"
+ v-for="item in ZZtreams"
:key="item.group_code"
:label="item.group_name"
:value="item.group_code"
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" prop="eqpcode">
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.eqpcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in ZZeqpArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐鏁伴噺锛�" prop="startqty">
+ <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
+ <el-input v-model="dialogForm.noputqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">
+ <el-select
+ v-model="dialogForm.badcode"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
+ multiple
+ >
+ <el-option
+ v-for="item in badArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -440,29 +450,30 @@
style="width: 100%"
>
<el-table-column
- prop="RowNum"
+ width="100"
label="搴忓彿"
+ type="index"
/>
<el-table-column
- prop="name"
+ prop="username"
label="浜哄憳鍚嶇О"
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.name }}</div>
- <el-input v-if="row.isVisible===1" v-model="row.name" />
- <!-- <el-select-->
- <!-- v-if="row.isVisible===1"-->
- <!-- v-model="dialogForm.OrgType"-->
- <!-- style="width: 200px;"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in options"-->
- <!-- :key="item.value"-->
- <!-- :label="item.label"-->
- <!-- :value="item.value"-->
- <!-- />-->
- <!-- </el-select>-->
+ <div v-if="row.isVisible===0">{{ row.username }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.username"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>usernameChange(val,row)"
+ >
+ <el-option
+ v-for="item in ZZuserArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
</template>
</el-table-column>
<el-table-column
@@ -472,7 +483,7 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-button v-if="row.isVisible===0" type="text" @click="userDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="userSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1&&!userIsSave" type="text" @click="userSave(row)">淇濆瓨</el-button>
<el-button v-if="row.isVisible===1" type="text" @click="userCancel(row)">鍙栨秷</el-button>
</div>
</template>
@@ -490,88 +501,134 @@
@pagination="getMesOrderStepSearch"
/>
</div>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="澶栧崗渚涙柟锛�">
+ <!-- 澶栧崗鍙戞枡-->
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ label="澶栧崗渚涙柟锛�"
+ prop="wxcode"
+ >
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.wxcode"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in WXouterprovide"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ label="鍙戞枡浜哄憳锛�"
+ prop="outuser"
+ >
+ <el-select
+ v-model="dialogForm.outuser"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in WXoutuser"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ label="鍙戞枡鏁伴噺锛�"
+ prop="fqty"
+ >
+ <el-input v-model="dialogForm.fqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ </el-form-item>
+ <!-- 澶栧崗鏀舵枡-->
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="涓嬮亾宸ュ簭锛�"
+ >
+ <div style="width: 200px">{{ dialogForm.nextstepname }}</div>
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="澶栧崗渚涙柟锛�"
+ prop="wxcode"
+ >
+ <el-select
+ v-model="dialogForm.wxcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in WXouterprovide"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鍙戞枡浜哄憳锛�">
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="鏀舵枡浜哄憳锛�"
+ prop="inuser"
+ >
<el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- multiple
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鍙戞枡鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="涓嬮亾宸ュ簭锛�">
- <div style="width: 200px">B宸ュ簭</div>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="澶栧崗渚涙柟锛�">
- <el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.inuser"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in WXoutuser"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡浜哄憳锛�">
- <el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- multiple
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡鏁伴噺锛�">
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="鏀舵枡鏁伴噺锛�"
+ prop="sqty"
+ >
<el-input
- v-model="dialogForm.OrgName"
+ v-model="dialogForm.sqty"
style="width: 200px"
oninput="value=value.replace(/[^0-9.]/g,'')"
/>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="涓嶈壇鍘熷洜锛�">
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="涓嶈壇鏁伴噺锛�"
+ prop="noputqty"
+ >
+ <el-input
+ v-model="dialogForm.noputqty"
+ style="width: 200px"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ />
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="涓嶈壇鍘熷洜锛�"
+ prop="badcode"
+ >
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.badcode"
style="width: 200px;"
+ multiple
+ :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in badArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -597,12 +654,21 @@
import $ from 'jquery'
import {
MesOrderGroupSelectUser,
+ MesOrderSelectUser,
MesOrderStepReportSelectUserGroup,
- MesOrderStepSearch, MesOrderStepStart,
+ MesOrderStepSearch,
+ MesOrderStepStart,
MesOrderStepStartSelectEqp,
- MesOrderWxStepSearch
+ MesOrderWxStepSearch,
+ MesOrderStepSelectWX,
+ SavaMesOrderStepOut,
+ MesOrderStepSelectCause,
+ SavaMesOrderStepIn,
+ SavaMesOrderStepStart,
+ SavaMesOrderStepReport
} from '@/api/scgl'
-import { MesOrderStepSelectWX } from '@/api/sbgl'
+import { urlAddRandomNo, webapp_ws_ajax_run } from '@/utils/grwebapp'
+import { MesOrderPrintSearch1 } from '@/api/utils'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -632,13 +698,13 @@
return {
mainHeight: 0,
tableHeight: 0,
- produceCode: '', // 宸ュ簭鐮�
- WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
+ // produceCode: '', // 宸ュ簭鐮�
+ // WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
radioSelected: '', // 宸ュ簭閫変腑
WXradioSelected: '', // 宸ュ簭閫変腑
form: {
- orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'wo', // 鎺掑簭瀛楁
+ orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ prop: 'wo_code', // 鎺掑簭瀛楁
order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -647,7 +713,7 @@
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
// PO202206280001_4;Step01
- orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
prop: 'wo_code', // 鎺掑簭瀛楁
order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -661,10 +727,6 @@
{ code: 'IN', name: '鏀舵枡' }
],
WXSelected: 'OUT', // 澶栧崗涓嬫媺鍒楄〃閫変腑鍊�
-
- judgeIsDialog: false, // 鍒ゆ柇鏄惁鑷姩寮圭獥
- judgeIsDialogNumber: false, // 鍒ゆ柇寮瑰摢涓獥
-
dialogVisible: false,
dialogTitle: '', // 鑷埗寮�濮嬨�佽嚜鍒舵姤宸ャ�佸鍗忓彂鏂欍�佸鍗忔敹鏂�
dialogForm: {
@@ -672,51 +734,84 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
+ stepseq: '', // 宸ュ簭搴忓彿
+ stepcode: '', // 宸ュ簭缂栫爜
stepname: '', // 褰撳墠宸ュ簭鍚�
nextstepname: '', // 涓嬩竴閬撳伐搴忓悕
stepdesc: '', // 宸ュ簭鎻忚堪
planqty: '', // 浠诲姟鏁伴噺
reportqty: '', // 宸叉姤鏁伴噺
noreportqty: '', // 鏈姤鏁伴噺
- startqty: '' // 鍙戞枡鏁伴噺
+ startqty: '', // 寮�(鎶�)宸ユ暟閲�
- // eqpcode: '', // 璁惧缂栫爜
- // usergroupcode: '', // 鐝粍缂栫爜
- // reportuser: '', // 鎶ュ伐浜哄憳
- // taskqty: '', // 浠诲姟鏁伴噺
- // startqty: '', // 寮�宸ユ暟閲�
- // reportqty: '', // 鎶ュ伐鏁伴噺
- // ngqty: '' // 涓嶈壇鏁伴噺
+ wxcode: '', // 澶栧崗渚涘簲鍟嗙紪鐮�
+ outuser: '', // 鍙戞枡浜哄憳
+ taskqty: '', // 浠诲姟鏁伴噺
+ fqty: '', // 鍙戞枡鏁伴噺
+
+ inuser: '', // 鏀舵枡浜哄憳
+ sqty: '', // 鏀舵枡鏁伴噺
+ ngqty: '', // 涓嶈壇鏁伴噺
+ badcode: '', // 涓嶈壇鍘熷洜缂栫爜
+
+ noputqty: '', // 涓嶈壇鏁伴噺
+
+ eqpcode: '', // 鐢熶骇璁惧缂栫爜
+
+ usergroupcode: '', // 鐝粍缂栫爜
+ reportuser: '', // 鎶ュ伐浜哄憳
+
+ startqtySum: '' // 涓嶈兘瓒呰繃鐨勬暟鍊�
},
- userTableData: [
- { RowNum: 1, name: '寮犱笁' },
- { RowNum: 2, name: '鏉庡洓' }
- ], // 浜哄憳鍒楄〃
+ ZZuserArr: [], // 鑷埗鐢ㄦ埛鎵�鏈�
+ ZZtreams: [], // 鑷埗鐢熶骇鐝粍鏁扮粍
+ ZZeqpArr: [], // 鑷埗璁惧鍚嶇О
+ badArr: [], // 涓嶈壇鍘熷洜鏁扮粍
+ WXouterprovide: [], // 澶栧崗渚涙柟鏁扮粍
+ WXoutuser: [], // 鍙戞枡浜哄憳鏁扮粍
+ userTableData: [], // 浜哄憳鍒楄〃
UserTotal: 0,
- Userform: {
-
- }
+ Userform: {},
+ userIsSave: false, // 姝や汉鍛樻槸鍚﹀彲淇濇寔
// operation: '',
- // dialogFormRules: {
- // OrgType: [
- // { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- // ],
- // OrgCode: [
- // { required: true, validator: validateName, trigger: ['blur', 'change'] }
- // ],
- // OrgName: [
- // { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- // ],
- // SupUnit: [
- // { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
- // ]
- // }
+ dialogFormRules: {
+ outuser: [
+ { required: true, message: '璇烽�夋嫨鍙戞枡浜哄憳', trigger: ['blur', 'change'] }
+ ],
+ fqty: [
+ { required: true, message: '璇疯緭鍏ュ彂鏂欐暟閲�', trigger: ['blur', 'change'] }
+ ],
+ wxcode: [
+ { required: true, message: '璇烽�夋嫨澶栧崗渚涙柟', trigger: ['blur', 'change'] }
+ ],
+ inuser: [
+ { required: true, message: '璇烽�夋嫨鏀舵枡浜哄憳', trigger: ['blur', 'change'] }
+ ],
+ sqty: [
+ { required: true, message: '璇疯緭鍏ユ敹鏂欐暟閲�', trigger: ['blur', 'change'] }
+ ],
+ // noputqty: [
+ // { required: true, message: '璇疯緭鍏ヤ笉鑹暟閲�', trigger: ['blur', 'change'] }
+ // ],
+ // badcode: [
+ // { required: true, message: '璇烽�夋嫨涓嶈壇鍘熷洜', trigger: ['blur', 'change'] }
+ // ]
+ eqpcode: [
+ { required: true, message: '璇烽�夋嫨鐢熶骇璁惧', trigger: ['blur', 'change'] }
+ ],
+ usergroupcode: [
+ { required: true, message: '璇烽�夋嫨鐢熶骇鐝粍', trigger: ['blur', 'change'] }
+ ],
+ startqty: [
+ { required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
+ ]
+ }
}
},
created() {
- // this.getMesOrderStepSearch()
+ this.getMesOrderStepSearch()
this.tabClick()
},
mounted() {
@@ -778,20 +873,23 @@
},
// tab鎸夐挳鍒囨崲榧犳爣鑷姩鑱氱劍
tabClick(val, d) {
- console.log(val, d, 1)
if (this.$refs.elTabs.currentName === '0') {
this.$nextTick(() => {
+ this.getMesOrderStepSearch()
$("input[name='produceCode']")[0].focus()
+ // this.WXform.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '1') {
this.$nextTick(() => {
+ this.getMesOrderWxStepSearch()
$("input[name='WXproduceCode']")[0].focus()
+ // this.form.orderstepqrcode = ''
})
}
},
// 鎵爜閿洏鍥炶溅浜嬩欢
- async enterNative(val, belong) {
+ async enterNative(val, belong) {
console.log(val, belong)
// 寮�宸ワ細code="200" count=0
// 鎶ュ伐锛歝ode="200" count=1
@@ -799,12 +897,19 @@
// 鏀舵枡锛歝ode="200" count=3
// 璧板垪琛ㄥ舰寮� code="200" count=4
if (belong === 'produceCode') {
- // this.ZZreport()
- // 鏌ユ壘璁惧
- // const {data:res} = await MesOrderStepStartSelectEqp({ orderstepqrcode: this.produceCode })
- // this.xxx=res
- // 鏌ユ壘鐝粍
- // const { data: res2 } = await MesOrderStepReportSelectUserGroup()
+ const data = {
+ OperType: 'ZZ',
+ orderstepqrcode: this.form.orderstepqrcode,
+ SelectType: ''
+ }
+ console.log(this.form.orderstepqrcode, 21)
+ const res = await MesOrderStepStart(data)
+ if (res.code === '200' && res.count === 0) {
+ await this.ZZstart(res.data)
+ }
+ if (res.code === '200' && res.count === 1) {
+ await this.ZZreport(res.data)
+ }
}
if (belong === 'WXproduceCode') {
const data = {
@@ -814,7 +919,10 @@
}
const res = await MesOrderStepStart(data)
if (res.code === '200' && res.count === 2) {
- this.WXsend(res.data)
+ await this.WXsend(res.data)
+ }
+ if (res.code === '200' && res.count === 3) {
+ await this.WXback(res.data)
}
}
},
@@ -823,58 +931,177 @@
this.getMesOrderStepSearch()
},
// 鑷埗寮�濮�
- async ZZstart() {
+ async ZZstart(obj) {
+ // if (!this.ZZisExecutable) {
+ // return this.$message.info('璇峰厛鎵爜宸ュ簭浜岀淮鐮侊紒')
+ // }
this.dialogTitle = '鑷埗寮�濮�'
- // this.dialogVisible = true
- this.dialogVisibleTrue()
+ this.dialogVisible = true
- const res = await MesOrderStepStartSelectEqp({ orderstepqrcode: produceCode })
+ this.$nextTick(() => {
+ this.dialogForm.wo_code = obj.wo_code
+ this.dialogForm.partcode = obj.partnumber
+ this.dialogForm.partname = obj.partname
+ this.dialogForm.partspec = obj.partspec
+ this.dialogForm.stepseq = obj.seq
+ this.dialogForm.stepcode = obj.stepcode
+ 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
+ })
+
+ await this.getMesOrderStepStartSelectEqp()
},
// 鑷埗鎶ュ伐
- ZZreport() {
+ async ZZreport(obj) {
+ // if (!this.ZZisExecutable) {
+ // return this.$message.info('璇峰厛鎵爜宸ュ簭浜岀淮鐮侊紒')
+ // }
this.dialogTitle = '鑷埗鎶ュ伐'
- // this.dialogVisible = true
- this.dialogVisibleTrue()
- this.getUserTableData()
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.wo_code = obj.wo_code
+ this.dialogForm.partcode = obj.partnumber
+ this.dialogForm.partname = obj.partname
+ this.dialogForm.partspec = obj.partspec
+ this.dialogForm.stepseq = obj.seq
+ this.dialogForm.stepcode = obj.stepcode
+ this.dialogForm.stepname = obj.stepname
+ this.dialogForm.stepdesc = obj.stepdesc
+ this.dialogForm.planqty = obj.planqty
+ this.dialogForm.reportqty = obj.reportqty
+ this.dialogForm.noputqty = obj.noputqty
+ this.dialogForm.noreportqty = obj.noreportqty
+ this.dialogForm.startqty = obj.startqty
+
+ if (obj.nextstepname === null || obj.nextstepcode === '') {
+ this.dialogForm.nextstepname = obj.stepname
+ } else {
+ this.dialogForm.nextstepname = obj.nextstepname
+ }
+
+ this.dialogForm.startqtySum = obj.startqty
+ })
+
+ await this.getMesOrderStepStartSelectEqp()
+ await this.getMesOrderStepReportSelectUserGroup()
+ await this.getMesOrderStepSelectCause('ZZ')
+ await this.getMesOrderSelectUserZZ()
},
// 澶栧崗鍙戞枡
- async WXsend(obj) {
- if (this.WXradioSelected.length < 1 && obj.length < 1) {
- return this.$message.info('璇峰厛閫夋嫨宸ュ簭锛�')
- }
+ async WXsend(obj) {
+ // if (this.WXradioSelected.length < 1 && obj.length < 1) {
+ // return this.$message.info('璇峰厛閫夋嫨宸ュ簭锛�')
+ // }
+ // console.log(this.WXform.orderstepqrcode === '', 6)
+ // if (this.WXform.orderstepqrcode === '') {
+ // return this.$message.info('璇峰厛杈撳叆宸ュ簭锛�')
+ // }
this.dialogTitle = '澶栧崗鍙戞枡'
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 = {
- //
- // }
- // const res = await MesOrderStepSelectWX(data)
- // console.log(res)
+ this.$nextTick(() => {
+ 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.fqty = obj.startqty
+ this.dialogForm.stepcode = obj.stepcode
+ this.dialogForm.stepseq = obj.seq
+ })
+
+ await this.getMesOrderStepSelectWX()
+ await this.getMesOrderSelectUser()
},
// 澶栧崗鏀舵枡
- WXback() {
+ async WXback(obj) {
+ // if (this.WXform.orderstepqrcode === '') {
+ // return this.$message.info('璇峰厛杈撳叆宸ュ簭锛�')
+ // }
this.dialogTitle = '澶栧崗鏀舵枡'
- this.dialogVisibleTrue()
- // this.dialogVisible = true
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ 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.stepcode = obj.stepcode
+ if (obj.nextstepname === null || obj.nextstepcode === '') {
+ this.dialogForm.nextstepname = obj.stepname
+ } else {
+ this.dialogForm.nextstepname = obj.nextstepname
+ }
+ this.dialogForm.noputqty = obj.noputqty
+ this.dialogForm.stepseq = obj.seq
+ this.dialogForm.sqty = obj.startqty
+
+ this.dialogForm.startqtySum = obj.startqty
+ })
+ await this.getMesOrderStepSelectWX()
+ await this.getMesOrderSelectUser()
+ await this.getMesOrderStepSelectCause('WX')
},
- dialogVisibleTrue() {
- // this.dialogVisible = true
- // this.dialogForm.wo_code=
+ // 鐢熶骇鐝粍涓嬫媺鏀瑰彉
+ usergroupChange(val) {
+ this.dialogForm.usergroupcode = val
+ this.getUserTableData()
+ },
+ // 鑾峰彇鑷埗鎶ュ伐鐢熶骇鐝粍涓嬫媺鍒楄〃
+ async getMesOrderStepReportSelectUserGroup() {
+ const { data: res } = await MesOrderStepReportSelectUserGroup()
+ this.ZZtreams = res
+ },
+ // 鑾峰彇鑷埗鎶ュ伐琛ㄦ牸user鎵�鏈�
+ async getMesOrderSelectUserZZ() {
+ const { data: res } = await MesOrderSelectUser({ usercode: this.dialogForm.usergroupcode })
+ this.ZZuserArr = res
+ },
+ // 鑾峰彇鑷埗鐢熶骇璁惧涓嬫媺
+ async getMesOrderStepStartSelectEqp() {
+ const { data: res } = await MesOrderStepStartSelectEqp({ orderstepqrcode: this.form.orderstepqrcode })
+ this.ZZeqpArr = res
+ },
+ // 鑾峰彇WX渚涙柟鎺ュ彛
+ async getMesOrderStepSelectWX() {
+ const { data: res } = await MesOrderStepSelectWX({ orderstepqrcode: this.WXform.orderstepqrcode })
+ this.WXouterprovide = res
+ },
+ // 鑾峰彇鏀跺彂鏂欎汉鍛樹笅鎷夋帴鍙�
+ async getMesOrderSelectUser() {
+ const { data: res } = await MesOrderSelectUser({ usercode: this.dialogForm.outuser })
+ this.WXoutuser = res
+ },
+ // 鑾峰彇鏀舵枡涓嶈壇鍘熷洜涓嬫媺
+ async getMesOrderStepSelectCause(val) {
+ let orderstepqrcode = ''
+ if (val === 'WX') {
+ orderstepqrcode = this.WXform.orderstepqrcode
+ }
+ if (val === 'ZZ') {
+ orderstepqrcode = this.form.orderstepqrcode
+ }
+ const { data: res } = await MesOrderStepSelectCause({ orderstepqrcode: orderstepqrcode })
+ this.badArr = res
},
// 鎶ュ伐鏌ヨ鐢ㄦ埛琛�
async getUserTableData() {
- // const { data: res } = await MesOrderGroupSelectUser({ usergroupcode: 'SC01' })
+ const { data: res } = await MesOrderGroupSelectUser({ usergroupcode: this.dialogForm.usergroupcode })
+ this.userTableData = res
this.userTableData.forEach(item => {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
@@ -886,7 +1113,8 @@
userAdd() {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- this.userTableData.unshift({ name: '', isVisible: 1, number: number })
+ console.log(this.userTableData, 6)
+ this.userTableData.unshift({ usercode: '', username: '', isVisible: 1, number: number })
},
// 鐢ㄦ埛鍒楄〃鍒犻櫎
userDel(row) {
@@ -912,58 +1140,236 @@
}
})
},
- // 閲嶇疆
- reset() {
- this.dialogTitle = ''
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
- this.getMesOrderStepSearch()
+ // 鐢ㄦ埛鍒楄〃浜哄憳鍚嶇О鍊奸�変腑
+ usernameChange(val, row) {
+ this.userTableData.forEach(item => {
+ if (item.usercode === val) {
+ this.userIsSave = true
+ return this.$message.info('姝や汉鍛樺凡鍦ㄥ垪涓紒')
+ }
+ if (item.number === row.number) {
+ this.userIsSave = false
+ item.usercode = val
+ item.username = this.ZZuserArr.find(item => item.usercode === val).username
+ }
+ })
},
-
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.wo_code = '', // 宸ュ崟缂栧彿
+ this.dialogForm.partcode = '', // 浜у搧缂栫爜
+ this.dialogForm.partname = '', // 浜у搧鍚嶇О
+ this.dialogForm.partspec = '', // 浜у搧瑙勬牸
+ this.dialogForm.stepseq = '', // 宸ュ簭搴忓彿
+ this.dialogForm.stepcode = '', // 宸ュ簭缂栫爜
+ this.dialogForm.stepname = '', // 褰撳墠宸ュ簭鍚�
+ this.dialogForm.nextstepname = '', // 涓嬩竴閬撳伐搴忓悕
+ this.dialogForm.stepdesc = '', // 宸ュ簭鎻忚堪
+ this.dialogForm.planqty = '', // 浠诲姟鏁伴噺
+ this.dialogForm.reportqty = '', // 宸叉姤鏁伴噺
+ this.dialogForm.noreportqty = '', // 鏈姤鏁伴噺
+ this.dialogForm.startqty = '', // 寮�(鎶�)宸ユ暟閲�
+
+ this.dialogForm.wxcode = '', // 澶栧崗渚涘簲鍟嗙紪鐮�
+ this.dialogForm.outuser = '', // 鍙戞枡浜哄憳
+ this.dialogForm.taskqty = '', // 浠诲姟鏁伴噺
+ this.dialogForm.fqty = '', // 鍙戞枡鏁伴噺
+
+ this.dialogForm.inuser = '', // 鏀舵枡浜哄憳
+ this.dialogForm.sqty = '', // 鏀舵枡鏁伴噺
+ this.dialogForm.ngqty = '', // 涓嶈壇鏁伴噺
+ this.dialogForm.badcode = '', // 涓嶈壇鍘熷洜缂栫爜
+
+ this.dialogForm.noputqty = '', // 涓嶈壇鏁伴噺
+
+ this.dialogForm.eqpcode = '', // 鐢熶骇璁惧缂栫爜
+
+ this.dialogForm.usergroupcode = '', // 鐝粍缂栫爜
+ this.dialogForm.reportuser = '', // 鎶ュ伐浜哄憳
+
+ this.dialogForm.startqtySum = '' // 涓嶈兘瓒呰繃鐨勬暟鍊�
+
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
this.dialogVisible = false
- // if (this.dialogTitle === '鑷埗寮�濮�'||this.dialogTitle === '鑷埗鎶ュ伐') {
- // this.tabClick('0')
- // }
- // if (this.dialogTitle === '澶栧崗鍙戞枡'||this.dialogTitle === '澶栧崗鏀舵枡') {
- // this.tabClick('1')
- // }
this.tabClick()
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- // this.$refs.dialogForm.validate(valid => {
- // if (valid) {
- // const data = {
- // OrganCode: this.dialogForm.OrgCode,
- // OrganName: this.dialogForm.OrgName,
- // Operator: getCookie('admin')
- // }
- // // this.tabClick()
- // // AddUpdateOrganization(data).then(res => {
- // // if (res.code === '200') {
- // // // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // // this.dialogVisible = false
- // // this.getMesOrderStepSearch()
- // // } else {
- // // // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // // }
- // // })
- // }
- // })
- this.tabClick()
- this.dialogVisible = false
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ if (this.dialogTitle === '澶栧崗鍙戞枡') {
+ if (parseFloat(this.dialogForm.fqty) > parseFloat(this.dialogForm.noreportqty)) {
+ return this.$message.info('鍙戞枡鏁伴噺涓嶈兘澶т簬鏈彂鏁伴噺!')
+ }
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿 鏆傛椂缂�
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ wxcode: this.dialogForm.wxcode, // 澶栧崗渚涘簲鍟嗙紪鐮�
+ outuser: this.dialogForm.outuser, // 鍙戞枡浜哄憳
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ fqty: this.dialogForm.fqty // 鍙戞枡鏁伴噺
+ }
+ SavaMesOrderStepOut(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍙戞枡鎴愬姛锛�')
+ this.dialogVisible = false
+ this.tabClick()
+ } else {
+ this.$message.error('鍙戞枡澶辫触!')
+ }
+ })
+ }
+
+ if (this.dialogTitle === '澶栧崗鏀舵枡') {
+ if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
+ return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈敹鏁伴噺!')
+ }
+
+ if (parseFloat(this.dialogForm.noputqty) > 0) {
+ if (this.dialogForm.badcode.length < 1) {
+ return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
+ }
+ }
+
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ wxcode: this.dialogForm.wxcode, // 澶栧崗渚涘簲鍟嗙紪鐮�
+ inuser: this.dialogForm.inuser, // 鍙戞枡浜哄憳
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ sqty: this.dialogForm.sqty, // 鏀舵枡鏁伴噺
+ ngqty: this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
+ }
+ SavaMesOrderStepIn(data).then(res => {
+ if (res.code === '200') {
+ // this.WXprint()
+ this.$message.success('鏀舵枡鎴愬姛锛�')
+ this.dialogVisible = false
+ this.tabClick()
+ } else {
+ this.$message.error('鏀舵枡澶辫触!')
+ }
+ })
+ }
+
+ if (this.dialogTitle === '鑷埗寮�濮�') {
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿 鏆傛椂缂�
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ eqpcode: this.dialogForm.eqpcode, // 鐢熶骇璁惧
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ startqty: this.dialogForm.startqty// 寮�濮嬫暟閲�
+ }
+ SavaMesOrderStepStart(data).then(res => {
+ if (res.code === '200') {
+ // this.WXprint()
+ this.$message.success('寮�宸ユ垚鍔燂紒')
+ this.dialogVisible = false
+ this.tabClick()
+ } else {
+ this.$message.error('寮�宸ュけ璐�!')
+ }
+ })
+ }
+
+ if (this.dialogTitle === '鑷埗鎶ュ伐') {
+ if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
+ return this.$message.info('鎶ュ伐鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈姤鏁伴噺!')
+ }
+ if (this.userTableData.length < 1) {
+ return this.$message.info('浜哄憳鍒楄〃涓嶈兘涓虹┖!')
+ }
+
+ if (parseFloat(this.dialogForm.noputqty) > 0) {
+ if (this.dialogForm.badcode.length < 1) {
+ return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
+ }
+ }
+
+ const reportuser = this.userTableData.map(item => item.usercode).join(';')
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ eqpcode: this.dialogForm.eqpcode, // 璁惧缂栫爜
+ usergroupcode: this.dialogForm.usergroupcode, // 鐝粍缂栫爜
+ reportuser: reportuser, // 鎶ュ伐浜哄憳
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ // startqty: this.dialogForm.startqty, // 寮�宸ユ暟閲�
+ startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
+ // reportqty: this.dialogForm.reportqty, // 鎶ュ伐鏁伴噺
+ reportqty: this.dialogForm.startqty, // 鎶ュ伐鏁伴噺
+ ngqty: this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
+ }
+ SavaMesOrderStepReport(data).then(res => {
+ if (res.code === '200') {
+ // this.ZZprint()
+ this.$message.success('鎶ュ伐鎴愬姛锛�')
+ this.dialogVisible = false
+ this.tabClick()
+ } else {
+ this.$message.error('鎶ュ伐澶辫触!')
+ }
+ })
+ }
+ }
+ })
+ },
+ async ZZprint() {
+ const obj = {
+ recordset: [
+ {
+ wo_code: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ partname: this.dialogForm.partname, // 浜у搧鍚嶇О
+ next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
+ qty: this.dialogForm.startqty, // 鏁伴噺
+ qrcode: this.form.orderstepqrcode// 浜岀淮鐮�
+ }
+ ]
+ }
+ const args = {
+ type: 'print', // preview print
+ showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo('./static/grf/鎶ュ伐浜у嚭鏍囩.grf'),
+ data: obj
+ }
+ webapp_ws_ajax_run(args)
+ },
+ // 澶栧崗鏀舵枡鎵撳嵃
+ WXprint() {
+ // 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+ const obj = {
+ recordset: [
+ {
+ wo_code: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ partname: this.dialogForm.partname, // 浜у搧鍚嶇О
+ next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
+ qty: this.dialogForm.sqty, // 鏁伴噺
+ qrcode: this.WXform.orderstepqrcode// 浜岀淮鐮�
+ }
+ ]
+ }
+ const args = {
+ type: 'print', // preview print
+ showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo('./static/grf/澶栧崗鏀舵枡鏍囩.grf'),
+ data: obj
+ }
+ webapp_ws_ajax_run(args)
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
@@ -1141,11 +1547,12 @@
}
//.dialogVisible{
- ::v-deep .el-select .el-input .el-select__caret {
- display: flex;
- align-items: center;
- justify-content: center;
- }
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
//}
.elTableDiv {
::v-deep .el-radio__label {
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index a5b7c9b..49ed450 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -28,8 +28,8 @@
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getWareHouseSelect"
>
+ <!-- @focus="getWareHouseSelect"-->
<el-option
v-for="item in stockArr"
:key="item.code"
@@ -150,10 +150,10 @@
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getWareHouseSelect2"
>
+ <!-- @focus="getWareHouseSelect2"-->
<el-option
- v-for="item in stockArr2"
+ v-for="item in stockArr"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -212,7 +212,7 @@
},
total: 10,
stockArr: [], // 鎵�灞炰粨搴撴暟缁�
- stockArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
+ // stockArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
tableData: [],
dialogVisible: false,
dialogForm: {
@@ -240,7 +240,7 @@
},
created() {
this.getStorageDefSearch()
- // this.getWareHouseSelect()
+ this.getWareHouseSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -257,10 +257,10 @@
this.stockArr = res
},
// 瀵硅瘽妗嗕腑鐨�
- async getWareHouseSelect2() {
- const { data: res } = await WareHouseSelect()
- this.stockArr2 = res
- },
+ // async getWareHouseSelect2() {
+ // const { data: res } = await WareHouseSelect()
+ // this.stockArr2 = res
+ // },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 3c36587..570859e 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -60,8 +60,8 @@
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getWareHouseSelect"
>
+ <!-- @focus="getWareHouseSelect"-->
<el-option
v-for="item in storehouseArr"
:key="item.code"
@@ -244,10 +244,10 @@
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getWareHouseSelect2"
>
+ <!-- @focus="getWareHouseSelect2"-->
<el-option
- v-for="item in storehouseArr2"
+ v-for="item in storehouseArr"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -644,7 +644,7 @@
created() {
this.getInventoryFileSelect()
this.getStockTypeSelect()
- // this.getWareHouseSelect()
+ this.getWareHouseSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -664,10 +664,10 @@
const { data: res } = await WareHouseSelect()
this.storehouseArr = res
},
- async getWareHouseSelect2() {
- const { data: res } = await WareHouseSelect()
- this.storehouseArr2 = 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 f98d964..1b82c81 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -123,6 +123,7 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 9bd31ba..5bcb346 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -17,9 +17,10 @@
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getPartSelect"
+
@change="partChange"
>
+ <!-- @focus="getPartSelect"-->
<el-option
v-for="item in partArr"
:key="item.partcode"
@@ -221,9 +222,10 @@
style="width: 220px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
- @focus="getPartSelect2"
+
@change="partDialogChange"
>
+ <!-- @focus="getPartSelect2"-->
<el-option
v-for="item in partArr2"
:key="item.partcode"
@@ -527,7 +529,7 @@
},
created() {
this.getBeatRateSearch()
- // this.getPartSelect()
+ this.getPartSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -738,6 +740,7 @@
add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.getPartSelect2()
},
// 淇敼鎸夐挳
async edit(operation, row) {
--
Gitblit v1.9.3