ci-plus 1.3.5 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {
@@ -13,9 +13,20 @@
     "element-plus",
     "ui组件库二次封装"
   ],
-  "author": "cc",
+  "type": "module",
+  "author": {
+    "name": "卖女孩的小火柴",
+    "email": "10000@qq.com"
+  },
   "license": "ISC",
-  "dependencies": {},
+  "dependencies": {
+    "lodash": "^4.17.21",
+    "vue-draggable-plus": "^0.4.0",
+    "vue3-print-nb": "^0.1.4",
+    "vuedraggable": "^2.24.3",
+    "qrcode": "^1.5.3",
+    "jsbarcode": "^3.11.6"
+  },
   "devDependencies": {},
   "peerDependencies": {},
   "peerDependenciesMeta": {}

package/src/identificationCard/identificationCard.vue

@@ -988,7 +988,7 @@
             :style="`width: ${myWidth}; `"
             v-else-if="item.card_state == 'ZHUANGPEI' && item.factoryType == '2'"
           >
-            <table
+          <table
               border="1"
               cellpadding="0"
               style="
@@ -1033,24 +1033,27 @@
                   </td>
                 </tr>
                 <tr>
+                  <!-- 外圈编码 内圈编码 -->
                   <td>{{ item.r6c1 }}</td>
                   <td>{{ item.r6c2 }}</td>
                   <td>{{ item.r6c3 }}</td>
                   <td>{{ item.r6c4 }}</td>
                 </tr>
                 <tr>
+                  <!-- 外圈批号 内圈批号 -->
                   <td>{{ item.r7c1 }}</td>
                   <td>{{ item.r7c2 }}</td>
                   <td>{{ item.r7c3 }}</td>
                   <td>{{ item.r7c4 }}</td>
                 </tr>
-                <tr>
+                <!-- 开始动态行数据渲染 -->
+                <tr v-if="item.r8c1">
                   <td>{{ item.r8c1 }}</td>
                   <td>{{ item.r8c2 }}</td>
                   <td>{{ item.r8c3 }}</td>
                   <td>{{ item.r8c4 }}</td>
                 </tr>
-                <tr>
+                <tr v-if="item.r9c1">
                   <td>{{ item.r9c1 }}</td>
                   <td>{{ item.r9c2 }}</td>
                   <td>{{ item.r9c3 }}</td>
@@ -1059,7 +1062,7 @@
                 <tr v-if="item.r10c1">
                   <td>{{ item.r10c1 }}</td>
                   <td>{{ item.r10c2 }}</td>
-                  <td style="">{{ item.r10c3 }}</td>
+                  <td>{{ item.r10c3 }}</td>
                   <td>{{ item.r10c4 }}</td>
                 </tr>
                 <tr v-if="item.r11c1">
@@ -1086,10 +1089,76 @@
                   <td>{{ item.r14c3 }}</td>
                   <td>{{ item.r14c4 }}</td>
                 </tr>
+                <tr v-if="item.r15c1">
+                  <td>{{ item.r15c1 }}</td>
+                  <td>{{ item.r15c2 }}</td>
+                  <td>{{ item.r15c3 }}</td>
+                  <td>{{ item.r15c4 }}</td>
+                </tr>
+                <tr v-if="item.r16c1">
+                  <td>{{ item.r16c1 }}</td>
+                  <td>{{ item.r16c2 }}</td>
+                  <td>{{ item.r16c3 }}</td>
+                  <td>{{ item.r16c4 }}</td>
+                </tr>
+                <tr v-if="item.r17c1">
+                  <td>{{ item.r17c1 }}</td>
+                  <td>{{ item.r17c2 }}</td>
+                  <td>{{ item.r17c3 }}</td>
+                  <td>{{ item.r17c4 }}</td>
+                </tr>
+                <tr v-if="item.r18c1">
+                  <td>{{ item.r18c1 }}</td>
+                  <td>{{ item.r18c2 }}</td>
+                  <td>{{ item.r18c3 }}</td>
+                  <td>{{ item.r18c4 }}</td>
+                </tr>
+                <tr v-if="item.r19c1">
+                  <td>{{ item.r19c1 }}</td>
+                  <td>{{ item.r19c2 }}</td>
+                  <td>{{ item.r19c3 }}</td>
+                  <td>{{ item.r19c4 }}</td>
+                </tr>
+                <tr v-if="item.r20c1">
+                  <td>{{ item.r20c1 }}</td>
+                  <td>{{ item.r20c2 }}</td>
+                  <td>{{ item.r20c3 }}</td>
+                  <td>{{ item.r20c4 }}</td>
+                </tr>
+                <!-- 中间动态数据预留到第20行 -->
+                <!-- 开始尾部的固定项目数据 -->
+                <tr>
+                  <!-- 尺寸/游隙 本工序 -->
+                  <td>{{ item.r50c1 }}</td>
+                  <td>{{ item.r50c2 }}</td>
+                  <td>{{ item.r50c3 }}</td>
+                  <td>{{ item.r50c4 }}</td>
+                </tr>
+                <tr>
+                  <!-- 下工序 本箱数量 -->
+                  <td>{{ item.r51c1 }}</td>
+                  <td>{{ item.r51c2 }}</td>
+                  <td>{{ item.r51c3 }}</td>
+                  <td>{{ item.r51c4 }}</td>
+                </tr>
+                <tr>
+                  <!-- 操作员 质检员 -->
+                  <td>{{ item.r52c1 }}</td>
+                  <td>{{ item.r52c2 }}</td>
+                  <td>{{ item.r52c3 }}</td>
+                  <td>{{ item.r52c4 }}</td>
+                </tr>
+                <tr>
+                  <!-- 生产日期 质检日期 -->
+                  <td>{{ item.r53c1 }}</td>
+                  <td>{{ item.r53c2 }}</td>
+                  <td>{{ item.r53c3 }}</td>
+                  <td>{{ item.r53c4 }}</td>
+                </tr>
                 <tr>
                   <!-- 备注  -->
-                  <td>{{ item.r15c1 }}</td>
-                  <td colspan="3">{{ item.r15c2 }}</td>
+                  <td>{{ item.r54c1 }}</td>
+                  <td colspan="3">{{ item.r54c2 }}</td>
                 </tr>
                 <!--
                   装配标识卡无条形码
@@ -1117,7 +1186,7 @@
             :style="`width: ${myWidth}; `"
             v-else-if="item.card_state == 'ZHUANGPEI' && item.factoryType == '1'"
           >
-            <div>为尚工厂无装配标识卡模板</div>
+            <div>本工厂无装配标识卡模板</div>
           </div>
 
           <!-- 料废标识卡(成品工厂) -->
@@ -1358,7 +1427,7 @@
 
           <!-- 尾料标识卡(为尚工厂) -->
           <div class="id-code" :style="`width: ${myWidth}; `" v-else>
-            <div>此标识卡号无打印模板</div>
+            <div>本工厂无此种标识卡模板</div>
           </div>
         </div>
       </div>
@@ -1373,8 +1442,8 @@ import barCode from './barCode.vue'
 import CiQrcode from './qrcode'
 // 导入 public/C&U.png 图片
 // import C_U from '@/assets/C&U.png'
-const baseUrls = import.meta.env.VITE_BASE_URL
-const C_U = baseUrls + '/public/C&U.png'
+const NODE_ENV = import.meta.env.VITE_NODE_ENV
+const C_U = NODE_ENV === 'development' ? '/public/C&U.png' : '/C&U.png'
 
 const props = defineProps({
   value: {

package/src/utils/cardPrint.ts

@@ -521,37 +521,19 @@ export const cardPrint = (
           let badNum = item.children?.length || 0
           let badList: { id: number | string; label: string; value: string }[] =
             []
+          let nqbm = '' //  内圈编码
+          let nqph = '' //  内圈批号
+          let wqbm = '' //  内圈编码
+          let wqph = '' //  内圈批号
           if (item.children && badNum > 0) {
             item.children?.forEach((badItem: any) => {
-              let nqbm = { id: '', label: '', value: '' } //  内圈编码
-              let nqph = { id: '', label: '', value: '' } //  内圈批号
-              let wqbh = { id: '', label: '', value: '' } //  内圈编码
-              let wqph = { id: '', label: '', value: '' } //  内圈批号
               let objbad = { id: '', label: '', value: '' }
               if (badItem.category == '内圈') {
-                nqbm = {
-                  id: badItem.card_code,
-                  label: '内圈编码',
-                  value: badItem.material_code,
-                }
-                nqph = {
-                  id: badItem.card_code,
-                  label: '内圈批号',
-                  value: badItem.b2b_batch_number,
-                }
-                badList.push(nqbm, nqph)
+                nqbm = badItem.material_code || ''
+                nqph = badItem.b2b_batch_number || ''
               } else if (badItem.category == '外圈') {
-                wqbh = {
-                  id: badItem.card_code,
-                  label: '外圈编码',
-                  value: badItem.material_code,
-                }
-                wqph = {
-                  id: badItem.card_code,
-                  label: '外圈批号',
-                  value: badItem.b2b_batch_number,
-                }
-                badList.push(nqbm, nqph, wqbh, wqph)
+                wqbm = badItem.material_code || ''
+                wqph = badItem.b2b_batch_number || ''
               } else {
                 objbad = {
                   id: badItem.card_code,
@@ -565,17 +547,8 @@ export const cardPrint = (
             })
           }
 
-          // 获取 badList[4] 以后项的 value 拼接成字符串
-          let badStr = badList
-            .slice(5)
-            .map((badItem: any) => {
-              let l = badItem.label
-              let v = badItem.value || ''
-              return l + ':' + v
-            })
-            .join(',')
 
-          obj = {
+          let obj1 = {
             card_state: item.card_state,
             // 工厂类型：1：为尚工厂 | 2：成品工厂
             factoryType: item.is_finished_goods,
@@ -592,48 +565,87 @@ export const cardPrint = (
             r5c1: '装配批次号',
             r5c2: item.flow_lot_number,
             r5c4: item.card_code, // 标识卡号
-
-            r6c1: '尺寸/游隙',
-            r6c2: '',
-            r6c3: '本工序',
-            r6c4: item.process_name,
-            r7c1: '下工序',
-            r7c2: item.next_process_code,
-            r7c3: '本箱数量',
-            r7c4: item.current_inventory,
-            r8c1: '操作员',
-            r8c2: item.report_user_name,
-            r8c3: '质检员',
-            r8c4: '',
-            r9c1: '生产日期',
-            r9c2: setDate(item.product_date),
-            r9c3: '质检日期',
-            r9c4: '',
+            r6c1: '外圈编码',
+            r6c2: wqbm,
+            r6c3: '内圈编码',
+            r6c4: nqbm,
+            r7c1: '外圈批号',
+            r7c2: wqph,
+            r7c3: '内圈批号',
+            r7c4: nqph,
+            // r8c1: '尺寸/游隙',
+            // r8c2: '',
+            // r8c3: '本工序',
+            // r8c4: item.process_name,
+            // r9c1: '下工序',
+            // r9c2: item.next_process_code,
+            // r9c3: '本箱数量',
+            // r9c4: item.current_inventory,
+            // r10c1: '操作员',
+            // r10c2: item.report_user_name,
+            // r10c3: '质检员',
+            // r10c4: '',
+            // r11c1: '生产日期',
+            // r11c2: setDate(item.product_date),
+            // r11c3: '质检日期',
+            // r11c4: '',
             /** ----循环的数据-------------------------------- **/
-            r10c1: badList[0]?.label,
-            r10c2: badList[0]?.value,
-            r10c3: badList[1]?.label,
-            r10c4: badList[1]?.value,
-            r11c1: badList[2]?.label,
-            r11c2: badList[2]?.value,
-            r11c3: badList[3]?.label,
-            r11c4: badList[3]?.value,
-            r12c1: badList[4]?.label,
-            r12c2: badList[4]?.value,
-            r12c3: badList[5]?.label,
-            r12c4: badList[5]?.value,
-            r13c1: badList[6]?.label,
-            r13c2: badList[6]?.value,
-            r13c3: badList[7]?.label,
-            r13c4: badList[7]?.value,
-            r14c1: badList[8]?.label,
-            r14c2: badList[8]?.value,
-            r14c3: badList[9]?.label,
-            r14c4: badList[9]?.value,
-            r15c1: '备注',
-            r15c2: item.remark,
+            // r12c1: badList[0]?.label,
+            // r12c2: badList[0]?.value,
+            // r12c3: badList[1]?.label,
+            // r12c4: badList[1]?.value,
+            // r13c1: badList[2]?.label,
+            // r13c2: badList[2]?.value,
+            // r13c3: badList[3]?.label,
+            // r13c4: badList[3]?.value,
+            // r14c1: badList[4]?.label,
+            // r14c2: badList[4]?.value,
+            // r14c3: badList[5]?.label,
+            // r14c4: badList[5]?.value,
+
+            // r15c1: '备注',
+            // r15c2: item.remark,
             // r16c1: item.center_data[0]?.b2b_batch_number || '', // 条形码文本
           }
+          // 获取obj1最后一条属性的行号列号
+          // 获取obj1最后一条属性
+          let lastKey = Object.keys(obj1)[Object.keys(obj1).length - 1]
+          // 获取行号
+          let row = Number(parseInt(lastKey.split('r')[1].split('c')[0]))
+          // 获取列号
+          let column = Number(lastKey.split('c')[1])
+
+          // 通过循环badList数组，将数组中的每一项合并到obj中
+          let obj2 = {}
+          for (let i = 0; i < badList.length; i++) {
+            const item = badList[i]
+            const rowIndex = Math.floor(i / 2) + (row + 1) // 从r8c1开始这里就是8
+            const columnIndex = (i % 2) * 2 + 1
+            obj2[`r${rowIndex}c${columnIndex}`] = item.label
+            obj2[`r${rowIndex}c${columnIndex + 1}`] = item.value
+          }
+          let obj3 = {
+            r50c1: '尺寸/游隙',
+            r50c2: '',
+            r50c3: '本工序',
+            r50c4: item.process_name,
+            r51c1: '下工序',
+            r51c2: item.next_process_code,
+            r51c3: '本箱数量',
+            r51c4: item.current_inventory,
+            r52c1: '操作员',
+            r52c2: item.report_user_name,
+            r52c3: '质检员',
+            r52c4: '',
+            r53c1: '生产日期',
+            r53c2: setDate(item.product_date),
+            r53c3: '质检日期',
+            r53c4: '',
+            r54c1: '备注',
+            r54c2: item.remark,
+          }
+          // 将 obj1, obj2, obj3 合并到obj的后面
+          Object.assign(obj, obj1, obj2, obj3)
         }
         //  为尚工厂-装配标识卡（为尚工厂无装配标识卡）
         else if (