up

src/global/components/hc-uploads/index.vue

@@ -165,6 +165,8 @@ const getUploadFileList = (fileListArr) => {
     return fileArr
 }
 
+
+
 //预览
 const showViewer = ref(false)
 const initialIndex = ref(-1)

src/views/ledger/components/table-form.vue

@@ -142,33 +142,18 @@ nextTick(() => {
 
 //获取相关数据
 const getQueryData = () => {
-    const {excelId, primaryKeyId} = menuItem.value
+    const {excelId} = menuItem.value
     excelIdVal.value = excelId > 0 ? excelId + '' : ''
-    getSubmitLogDateList(primaryKeyId)
-}
-
-//获取日期记录
-const dateData = ref([])
-const getSubmitLogDateList = async (pid) => {
-    if (pid > 0) {
-        const { data } = await queryApi.getSubmitLogDateList({
-            projectId: projectId.value,
-            contractId: contractId.value,
-            primaryKeyId: pid
-        }, false)
-        //处理数据
-        dateData.value = getArrValue(data)
-    } else {
-        dateData.value = []
-    }
 }
 
 //日期日历回调
 const recordTime = ref('')
-const dateCalendarChoice = ({choices}) => {
+const dateCalendarChoice = ({date, choices}) => {
+    const {primaryKeyId} = menuItem.value
     recordTime.value = choices
     getExcelHtml(excelIdVal.value)
     getTheLogBusinessData(excelIdVal.value, choices)
+    getSubmitLogDateList(date,primaryKeyId)
     queryCurrentLogSelectProcessList(choices)
 }
 
@@ -270,6 +255,23 @@ const getBussDataInfo = (index = 0) => {
     }
 }
 
+//获取日期记录
+const dateData = ref([])
+const getSubmitLogDateList = async ({year},pid) => {
+    if (pid > 0) {
+        const { data } = await queryApi.getSubmitLogDateList({
+            projectId: projectId.value,
+            contractId: contractId.value,
+            primaryKeyId: pid,
+            year: year
+        }, false)
+        //处理数据
+        dateData.value = getArrValue(data)
+    } else {
+        dateData.value = []
+    }
+}
+
 //关联工序
 const processNodeModal = ref(false)
 const showProcessModal = () => {

src/views/other/order-service.vue

@@ -175,7 +175,7 @@ import orderServe from '~api/other/orderServe';
 import avatarPng from '~src/assets/images/avatar.png';
 import Web515Png from '~src/assets/images/Web515.png';
 import {userConfigSave} from "~api/other";
-import {isType, base64ToFile} from "vue-utils-plus"
+import {isType, base64ToFile, getObjNullValue} from "vue-utils-plus"
 import ossApi from "~api/oss";
 
 //初始变量
@@ -489,6 +489,19 @@ const saveClick = async () => {
     }
 }
 
+//获取文件URL
+const getUploadFileUrl = () => {
+    let fileArr = [], fileList = uploadFileList.value ?? [];
+    fileList.forEach(item => {
+        if (getObjNullValue(item?.response)) {
+            fileArr.push(item?.response?.data?.link)
+        } else {
+            fileArr.push(item?.url)
+        }
+    })
+    return fileArr
+}
+
 //评价
 const showTipModal = ref(false)
 const evaluationKey = ref('1')