diff --git a/src/components/custom/InternalStaffViews.vue b/src/components/custom/InternalStaffViews.vue new file mode 100644 index 0000000..3463498 --- /dev/null +++ b/src/components/custom/InternalStaffViews.vue @@ -0,0 +1,204 @@ + + + diff --git a/src/components/custom/OrderDetailContent.vue b/src/components/custom/OrderDetailContent.vue index 3cb812d..b0c6da3 100644 --- a/src/components/custom/OrderDetailContent.vue +++ b/src/components/custom/OrderDetailContent.vue @@ -137,6 +137,14 @@ '—' }} + + + @@ -135,7 +135,7 @@ top="40px" :close-on-click-modal="false" > -
+
下载
@@ -157,6 +157,13 @@ style="flex: 1; width: 100%; border: 1px solid #eee; border-radius: 6px;" />
+
+ +
- + /> -->
@@ -190,7 +197,8 @@ import type { OrderData } from '@/composables/useOrderDetailDialog' import { usePdfPreview } from '@/composables/usePdfPreview' import FilePreview from '@/components/custom/FilePreview.vue' - import InternalStaffView from '@/components/custom/InternalStaffView.vue' + // import InternalStaffView from '@/components/custom/InternalStaffView.vue' + import InternalStaffViews from '@/components/custom/InternalStaffViews.vue' const timelineDialogVisible = ref(false) const approvalRecords = ref([]) const isFinites = ref(false) @@ -274,6 +282,7 @@ } else { isFinites.value = false } + handleViewnq(row) manageService .printStock({ id: row.id }) .then((res) => { @@ -315,7 +324,7 @@ port_fee_currency: it.port_misc_fee?.currency || it.port_fee_currency, model: it.model_snapshot })) - nqDialogVisible.value = true + // nqDialogVisible.value = true } // 文件数据 const contractFiles = ref>([]) @@ -547,4 +556,10 @@ font-size: 48px; color: #ddd; } + .inter-view { + margin-top: 10px; + padding: 10px; + border: 1px solid #ccc; + border-radius: 10px; + } diff --git a/src/views/admin/stock/stocking_list_admin.vue b/src/views/admin/stock/stocking_list_admin.vue index 6bf94b3..f35171e 100644 --- a/src/views/admin/stock/stocking_list_admin.vue +++ b/src/views/admin/stock/stocking_list_admin.vue @@ -93,14 +93,6 @@ > 查看审批 - - 内勤专用 - @@ -116,7 +108,7 @@ top="40px" :close-on-click-modal="false" > -
+
下载
@@ -138,6 +130,13 @@ style="flex: 1; width: 100%; border: 1px solid #eee; border-radius: 6px;" />
+
+ +
- + /> -->
@@ -196,10 +195,11 @@ import ApprovalTimeline from '@/components/custom/ApprovalTimeline.vue' import type { OrderData } from '@/composables/useOrderDetailDialog' import FilePreview from '@/components/custom/FilePreview.vue' - import InternalStaffView from '@/components/custom/InternalStaffView.vue' + // import InternalStaffView from '@/components/custom/InternalStaffView.vue' + import InternalStaffViews from '@/components/custom/InternalStaffViews.vue' const timelineDialogVisible = ref(false) const approvalRecords = ref([]) - const nqDialogVisible = ref(false) + // const nqDialogVisible = ref(false) const nqCurrency = ref('') const nqData = ref([]) const isFinites = ref(false) @@ -466,6 +466,7 @@ } else { isFinites.value = false } + handleViewnq(row) manageService .printStock({ id: row.id }) .then((res) => { @@ -530,7 +531,7 @@ port_fee_currency: it.port_misc_fee?.currency || it.port_fee_currency, model: it.model_snapshot })) - nqDialogVisible.value = true + // nqDialogVisible.value = true } @@ -667,5 +668,11 @@ word-break: break-all; max-width: 100%; } + .inter-view { + margin-top: 10px; + padding: 10px; + border: 1px solid #ccc; + border-radius: 10px; + } diff --git a/src/views/crmpc/stocking/Add.vue b/src/views/crmpc/stocking/Add.vue index 52f7790..a8784a8 100644 --- a/src/views/crmpc/stocking/Add.vue +++ b/src/views/crmpc/stocking/Add.vue @@ -264,6 +264,23 @@ + + + + + + + + diff --git a/src/views/crmpc/stocking/final_add.vue b/src/views/crmpc/stocking/final_add.vue index 3c0df72..a549d22 100644 --- a/src/views/crmpc/stocking/final_add.vue +++ b/src/views/crmpc/stocking/final_add.vue @@ -287,6 +287,23 @@ + + + + + + + + diff --git a/src/views/crmpc/stocking/final_edit.vue b/src/views/crmpc/stocking/final_edit.vue index 62e403c..83845c0 100644 --- a/src/views/crmpc/stocking/final_edit.vue +++ b/src/views/crmpc/stocking/final_edit.vue @@ -326,6 +326,48 @@ + + + + + + + + + + + + + + + + @@ -378,6 +420,31 @@ + + + + + + + + - +