From da898ad78c509134aa3b1324374e7ab1ae9e56fd Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 10:42:44 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-admin/src/views/base/zpalletBarcode/index.vue                         |   38 ++++++++++++++++++++++++--------------
 zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template2.vue |    4 ++--
 zy-asrs-admin/src/views/in/waitPakin/index.vue                                |    2 +-
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template2.vue b/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template2.vue
index 2795c51..a05fc99 100644
--- a/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template2.vue
+++ b/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template2.vue
@@ -21,9 +21,9 @@
         <div v-for="(item, index) in list" :key="index">
             <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 20px;">
                 <div style="text-align: center;">
-                    <img :src="globalState.url + '/api/code/auth?type=2&param=' + item.barcode" />
+                    <img :src="globalState.url + '/api/code/auth?type=2&param=' + item.barcode" style="width: 200px;height: 200px;;"/>
                 </div>
-                <div style="text-align: center;">
+                <div style="text-align: center; font-size: 55px; font-weight: 600;" >
                     {{ item.barcode }}
                 </div>
             </div>
diff --git a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
index 322ae7c..053ff00 100644
--- a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
+++ b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
@@ -21,6 +21,7 @@
 
 let openGenerate = ref(false);
 let generateBarcodeValue = ref("80000001");
+let pakinType = ref(1);
 let generateNum = ref(100);
 
 const state = reactive({
@@ -211,6 +212,7 @@
   post('/api/zpalletBarcode/generate', {
     barcode: generateBarcodeValue.value,
     num: generateNum.value,
+    type: pakinType.value
   }).then((resp) => {
     let result = resp.data;
     if (result.code == 200) {
@@ -227,20 +229,20 @@
 }
 
 const handlePrint = () => {
-    if (state.selectedRowKeys.length == 0) {
-        message.warning(formatMessage('common.select', '璇烽�夋嫨'));
-        return;
+  if (state.selectedRowKeys.length == 0) {
+    message.warning(formatMessage('common.select', '璇烽�夋嫨'));
+    return;
+  }
+  let data = tableData.value.records;
+  let tmp = [];
+  data.forEach((item) => {
+    if (state.selectedRowKeys.indexOf(item.id) != -1) {
+      tmp.push(item);
     }
-    let data = tableData.value.records;
-    let tmp = [];
-    data.forEach((item) => {
-        if (state.selectedRowKeys.indexOf(item.id) != -1) {
-            tmp.push(item);
-        }
-    })
+  })
 
-    printChild.value.printData = tmp;
-    printChild.value.open = true;
+  printChild.value.printData = tmp;
+  printChild.value.open = true;
 }
 
 </script>
@@ -272,13 +274,14 @@
     <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
       :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
       :pagination="{ total: tableData.total, onChange: onPageChange }"
-      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
+      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"
+      :loading="state.loading">
       <template #bodyCell="{ column, text, record }">
         <template v-if="column.dataIndex === 'oper'">
           <div style="display: flex;justify-content: space-evenly;">
             <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
             <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
-              }}</a-button>
+            }}</a-button>
           </div>
         </template>
       </template>
@@ -293,6 +296,13 @@
         <a-form-item :label="formatMessage('db.man_zpallet_barcode.generateNum', '鐢熸垚鏁伴噺')">
           <a-input v-model:value="generateNum" />
         </a-form-item>
+        <a-form-item :label="formatMessage('db.man_container.type', '鎵樼洏绫诲瀷')" name="type" >
+          <a-select v-model:value="pakinType" :options="[
+            { label: '骞冲簱鎵樼洏', value: 1 },
+            { label: '绔嬪簱鎵樼洏', value: 2 },
+          ]">
+          </a-select>
+        </a-form-item>
       </a-form>
     </a-modal>
 
diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue
index 3e2ade2..3b8e9c6 100644
--- a/zy-asrs-admin/src/views/in/waitPakin/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue
@@ -338,7 +338,7 @@
             <DownOutlined />
           </a-button>
         </a-dropdown>
-        <a-button @click="generateTask()" type="primary">{{ formatMessage('page.generateTask', '鐢熸垚浠诲姟') }}</a-button>
+        <!-- <a-button @click="generateTask()" type="primary">{{ formatMessage('page.generateTask', '鐢熸垚浠诲姟') }}</a-button> -->
         <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
         <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
       </div>

--
Gitblit v1.9.1