GitBucket
|
解决冲突
|
|---|
|
|
| src/api/business/task.ts |
|---|
| src/api/device/standard.ts |
|---|
| src/api/measure/person.ts |
|---|
| src/assets/icons/icon-scan.svg 0 → 100644 |
|---|
| src/assets/images/scan.png 0 → 100644 |
|---|
|
|
| src/assets/styles/globals.scss |
|---|
| src/components.d.ts |
|---|
| src/components/BarCodeBind/index.vue 0 → 100644 |
|---|
| src/components/Sample/certificationMonitor.vue 0 → 100644 |
|---|
| src/components/Sample/certificationRecords.vue 0 → 100644 |
|---|
| src/components/Sample/measureRecords.vue 0 → 100644 |
|---|
| src/components/ScanSampleDialog/index.vue 0 → 100644 |
|---|
| src/components/ScanSampleDialog/scan-interface.ts 0 → 100644 |
|---|
| src/components/dialog/selectStaffDialog.vue 0 → 100644 |
|---|
| src/router/modules/business.ts |
|---|
| src/router/modules/device.ts |
|---|
| src/store/modules/user.ts |
|---|
| src/views/business/bench/bench.vue |
|---|
| src/views/business/lab/components/rollbackDialog.vue 0 → 100644 |
|---|
| src/views/business/lab/deptMeasure/deptMeasureList.vue |
|---|
| src/views/business/lab/environmental/environmentalAdd.vue 0 → 100644 |
|---|
| src/views/business/lab/environmental/environmentalList.vue 0 → 100644 |
|---|
| src/views/business/lab/myMeasure/myMeasureList.vue |
|---|
| src/views/business/lab/primitiveLog/primitiveLogList.vue 0 → 100644 |
|---|
| src/views/business/lab/reportOnCredentials/components/baseInfo.vue 0 → 100644 |
|---|
| src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue 0 → 100644 |
|---|
| src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue 0 → 100644 |
|---|
| src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue 0 → 100644 |
|---|
| src/views/business/schedule/task/components/chooseLab.vue |
|---|
| src/views/business/schedule/task/components/processNode.vue |
|---|
| src/views/business/schedule/task/task-interface.ts |
|---|
| src/views/business/schedule/task/taskEdit.vue |
|---|
| src/views/business/schedule/task/taskList.vue |
|---|
| src/views/customer/advice/adviceEdit.vue |
|---|
| src/views/customer/advice/advice_interface.ts |
|---|
| src/views/device/deviceMaintenance/components/checkList.vue |
|---|
| src/views/device/deviceMaintenance/components/listApproval.vue |
|---|
| src/views/device/deviceMaintenance/components/listApprovalAdd.vue |
|---|
| src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue |
|---|
| src/views/device/deviceMaintenance/components/listPageAdd.vue |
|---|
| src/views/device/deviceMaintenance/components/manageAdd.vue |
|---|
| src/views/device/deviceMaintenance/maintenanceCheckList.vue |
|---|
| src/views/device/deviceMaintenance/maintenanceList.vue |
|---|
| src/views/device/standardEquipment/cancelApply.vue |
|---|
| src/views/device/standardEquipment/components/applyList.vue |
|---|
| src/views/device/standardEquipment/components/listApply/all.vue |
|---|
| src/views/device/standardEquipment/components/listApply/approvalPending.vue |
|---|
| src/views/device/standardEquipment/components/listApply/canceled.vue |
|---|
| src/views/device/standardEquipment/components/listApply/draftBox.vue |
|---|
| src/views/device/standardEquipment/components/listApply/examineAndApprove.vue |
|---|
| src/views/device/standardEquipment/components/listApply/listPage.vue |
|---|
| src/views/device/standardEquipment/components/listApply/listPageAdd.vue |
|---|
| src/views/device/standardEquipment/components/listApply/passed.vue |
|---|
| src/views/device/standardEquipment/components/listApply/standardDialog.vue 0 → 100644 |
|---|
| src/views/device/standardEquipment/components/listApply/userListDialog.vue |
|---|
| src/views/device/standardEquipment/components/standardList/baseInfo.vue |
|---|
| src/views/device/standardEquipment/components/standardList/equipmentDialog.vue 0 → 100644 |
|---|
| src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue 0 → 100644 |
|---|
| src/views/device/standardEquipment/components/standardList/templateTable.vue |
|---|
| src/views/device/standardEquipment/components/standardList/verificationDialog.vue 0 → 100644 |
|---|
| src/views/device/standardEquipment/components/standardListAdd.vue |
|---|
| src/views/device/standardEquipment/expirationRemind.vue |
|---|
| src/views/device/standardEquipment/standardList.vue |
|---|
| src/views/device/standardEquipment/standard_interface.ts |
|---|
| src/views/measure/source/approve.vue |
|---|
| src/views/measure/source/components/baseInfoDetail.vue |
|---|
| src/views/measure/source/listAdd.vue |
|---|
| src/views/measure/train/components/planListDialog.vue 0 → 100644 |
|---|
| src/views/measure/train/planAdd.vue |
|---|
| src/views/measure/train/plan_interface.ts |
|---|
| src/views/measure/train/trainLogAdd.vue |
|---|
| src/views/measure/train/trainPlanApprove.vue |
|---|