Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Còn 3 bảng document và cơ quan chưa sửa đc #1

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME=VB&DH
APP_ENV=local
APP_KEY=base64:xTuBtcPwDbu6ddAonF67xeq0aCMdh5W0/IhbFsWzAvg=
APP_KEY=base64:lY+NQpdbfAjat285EIpGj5+ADY2Jc6yC/XlbqBspFWg=
APP_DEBUG=true
APP_URL=http://localhost

Expand Down
32 changes: 16 additions & 16 deletions database/seeds/DepartmentSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ class DepartmentSeeder extends Seeder
public function run()
{
DB::table('departments')->insert([
['id' => 'BGD', 'name' => 'Совет управляющих', 'tel' => '0123456600'],
['id' => 'PKHSX', 'name' => 'Производственный отдел', 'tel' => '0123456700'],
['id' => 'PTCLD', 'name' => 'Phòng Tổ chức - Lao động', 'tel' => '0123456701'],
['id' => 'BGD', 'name' => 'Юридический отдел', 'tel' => '0123456600'],
['id' => 'PKHSX', 'name' => 'Планово-экономический отдел', 'tel' => '0123456700'],
['id' => 'PTCLD', 'name' => 'Отдел кадров', 'tel' => '0123456701'],
['id' => 'PTC', 'name' => 'Финансовый отдел', 'tel' => '0123456702'],
['id' => 'PKTCN', 'name' => 'Отдел технологий', 'tel' => '0123456703'],
['id' => 'PVT', 'name' => 'Офисные принадлежности', 'tel' => '0123456704'],
['id' => 'PKCS', 'name' => 'Phòng KCS', 'tel' => '0123456705'],
['id' => 'PHCHC', 'name' => 'Phòng Hành chính - Hậu cần', 'tel' => '0123456706'],
['id' => 'PKTCN', 'name' => 'Отдел ремонта и технического обслуживания', 'tel' => '0123456703'],
['id' => 'PVT', 'name' => 'Отдел закупок', 'tel' => '0123456704'],
['id' => 'PKCS', 'name' => 'Отдел маркетинга', 'tel' => '0123456705'],
['id' => 'PHCHC', 'name' => 'Cлужба HR', 'tel' => '0123456706'],
['id' => 'PCT', 'name' => 'Политический отдел', 'tel' => '0123456707'],
['id' => 'PTKCN', 'name' => 'Phòng Thiết Kế - Công Nghệ', 'tel' => '0123456708'],
['id' => 'BATLD', 'name' => 'Ban An Toàn Lao Động', 'tel' => '0123456709'],
['id' => 'XDL', 'name' => 'Phân xưởng Động lực', 'tel' => '0123456710'],
['id' => 'XVT', 'name' => 'Phân xưởng Vỏ tàu', 'tel' => '0123456711'],
['id' => 'XDTCD', 'name' => 'Phân xưởng Điện tàu - Cơ điện', 'tel' => '0123456712'],
['id' => 'XCK', 'name' => 'Phân xưởng Cơ khí', 'tel' => '0123456713'],
['id' => 'XDD', 'name' => 'Phân xưởng Đà đốc', 'tel' => '0123456714'],
['id' => 'XVKKTDT', 'name' => 'Phân xưởng VK-KTĐT', 'tel' => '0123456715'],
['id' => 'XO', 'name' => 'Phân xưởng Ống', 'tel' => '0123456716'],
['id' => 'PTKCN', 'name' => 'Отдел контроля качества', 'tel' => '0123456708'],
['id' => 'BATLD', 'name' => 'Отдел автоматизации', 'tel' => '0123456709'],
['id' => 'XDL', 'name' => 'Отдел маркетинга', 'tel' => '0123456710'],
['id' => 'XVT', 'name' => 'Отдел секретариата', 'tel' => '0123456711'],
['id' => 'XDTCD', 'name' => 'Отдел клиентского сервиса', 'tel' => '0123456712'],
['id' => 'XCK', 'name' => 'Отдел транспортной логистики', 'tel' => '0123456713'],
['id' => 'XDD', 'name' => 'Отдел продаж', 'tel' => '0123456714'],
['id' => 'XVKKTDT', 'name' => 'ИТ-отдел', 'tel' => '0123456715'],
['id' => 'XO', 'name' => 'Производственный отдел', 'tel' => '0123456716'],
]);
}
}
1 change: 0 additions & 1 deletion database/seeds/SignerSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public function run()
['name' => 'Nguyễn Thanh Toàn', 'description' => 'Главный финансовый директор'],
['name' => 'Đào Thị Xa', 'description' => 'Генеральный директор'],
['name' => 'Hoàng Công', 'description' => 'Руководитель компание'],
['name' => 'Nguyễn Công Quân', 'description' => null],
['name' => 'Nguyễn Đức Tiên', 'description' => 'Замдиректор'],
]);
}
Expand Down
46 changes: 46 additions & 0 deletions laradock/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
APP_NAME=VB&DH
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost

LOG_CHANNEL=stack

DB_CONNECTION=mysql
DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=qlvbdh
DB_USERNAME=default
DB_PASSWORD=secret

BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=database
SESSION_DRIVER=cookie
SESSION_LIFETIME=120

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_DRIVER=smtp
MAIL_HOST=in-v3.mailjet.com
MAIL_PORT=587
MAIL_USERNAME=2e99b04784720bfd52cacc0dde78e468
MAIL_PASSWORD=24cc9628b13ab2040c7d2f1873973db7
MAIL_ENCRYPTION=tls
[email protected]
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
4 changes: 2 additions & 2 deletions public/1.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
this.service["delete"](this.itemSelected.id).then(function (response) {
_this4.isShowDetail = false;

_this4.$toast.success("Đã xóa");
_this4.$toast.success("Удалено");

_this4.fetchList();
})["catch"](function (error) {
Expand Down Expand Up @@ -353,7 +353,7 @@ var render = function() {
},
[
_c("CIcon", { attrs: { name: "cil-x" } }),
_vm._v(" Xóa\n ")
_vm._v(" Удалить\n ")
],
1
)
Expand Down
2 changes: 1 addition & 1 deletion public/20.js
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ var render = function() {
[
_c("CInput", {
attrs: {
description: "Let us know your full name.",
description: "ФИО ",
label: "Enter your name",
horizontal: "",
autocomplete: "name"
Expand Down
2 changes: 1 addition & 1 deletion public/4.js
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ var render = function() {
_vm._v(" "),
_c("CInput", {
attrs: {
placeholder: "Let us know your full name.",
placeholder: "ФИО ",
label: "Имя",
value: _vm.user.name,
horizontal: ""
Expand Down
4 changes: 2 additions & 2 deletions public/57.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ var render = function() {
[
_c("CInput", {
attrs: {
placeholder: "Let us know your full name.",
placeholder: "ФИО ",
label: "Имя",
value: _vm.user.name,
horizontal: ""
Expand Down Expand Up @@ -378,7 +378,7 @@ var render = function() {
_vm._v(" "),
_c("CInput", {
attrs: {
placeholder: "Nhập lại mật khẩu.",
placeholder: "Подтверждение пароля",
label: "Подтверждить",
type: "password",
value: _vm.user.password_confirmation,
Expand Down
2 changes: 1 addition & 1 deletion public/8.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
_services_factory__WEBPACK_IMPORTED_MODULE_1__["default"].attachment["delete"](id).then(function (response) {
_this3.attachments.splice(index, 1);

_this3.$toast.success("Đã xóa");
_this3.$toast.success("Удалено");
})["catch"](function (error) {
_this3.toastHttpError(error);
});
Expand Down
2 changes: 1 addition & 1 deletion resources/js/src/components/document/Attachments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default {
.delete(id)
.then(response => {
this.attachments.splice(index, 1);
this.$toast.success("Đã xóa");
this.$toast.success("Удалено");
})
.catch(error => {
this.toastHttpError(error);
Expand Down
4 changes: 2 additions & 2 deletions resources/js/src/components/form/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
color="danger"
@click="onClickDelete"
>
<CIcon name="cil-x" /> Xóa
<CIcon name="cil-x" /> Удалить
</CButton>
</template>
</CModal>
Expand Down Expand Up @@ -167,7 +167,7 @@ export default {
.delete(this.itemSelected.id)
.then(response => {
this.isShowDetail = false;
this.$toast.success("Đã xóa");
this.$toast.success("Удалено");
this.fetchList();
})
.catch(error => {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/src/components/user/Info.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<CForm>
<CInput label="Код" :value.sync="user.id" horizontal :readonly="true" />
<CInput
placeholder="Let us know your full name."
placeholder="ФИО "
label="Имя"
:value.sync="user.name"
horizontal
Expand Down
2 changes: 1 addition & 1 deletion resources/js/src/views/base/Forms.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<CCardBody>
<CForm>
<CInput
description="Let us know your full name."
description="ФИО "
label="Enter your name"
horizontal
autocomplete="name"
Expand Down
4 changes: 2 additions & 2 deletions resources/js/src/views/users/Create.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<CCardBody>
<CForm>
<CInput
placeholder="Let us know your full name."
placeholder="ФИО "
label="Имя"
:value.sync="user.name"
horizontal
Expand Down Expand Up @@ -62,7 +62,7 @@
horizontal
/>
<CInput
placeholder="Nhập lại mật khẩu."
placeholder="Подтверждение пароля"
label="Подтверждить"
type="password"
:value.sync="user.password_confirmation"
Expand Down
Loading