Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev

Fork: 0

codedev / smart-metering-front

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev dev excel vue3-front v1.1.0.1 v1.1.0 V1.3.2 V1.3.1 V1.0.2 V1.0.1 V1.0.0
commit c507ec618a9d7e5095d647aaeecfb7adb36a3938 2 parents 3e74ab1 + 262502b dutingting authored on 1 Mar 2023

Patch

Unified Split

Showing 18 changed files

Ignore Space Show notes View .vscode/settings.json

Ignore Space Show notes View src/api/device/borrow.ts

Ignore Space Show notes View src/components/NormalTable/table_interface.ts

Ignore Space Show notes View src/views/device/borrow/borrowHandle.vue

Ignore Space Show notes View src/views/device/borrow/borrwoApply.vue

Show notes View src/views/device/borrow/components/applyList.vue 100644 → 0

Ignore Space Show notes View src/views/device/borrow/components/approvalActionDialog.vue

Show notes View src/views/device/borrow/components/handleList.vue 100644 → 0

Ignore Space Show notes View src/views/device/borrow/editHandle.vue

Ignore Space Show notes View src/views/device/stateManage/components/status-interface.ts

Ignore Space Show notes View src/views/device/stateManage/components/templateAdd.vue

Ignore Space Show notes View src/views/device/stateManage/components/templateList.vue

Ignore Space Show notes View src/views/device/stateManage/components/templatePage.vue

Ignore Space Show notes View src/views/device/stateManage/handleApply.vue

Ignore Space Show notes View src/views/device/stateManage/openApply.vue

Ignore Space Show notes View src/views/device/stateManage/scrapApply.vue

Ignore Space Show notes View src/views/device/stateManage/sealupApply.vue

Ignore Space Show notes View src/views/device/stateManage/unusedApply.vue

Show line notes below