Squashed commit of the following:

commit 90df51097f Author: 浅念 <email@sample.com> Date: Wed Sep 24 18:50:35 2025 +0800 备货单采购单 commit 7b1fdf3883 Author: 浅念 <email@sample.com> Date: Wed Sep 24 11:15:31 2025 +0800 渠道筛选 commit 1c81d3108c Author: 浅念 <email@sample.com> Date: Wed Sep 24 10:50:43 2025 +0800 客户列表添加渠道筛选 commit 2b877e9b4d Author: 浅念 <email@sample.com> Date: Mon Sep 22 10:20:46 2025 +0800 去掉编码显示 commit bee80af5af Author: 浅念 <email@sample.com> Date: Fri Sep 19 16:43:30 2025 +0800 港口添加英文 commit 045ce9289c Author: 浅念 <email@sample.com> Date: Thu Sep 18 15:17:30 2025 +0800 审批历史和代办审批 commit c5ec4bb5e1 Author: 浅念 <email@sample.com> Date: Thu Sep 18 11:31:22 2025 +0800 修改kpi commit 9e260ddcd8 Author: 浅念 <email@sample.com> Date: Thu Sep 18 09:49:33 2025 +0800 修改 kpi commit 6feb3ace75 Author: 浅念 <email@sample.com> Date: Thu Sep 18 09:42:44 2025 +0800 kpi 统计 commit ec257a246d Author: 浅念 <email@sample.com> Date: Wed Sep 17 17:04:35 2025 +0800 修改弹框表格 commit fa764852ab Author: 浅念 <email@sample.com> Date: Wed Sep 17 15:54:35 2025 +0800 添加账户简称 commit 65f7f4a123 Author: 浅念 <email@sample.com> Date: Wed Sep 17 15:10:28 2025 +0800 品牌加热门修改仪表盘接口 commit 922cfec81d Author: 浅念 <email@sample.com> Date: Tue Sep 16 15:57:17 2025 +0800 调整备货单 crm 端页面 commit 5c8df36f12 Author: 浅念 <email@sample.com> Date: Mon Sep 15 17:14:38 2025 +0800 调整备货单及各页面名称 commit 5503a14408 Author: 浅念 <email@sample.com> Date: Fri Sep 12 18:10:03 2025 +0800 账户添加公司 commit 3439b45d9a Author: 浅念 <email@sample.com> Date: Fri Sep 12 17:53:26 2025 +0800 修改终版备货单 commit 045d13eb7b Author: 浅念 <email@sample.com> Date: Fri Sep 12 17:49:07 2025 +0800 修改备货单等页面 commit da690dfa06 Author: 浅念 <email@sample.com> Date: Thu Sep 11 17:44:37 2025 +0800 修改备货单详情 commit 853e9591b3 Author: 浅念 <email@sample.com> Date: Wed Sep 10 18:11:39 2025 +0800 修改备货单页面 commit 9052bd1027 Author: 浅念 <email@sample.com> Date: Tue Sep 9 20:53:30 2025 +0800 备货单审核功能 commit 079d9babb8 Merge: ebd7479 91d810b Author: 浅念 <email@sample.com> Date: Tue Sep 9 14:51:43 2025 +0800 Merge branch 'feature/crm_pc' of http://219.157.255.213:25311/xinyouhe/art-design into feature/crm_vehicle commit ebd7479573 Merge: 64e53b6 459d306 Author: 浅念 <email@sample.com> Date: Tue Sep 9 13:57:28 2025 +0800 Merge branch 'feature/crm_pc' of http://219.157.255.213:25311/xinyouhe/art-design into feature/crm_vehicle commit 64e53b6ee9 Author: 浅念 <email@sample.com> Date: Mon Sep 8 19:09:55 2025 +0800 备货单加审批流程 commit 9bd7c89cb4 Author: 浅念 <email@sample.com> Date: Thu Sep 4 15:09:17 2025 +0800 车辆信息，备货单等页面 # Conflicts: # src/api/adminApi.ts # src/api/crmApi.ts # src/components/custom/OrderDetailContent.vue # src/composables/useOrderDetailDialog.ts # src/composables/useStockingForm.ts # src/views/admin/approval/stocking_auth.vue # src/views/admin/approval/stocking_auth_detil.vue # src/views/admin/stock/final_list_admin.vue # src/views/admin/stock/stocking_list_admin.vue # src/views/admin/user/index.vue # src/views/admin/vehicle/color.vue # src/views/admin/vehicle/modification.vue # src/views/admin/vehicle/port.vue # src/views/admin/vehicle/vehicle_list.vue # src/views/crmpc/approval/stocking_auth.vue # src/views/crmpc/stocking/Add.vue # src/views/crmpc/stocking/final_add.vue # src/views/crmpc/stocking/final_edit.vue # src/views/crmpc/stocking/final_list.vue # src/views/crmpc/stocking/stocking_edit.vue # src/views/crmpc/stocking/stocking_list.vue # src/views/crmpc/vehicle/color.vue # src/views/crmpc/vehicle/modification.vue # src/views/crmpc/vehicle/vehicle_list.vue
2025-09-24 19:06:26 +08:00
parent 4f18a1b8bf
commit 9925e2e2e4
39 changed files with 3861 additions and 159 deletions
@@ -373,6 +373,57 @@
                <ElInput v-model="item.ocean_freight_currency_snapshot" type="hidden" />
              </ElFormItem>
            </ElCol>
+            <ElCol :sm="12" :md="12" :lg="6" :xl="4">
+              <ElFormItem label="佣金" label-width="85px">
+                <ElInput v-model="item.commission" placeholder="请输入佣金">
+                  <template #suffix>
+                    <ElSelect v-model="item.commission_currency" style="width: 64px">
+                      <ElOption
+                        v-for="c in currencyOptions"
+                        :key="c.currency_code"
+                        :label="c.currency_name"
+                        :value="c.currency_code"
+                      />
+                    </ElSelect>
+                  </template>
+                </ElInput>
+                <ElInput v-model="item.commission_currency_snapshot" type="hidden" />
+              </ElFormItem>
+            </ElCol>
+            <ElCol :sm="12" :md="12" :lg="6" :xl="4">
+              <ElFormItem label="购置税" label-width="85px">
+                <ElInput v-model="item.purchase_tax" placeholder="请输入购置税">
+                  <template #suffix>
+                    <ElSelect v-model="item.purchase_tax_currency" style="width: 64px">
+                      <ElOption
+                        v-for="c in currencyOptions"
+                        :key="c.currency_code"
+                        :label="c.currency_name"
+                        :value="c.currency_code"
+                      />
+                    </ElSelect>
+                  </template>
+                </ElInput>
+                <ElInput v-model="item.purchase_tax_currency_snapshot" type="hidden" />
+              </ElFormItem>
+            </ElCol>
+            <ElCol :sm="12" :md="12" :lg="6" :xl="4">
+              <ElFormItem label="预估退税额" label-width="85px">
+                <ElInput v-model="item.tax_refund" placeholder="请输入预估退税额">
+                  <template #suffix>
+                    <ElSelect v-model="item.tax_refund_currency" style="width: 64px">
+                      <ElOption
+                        v-for="c in currencyOptions"
+                        :key="c.currency_code"
+                        :label="c.currency_name"
+                        :value="c.currency_code"
+                      />
+                    </ElSelect>
+                  </template>
+                </ElInput>
+                <ElInput v-model="item.tax_refund_currency_snapshot" type="hidden" />
+              </ElFormItem>
+            </ElCol>
          </ElRow>
          <ElRow :gutter="12" class="item-row-wrap">
            <ElCol :sm="12" :md="12" :lg="6" :xl="6">
@@ -429,6 +480,13 @@
              </ElFormItem>
            </ElCol>
          </ElRow>
+          <ElRow :gutter="12" class="item-row-wrap">
+            <ElCol :sm="24" :md="24" :lg="24" :xl="24">
+              <ElFormItem label="备注" label-width="85px">
+                <ElInput type="textarea" :rows="2" v-model="item.remark" placeholder="请输入备注" />
+              </ElFormItem>
+            </ElCol>
+          </ElRow>
          <ElRow :gutter="12">
            <ElCol :span="24" style="text-align: right">
              <el-tag effect="light" class="row-actions" type="success" @click="copyRow(idx)"> 复制 </el-tag>
@@ -525,7 +583,12 @@
                      (portOptions || []).find((x: any) => x.id === val)?.port_name || '')
                "
              >
-                <ElOption v-for="p in portOptions" :key="p.id" :label="p.port_name" :value="p.id" />
+                <ElOption
+                  v-for="p in portOptions"
+                  :key="p.id"
+                  :label="p.port_names"
+                  :value="p.id"
+                />
              </ElSelect>
              <ElInput v-model="baseForm.domestic_port_snapshot" type="hidden" />
            </ElFormItem>
@@ -586,7 +649,7 @@
                <ElOption
                  v-for="p in portOptionsall"
                  :key="p.id"
-                  :label="p.port_name"
+                  :label="p.port_names"
                  :value="p.id"
                />
              </ElSelect>