From 1171a8b5336f6ffd543aa532b142c223a9f0f003 Mon Sep 17 00:00:00 2001
From: dev <182542500@qq.com>
Date: Thu, 19 Jun 2025 10:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml                  | 26 ++++++++++++++++++++
 src/api/amz/logisticsQuote/types.ts          |  2 ++
 src/api/amz/purchaseOrder/index.ts           |  1 +
 src/views/amz/inquiryRequest/index.vue       | 16 ++++++++++--
 src/views/amz/logisticsOrder/index.vue       |  2 +-
 src/views/amz/logisticsQuote/index.vue       |  6 ++---
 src/views/amz/purchaseOrder/index.vue        | 22 +++++++++++------
 src/views/amz/purchaseOrderConfirm/index.vue |  2 +-
 src/views/amz/purchaseOrderQuery/index.vue   | 11 ++++++++-
 src/views/amz/sendOrder/index.vue            | 16 ++++++------
 src/views/amz/sendOrderConfirm/index.vue     |  3 ++-
 src/views/amz/sendOrderLast/index.vue        |  4 ++-
 src/views/amz/sendOrderReport/index.vue      | 26 +++++++++++---------
 src/views/amz/shipForward/index.vue          |  2 +-
 src/views/amz/shipForwardIn/index.vue        |  1 +
 src/views/amz/shipForwardOut/index.vue       |  1 +
 16 files changed, 103 insertions(+), 38 deletions(-)
 create mode 100644 .gitea/workflows/deploy.yml

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
new file mode 100644
index 0000000..37444fc
--- /dev/null
+++ b/.gitea/workflows/deploy.yml
@@ -0,0 +1,26 @@
+name: 自动部署测试   # 任务名称
+on: [push]         # 触发条件：代码推送时执行
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest  # 使用 Ubuntu 系统运行
+    steps:
+      - name: 拉取代码
+        uses: actions/checkout@v4  # 官方插件：下载代码
+
+      - name: 安装依赖
+        run: npm install   # 执行任意命令（这里是 Node.js 示例）
+
+      - name: 构建项目
+        run: npm run build
+
+      - name: 部署到服务器
+        uses: appleboy/ssh-action@master  # SSH 插件
+        with:
+          host: 你的服务器IP
+          username: root
+          key: ${{ secrets.SSH_PRIVATE_KEY }}  # 密钥（下一步配置）
+          script: |
+            cd /var/www/你的项目
+            git pull origin main
+            systemctl restart nginx
diff --git a/src/api/amz/logisticsQuote/types.ts b/src/api/amz/logisticsQuote/types.ts
index 593fb34..eeddda8 100644
--- a/src/api/amz/logisticsQuote/types.ts
+++ b/src/api/amz/logisticsQuote/types.ts
@@ -139,6 +139,8 @@ export interface LogisticsQuoteForm extends BaseEntity {
 
   channelName?: string;
 
+  customsFlag?: string;
+
   quoteStartDate?: string;
   quoteEndDate?: string;
 
diff --git a/src/api/amz/purchaseOrder/index.ts b/src/api/amz/purchaseOrder/index.ts
index 2b4dd6f..9e3d131 100644
--- a/src/api/amz/purchaseOrder/index.ts
+++ b/src/api/amz/purchaseOrder/index.ts
@@ -73,3 +73,4 @@ export const delPurchaseOrder = (orderSn: string | number | Array<string | numbe
     method: 'delete'
   });
 };
+
diff --git a/src/views/amz/inquiryRequest/index.vue b/src/views/amz/inquiryRequest/index.vue
index 429e926..9f10ac3 100644
--- a/src/views/amz/inquiryRequest/index.vue
+++ b/src/views/amz/inquiryRequest/index.vue
@@ -125,6 +125,11 @@
           </template>
         </el-table-column>
         <el-table-column label="询价状态" align="center" prop="inquiryStatus" />
+        <el-table-column label="是否需要报关" align="center" prop="inquiryNo">
+          <template #default="scope">
+            <dict-tag :options="sys_yes_no" :value="scope.row.customsFlag" />
+          </template>
+        </el-table-column>
         <el-table-column label="报价截止时间" align="center" prop="deadline" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.deadline, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
@@ -231,6 +236,9 @@
         <el-form-item label="渠道名称" prop="channelName">
           <el-input v-model="quoteForm.channelName" placeholder="请输入渠道名称" disabled />
         </el-form-item>
+        <el-form-item label="是否需要报关" prop="channelName">
+          <el-input v-model="quoteForm.customsFlag" placeholder="请输入是否需要报关" disabled />
+        </el-form-item>
         <el-form-item label="基础价格" prop="price">
           <div class="kgprice">
             <el-input-number v-model="quoteForm.price" :precision="2" :step="0.1" :min="1" :max="100">
@@ -254,7 +262,7 @@
               </template>
             </el-input-number>
             到
-            <el-input-number v-model="quoteForm.leadTime" :min="1" :max="100">
+            <el-input-number v-model="quoteForm.leadTime" :min="1" :max="10000">
               <template #suffix>
                 <span>天</span>
               </template>
@@ -262,7 +270,7 @@
           </div>
         </el-form-item>
         <el-form-item label="附加费" prop="surcharge">
-          <el-input-number v-model="quoteForm.surcharge" :precision="2" :step="0.1" :min="0" :max="100">
+          <el-input-number v-model="quoteForm.surcharge" :precision="2" :step="0.1" :min="0" :max="1000000">
             <template #suffix>
               <span>元</span>
             </template>
@@ -324,6 +332,8 @@ const { biz_shipping_method } = toRefs<any>(proxy?.useDict('biz_shipping_method'
 
 const { back_logistics_type } = toRefs<any>(proxy?.useDict('back_logistics_type'));
 
+const { sys_yes_no } = toRefs<any>(proxy?.useDict('sys_yes_no'));
+
 const inquiryRequestList = ref<InquiryRequestVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -604,6 +614,8 @@ const handleSubmit = async (row?: InquiryRequestVO) => {
   quoteForm.value.transportChannel = row.transportChannel;
   quoteForm.value.channelId = row.channelId;
   quoteForm.value.channelName = row.channelName;
+  quoteForm.value.customsFlag = row.customsFlag;
+
   quoteDialog.visible = true;
   console.log(row.effectiveStartTime);
   // quoteForm.quoteDate[0] = row.effectiveStartTime;
diff --git a/src/views/amz/logisticsOrder/index.vue b/src/views/amz/logisticsOrder/index.vue
index 246253f..66820a5 100644
--- a/src/views/amz/logisticsOrder/index.vue
+++ b/src/views/amz/logisticsOrder/index.vue
@@ -179,7 +179,7 @@
               v-model="fileList"
               :limit="1"
               :file-size="1"
-              :file-type="['pdf', 'doc', 'docx']"
+              :file-type="['pdf', 'png', 'jpg']"
               :is-show-tip="true"
               :file-data="orderData"
             />
diff --git a/src/views/amz/logisticsQuote/index.vue b/src/views/amz/logisticsQuote/index.vue
index 5087558..88d6a91 100644
--- a/src/views/amz/logisticsQuote/index.vue
+++ b/src/views/amz/logisticsQuote/index.vue
@@ -16,9 +16,9 @@
             <el-form-item label="时效" prop="leadTime">
               <el-input v-model="queryParams.leadTime" placeholder="请输入时效" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="附加费" prop="surcharge">
-              <el-input v-model="queryParams.surcharge" placeholder="请输入附加费" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            <!--            <el-form-item label="附加费" prop="surcharge">-->
+            <!--              <el-input v-model="queryParams.surcharge" placeholder="请输入附加费" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
             <el-form-item label="报价生效日期" prop="quoteDate">
               <el-date-picker clearable v-model="queryParams.quoteDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择报价生效日期" />
             </el-form-item>
diff --git a/src/views/amz/purchaseOrder/index.vue b/src/views/amz/purchaseOrder/index.vue
index 887b9d0..7c2b186 100644
--- a/src/views/amz/purchaseOrder/index.vue
+++ b/src/views/amz/purchaseOrder/index.vue
@@ -141,6 +141,7 @@
         <!--        <el-table-column label="到货状态说明" align="center" prop="statusShippedText" />-->
         <!--        <el-table-column label="货物总价" align="center" prop="amountTotal" />-->
         <el-table-column label="总金额" align="center" prop="totalPrice" />
+
         <!--        <el-table-column label="币种符号" align="center" prop="icon" />-->
         <!--        <el-table-column label="付款状态" align="center" prop="payStatus" />-->
 
@@ -268,9 +269,14 @@
         <!--        <el-form-item label="货物总价" prop="amountTotal">-->
         <!--          <el-input v-model="form.amountTotal" placeholder="请输入货物总价" />-->
         <!--        </el-form-item>-->
-        <!--        <el-form-item label="总金额" prop="totalPrice">-->
-        <!--          <el-input v-model="form.totalPrice" placeholder="请输入总金额" />-->
-        <!--        </el-form-item>-->
+        <el-form-item label="总金额" prop="totalPrice">
+          <el-input v-model="form.totalPrice" placeholder="请输入总金额" suffix="元" disabled>
+            <template #prefix>
+              <span class="suffix-text">{{ form.icon }}</span>
+              <!-- 可自定义样式 -->
+            </template>
+          </el-input>
+        </el-form-item>
         <!--        <el-form-item label="币种符号" prop="icon">-->
         <!--          <el-input v-model="form.icon" placeholder="请输入币种符号" />-->
         <!--        </el-form-item>-->
@@ -310,9 +316,11 @@
         <!--        <el-form-item label="入库量" prop="quantityEntry">-->
         <!--          <el-input v-model="form.quantityEntry" placeholder="请输入入库量" />-->
         <!--        </el-form-item>-->
-        <!--        <el-form-item label="实际采购量" prop="quantityReal">-->
-        <!--          <el-input v-model="form.quantityReal" placeholder="请输入实际采购量" />-->
-        <!--        </el-form-item>-->
+
+        <el-form-item label="采购数量" prop="quantityReal">
+          <el-tag type="warning">实际的订单数量以跟单扫描的纸制订单为准！</el-tag>
+          <el-input v-model="form.quantityReal" placeholder="请输入实际采购数量" disabled />
+        </el-form-item>
         <!--        <el-form-item label="待到货量" prop="quantityReceive">-->
         <!--          <el-input v-model="form.quantityReceive" placeholder="请输入待到货量" />-->
         <!--        </el-form-item>-->
@@ -353,7 +361,7 @@
         </el-form-item>
         <el-form-item label="交货天数" prop="estDlvDays">
           <!--          <el-input v-model="form.estDlvDays" placeholder="请输入交货天数" />-->
-          <el-input-number v-model="form.estDlvDays" :min="0" :max="100" @change="delevAction()">
+          <el-input-number v-model="form.estDlvDays" :min="0" :max="10000" @change="delevAction()">
             <template #suffix>
               <span>天</span>
             </template>
diff --git a/src/views/amz/purchaseOrderConfirm/index.vue b/src/views/amz/purchaseOrderConfirm/index.vue
index 65ba0a7..224fddc 100644
--- a/src/views/amz/purchaseOrderConfirm/index.vue
+++ b/src/views/amz/purchaseOrderConfirm/index.vue
@@ -71,7 +71,7 @@
                 <!--              <el-table-column label="本地产品ID" align="center" prop="productId" />-->
                 <el-table-column label="品名" align="center" prop="productName" width="200px" />
                 <el-table-column label="SKU" align="center" prop="sku" width="200px" />
-                <el-table-column label="FNSKU" align="center" prop="fnsku" width="90px" />
+                <!--                <el-table-column label="FNSKU" align="center" prop="fnsku" width="90px" />-->
                 <!--                <el-table-column label="店铺ID" align="center" prop="sid" width="70px" />-->
                 <!--              <el-table-column label="型号" align="center" prop="model" />-->
                 <el-table-column label="含税单价" align="center" prop="price" />
diff --git a/src/views/amz/purchaseOrderQuery/index.vue b/src/views/amz/purchaseOrderQuery/index.vue
index 949a6b6..85f2e55 100644
--- a/src/views/amz/purchaseOrderQuery/index.vue
+++ b/src/views/amz/purchaseOrderQuery/index.vue
@@ -510,7 +510,16 @@ const data = reactive<PageData<PurchaseOrderForm, PurchaseOrderQuery>>({
     settlementDescription: undefined,
     paymentMethod: undefined,
     estDlvDays: undefined,
-    orderStatus: undefined,
+    orderStatus: [
+      'ord_confirmed',
+      'material_preparing',
+      'production_started',
+      'labeling_packaging',
+      'semi_finished_outbound',
+      'pending_outbound',
+      'outbound_completed',
+      'order_overdue'
+    ],
     deliveryTime: undefined,
     // dlvTimeVar: undefined,
     params: {}
diff --git a/src/views/amz/sendOrder/index.vue b/src/views/amz/sendOrder/index.vue
index dc22bf2..d7df0ac 100644
--- a/src/views/amz/sendOrder/index.vue
+++ b/src/views/amz/sendOrder/index.vue
@@ -36,9 +36,9 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['amz:sendOrder:add']">新增 </el-button>
-          </el-col>
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['amz:sendOrder:add']">新增 </el-button>-->
+          <!--          </el-col>-->
           <!--          <el-col :span="1.5">-->
           <!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['amz:sendOrder:edit']"-->
           <!--              >修改-->
@@ -89,7 +89,7 @@
         <!--        <el-table-column label="单箱产品数量" align="center" prop="quantityPerBox" />-->
         <el-table-column label="箱数" align="center" prop="boxCount">
           <template #default="{ row }">
-            <el-popover placement="top" title="装箱明细" :width="350" trigger="click">
+            <el-popover placement="top" title="装箱明细" :width="500" trigger="click">
               <template #reference>
                 <el-button text size="small" type="primary"> {{ row.boxCount }}箱</el-button>
               </template>
@@ -98,7 +98,7 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="箱子尺寸" align="center" prop="boxDimensions" />
+        <!--        <el-table-column label="箱子尺寸" align="center" prop="boxDimensions" />-->
         <el-table-column label="总重量" align="center" prop="weightPerBox" />
         <el-table-column label="实际发货店铺" align="center" prop="realStoreName" />
         <el-table-column label="发货状态" align="center" prop="sendStatus">
@@ -108,9 +108,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top" v-if="scope.row.sendStatus === 'pending'">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['amz:sendOrder:edit']"></el-button>
-            </el-tooltip>
+            <!--            <el-tooltip content="修改" placement="top" v-if="scope.row.sendStatus === 'pending'">-->
+            <!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['amz:sendOrder:edit']"></el-button>-->
+            <!--            </el-tooltip>-->
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['amz:sendOrder:remove']"></el-button>
             </el-tooltip>
diff --git a/src/views/amz/sendOrderConfirm/index.vue b/src/views/amz/sendOrderConfirm/index.vue
index ceef9f3..794ea99 100644
--- a/src/views/amz/sendOrderConfirm/index.vue
+++ b/src/views/amz/sendOrderConfirm/index.vue
@@ -59,6 +59,7 @@
       <el-table v-loading="loading" :data="sendOrderList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
         <!--        <el-table-column label="主键ID" align="center" prop="id" />-->
+        <el-table-column label="发货单号" align="center" prop="id" />
         <el-table-column label="采购单号" align="center" prop="orderSn" />
         <el-table-column label="创建日期" align="center" prop="createTime" width="180">
           <template #default="scope">
@@ -88,7 +89,7 @@
         <el-table-column label="发货数量" align="center" prop="quantitySend" />
         <el-table-column label="箱数" align="center" prop="boxCount">
           <template #default="{ row }">
-            <el-popover placement="top" title="装箱明细" :width="350" trigger="click">
+            <el-popover placement="top" title="装箱明细" :width="500" trigger="click">
               <template #reference>
                 <el-button text size="small" type="primary"> {{ row.boxCount }}箱</el-button>
               </template>
diff --git a/src/views/amz/sendOrderLast/index.vue b/src/views/amz/sendOrderLast/index.vue
index 633088b..ae03015 100644
--- a/src/views/amz/sendOrderLast/index.vue
+++ b/src/views/amz/sendOrderLast/index.vue
@@ -59,6 +59,8 @@
       <el-table v-loading="loading" :data="sendOrderList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
         <!--        <el-table-column label="主键ID" align="center" prop="id" />-->
+        <el-table-column label="发货单号" align="center" prop="id" />
+
         <el-table-column label="采购单号" align="center" prop="orderSn" />
         <el-table-column label="创建日期" align="center" prop="createTime" width="180">
           <template #default="scope">
@@ -88,7 +90,7 @@
         <el-table-column label="发货数量" align="center" prop="quantitySend" />
         <el-table-column label="箱数" align="center" prop="boxCount">
           <template #default="{ row }">
-            <el-popover placement="top" title="装箱明细" :width="350" trigger="click">
+            <el-popover placement="top" title="装箱明细" :width="500" trigger="click">
               <template #reference>
                 <el-button text size="small" type="primary"> {{ row.boxCount }}箱</el-button>
               </template>
diff --git a/src/views/amz/sendOrderReport/index.vue b/src/views/amz/sendOrderReport/index.vue
index 2a20165..1054c82 100644
--- a/src/views/amz/sendOrderReport/index.vue
+++ b/src/views/amz/sendOrderReport/index.vue
@@ -90,7 +90,7 @@
               </el-descriptions>
             </el-card>
             <el-card v-else>
-              <el-card shadow="never"> 暂无物流信息 </el-card>
+              <el-card shadow="never"> 暂无物流信息</el-card>
             </el-card>
           </template>
         </el-table-column>
@@ -125,7 +125,7 @@
         <!--        <el-table-column label="单箱产品数量" align="center" prop="quantityPerBox" />-->
         <el-table-column label="箱数" align="center" prop="boxCount">
           <template #default="{ row }">
-            <el-popover placement="top" title="装箱明细" :width="350" trigger="click">
+            <el-popover placement="top" title="装箱明细" :width="500" trigger="click">
               <template #reference>
                 <el-button text size="small" type="primary"> {{ row.boxCount }}箱</el-button>
               </template>
@@ -142,16 +142,16 @@
             <dict-tag :options="send_status" :value="scope.row.sendStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top" v-if="scope.row.sendStatus === 'pending'">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['amz:sendOrder:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['amz:sendOrder:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+        <!--          <template #default="scope">-->
+        <!--            <el-tooltip content="修改" placement="top" v-if="scope.row.sendStatus === 'pending'">-->
+        <!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['amz:sendOrder:edit']"></el-button>-->
+        <!--            </el-tooltip>-->
+        <!--            <el-tooltip content="删除" placement="top">-->
+        <!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['amz:sendOrder:remove']"></el-button>-->
+        <!--            </el-tooltip>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@@ -265,6 +265,8 @@
         <el-table-column label="FBA箱号" align="center" prop="fbaBoxNumber" />
         <el-table-column label="物流商名称" align="center" prop="logisticsProviderName" />
         <el-table-column label="物流渠道" align="center" prop="channelName" />
+        <el-table-column label="预计到达时间" align="center" prop="estimatedDeliveryDate" />
+
         <!--        <el-table-column label="物流称重" align="center" prop="logisticsWeight">-->
         <!--          <template #default="scope">-->
         <!--            {{ scope.row.logisticsWeight != null ? `${scope.row.logisticsWeight} kg` : '' }}-->
diff --git a/src/views/amz/shipForward/index.vue b/src/views/amz/shipForward/index.vue
index 498934f..abc309f 100644
--- a/src/views/amz/shipForward/index.vue
+++ b/src/views/amz/shipForward/index.vue
@@ -74,7 +74,7 @@
 
       <el-table v-loading="loading" :data="shipForwardList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
-
+        <el-table-column label="转发单号" align="center" prop="id" />
         <el-table-column label="采购单号" align="center" prop="orderSn" />
         <el-table-column label="采购店铺名称" align="center" prop="storeName" />
         <el-table-column label="SKU" align="center" prop="sku" />
diff --git a/src/views/amz/shipForwardIn/index.vue b/src/views/amz/shipForwardIn/index.vue
index 84dac4e..649954f 100644
--- a/src/views/amz/shipForwardIn/index.vue
+++ b/src/views/amz/shipForwardIn/index.vue
@@ -74,6 +74,7 @@
 
       <el-table v-loading="loading" :data="shipForwardList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
+        <el-table-column label="转发单号" align="center" prop="id" />
 
         <el-table-column label="采购单号" align="center" prop="orderSn" />
         <el-table-column label="采购店铺名称" align="center" prop="storeName" />
diff --git a/src/views/amz/shipForwardOut/index.vue b/src/views/amz/shipForwardOut/index.vue
index b81858d..1bbb3f8 100644
--- a/src/views/amz/shipForwardOut/index.vue
+++ b/src/views/amz/shipForwardOut/index.vue
@@ -74,6 +74,7 @@
 
       <el-table v-loading="loading" :data="shipForwardList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
+        <el-table-column label="转发单号" align="center" prop="id" />
 
         <el-table-column label="采购单号" align="center" prop="orderSn" />
         <el-table-column label="采购店铺名称" align="center" prop="storeName" />