diff --git a/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig b/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig index 9fb309e..3b15418 100644 --- a/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig +++ b/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig @@ -1,196 +1,298 @@ - - - - - - - -
-
-
- - +{% block content %} + + + + + + + + +
+
+
- - - - -
- + لوگو -

{{ bid.name }}

-
-

رسید تحویل کالا

+

{{ bid.name }}

+

رسید تحویل کالا

+

{{bid.name}}

تاریخ: {{ doc.date }}

-

شماره: {{ doc.code }}

-
-

- آدرس: - - استان - {{ bid.ostan }}، شهر - {{ bid.shahrestan }}، - {{ bid.address }} -

-

- تلفن تماس:{{ bid.tel }} -

-
-
-
-
- مشتری +
- - - - - - + +
+
+ اطلاعات {{bid.type}} +
+
-

- نام: - - {{ doc.person.nikename }} -

- 		-

- تلفن همراه - {{ doc.person.mobile }} -

-
- + - -
-

- آدرس: - - {{ doc.person.address }} -

+ 		+

نام فروشگاه: {{ bid.legalName }}

+

آدرس: استان {{ bid.ostan }}، شهر {{ bid.shahrestan }}، {{ bid.address }}

+ 		+

تلفن تماس: {{ bid.tel }}

+

کد اقتصادی: {{ bid.codeeghtesadi }}
-
-
-
- اطلاعات +
- - - -
+ +
+
+ مشتری +
+ + + - - - - - - +

- نام کالا: - - {{ doc.commodity.name }} -

+ نام: + {{ doc.person.nikename }}

 +

- مدل: - - {{ doc.model }} -

- 		-

- رنگ: - - {{ doc.color }} -

- 		-

- سریال: - - {{ doc.serial }} -

- 		-

- پلاک: - - {{ doc.pelak }} -

+ تلفن همراه: + {{ doc.person.mobile }}
+

- شرح: - - {{ doc.des }} -

+ آدرس: + {{ doc.person.address }}

 +
+
+ +
+
+ اطلاعات کالا +
+ + + + + + + + + + + - -
+ نام کالا: + {{ doc.commodity.name is empty ? '×' : doc.commodity.name }} + مدل: + {{ doc.model is empty ? '×' : doc.model }} + رنگ: + {{ doc.color is empty ? '×' : doc.color }} + سریال: + {{ doc.serial is empty ? '×' : doc.serial }} + پلاک: + {{ doc.pelak is empty ? '×' : doc.pelak }}

- متعلقات: - - {{ doc.motaleghat }} -

+ شرح: + {{ doc.des is empty ? '×' : doc.des }}

+ 		+

+ متعلقات: + {{ doc.motaleghat is empty ? '×' : doc.motaleghat }}
-
-
- - - - - - -
-

- مهر و امضا تحویل گیرنده -
- {{ doc.submitter.fullname }} -
- -

-
-
+
+
-
- - - - - - -
- {{ printOptions.repserviceNoteString}} -
-
-
- - +
+
+
+ مهر و امضا +
+ + + + + +
+

+ تحویل گیرنده +
+ {{ doc.submitter.fullname }} +

+ 		+ مهر +
+
- +
+
+ توضیحات +
+ + + + +
+
+ {{ printOptions.repserviceNoteString | raw }} +
+
+
+
+
+
+ + +{% endblock %} diff --git a/webUI/package.json b/webUI/package.json index f2bb785..a4b0313 100644 --- a/webUI/package.json +++ b/webUI/package.json @@ -18,6 +18,10 @@ "@date-io/date-fns-jalali": "^3.2.0", "@mdi/font": "^7.4.47", "@syncfusion/ej2-vue-dropdowns": "^21.2.5", + "@tiptap/extension-text-align": "^2.11.7", + "@tiptap/pm": "^2.11.7", + "@tiptap/starter-kit": "^2.11.7", + "@tiptap/vue-3": "^2.11.7", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.0", "@vueuse/core": "^12.0.0", diff --git a/webUI/src/components/Editor.vue b/webUI/src/components/Editor.vue new file mode 100644 index 0000000..05e2739 --- /dev/null +++ b/webUI/src/components/Editor.vue @@ -0,0 +1,232 @@ + + + + + \ No newline at end of file diff --git a/webUI/src/main.ts b/webUI/src/main.ts index ce6b0fc..3470bca 100644 --- a/webUI/src/main.ts +++ b/webUI/src/main.ts @@ -146,12 +146,12 @@ import money from 'v-money3'; import Vue3PersianDatetimePicker from 'vue3-persian-datetime-picker'; import Swal from "sweetalert2"; import { getApiUrl } from "@/hesabixConfig"; -const app = createApp(App) -app.component('EasyDataTable', Vue3EasyDataTable); -app.component('DatePicker', Vue3PersianDatetimePicker); import vSelect from 'vue-select' import 'vue-select/dist/vue-select.css'; +const app = createApp(App) +app.component('EasyDataTable', Vue3EasyDataTable); +app.component('DatePicker', Vue3PersianDatetimePicker); app.component('v-cob', vSelect) import Hdatepicker from "@/components/forms/Hdatepicker.vue"; import calendarLocalConfig from "@/i18n/calendarLocalConfig"; diff --git a/webUI/src/views/acc/settings/print.vue b/webUI/src/views/acc/settings/print.vue index 0913411..da8cc3d 100644 --- a/webUI/src/views/acc/settings/print.vue +++ b/webUI/src/views/acc/settings/print.vue @@ -42,284 +42,179 @@ -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
+ + + + + + + + + + + + + + + -
-
-
- - -
-
-
-
- - -
-
-
+ + + + + + + + @@ -331,68 +226,75 @@ - \ No newline at end of file + \ No newline at end of file