1

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240705193225"
+  "value": "20240705193346"
 }

src/api/modules/other.js

@@ -76,3 +76,11 @@ export const saveSmsTimeout = (form) => HcApi({
     method: 'get',
     params: form,
 })
+
+
+//撤销上报， periodId 期数，type 类型(0中间，1材料，2开工)
+export const backMeterTask = (form) => HcApi({
+    url: '/api/blade-meter/task/backMeterTask',
+    method: 'get',
+    params: form,
+})

src/views/debit-pay/material/order.vue

@@ -27,7 +27,8 @@
                         @selection-change="tableCheckChange" @row-click="hanleRow"
                     >
                         <template #approveStatusName="{ row }">
-                            <el-link type="primary" @click="rowTableClick(row)">{{ row.approveStatusName }}</el-link>
+                            <el-link v-if="row.approveStatusName !== '未上报'" type="primary" @click="rowTableClick(row)">{{ row.approveStatusName }}</el-link>
+                            <span v-else>{{ row.approveStatusName }}</span>
                         </template>
                         <template #action="{ row }">
                             <el-link type="success" :disabled="approveStatus !== 0" @click="rowEditClick(row)">修改</el-link>

src/views/debit-pay/start-work/components/order/dataModal.vue

@@ -73,13 +73,17 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
+    periodId: {
+        type: [String, Number],
+        default: '',
+    },
     infoData: {
         type: Object,
         default: () => ({}),
     },
 })
 //事件
-const emit = defineEmits(['close'])
+const emit = defineEmits(['finish', 'close'])
 const useAppState = useAppStore()
 const contractId = ref(useAppState.getContractId)
 const projectId = ref(useAppState.getProjectId)
@@ -96,22 +100,17 @@ const modalTitle = ref('开工预付款计量单新增')
 const getStartAmountData = async () => {
     const { error, code, data } = await orderApi.getStartAmount({
         contractId: contractId.value,
-
     })
     if (!error && code === 200) {
         if (modalTitle.value === '开工预付款计量单新增') {
             baseForm.value.startPayAmount = Number(data)
         }
-
     } else {
         baseForm.value.startPayAmount = 0
     }
 }
 //监听
-watch(() => [
-    props.ids,
-    props.infoData,
-], ([Id, info]) => {
+watch(() => [props.ids, props.infoData], ([Id, info]) => {
     ids.value = Id
     infoData.value = info
     if (Id.length > 0) {
@@ -123,37 +122,35 @@ watch(() => [
         fileName.value = []
         modalTitle.value = '开工预付款计量单新增'
     }
-}, { immediate: true })
+}, { immediate: true, deep: true })
 //双向绑定
 // eslint-disable-next-line no-undef
 const isShow = defineModel('modelValue', {
     default: false,
 })
 
+//监听
+watch(() => props.periodId, (pid) => {
+    baseForm.value.meterPeriodId = pid
+}, { immediate: true, deep: true })
+
 //监听
 watch(isShow, (val) => {
     if (val) {
-        console.log('isShow', val)
         getKey1Data()
         getStartAmountData()
+        baseForm.value.meterPeriodId = props.periodId
     }
 })
 
 //计量期
 const key1Data = ref([])
 const getKey1Data = async () => {
-    const { error, code, data } = await periodApi.allPeriod({
+    const { data } = await periodApi.allPeriod({
         contractId: contractId.value,
         type: 2,
     })
-    if (!error && code === 200) {
-        key1Data.value = getArrValue(data)
-        if (key1Data.value.length > 0) {
-            baseForm.value.meterPeriodId = key1Data.value[key1Data.value.length - 1].id
-        }
-    } else {
-        key1Data.value = []
-    }
+    key1Data.value = getArrValue(data)
 }
 
 //基础表单
@@ -189,8 +186,7 @@ const modalSave = async () => {
         modalSaving.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
-
-
+            emit('finish')
         } else {
             window.$message.error(msg ?? '操作失败')
         }
@@ -204,13 +200,11 @@ const modalSave = async () => {
         modalSaving.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
-
-
+            emit('finish')
         } else {
             window.$message.error(msg ?? '操作失败')
         }
     }
-
     modalClose()
 }
 

src/views/debit-pay/start-work/order.vue

@@ -30,7 +30,8 @@
                         is-current-row @selection-change="tableCheckChange" @row-click="hanleRow"
                     >
                         <template #approveStatusName="{ row }">
-                            <el-link type="primary" @click="rowTableClick(row)">{{ row.approveStatusName }}</el-link>
+                            <el-link v-if="row.approveStatusName !== '未上报'" type="primary" @click="rowTableClick(row)">{{ row.approveStatusName }}</el-link>
+                            <span v-else>{{ row.approveStatusName }}</span>
                         </template>
                         <template #action="{ row }">
                             <el-link type="success" :disabled="approveStatus !== 0" @click="rowEditClick(row)">
@@ -88,7 +89,7 @@
             </div>
         </div>
         <!-- 新增/修改 -->
-        <HcDataModal v-model="isDataModal" :info-data="newInfoData" :ids="editId" @close="finishData" />
+        <HcDataModal v-model="isDataModal" :info-data="newInfoData" :ids="editId" :period-id="searchForm.meterPeriodId" @finish="finishData" />
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" :info="reportInfo" @finish="reportFinish" />
@@ -180,18 +181,19 @@ const getTableData = async () => {
         ...searchForm.value,
         contractId: contractId.value,
     })
-    tableLoading.value = false
     if (!error && code === 200) {
         tableData.value = getArrValue(data['records'])
         searchForm.value.total = data['total']
         if (tableData.value.length > 0) {
-            getDetail(tableData.value[0].id)
+            await getDetail(tableData.value[0].id)
         } else {
             infoData.value = {}
         }
+        tableLoading.value = false
     } else {
         tableData.value = []
         searchForm.value.total = 0
+        tableLoading.value = false
     }
 }
 //获取详情
@@ -219,7 +221,7 @@ const hanleRow = ({ row }) => {
 const isDataModal = ref(false)
 const addModalClick = () => {
     editId.value = ''
-    newInfoData.value = deepClone(infoData.value)
+    newInfoData.value = {}
     nextTick(()=> {
         isDataModal.value = true
     })
@@ -228,8 +230,8 @@ const editId = ref('')
 const newInfoData = ref({})
 //修改
 const rowEditClick = (row) => {
-    newInfoData.value = deepClone(infoData.value)
     editId.value = row.id
+    newInfoData.value = deepClone(infoData.value)
     nextTick(()=> {
         isDataModal.value = true
     })