From c6c5e0b4130cc9d3ec89ef67bdc5b09db045fc74 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 8 Apr 2024 09:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/src/UploadFile.vue  | 12 +---
 src/views/qms/inspectionMethod/index.vue      | 64 +++++++++++++------
 .../inspectionMethod/inspectionMethod.data.ts | 17 ++++-
 3 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 36fed8b4b..26e97d622 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -148,17 +148,7 @@ const listToString = (list: UploadUserFile[], separator?: string) => {
   }
   return strs != '' ? strs.substr(0, strs.length - 1) : ''
 }
-watch(
-  () => props.modelValue,
-  (data) => {
-    if (!data) return
-    fileList.value = data
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
+
 </script>
 <style scoped lang="scss">
 .upload-file-uploader {
diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue
index f3ffe611c..fdf4cf9fc 100644
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@@ -42,6 +42,13 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
+    :sumFormDataByForm ="(formRef,formModel)=>{
+      console.log(formModel)
+      const {videoAddress} = formModel
+      formRef.value.setValues({
+        installPackageUrl:videoAddress
+      })
+    }"
     :rules="InspectionMethodRules"
     :formAllSchemas="InspectionMethod.allSchemas"
     :apiUpdate="InspectionMethodApi.updateInspectionMethod"
@@ -163,6 +170,18 @@ const openForm = (type: string, row?: any) => {
       }
     })
   }
+  if(type=='create'){
+    const currentTime = new Date().getTime()
+    const fileId = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='fileId')
+    const uploadFile = InspectionMethod.allSchemas.formSchema.find(item=>item.field=='videoAddress')
+    if(fileId){
+      fileId['value'] = currentTime
+    }
+    if(uploadFile){
+      uploadFile['componentProps']['upData']['tableId'] = currentTime
+    }
+    
+  }
   basicFormRef.value.open(type, row)
 }
 
@@ -170,27 +189,31 @@ const openForm = (type: string, row?: any) => {
 const formsSuccess = async (formType,data) => {
   // data.filePathList = []
   // data.tmp = []
-  data.filePathList = []
-  for (let i = 0; i < data.filePathListView.length; i++) {
-    data.filePathList.push(data.filePathListView[i].url)
-  }
-  if(data.filePathList.length>0){
-    data.videoAddress = data.filePathList.join(',')
-  }
+  console.log(data)
+  // for (let i = 0; i < data.filePathListView.length; i++) {
+  //   data.filePathList.push(data.filePathListView[i].url)
+  // }
+  // data.filePathList = []
+  // for (let i = 0; i < data.filePathListView.length; i++) {
+  //   data.filePathList.push(data.filePathListView[i].url)
+  // }
+  // if(data.filePathList.length>0){
+  //   data.videoAddress = data.filePathList.join(',')
+  // }
 // debugger
-//   if(data.filePathListView instanceof Array){
-//     for(let i=0; i<data.filePathListView.length; i++){
-//       data.tmp.push(data.filePathListView[i].url)
-//     }
-//     data.videoAddress = data.tmp.join(',')
-//   }else{
-//     data.videoAddress = data.filePathListView
-//     data.filePathListView = data.filePathListView.split(',').map(url=>{return {url}})
-//   }
-//   for (let i = 0; i < data.filePathListView.length; i++) {
-//     data.filePathList.push(data.filePathListView[i])
-//   }
-//   console.log(1111,data)
+  // if(data.filePathListView instanceof Array){
+  //   for(let i=0; i<data.filePathListView.length; i++){
+  //     data.tmp.push(data.filePathListView[i].url)
+  //   }
+  //   data.videoAddress = data.tmp.join(',')
+  // }else{
+  //   data.videoAddress = data.filePathListView
+  //   data.filePathListView = data.filePathListView.split(',').map(url=>{return {url}})
+  // }
+  // for (let i = 0; i < data.filePathListView.length; i++) {
+  //   data.filePathList.push(data.filePathListView[i])
+  // }
+  // console.log(1111,data)
   // var isHave =InspectionMethod.allSchemas.formSchema.some(function (item) {
   //   return item.field === 'activeTime' || item.field === 'expireTime';
   // });
@@ -204,6 +227,7 @@ const formsSuccess = async (formType,data) => {
   // if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
 
+    delete data['uploadFile']
     await InspectionMethodApi.createInspectionMethod(data)
     message.success(t('common.createSuccess'))
   } else {
diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
index d31c28877..8277a837d 100644
--- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts
+++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
@@ -53,7 +53,7 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '文件',
-    field: 'filePathListView',
+    field: 'videoAddress',
     sort: 'custom',
     isTable: false,
     table: {
@@ -84,6 +84,21 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '文件',
+    field: 'videoAddress',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+    table: {
+    },
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',