ci-plus 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {
@@ -11,7 +11,8 @@
   "keywords": [
     "vue",
     "element-plus",
-    "ui组件库二次封装"
+    "ui组件库二次封装",
+    "更新标识卡中产品标识卡操作工取值"
   ],
   "type": "module",
   "author": {
@@ -21,7 +22,7 @@
   "license": "ISC",
   "dependencies": {},
   "devDependencies": {
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "sortablejs": "^1.15.1",
     "jsbarcode": "^3.11.4",
     "@types/jsbarcode": "^3.11.4",

package/src/selectSuffix/selectSuffix.vue

@@ -32,7 +32,7 @@
           <div v-else>
             <el-pagination
               v-model:current-page="basic.s_page"
-              small
+              size="small"
               layout="prev, pager, next"
               :pager-count="5"
               :page-size="10"
@@ -150,7 +150,7 @@
           layout="total,sizes, prev, pager, next,jumper"
           :pager-count="5"
           :total="basic.count"
-          small
+          size="small"
           :page-sizes="[30, 100, 200]"
           v-model:current-page="basic.page"
           v-model:page-size="basic.limit"

package/src/sortableTable/headerInput.vue

@@ -116,7 +116,7 @@
                 v-model:current-page="currentPage"
                 v-model:page-size="pageSize"
                 :page-sizes="[20, 30, 50, 100, 500]"
-                small
+                size="small"
                 :background="background"
                 layout=" prev, pager, next, jumper,total"
                 :total="selectOptionTotal"
@@ -167,7 +167,7 @@
 defineOptions({ name: 'ci-headerInput' })
 import SvgIcon from '../svgIcon/svgicon.vue'
 import { computed, ref, watch, PropType, onMounted } from 'vue'
-import lodash, { debounce } from 'lodash'
+import lodash, { debounce } from 'lodash-es'
 import headerPopover from './utils/headerPopover.vue'
 import filterIconVue from './utils/filterIcon.vue'
 import { TooltipTriggerType } from 'element-plus'

package/src/sortableTable/sortableTable copy.vue

@@ -16,7 +16,7 @@ import Sortable from 'sortablejs'
 import { computed, onBeforeMount, onMounted, ref } from 'vue'
 import { SortableTableIns, SortColumn } from './utils/interface'
 import sortableTableColumnCell from './index/sortableTableColumnCell'
-import { cloneDeep } from 'lodash'
+import { cloneDeep } from 'lodash-es'
 let props = defineProps<SortableTableIns>()
 const elTableRef = ref<InstanceType<typeof ElTable>>()
 const emits = defineEmits(['update:modelValue', 'update:data'])

package/src/sortableTable/sortableTable.vue

@@ -27,7 +27,7 @@ import Sortable from 'sortablejs'
 import { VNode, computed, ref } from 'vue'
 import { SortableTableIns, SortColumn } from './utils/interface'
 import sortableTableColumnCell from './index/sortableTableColumnCell'
-import { cloneDeep } from 'lodash'
+import { cloneDeep } from 'lodash-es'
 let props = defineProps<SortableTableIns>()
 const elTableRef = ref<InstanceType<typeof ElTable>>()
 const emits = defineEmits(['update:modelValue', 'update:data'])

package/src/utils/cardPrint.ts

@@ -69,8 +69,8 @@ export const cardPrint = (
             r6c2: item.process_name, // 本工序
             r6c4: item.next_process_name, // 下工序
             r7c2: item.current_inventory, // 本箱数量
-            r7c4: item.opt_user_name, // 操作工/自检员
-            r8c2: item.center_data[0]?.inspector, // 检验员
+            r7c4: item.report_user_name ? item.report_user_name : item.opt_user_name, // 操作工/自检员
+            r8c2: item.center_data[0]?.inspector, // 巡检员
             r8c4: setDate(item.product_date), // 生产日期
             r9c2: item.value, // 规值
             r9c4: item.specification, // 规格
@@ -316,7 +316,7 @@ export const cardPrint = (
             r9c1: '材料厂家', // 建
             r9c2: item.center_data[0]?.material_manufacturer,
             r9c3: '材料牌号', // 建
-            r9c4: '', // 责任人
+            r9c4: item.center_data[0]?.material_mark,
             r10c1: '总箱数', // 建
             r10c2: item.total_row,
             r10c3: '单重',
@@ -486,8 +486,10 @@ export const cardPrint = (
             r8c4: item.center_data[0]?.consignee, // 值
             r9c1: '材料厂家', // 建
             r9c2: item.center_data[0]?.material_manufacturer,
-            r9c3: '抽检结果', // 建
-            r9c4: '', // 责任人
+            // r9c3: '抽检结果', // 建
+            // r9c4: '',
+            r9c3: '材料牌号', // 建
+            r9c4: item.center_data[0]?.material_mark,
             r10c1: '返工工序',
             r10c2: item.rework_process_names,
             r10c3: '返工总数',
@@ -783,8 +785,8 @@ export const cardPrint = (
             r8c4: item.center_data[0]?.consignee, // 值
             r9c1: '材料厂商',
             r9c2: item.center_data[0]?.material_manufacturer,
-            r9c3: '材料品牌',
-            r9c4: '',
+            r9c3: '材料牌号',
+            r9c4: item.center_data[0]?.material_mark,
             r10c1: '总箱数',
             r10c2: item.total_row,
             r10c3: '单重',