Browse Source

报告复核问题调整

huangguoce 1 week atrás
parent
commit
9a6532897b

+ 0 - 1
src/views/common/DigitalInvoiceUploadComponent.vue

@@ -125,7 +125,6 @@
 						<el-button v-if="isConfirm && (!scope.row.confirmStatus || scope.row.confirmStatus == '0')" text
 							type="primary" key="btn01" icon="el-icon-check" size="small"
 							@click="changeStatus(scope.row, '1')">确认</el-button>
-						<!-- TODO 切换状态时,按钮字不会改变 -->
 						<el-button v-if="isConfirm && scope.row.confirmStatus == '1'" text type="danger" key="btn02"
 							icon="el-icon-close" size="small" @click="changeStatus(scope.row, '0')">取消确认</el-button>
 						<el-button text type="primary" key="01" icon="el-icon-download" size="small"

+ 4 - 3
src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -1173,9 +1173,10 @@ export default {
       this.loading = true
       await projectReportService.queryById(this.inputForm.id).then((data) => {
         if (data.reviewStatus !== '2') { // 审核状态不是“待审核”,就弹出提示
-          this.loading = false
-          this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
-          throw new Error()
+          // this.loading = false
+          // this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
+          // throw new Error()
+          this.doSubmit('agree', callback)
         } else {
           this.doSubmit('agree', callback)
         }

+ 16 - 10
src/views/home/index.vue

@@ -10,7 +10,7 @@
 			<el-row :gutter="16" style="height: 100%;">
 				<el-col :span="24" class="panel">
 					<div style="max-height: 50%;">
-						<TodoList2 />
+						<TodoList2 ref="todoList2" />
 					</div>
 				</el-col>
 				<el-col :span="24" class="panel">
@@ -19,7 +19,7 @@
 					</div>
 				</el-col>
 				<el-col class="panel" :span="24">
-<!--					<Announcement />-->
+					<!--					<Announcement />-->
 					<div style="max-height: 50%; margin-top: 3px">
 						<MyNotifyList2 />
 					</div>
@@ -49,9 +49,9 @@ import Wx from "./components/wx.vue";
 import Footer from "@/components/footer/index.vue";
 export default {
 	name: "Dashboard", // If you want the include property of keep-alive to take effect, you must name the component
-	data(){
-		return{
-			innerVisible:true
+	data() {
+		return {
+			innerVisible: true
 		}
 	},
 	components: {
@@ -72,11 +72,10 @@ export default {
 		Footer,
 
 	},
-	 activated() {
-
+	activated() {
 	},
-	methods:{
-		getInnerStatus(status){
+	methods: {
+		getInnerStatus(status) {
 			this.innerVisible = status
 		}
 	}
@@ -84,9 +83,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.adminui-topbar + .container {
+.adminui-topbar+.container {
 	padding: 12px 12px 8px 12px;
 }
+
 .container {
 	padding: 8px 12px;
 	display: flex;
@@ -95,6 +95,7 @@ export default {
 .left-side {
 	flex: 1;
 	overflow: hidden;
+
 	.panel {
 		background-color: #fff;
 	}
@@ -110,13 +111,16 @@ export default {
 	overflow: hidden;
 	margin-bottom: 16px;
 }
+
 :deep(.panel-border) {
 	margin-bottom: 0;
 	border-bottom: 1px solid rgb(242, 243, 245);
 }
+
 .moduler-wrap {
 	border-radius: 4px;
 	background-color: #fff;
+
 	:deep(.text) {
 		font-size: 14px;
 		text-align: center;
@@ -133,6 +137,7 @@ export default {
 				margin-bottom: 0;
 			}
 		}
+
 		&:hover {
 			.text {
 				color: var(--el-color-primary);
@@ -159,6 +164,7 @@ export default {
 		display: block;
 		margin-bottom: 10px;
 	}
+
 	.right-side {
 		// display: none;
 		width: 100%;