计量上报修改

src/components/hc-report/hc-report.vue

@@ -8,7 +8,8 @@
             label-width="auto" size="large"
         >
             <el-form-item label="任务名称：" prop="taskName">
-                <el-input v-model="formModel.taskName" disabled />
+                <el-input v-if="!isBatch" v-model="formModel.taskName" disabled />
+                <el-input v-else v-model="formModel.taskName" disabled type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" />
             </el-form-item>
             <el-form-item v-if="isShowMoney" label="送审金额：" prop="submitApprovalMoney">
                 <el-input-number v-model="formModel.submitApprovalMoney" :precision="0" :controls="false" :min="1" class="mr-1" />(元)
@@ -76,6 +77,14 @@ const props = defineProps({
         type: Boolean,
         default: false,
     }, //是否显示送审金额
+    isBatch: {
+        type: Boolean,
+        default: false,
+    }, //是否显示上报批次
+    nameList: {
+        type: Object,
+        default: () => ([]),
+    },
 })
 
 //事件
@@ -86,6 +95,8 @@ const useAppState = useAppStore()
 const projectId = ref(useAppState.getProjectId || '')
 const contractId = ref(useAppState.getContractId || '')
 const isShowMoney = ref(props.isShowMoney)
+const isBatch = ref(props.isBatch)
+const nameList = ref(props.nameList)
 defineOptions({
     name: 'HcReportDialog',
 })
@@ -97,8 +108,12 @@ const isShow = defineModel('modelValue', {
 })
 watch(() => [
     props.isShowMoney,
-], ([money]) => {
+    props.isBatch,
+    props.nameList,
+], ([money, batch, list]) => {
     isShowMoney.value = money
+    isBatch.value = batch
+    nameList.value = list
 })
 //任务数据
 const reportInfo = ref(props.info)
@@ -134,9 +149,10 @@ const getReportTaskName = async () => {
         id: periodId,
         type,
     })
-    const { name, submitApprovalMoney } = getObjVal(data)
+    const { name, submitApprovalMoney, ids } = getObjVal(data)
     formModel.value.taskName = name ?? ''
        formModel.value.submitApprovalMoney = Number(submitApprovalMoney) ?? 0
+        formModel.value.ids = ids ?? ''
 }
 
 //任务流程
@@ -239,6 +255,8 @@ const modalSave = async () => {
     const res = await formValidate(formRef.value)
     if (!res) return
     formReportLoading.value = true
+    console.log(formModel.value, 'formModel.value')
+    
     //发起请求
     const { error, code, msg } = await mainApi.reportTaskForm({
         ...formModel.value,

src/views/alter/admin/order.vue

@@ -20,7 +20,7 @@
                 <span>上报</span>
             </el-button>
             <el-button hc-btn color="#FF7D43" :loading="undoLoading" class="text-white" :disabled="tableCheckKeys.length <= 0" @click="undoReportClick">
-                <span>撤销上报</span>
+                <span>撤销上报11</span>
             </el-button>
         </template>
         <div class="relative h-full flex">
@@ -130,7 +130,7 @@
         </div>
 
         <!-- 上报弹窗 -->
-        <hc-report-dialog v-model="isReport" :info="reportInfo" :is-build-audit="false" @finish="reportFinish" />
+        <hc-report-dialog v-model="isReport" :info="reportInfo" :is-build-audit="false" :is-batch="true" @finish="reportFinish" />
 
         <!-- 新增修改的弹窗 -->
         <addModal v-model="isAddShow" :ids="addEditIds" @finish="addEditFinish" />