任务管理

src/api/modules/tasks/hc-data.js

@@ -82,11 +82,11 @@ export default {
         }, false)
     },
     //附件文件删除
-    async removeFile(id) {
+    async removeFile(form) {
         return HcApi({
             url: '/api/blade-meter/task/data/removeFile',
             method: 'get',
-            params: { id },
+            params: form,
         }, false)
     },
     //批注信息列表

src/config/index.json

@@ -1,6 +1,6 @@
 {
     "version": "20230607160059",
-    "target": "http://192.168.0.196:8090",
+    "target": "http://192.168.0.109:8090",
     "smsPhone": "",
     "vite": {
         "port": 5180,

src/views/tasks/components/hc-data/material-form.vue

@@ -18,11 +18,11 @@
                 <tr>
                     <hc-info-table-td center is-title>单价：</hc-info-table-td>
                     <hc-info-table-td v-loading="priceLoading" width="120px">
-                        <el-input v-model="baseForm.price" :disabled="!isEdits" @blur="priceInputBlur" />
+                        <el-input v-model="baseForm.price" :disabled="!isEdits || tableInfo.status === 2" @blur="priceInputBlur" />
                     </hc-info-table-td>
                     <hc-info-table-td center is-title>计量数量：</hc-info-table-td>
                     <hc-info-table-td v-loading="meterLoading" width="120px">
-                        <el-input v-model="baseForm.meterAmount" :disabled="!isEdits" @blur="meterAmountInputBlur" />
+                        <el-input v-model="baseForm.meterAmount" :disabled="!isEdits || tableInfo.status === 2" @blur="meterAmountInputBlur" />
                     </hc-info-table-td>
                 </tr>
                 <tr>
@@ -158,6 +158,7 @@ const priceInputBlur = async () => {
     const { error, code, msg } = await mainApi.taskMaterialUpdate({
         projectId: projectId.value,
         contractId: contractId.value,
+        taskId: taskInfo.value.id,
         price: priceValue,
         id,
     })
@@ -187,6 +188,7 @@ const meterAmountInputBlur = async () => {
         projectId: projectId.value,
         contractId: contractId.value,
         meterAmount: meterAmountValue,
+        taskId: taskInfo.value.id,
         id,
     })
     meterLoading.value = false
@@ -209,7 +211,7 @@ const uploadFormProps = {
 }
 
 const attachmentUpload = () => {
-    if (isEdits.value) {
+    if (isEdits.value || tableInfo.status !== 2) {
         uploadFileRef.value?.selectFile()
     } else {
         window.$message.error('当前状态不可上传')
@@ -226,6 +228,7 @@ const uploadFileSuccess = async ({ resData }) => {
         fileName: resData.originalName ?? '',
         filePdfUrl: resData.pdfUrl ?? '',
         fileUrl: resData.link ?? '',
+        taskId: taskInfo.value.id,
     })
     uploadFileRef.value?.setModalShow(false)
     //发起请求
@@ -251,7 +254,10 @@ const attachmentUploadDel = ({ file }, resolve) => {
         return
     }
     delMessage(async () => {
-        const { error, code, msg } = await mainApi.removeFile(file.id)
+        const { error, code, msg } = await mainApi.removeFile({
+            id: file.id,
+            taskId: taskInfo.value.id,
+        })
         if (!error && code === 200) {
             resolve(true)
         } else {

src/views/tasks/components/hc-data/middlepay-form.vue

@@ -72,7 +72,7 @@
                 <span class="text-[13px] text-orange font-400">温馨提示：超计,累计计量量> 变更后数量，分解清单超计整行红色</span>
             </template>
             <template #extra>
-                <el-link type="primary" :disabled="!isEdits" @click="addBillModalClick">
+                <el-link type="primary" :disabled="!isEdits || tableInfo.status === 2" @click="addBillModalClick">
                     <hc-icon name="add" />
                     <span>添加清单</span>
                 </el-link>
@@ -85,10 +85,10 @@
                     <hc-table-input v-model="row.changeTotal" disabled />
                 </template>
                 <template #currentMeterTotal="{ row }">
-                    <hc-table-input v-model="row.currentMeterTotal" :disabled="!isEdits" @blur="currentMeterTotalBlur(row)" />
+                    <hc-table-input v-model="row.currentMeterTotal" :disabled="!isEdits || tableInfo.status === 2" @blur="currentMeterTotalBlur(row)" />
                 </template>
                 <template #containChangeTotal="{ row }">
-                    <hc-table-input v-model="row.containChangeTotal" :disabled="!isEdits" @blur="containChangeTotalBlur(row)" />
+                    <hc-table-input v-model="row.containChangeTotal" :disabled="!isEdits || tableInfo.status === 2" @blur="containChangeTotalBlur(row)" />
                 </template>
                 <template #currentMeterMoney="{ row }">
                     <hc-table-input v-model="row.currentMeterMoney" disabled />
@@ -97,7 +97,7 @@
                     <hc-table-input v-model="row.allMeterTotal" disabled />
                 </template>
                 <template #action="{ row, index }">
-                    <el-link type="danger" :disabled="!isEdits" @click="delAddTableClick(row, index)">删除</el-link>
+                    <el-link type="danger" :disabled="!isEdits || tableInfo.status === 2" @click="delAddTableClick(row, index)">删除</el-link>
                 </template>
             </hc-table>
         </hc-card-item>
@@ -186,6 +186,7 @@ const getAllPeriod = async () => {
     const { data } = await middlepayApi.getAllPeriod({
         projectId: projectId.value,
         contractId: contractId.value,
+        taskId: taskInfo.value.id,
         type: 1,
     })
     periods.value = getArrValue(data)
@@ -287,7 +288,10 @@ const containChangeTotalBlur = (row) => {
 
 //清单数据修改
 const meterTableUpdate = async (form) => {
-    const { error, msg, code } = await mainApi.tableUpdate(form)
+    const { error, msg, code } = await mainApi.tableUpdate({
+        ...form,
+        taskId: taskInfo.value.id,
+    })
     if (!error && code === 200) {
         window.$message.success('更新成功')
     } else {
@@ -302,6 +306,7 @@ const delAddTableClick = (row, index) => {
         const { code, msg } = await mainApi.remove({
             id: row.id,
             dataId,
+            taskId: taskInfo.value.id,
         })
         if (code === 200) {
             window.$message.success('删除成功')
@@ -337,7 +342,7 @@ const uploadFormProps = {
 }
 
 const attachmentUpload = () => {
-    if (isEdits.value) {
+    if (isEdits.value || tableInfo.status !== 2) {
         uploadFileRef.value?.selectFile()
     } else {
         window.$message.error('当前状态不可上传')
@@ -354,6 +359,7 @@ const uploadFileSuccess = async ({ resData }) => {
         fileName: resData.originalName ?? '',
         filePdfUrl: resData.pdfUrl ?? '',
         fileUrl: resData.link ?? '',
+        taskId: taskInfo.value.id,
     })
     uploadFileRef.value?.setModalShow(false)
     //发起请求
@@ -379,7 +385,10 @@ const attachmentUploadDel = ({ file }, resolve) => {
         return
     }
     delMessage(async () => {
-        const { error, code, msg } = await mainApi.removeFile(file.id)
+        const { error, code, msg } = await mainApi.removeFile({
+            id: file.id,
+            taskId: taskInfo.value.id
+        })
         if (!error && code === 200) {
             resolve(true)
         } else {

src/views/tasks/components/hc-data/start-work-form.vue

@@ -16,7 +16,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item v-loading="meterMoneyLoading" label="计量金额：">
-                            <el-input v-model="baseForm.meterMoney" :disabled="!isEdits" @blur="meterMoneyInputBlur" />
+                            <el-input v-model="baseForm.meterMoney" :disabled="!isEdits || tableInfo.status === 2" @blur="meterMoneyInputBlur" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -26,7 +26,7 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item v-loading="applyCauseLoading" label="申请依据：">
-                            <el-input v-model="baseForm.applyCause" :autosize="{ minRows: 4, maxRows: 8 }" type="textarea" :disabled="!isEdits" @blur="applyCauseInputBlur" />
+                            <el-input v-model="baseForm.applyCause" :autosize="{ minRows: 4, maxRows: 8 }" type="textarea" :disabled="!isEdits || tableInfo.status === 2" @blur="applyCauseInputBlur" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -138,6 +138,7 @@ const meterMoneyInputBlur = async () => {
         projectId: projectId.value,
         contractId: contractId.value,
         meterMoney: meterMoneyValue,
+        taskId: taskInfo.value.id,
         id,
     })
     meterMoneyLoading.value = false
@@ -158,6 +159,7 @@ const applyCauseInputBlur = async () => {
         projectId: projectId.value,
         contractId: contractId.value,
         applyCause: applyCause ?? '',
+        taskId: taskInfo.value.id,
         id,
     })
     applyCauseLoading.value = false
@@ -180,7 +182,7 @@ const uploadFormProps = {
 }
 
 const attachmentUpload = () => {
-    if (isEdits.value) {
+    if (isEdits.value || tableInfo.status !== 2) {
         uploadFileRef.value?.selectFile()
     } else {
         window.$message.error('当前状态不可上传')
@@ -197,6 +199,7 @@ const uploadFileSuccess = async ({ resData }) => {
         fileName: resData.originalName ?? '',
         filePdfUrl: resData.pdfUrl ?? '',
         fileUrl: resData.link ?? '',
+        taskId: taskInfo.value.id,
     })
     uploadFileRef.value?.setModalShow(false)
     //发起请求
@@ -222,7 +225,10 @@ const attachmentUploadDel = ({ file }, resolve) => {
         return
     }
     delMessage(async () => {
-        const { error, code, msg } = await mainApi.removeFile(file.id)
+        const { error, code, msg } = await mainApi.removeFile({
+            id: file.id,
+            taskId: taskInfo.value.id,
+        })
         if (!error && code === 200) {
             resolve(true)
         } else {

src/views/tasks/components/hc-data/task-form.vue

@@ -13,19 +13,19 @@
         <HcAlterForm v-if="taskInfo.meterType === 4" :table="tableInfo" :info="taskInfo" :is-edit="isEdits" />
         <hc-card-item class="hc-card-footer mt-3">
             <template #header>
-                <el-radio-group v-model="taskForm.auditStatus" size="large" :disabled="!isEdits">
+                <el-radio-group v-model="taskForm.auditStatus" size="large" :disabled="!isEdits || tableInfo.status === 2">
                     <el-radio :label="1">同意</el-radio>
                     <el-radio :label="2">驳回</el-radio>
                 </el-radio-group>
             </template>
             <template #extra>
-                <el-link type="primary" :disabled="taskForm.auditStatus === 0 || !isEdits" @click="tableSubmitClick">
+                <el-link type="primary" :disabled="taskForm.auditStatus === 0 || !isEdits || tableInfo.status === 2" @click="tableSubmitClick">
                     <hc-icon name="check" />
                     <span class="ml-1">这里点提交</span>
                 </el-link>
             </template>
             <div class="relative">
-                <el-input v-model="taskForm.repealDesc" :autosize="{ minRows: 2, maxRows: 4 }" :disabled="!isEdits" type="textarea" placeholder="请描述废除整条任务的原因" />
+                <el-input v-model="taskForm.repealDesc" :autosize="{ minRows: 2, maxRows: 4 }" :disabled="!isEdits || tableInfo.status === 2" type="textarea" placeholder="请描述废除整条任务的原因" />
             </div>
         </hc-card-item>
     </div>

src/views/tasks/components/hc-data/task-review.vue

@@ -231,7 +231,9 @@ const isNotesShow = ref(false)
 const tableNoteInfo = ref({})
 const rowRemarkClick = (row) => {
     tableNoteInfo.value = row
-    isNotesShow.value = true
+    nextTick(() => {
+        isNotesShow.value = true
+    })
 }
 
 //批注完成