From 9a4d3ad2952c4de1ece6159ab8bdaa4b46045733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Tue, 18 Feb 2025 14:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BA=A2=E7=82=B9=EF=BC=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD=E7=AD=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/main/red.png                | Bin 0 -> 1027 bytes
 src/views/main-navbar.vue                     |  18 ++++++--
 .../smartExcel/cpts/acceptingPersonel.vue     |  38 +++++++++++++---
 .../base/smartExcel/cpts/excel-info.vue       |  43 +++++++++++-------
 .../cpts/excel-template-confirmation.vue      |  12 ++---
 .../base/smartExcel/cpts/excel-view.vue       |   7 +--
 .../base/smartExcel/cpts/filling-info.vue     |   2 +-
 7 files changed, 83 insertions(+), 37 deletions(-)
 create mode 100644 src/assets/images/main/red.png

diff --git a/src/assets/images/main/red.png b/src/assets/images/main/red.png
new file mode 100644
index 0000000000000000000000000000000000000000..d94ca9ba6237658d50bc120fda319caf7f2ccb49
GIT binary patch
literal 1027
zcmaJ=&ubGw6kZ!`Yp~!!K}(f!Td)PQztZN%lGrBMqz$+=q=Duj*v;-FS=!xMcc;y^
zXf3Thco6*~#G_XQ@dwf(V!?w4K}4iS5k)Trt>SE&q#lfW*m*O2-}k=v=FQFA<am$2
z*H2MYPj*7elhup;-JRrrOL+a5EGKcgh^J5)*AyF42@RDX$Qnuo=Aoi3UU>;)6y@vJ
z3q@R%FNi8K7{$Xdu3-^2Ma4#4OHpSb1|?Y0%{cw_(Nh}eTAZF9kvZ8)!Kyy7WW%YY
z$%48xt41|?^gM{UA`vhkR)A~FnU3hj>AJ2+V(*xxK^=l;<Mf`XqMQRMWJ55*gaRr*
z90B1d!-s~sVCWnWI6lg95ta`II9}vJ;z$@YKAL2+wX&F(GL2kh7pJQjTO!NWYBi=7
zWRP89`Dm1A2&^Ck2qNGtnpklIrqkb4kf5X5x`lOQ0#8vXp?MsqiPOCj467w;I*m4w
zhOw?<u{^_hB{hMv{C}unw9pRD!+pR16m|-W7G(3#LG!jsF0S0~rLx474Hb;+0zz}m
zF6OETBd3ZiAP`Gna9TGtRC9*v1X&idrh^qzg;^<16A4DwH8B)Qq$8Y=OiM|L=hK-e
zmrg~b44(;0nMg_+ZgM50&KuCgO|G`jO||8EvtU>xvjlB@0csf=8K7RXsJHhLZL8Pd
zYVExw+HzT9hV^dtubXZjk@4}u*4&a!Yx1E<#@!}!y%p>IK;FbcR!S7ycctA|o14_3
zCu5hoH}2(r>)?xTJ1}#4;>^(p)VJ$>Ck9?T>mIne@+lnr*tHDSf36%E@9^)e9b4`Y
z+{1&rTN`72GY5xasT<GVfc0O};OENfkB7%^(|6vNGk2*S-*yKGt$n|kFnnF7##Rnc
W@oQ&=&dbTS-m}c6C#CzznbkiMnniyA

literal 0
HcmV?d00001

diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index ca1a527d3..0c1c0585a 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -30,13 +30,15 @@
 					<el-menu-item index="3"  @click="$router.push({ path: '/main/base-smartExcel-filling' })">
 						<div class="nav-item" v-for="menu in $store.state.sidebarMenuList" v-show="menu.children.find(item => item.name === '任务填报')">
 							<img src="~@/assets/images/main/nav-sjjy.png" />
+		
 							<span>填报任务</span>
+							<img  v-if="dataRed" style="width: 10px;height: 10px;margin-bottom: 20px;" src="~@/assets/images/main/red.png"/>
 						</div>
 					</el-menu-item>
 					<el-menu-item index="3" @click="handleCLickNav">
 						<div class="nav-item">
 							<img src="~@/assets/images/main/nav-sjdb.png" />
-							<span>智能分析</span>
+							<span >智能分析</span>
 						</div>
 					</el-menu-item>
 				</el-menu>
@@ -100,15 +102,13 @@ export default {
 	inject: ['refresh'],
 	data() {
 		return {
+			dataRed:0,
 			showHeader: true,
 			i18nMessages: messages,
 			updatePassowrdVisible: false,
 			customerName: '',
-
 			unreadMsgNum: 0,
-
 			noticeList: [],
-
 			displayedNoticeList: true
 		};
 	},
@@ -123,6 +123,7 @@ export default {
 		this.changeCustomerName();
 
 		this.pollGetNoticeData();
+		this.redDot()
 	},
 	computed: {
 		userType() {
@@ -130,6 +131,15 @@ export default {
 		}
 	},
 	methods: {
+		async redDot() {
+			const url = `/actual/base/communityOneTablePeriodPublish/redDot`;
+			const { data, code, msg } = await requestGet(url);
+			if (code == 0) {
+				this.dataRed=data
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
 		async readClearOne(item) {
 			const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
 			const { data, code, msg } = await requestPost(url);
diff --git a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
index 99a7510bd..7bc9402fe 100644
--- a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
+++ b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
@@ -36,7 +36,7 @@
             <el-table-column prop="renwu" align="center" :show-overflow-tooltip="true" label="转派给">
             </el-table-column>
         </el-table>
-        <el-form v-if="showType == 'edit'" ref="formData " label-position="left" :model="formData" label-width="150px"
+        <el-form v-if="showType == 'edit'" ref="formData " label-position="left" :model="formData" label-width="150px"  :rules="dataRule"
             style="margin-left: 3%; margin-top: 10px;">
                 <el-form-item label="任务要求" prop="taskIntroduction" style="display: block">
                     <el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
@@ -81,6 +81,15 @@ import { requestPost, requestGet } from "@/js/dai/request";
 export default {
     data() {
         return {
+            dataRule: {
+                taskTitle: [{ required: true, message: "任务主题不能为空", trigger: "blur" },],
+                taskPeriod: [{ required: 'true', message: '任务周期不能为空', trigger: 'blur' }],
+                receiverIds: [{ required: 'true', message: '分发人员不能为空', trigger: 'blur' }],
+                moduleUrl: [{ required: 'true', message: '模板不能为空', trigger: 'blur' }],
+                completeLimitDay: [
+                    { required: true, message: '完成时限不能为空', trigger: 'blur' },
+                ],
+            },
             tableData: [],
             formData: {
                 effectiveDateRange:[],
@@ -112,19 +121,15 @@ export default {
             pageNo: 1,
             pageSize: 10
         };
+        
     },
     created() {
-        console.log(this.formDatas,"sdfljksdlk");
         this.formData.taskPeriod=this.formDatas.taskPeriod
         this.formData.completeLimitDay=this.formDatas.completeLimitDay
         this.formData.effectiveDateRange.push(this.formDatas.startTime,this.formDatas.endTime)
-        console.log(this.formData.effectiveDateRange,"sdfjksdf");
-        
      },
     methods: {
       async  handleConfirm() {
-        console.log(this.showType, "dsklmfklds");
-            console.log(this.selfTag),"dsfkljdslk";
             let userIdList = this.selfTag.map(item => {
                 return item.staffId
             })
@@ -161,6 +166,9 @@ export default {
                 // this.updateState()
             }
             else {
+                if (!this.formData.completeLimitDay) {
+                    return this.$message.error("完成时限不能为0天")
+                }
                 const parms = {
                     userIdList: userIdList,
                     id: this.taskId,
@@ -328,7 +336,23 @@ export default {
     computed: {
 
     },
-    watch: {},
+    watch: {
+        'formData.taskPeriod': function (newPeriod) {
+            if (newPeriod === 'once') {
+                this.formData.completeLimitDay = ''; // 如果是 'once'，清空 completeLimitDay 以防止数值冲突
+            } else {
+                this.formData.completeLimitDay = ''; // 如果不是 'once'，可以设置一个默认值
+            }
+        },
+        'formData.completeLimitDay': function (newPeriod) {
+  
+            if (newPeriod<0) {
+                console.log(newPeriod,"第一次");
+                this.formData.completeLimitDay = ''; // 如果是 'once'，清空 completeLimitDay 以防止数值冲突
+            } else {
+            }
+        }
+    }
 }
 </script>
 
diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue
index ecb469139..fb2f77b5a 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue
@@ -14,8 +14,8 @@
                                 <div
                                     style="display: flex;margin-left: 10px;
                                      justify-content: center; align-items: center; width: 60px; height: 20px; border: 2px solid #ADD8E6; color: #ADD8E6; font-size: 12px;">
-                                   {{ formData.taskStateName }}
-                                   
+                                    {{ formData.taskStateName }}
+
                                 </div>
                             </div>
 
@@ -36,24 +36,32 @@
                             <div>{{formData.createByName}}</div>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8" >
+                    <el-col :span="8">
                         <el-form-item label="任务类型">
                             <div>{{formData.type || '数据填报'}}</div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="完成时限">
-                            <div><span v-if="formData.taskPeriod!=='once'">每周期的第</span>{{formData.completeLimitDay}}<span v-if="formData.taskPeriod!=='once'">天内完成</span></div>
+                            <div><span
+                                    v-if="formData.taskPeriod!=='once'">每周期的第</span>{{formData.completeLimitDay}}<span
+                                    v-if="formData.taskPeriod!=='once'">天内完成</span>
+                                <el-button style="margin-left: 10px;" type="text"
+                                    @click="oncClickInfo('edit')">[修改]</el-button>
+                            </div>
+
                         </el-form-item>
                     </el-col>
                     <el-col :span="16" v-if="formData.taskPeriod!=='once'">
                         <el-form-item label="任务完成有效期">
-                            <div>{{formData.startTime.slice(0, 10) }}-{{formData.endTime.slice(0, 10)  }}</div>
+                            <div>{{formData.startTime?formData.startTime.slice(0, 10):formData.startTime }}-{{formData.endTime?formData.endTime.slice(0, 10):formData.endTime }}</div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="16">
                         <el-form-item label="任务周期">
-                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }}</div>
+                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' :
+                                formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' :
+                                '每季度' }}</div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -79,28 +87,31 @@
             <div class="m-table">
 
                 <el-table :data="tableData" border class="m-table-item"
-                    style="width: 70%;margin-left: 3%; margin-top: 30px;" >
+                    style="width: 70%;margin-left: 3%; margin-top: 30px;">
                     <el-table-column label="序号" fixed="left" type="index" align="center" width="80" />
                     <el-table-column prop="taskPeriodName" align="center" :show-overflow-tooltip="true" label="任务周期">
-                        <template slot-scope="scope" v-if="taskPeriod === 'once'">
+                        <template slot-scope="scope">
                             {{taskPeriod === 'once'?'一次性':`${scope.row.taskPeriodName}`}}
                         </template>
                     </el-table-column>
                     <el-table-column fixed="right" label="汇报情况" align="center">
                         <template slot-scope="scope">
-                            <el-button @click="handleInfo(scope.row)" type="text" size="small">{{ scope.row.resolveNum}}/{{ scope.row.totalNum }}</el-button>
-                            <el-button @click="handelClickShowSummary(scope.row)" type="text" size="small">查看</el-button>
+                            <el-button @click="handleInfo(scope.row)" type="text" size="small">{{
+                                scope.row.resolveNum}}/{{ scope.row.totalNum }}</el-button>
+                            <el-button @click="handelClickShowSummary(scope.row)" type="text"
+                                size="small">查看</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
-         
-        </div>  
-         <div v-if="showSummary" style="width: 100%;background: #ffffff;">
-                <excel-summary @close="closeSummary" :summaryDetal=summaryDetal></excel-summary>
-            </div>
+
+        </div>
+        <div v-if="showSummary" style="width: 100%;background: #ffffff;">
+            <excel-summary @close="closeSummary" :summaryDetal=summaryDetal></excel-summary>
+        </div>
         <div class=''>
-            <el-dialog :title="title" v-if="showPersonel" :visible.sync="showPersonel" width="50%" :close-on-click-modal="false">
+            <el-dialog :title="title" v-if="showPersonel" :visible.sync="showPersonel" width="50%"
+                :close-on-click-modal="false">
                 <acceptingPersonel :showType="showType" :acceptingId="formData.acceptingId" :taskId="taskId"
                     @handelPersonel="handelPersonel" :formDatas="formData"></acceptingPersonel>
             </el-dialog>
diff --git a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
index bd9b11e31..ebbb5bc7d 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
@@ -91,12 +91,12 @@ export default {
     },
     mounted() {
         console.log(this.fileUrl, 'fileUrl===');//测试用'http://localhost:9001/epmet-work-pc/test1.xlsx'
-        const newUrl = this.fileUrl.replace(
-        /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, 
-        `${location.origin}`
-        );
-        this.urlToFile(newUrl,this.fileName)
-        // this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName)
+        // const newUrl = this.fileUrl.replace(
+        // /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, 
+        // `${location.origin}`
+        // );
+        // this.urlToFile(newUrl,this.fileName)
+        this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName)
 
     },
     props: {
diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue
index 2f272c875..74f23a630 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-view.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue
@@ -1,7 +1,7 @@
 <template>
   <div class='flex'  :style="{ height: tableHeight }">
     <div class="left_menu flex flex-y" v-if="!sheetTotal">
-      <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button>
+      <!-- <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button> -->
       <section>
         <h3>{{ menuList[0].taskTitle }}</h3>
         <p>{{ menuList[0].agencyName }}</p>
@@ -17,9 +17,10 @@
     <div :class="['flex', 'flex-y', 'flex1', sheetTotal ? 'luckysheet-wrap' : 'luckysheet-wrap-all']">
       <div class="top_btn flex flex-end">
         <div>
-          <el-button type="warning" v-if="pageType === 'add'" @click="handleClickInspect"> 自动检查</el-button>
+             <el-button type="text" round @click="handelClickBack" icon="el-icon-back"  v-if="!sheetTotal">返回</el-button>
           <el-button type="text" round @click="handelClickBack" v-if="pageType !== 'add' || sheetTotal"
-            icon="el-icon-back">返回</el-button>
+          icon="el-icon-back">返回</el-button>
+          <el-button type="warning" v-if="pageType === 'add'" @click="handleClickInspect"> 自动检查</el-button>
           <el-button type="success" @click="onClickUplond()" v-if="pageType !== 'add'"> 智能填表</el-button>
         </div>
         <div>
diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue
index d33af12e6..bd4fc6ab4 100644
--- a/src/views/modules/base/smartExcel/cpts/filling-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue
@@ -25,7 +25,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="完成时限">
-                            <div style="color: #FF3300;"> <span v-if="formData.taskPeriod !== 'once'">每周期内的第</span>{{formData.completeLimitDay }}<span
+                            <div style="color: #FF3300;"> <span v-if="formData.taskPeriod !== 'once'">每周期的第</span>{{formData.completeLimitDay }}<span
                                     v-if="formData.taskPeriod == 'once'"> {{formData.completeLimitHour}}</span>
                                 <span v-if="formData.taskPeriod !== 'once'">内完成</span>
                             </div>