会计报告替换新字典

src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -70,7 +70,7 @@
       </el-form-item>
       <el-form-item v-if="showHideItem" label="状态" prop="status">
         <el-select v-model="searchForm.status" placeholder="请选择" style="width:100%;" clearable>
-          <el-option v-for="item in $dictUtils.getDictList('cw_status')" :key="item.value" :label="item.label"
+          <el-option v-for="item in $dictUtils.getDictList('cw_archive_status')" :key="item.value" :label="item.label"
             :value="item.value">
           </el-option>
         </el-select>
@@ -173,20 +173,16 @@
           <vxe-column min-width="200" align="center" title="创建时间" field="createTime"></vxe-column>
           <vxe-column min-width="130px" align="center" fixed="right" title="状态" field="status">
             <template #default="scope">
-              <span v-if="scope.row.status == '8'">
-                <el-button @click="voidDetail(scope.row)" effect="dark" type="danger">
-                  作废待审核
-                </el-button>
-              </span>
-              <span v-else-if="scope.row.status == '7'">
-                <el-button @click="voidDetail(scope.row)" effect="dark" type="danger">
-                  已作废
+              <span v-if="scope.row.status == '7' || scope.row.status == '8'">
+                <el-button @click="voidDetail(scope.row)" effect="dark"
+                  :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status, '-')">
+                  {{ $dictUtils.getDictLabel("cw_archive_status", scope.row.status, '-') }}
                 </el-button>
               </span>
               <span v-else>
                 <el-button @click="detail(scope.row)" effect="dark"
                   :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status, '-')">
-                  {{ $dictUtils.getDictLabel("cw_status", scope.row.status, '-') }}
+                  {{ $dictUtils.getDictLabel("cw_archive_status", scope.row.status, '-') }}
                 </el-button>
               </span>
 

src/views/cw/reportManagement/ReportManagementList.vue

@@ -85,22 +85,22 @@
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="报告号申请" prop="applyStatus">
 				<el-select v-model="searchForm.applyStatus" placeholder="请选择" style="width:100%;">
-					<el-option v-for="item in $dictUtils.getDictList('cw_status')" :key="item.value" :label="item.label"
-						:value="item.value">
+					<el-option v-for="item in $dictUtils.getDictList('cw_archive_status')" :key="item.value"
+						:label="item.label" :value="item.value">
 					</el-option>
 				</el-select>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="复核签章状态" prop="reviewStatus">
 				<el-select v-model="searchForm.reviewStatus" placeholder="请选择" style="width:100%;">
-					<el-option v-for="item in $dictUtils.getDictList('cw_status')" :key="item.value" :label="item.label"
-						:value="item.value">
+					<el-option v-for="item in $dictUtils.getDictList('cw_archive_status')" :key="item.value"
+						:label="item.label" :value="item.value">
 					</el-option>
 				</el-select>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="签章状态(原)" prop="status1">
 				<el-select v-model="searchForm.status1" placeholder="请选择" style="width:100%;">
-					<el-option v-for="item in $dictUtils.getDictList('cw_status')" :key="item.value" :label="item.label"
-						:value="item.value">
+					<el-option v-for="item in $dictUtils.getDictList('cw_archive_status')" :key="item.value"
+						:label="item.label" :value="item.value">
 					</el-option>
 				</el-select>
 			</el-form-item>
@@ -207,7 +207,7 @@
 								<el-button @click="detailApply(scope.row)" effect="dark"
 									v-if="scope.row.applyStatus !== '0'"
 									:type="$dictUtils.getDictLabel('cw_status_flag', scope.row.applyStatus, '-')">
-									{{ $dictUtils.getDictLabel("cw_status", scope.row.applyStatus, '-') }}
+									{{ $dictUtils.getDictLabel("cw_archive_status", scope.row.applyStatus, '-') }}
 								</el-button>
 								<el-button v-else-if="scope.row.reviewStatus === '0'" effect="dark">
 									未发起
@@ -216,7 +216,7 @@
 								<el-button @click="detailApplyReview(scope.row)" effect="dark"
 									v-if="scope.row.improperTakeCause"
 									:type="$dictUtils.getDictLabel('cw_status_flag', scope.row.applyReviewStatus, '-')">
-									{{ $dictUtils.getDictLabel("cw_status", scope.row.applyReviewStatus, '-') }}
+									{{ $dictUtils.getDictLabel("cw_archive_status", scope.row.applyReviewStatus, '-') }}
 								</el-button>
 							</div>
 						</template>
@@ -247,14 +247,15 @@
 							<div v-else>
 								<el-button @click="detail(scope.row)" effect="dark"
 									:type="$dictUtils.getDictLabel('cw_status_flag', scope.row.reviewStatus, '-')">
-									{{ $dictUtils.getDictLabel("cw_status", scope.row.reviewStatus, '-') }}
+									{{ $dictUtils.getDictLabel("cw_archive_status", scope.row.reviewStatus, '-') }}
 								</el-button>
 
 								<el-button v-if="scope.row.signatureType === '1' && scope.row.newType === '0'"
 									@click="detailS(scope.row)" effect="dark"
 									:type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status1, '-')">
-									{{ scope.row.status1 === '5' ? '电子章已完成' : $dictUtils.getDictLabel("cw_status",
-										scope.row.status1, '-') }}
+									{{ scope.row.status1 === '5' ? '电子章已完成' :
+										$dictUtils.getDictLabel("cw_archive_status",
+											scope.row.status1, '-') }}
 								</el-button>
 								<el-button v-else-if="scope.row.signatureType === '2' && scope.row.newType === '0'"
 									@click="detailS2(scope.row)" effect="dark"
@@ -265,8 +266,9 @@
 								<el-button v-else-if="scope.row.signatureType === '3' && scope.row.newType === '0'"
 									@click="detailS3(scope.row)" effect="dark"
 									:type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status3, '-')">
-									{{ scope.row.status3 === '5' ? '实体章已完成' : $dictUtils.getDictLabel("cw_status",
-										scope.row.status3, '-') }}
+									{{ scope.row.status3 === '5' ? '实体章已完成' :
+										$dictUtils.getDictLabel("cw_archive_status",
+											scope.row.status3, '-') }}
 								</el-button>
 								<el-button v-else-if="scope.row.newType === '0'" effect="dark">
 									未发起
@@ -298,7 +300,8 @@
 								<el-button @click="detailSig(scope.row)" effect="dark"
 									v-if="scope.row.signatureAnnotatorStatus !== '0'"
 									:type="$dictUtils.getDictLabel('cw_status_flag', scope.row.signatureAnnotatorStatus, '-')">
-									{{ $dictUtils.getDictLabel("cw_status", scope.row.signatureAnnotatorStatus, '-') }}
+									{{ $dictUtils.getDictLabel("cw_archive_status", scope.row.signatureAnnotatorStatus,
+									'-') }}
 								</el-button>
 								<el-button v-else effect="dark">
 									未发起
@@ -312,7 +315,7 @@
 							<el-button @click="detailRevocation(scope.row)" effect="dark"
 								v-if="scope.row.rebackStatus !== '0'"
 								:type="$dictUtils.getDictLabel('cw_status_flag', scope.row.rebackStatus, '-')">
-								{{ $dictUtils.getDictLabel("cw_status", scope.row.rebackStatus, '未发起') }}
+								{{ $dictUtils.getDictLabel("cw_archive_status", scope.row.rebackStatus, '未发起') }}
 							</el-button>
 							<el-button v-else effect="dark">
 								未发起