计量期编辑修改

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

@@ -44,29 +44,29 @@
                 </template>
                 <hc-table :column="tableEditColumn" :datas="tableEditData" is-new is-current-row :index-style="{ width: 60 }" :loading="tableEditLoading" @row-click="hangeRow">
                     <template #periodNumber="{ row }">
-                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
+                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.approveStatus !== 0" />
                     </template>
                     <template #payNumber="{ row }">
                         <hc-table-input v-model="row.payNumber" is-new :index-style="{ width: 60 }" disabled />
                     </template>
                     <template #periodName="{ row }">
-                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
+                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.approveStatus !== 0" />
                     </template>
                     <template #periodYear="{ row }">
-                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
+                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1 || row?.approveStatus !== 0">
                             <el-option v-for="item in yearData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>
                     <template #periodMonth="{ row }">
-                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
+                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1 || row?.approveStatus !== 0">
                             <el-option v-for="item in monthData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>
                     <template #formPrintDate="{ row }">
-                        <el-date-picker v-model="row.formPrintDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" :disabled="row.isLock === 1" />
+                        <el-date-picker v-model="row.formPrintDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" :disabled="row.isLock === 1 || row?.approveStatus !== 0" />
                     </template>
                     <template #action="{ row, index }">
-                        <el-button plain size="small" type="danger" :disabled="row?.isLock === 1 || row?.citeStatus === 1" @click="delRow(row, index)">删除</el-button>
+                        <el-button plain size="small" type="danger" :disabled="row.isLock === 1 || row?.approveStatus !== 0" @click="delRow(row, index)">删除</el-button>
                     </template>
                 </hc-table>
             </hc-card-item>

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

@@ -44,29 +44,29 @@
                 </template>
                 <hc-table :column="tableEditColumn" :datas="tableEditData" is-new is-current-row :index-style="{ width: 60 }" :loading="tableEditLoading" @row-click="hangeRow">
                     <template #periodNumber="{ row }">
-                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
+                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.approveStatus !== 0" />
                     </template>
                     <template #payNumber="{ row }">
                         <hc-table-input v-model="row.payNumber" is-new :index-style="{ width: 60 }" disabled />
                     </template>
                     <template #periodName="{ row }">
-                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
+                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.approveStatus !== 0" />
                     </template>
                     <template #periodYear="{ row }">
-                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
+                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1 || row?.approveStatus !== 0">
                             <el-option v-for="item in yearData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>
                     <template #periodMonth="{ row }">
-                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
+                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1 || row?.approveStatus !== 0">
                             <el-option v-for="item in monthData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>
                     <template #coverDate="{ row }">
-                        <el-date-picker v-model="row.coverDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" :disabled="row.isLock === 1" />
+                        <el-date-picker v-model="row.coverDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" :disabled="row.isLock === 1 || row?.approveStatus !== 0" />
                     </template>
                     <template #formPrintDate="{ row }">
-                        <el-date-picker v-model="row.formPrintDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" :disabled="row.isLock === 1" />
+                        <el-date-picker v-model="row.formPrintDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" :disabled="row.isLock === 1 || row?.approveStatus !== 0" />
                     </template>
                     <template #action="{ row, index }">
                         <el-button plain size="small" type="danger" :disabled="row?.isLock === 1 || row?.citeStatus === 1 " @click="delRow(row, index)">删除</el-button>

src/views/tasks/hc-data.vue

@@ -98,7 +98,7 @@ const tabsClick = ({ key }) => {
 
 //搜索条件
 const searchForm = ref({
-    selectedType: 1, typeValue: '', statusValue: '4', batchValue: '', queryValue: '', startTimeValue: '', endTimeValue: '',
+    selectedType: 1, typeValue: '', statusValue: '', batchValue: '', queryValue: '', startTimeValue: '', endTimeValue: '',
     current: 1, size: 100, total: 0,
 })
 
@@ -114,8 +114,8 @@ const queryTaskType = async () => {
 const tasksStatus = ref([])
 const queryTaskStatus = async () => {
     const { data } = await mainApi.queryTaskStatus({ typeOrStatus: 'task_status' })
-    // tasksStatus.value = getArrValue(data)
-    tasksStatus.value = [{ dictKey: '1', dictValue: '待审批' }, { dictKey: '2', dictValue: '已审批' }, { dictKey: '3', dictValue: '已废除' }, { dictKey: '4', dictValue: '可审批' }] 
+    tasksStatus.value = getArrValue(data)
+    //tasksStatus.value = [{ dictKey: '1', dictValue: '待审批' }, { dictKey: '2', dictValue: '已审批' }, { dictKey: '3', dictValue: '已废除' }, { dictKey: '4', dictValue: '可审批' }] 
 }
 
 //日期范围选择