From c1d53705603866a7ea47bca514f0844e4690e12f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 20 Jun 2024 18:01:53 +0800
Subject: [PATCH] md

---
 src/views/emis/emisTmsPack/packPrintList.vue  | 41 ++++++++++++-------
 .../emisWaybill/waybillDetailReadOnly.vue     |  4 +-
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packPrintList.vue b/src/views/emis/emisTmsPack/packPrintList.vue
index 69d2efe9..8dfdf4a6 100644
--- a/src/views/emis/emisTmsPack/packPrintList.vue
+++ b/src/views/emis/emisTmsPack/packPrintList.vue
@@ -11,13 +11,11 @@
         />
       </el-form-item>
 
-      <el-form-item label="" prop="printStatus">
-        <el-input
-          v-model="queryParams.printStatus"
-          :placeholder="$t('打印状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="打印状态" prop="printStatus">
+        <el-select v-model="queryParams.printStatus"  placeholder="打印状态" >
+            <el-option :key="1" label="已打印" value="1" ></el-option>
+            <el-option :key="2" label="未打印" value="0" ></el-option>
+        </el-select>
       </el-form-item>
     </SearchForm>
 
@@ -41,7 +39,7 @@
                   type="primary"
                   plain
                   size="mini"
-                  @click="handleAdd"
+                  @click="handleAddPack"
                   v-hasPermi="['emis:emisTmsPack:add']"
                 >新增合包条码</el-button>
               </el-col>
@@ -104,9 +102,6 @@
 
     </XdTable>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisTmsPackForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsPackForm>
-    </el-dialog>
 
 
 
@@ -116,12 +111,11 @@
 <script>
 import { listEmisTmsPack, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisTmsPackView from '@/views/emis/emisTmsPack/emisTmsPackView';
-import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
+import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
 
 export default {
   name: "emisTmsPack",
-  components: { elDateSimplePicker,emisTmsPackForm },
+  components: { elDateSimplePicker,TanexPrinterPanel },
   dicts: [
   ],
   data() {
@@ -163,7 +157,7 @@ export default {
         pageSize: 20,
         packNo: null,
         packStatus: '0',
-        printStatus: null,
+        printStatus: '0',
       },
     };
   },
@@ -171,6 +165,23 @@ export default {
     this.getList();
   },
   methods: {
+    handleAddPack() {
+
+      this.$prompt('请输入需要生成的合包数量', "操作确认", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /[1-9][0-9]{0,1}/,
+        inputErrorMessage: "数量介于 1 和 99 之间"
+      }).then(({ value }) => {
+        console.log("===>",value)
+        // auditNoPass(ids,value).then(response => {
+        //     this.$modal.msgSuccess("操作成功" );
+        //     this.getList();
+        // });
+
+      }).catch(() => {});
+    },
     handleBatchPrint(){
       this.$confirm("确定打印?", "提示", {
           cancelButtonText: "不打印",
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index f3b8c9f2..69e4c52f 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -50,7 +50,7 @@
 
   </el-descriptions>
 
-  <el-descriptions :title="$t('货物收费信息')"  :column="4" style="margin-top:10px">
+  <el-descriptions :title="$t('货物收费信息')" size="mini" :column="4" style="margin-top:10px">
             <!-- <el-descriptions-item label="总重量">{{ form.totalWeight }}</el-descriptions-item> -->
 
             <el-descriptions-item label="件数">{{ form.parcelQty }}件</el-descriptions-item>
@@ -306,7 +306,7 @@ methods: {
 }
 
 .el-descriptions__title{
-  font-size: 14px;
+  font-size: 12px;
 }
 
   .el-collapse-item__content {