|
@@ -127,9 +127,16 @@
|
|
|
<span class="text-link" @click="downloadImportClick">范例试验设备文件</span>
|
|
|
<span>) ,按模板样式编辑试验容器后,在点击“选择文件”按钮选择编辑好的文件,点击确认即可导入成功!</span>
|
|
|
</div>
|
|
|
- <HcDragUpload/>
|
|
|
+ <HcDragUpload action="use/read-excel" @progress="uploadprogress" @finished="uploadFinished"/>
|
|
|
<div class="hc-import-modal-table-box">
|
|
|
- <HcTable ref="tableImportRef" :column="tableColumn" :datas="tableImportData" :loading="tableImportLoading" isCheck @selection-change="tableImportSelection"/>
|
|
|
+ <HcTable ref="tableImportRef" :column="tableColumn" :datas="tableImportData" :loading="tableImportLoading" isCheck @selection-change="tableImportSelection">
|
|
|
+ <template #status="{row}">
|
|
|
+ {{row.status == 1?'启用中':'已停用'}}
|
|
|
+ </template>
|
|
|
+ <template #isCalibration="{row}">
|
|
|
+ {{row.isCalibration == 1?'是':'否'}}
|
|
|
+ </template>
|
|
|
+ </HcTable>
|
|
|
</div>
|
|
|
</HcDialog>
|
|
|
|
|
@@ -146,6 +153,7 @@ import {getContractUserList} from "~api/other";
|
|
|
import {formValidate, getArrValue} from "vue-utils-plus"
|
|
|
import dataApi from "~api/tentative/device/employ";
|
|
|
import {getRowsValue, rowsToId} from "~uti/tools";
|
|
|
+import approachApi from "~api/tentative/device/approach";
|
|
|
|
|
|
//初始变量
|
|
|
const useAppState = useAppStore()
|
|
@@ -345,13 +353,47 @@ const printerClick = async () => {
|
|
|
//导入
|
|
|
const importModal = ref(false)
|
|
|
const importModalClick = () => {
|
|
|
+ tableImportData.value = []
|
|
|
importModal.value = true
|
|
|
}
|
|
|
|
|
|
+//上传进度
|
|
|
+const uploadprogress = (res) => {
|
|
|
+ importModalLoading.value = res
|
|
|
+ tableImportLoading.value = res
|
|
|
+}
|
|
|
+
|
|
|
+//上传完成
|
|
|
+const uploadFinished = (data) => {
|
|
|
+ tableImportData.value = getArrValue(data)
|
|
|
+}
|
|
|
+
|
|
|
//确认导入
|
|
|
const importModalLoading = ref(false)
|
|
|
const importModalYesClick = () => {
|
|
|
- importModal.value = false
|
|
|
+ const keys = tableImportKeys.value
|
|
|
+ if (keys.length > 0) {
|
|
|
+ samplingRecord(keys)
|
|
|
+ } else {
|
|
|
+ window?.$message?.warning('请先勾选要导入的数据')
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+//导入数据保存
|
|
|
+const samplingRecord = async (keys) => {
|
|
|
+ importModalLoading.value = true
|
|
|
+ const { error, code } = await dataApi.samplingRecord({
|
|
|
+ projectId: projectId.value,
|
|
|
+ contractId: contractId.value,
|
|
|
+ list: keys
|
|
|
+ })
|
|
|
+ //处理数据
|
|
|
+ importModalLoading.value = false
|
|
|
+ if (!error && code === 200) {
|
|
|
+ importModal.value = false
|
|
|
+ } else {
|
|
|
+ importModal.value = false
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//关闭导入
|
|
@@ -367,9 +409,7 @@ const tableImportData = ref([])
|
|
|
//多选
|
|
|
const tableImportKeys = ref([]);
|
|
|
const tableImportSelection = (rows) => {
|
|
|
- tableImportKeys.value = rows.filter((item) => {
|
|
|
- return (item??'') !== '';
|
|
|
- })
|
|
|
+ tableImportKeys.value = rows
|
|
|
}
|
|
|
|
|
|
//新增/编辑
|
|
@@ -501,7 +541,7 @@ const addEditFormClick = async () => {
|
|
|
|
|
|
//下载导入模板
|
|
|
const downloadImportClick = () => {
|
|
|
- window.open('https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221109/613908ed418da0f4b92cd26a46d0dc4a.xlsx','_blank')
|
|
|
+ window.open('https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221109/aaafe6673c0338eeeba8ff537980e093.xlsx','_blank')
|
|
|
}
|
|
|
|
|
|
//左右拖动,改变树形结构宽度
|