kz-ui-base 1.0.67 → 1.0.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
v-if="isShowConfirm"
|
|
33
33
|
>添加
|
|
34
34
|
</el-button>
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
</el-col>
|
|
36
|
+
</el-row>
|
|
37
37
|
<el-form :model="ngEntity" ref="checkEntityNgs" :disabled="!isShowConfirm">
|
|
38
38
|
<el-table :border="true" max-height="400" width="100%" stripe :data="ngEntity.defectList"
|
|
39
39
|
:header-cell-style="{'text-align':'center'}">
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
</el-form-item>
|
|
57
57
|
</template>
|
|
58
58
|
</el-table-column>
|
|
59
|
-
<el-table-column prop="defectReason" label="不良原因" align="left" :min-width="
|
|
59
|
+
<el-table-column prop="defectReason" label="不良原因" align="left" :min-width="240">
|
|
60
60
|
<template slot-scope="scope">
|
|
61
61
|
<template v-if="scope.row.isSelect">
|
|
62
62
|
<el-select
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
</template>
|
|
76
76
|
</template>
|
|
77
77
|
</el-table-column>
|
|
78
|
-
<el-table-column prop="
|
|
78
|
+
<el-table-column prop="remark" label="备注" align="left" :min-width="120" show-overflow-tooltip>
|
|
79
79
|
<template slot-scope="scope">
|
|
80
80
|
<el-input v-model="scope.row.remark" clearable show-overflow-tooltip/>
|
|
81
81
|
</template>
|
|
@@ -113,6 +113,12 @@ export default {
|
|
|
113
113
|
isShowConfirm: {
|
|
114
114
|
type: Boolean,
|
|
115
115
|
default: true
|
|
116
|
+
},
|
|
117
|
+
processId: {
|
|
118
|
+
type: String,
|
|
119
|
+
default: function() {
|
|
120
|
+
return null
|
|
121
|
+
}
|
|
116
122
|
}
|
|
117
123
|
},
|
|
118
124
|
data() {
|
|
@@ -160,6 +166,7 @@ export default {
|
|
|
160
166
|
const self = this
|
|
161
167
|
this.$openDialog(DefectModal)({
|
|
162
168
|
siteId: self.siteId,
|
|
169
|
+
processId: self.processId,
|
|
163
170
|
multipleChoice: true,
|
|
164
171
|
onDone: async (data) => {
|
|
165
172
|
if (data?.length > 0) {
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 大于0校验
|
|
3
|
+
* @param rule
|
|
4
|
+
* @param value
|
|
5
|
+
* @param callback
|
|
6
|
+
*/
|
|
7
|
+
export const validateGtZero = (rule, value, callback) => {
|
|
8
|
+
if (value) {
|
|
9
|
+
if (value <= 0) {
|
|
10
|
+
callback(new Error(rule.message || '请输入大于0的数量'))
|
|
11
|
+
} else {
|
|
12
|
+
callback()
|
|
13
|
+
}
|
|
14
|
+
} else {
|
|
15
|
+
callback()
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* 大于等于0校验
|
|
21
|
+
* @param rule
|
|
22
|
+
* @param value
|
|
23
|
+
* @param callback
|
|
24
|
+
*/
|
|
25
|
+
export const validateGteZero = (rule, value, callback) => {
|
|
26
|
+
if (value) {
|
|
27
|
+
if (value < 0) {
|
|
28
|
+
callback(new Error(rule.message || '请输入大于等于0的数量'))
|
|
29
|
+
} else {
|
|
30
|
+
callback()
|
|
31
|
+
}
|
|
32
|
+
} else {
|
|
33
|
+
callback()
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export const validateYYYYMM = (rule, value, callback) => {
|
|
38
|
+
if (value) {
|
|
39
|
+
if (value < 0) {
|
|
40
|
+
callback(new Error(rule.message || '请输入大于等于0的数量'))
|
|
41
|
+
} else {
|
|
42
|
+
callback()
|
|
43
|
+
}
|
|
44
|
+
} else {
|
|
45
|
+
callback()
|
|
46
|
+
}
|
|
47
|
+
}
|