ci-plus 1.4.6 → 1.4.8
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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ci-plus",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.8",
|
|
4
4
|
"description": "ci组件库",
|
|
5
5
|
"main": "./index.ts",
|
|
6
6
|
"scripts": {
|
|
@@ -11,7 +11,8 @@
|
|
|
11
11
|
"keywords": [
|
|
12
12
|
"vue",
|
|
13
13
|
"element-plus",
|
|
14
|
-
"ui组件库二次封装"
|
|
14
|
+
"ui组件库二次封装",
|
|
15
|
+
"调整select组件的一个警告"
|
|
15
16
|
],
|
|
16
17
|
"type": "module",
|
|
17
18
|
"author": {
|
package/src/select/select.vue
CHANGED
|
@@ -163,8 +163,11 @@ const selectAll = (val: any) => {
|
|
|
163
163
|
}
|
|
164
164
|
// 自定义label显示
|
|
165
165
|
const customLabelHandler = (item) => {
|
|
166
|
-
|
|
167
|
-
return eval(props.customLabel)
|
|
166
|
+
console.log('customLabelHandler', item)
|
|
167
|
+
// return eval(props.customLabel)
|
|
168
|
+
const expression = props.customLabel.replace(/item/g, 'item.value');
|
|
169
|
+
const safeEval = new Function('item', `return ${expression};`);
|
|
170
|
+
return safeEval({ value: item });
|
|
168
171
|
}
|
|
169
172
|
</script>
|
|
170
173
|
<style lang="scss" scoped>
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
<div v-else>
|
|
33
33
|
<el-pagination
|
|
34
34
|
v-model:current-page="basic.s_page"
|
|
35
|
-
small
|
|
35
|
+
size="small"
|
|
36
36
|
layout="prev, pager, next"
|
|
37
37
|
:pager-count="5"
|
|
38
38
|
:page-size="10"
|
|
@@ -150,7 +150,7 @@
|
|
|
150
150
|
layout="total,sizes, prev, pager, next,jumper"
|
|
151
151
|
:pager-count="5"
|
|
152
152
|
:total="basic.count"
|
|
153
|
-
small
|
|
153
|
+
size="small"
|
|
154
154
|
:page-sizes="[30, 100, 200]"
|
|
155
155
|
v-model:current-page="basic.page"
|
|
156
156
|
v-model:page-size="basic.limit"
|
package/src/utils/cardPrint.ts
CHANGED
|
@@ -69,8 +69,8 @@ export const cardPrint = (
|
|
|
69
69
|
r6c2: item.process_name, // 本工序
|
|
70
70
|
r6c4: item.next_process_name, // 下工序
|
|
71
71
|
r7c2: item.current_inventory, // 本箱数量
|
|
72
|
-
r7c4: item.opt_user_name, // 操作工/自检员
|
|
73
|
-
r8c2: item.center_data[0]?.inspector, //
|
|
72
|
+
r7c4: item.report_user_name ? item.report_user_name : item.opt_user_name, // 操作工/自检员
|
|
73
|
+
r8c2: item.center_data[0]?.inspector, // 巡检员
|
|
74
74
|
r8c4: setDate(item.product_date), // 生产日期
|
|
75
75
|
r9c2: item.value, // 规值
|
|
76
76
|
r9c4: item.specification, // 规格
|