Merge remote-tracking branch 'origin/master'

src/views/expense/invoice/billing.vue

@@ -30,7 +30,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="开票金额：" prop="invoiceMoney">
-                            <el-input v-model="formModel.invoiceMoney">
+                            <el-input v-model="formModel.invoiceMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                                 <template #append>元</template>
                             </el-input>
                         </el-form-item>

src/views/expense/loanRequest/record.vue

@@ -18,7 +18,7 @@
                                 <span>申请金额：</span>
                                 <span style="color: #8f8d8d;">{{formModel.loanMoneyText}}</span>
                             </template>
-                            <el-input v-model="formModel.loanMoney" @change="loanMoneyChange">
+                            <el-input v-model="formModel.loanMoney" @change="loanMoneyChange" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                                 <template #append>元</template>
                             </el-input>
                         </el-form-item>

src/views/expense/outsourcing/record.vue

@@ -21,7 +21,7 @@
                             <el-input v-model="formModel.toUnit"/>
                         </el-form-item>
                         <el-form-item label="支付金额：" prop="key3">
-                            <el-input v-model="formModel.payMoney">
+                            <el-input v-model="formModel.payMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                                 <template #append>元</template>
                             </el-input>
                         </el-form-item>

src/views/expense/paymentRequest/record.vue

@@ -39,8 +39,8 @@
                         <el-form-item label="回款时间：" prop="collectionDate" v-if="formModel.isProjectBonus === 1">
                             <el-input v-model="formModel.collectionDate" disabled/>
                         </el-form-item>
-                        <el-form-item label="回款金额：" prop="collectionMoney" v-if="formModel.isProjectBonus === 1">
-                            <el-input v-model="formModel.collectionMoney" disabled>
+                        <el-form-item label="回款金额：" prop="collectionMoney" v-if="formModel.isProjectBonus === 1" >
+                            <el-input v-model="formModel.collectionMoney" disabled onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                                 <template #append>元</template>
                             </el-input>
                         </el-form-item>
@@ -50,7 +50,7 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item label="请款金额：" prop="afMoney">
-                            <el-input v-model="formModel.afMoney" :disabled="formModel.isProjectBonus === 1">
+                            <el-input v-model="formModel.afMoney" :disabled="formModel.isProjectBonus === 1" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                                 <template #append>元</template>
                             </el-input>
                         </el-form-item>

src/views/home/task/components/invoice-request.vue

@@ -51,7 +51,7 @@
             </div>
             <div class="hc-form-item">
                 <el-form-item label="开票金额：" prop="invoiceMoney">
-                    <el-input v-model="otherInfo.invoiceMoney">
+                    <el-input v-model="otherInfo.invoiceMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                         <template #append>元</template>
                     </el-input>
                 </el-form-item>

src/views/home/task/components/loan-request.vue

@@ -13,7 +13,7 @@
                 <span>申请金额：</span>
                 <span style="color: #8f8d8d;">{{otherInfo.loanMoneyText}}</span>
             </template>
-            <el-input v-model="otherInfo.loanMoney" >
+            <el-input v-model="otherInfo.loanMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                 <template #append>元</template>
             </el-input>
         </el-form-item>

src/views/home/task/components/outsourcing.vue

@@ -14,7 +14,7 @@
             <el-input v-model="otherInfo.toUnit"/>
         </el-form-item>
         <el-form-item label="支付金额：" prop="key3">
-            <el-input v-model="otherInfo.payMoney">
+            <el-input v-model="otherInfo.payMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                 <template #append>元</template>
             </el-input>
         </el-form-item>

src/views/home/task/components/pay-request.vue

@@ -42,7 +42,7 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item label="请款金额：" prop="afMoney"  v-if="otherInfo.isProjectBonus === 1">
-                            <el-input v-model="otherInfo.afMoney" :disabled="otherInfo.isProjectBonus === 1">
+                            <el-input v-model="otherInfo.afMoney" :disabled="otherInfo.isProjectBonus === 1" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
                                 <template #append>元</template>
                             </el-input>
                         </el-form-item>

src/views/home/task/task-details.vue

@@ -287,6 +287,9 @@ const saveGroundsClick = async() => {
         )
         if (!error && code === 200) {
             window?.$message.warning('驳回成功!')
+            router.push({
+                name: 'home-task'
+            })
         }
         closeGroundsClick()
     }
@@ -318,6 +321,9 @@ const doubleClick = async() => {
         )
     if (!error && code === 200) {
         window?.$message.success('审核通过!')
+        router.push({
+            name: 'home-task'
+        })
     } 
 }
 

src/views/program/project/form.vue

@@ -31,7 +31,7 @@
                 <span v-else>{{row.planTarget}}</span>
             </template>
             <template #key7="{row,index}">
-                <HcDatePicker :dates="[row.planStartTime,row.planEndTime]" @change="betweenTimeUpdate($event,row)" v-if="row.isEdit"/>
+                <HcDatePicker :dates="[row.planStartTime,row.planEndTime]" @change="betweenTimeUpdate($event,row)" v-if="row.isEdit" clearable/>
                 <!-- <span v-else>{{row.key7}}</span> -->
                 <span v-else>
                     <span >{{row.planStartTime?row.planStartTime:''}}</span>
@@ -51,7 +51,7 @@
             </template> -->
             <template #action="{row,index}">
                 <el-button size="small" type="success" v-if="row.isEdit" @click="getWorkDays(row)">保存</el-button>
-                <el-button size="small" type="primary" v-else @click="row.isEdit = true">编辑</el-button>
+                <el-button size="small" type="primary" v-else @click="row.isEdit = true" :disabled="row?.isShowEdit===0">编辑</el-button>
                 <el-button size="small" type="warning" @click="relatedModalShow(row)">关联回款</el-button>
                 <el-button size="small" type="danger" @click="subplanModalShow(row)" :disabled="row?.isShowChildren==0">分解子计划</el-button>
             </template>
@@ -91,7 +91,7 @@
                     <el-input v-model="row.planTarget" :disabled="!row.isEdit"/>
                 </template>
                 <template #key7="{row,index}">
-                    <HcDatePicker :dates="[row.planStartTime,row.planEndTime]" @change="subbetweenTimeUpdate($event,row)"  :disabled="!row.isEdit"/>
+                    <HcDatePicker :dates="[row.planStartTime,row.planEndTime]" @change="subbetweenTimeUpdate($event,row)"  :disabled="!row.isEdit" clearable/>
               
                 </template>
                 <template #planDays="{row,index}" >
@@ -103,7 +103,7 @@
                 </template>
                 <template #action="{row,index}">
                 <el-button size="small" type="success" v-if="row.isEdit" @click="getWorkDays(row)">保存</el-button>
-                <el-button size="small" type="primary" v-else @click="row.isEdit = true">编辑</el-button>
+                <el-button size="small" type="primary" v-else @click="row.isEdit = true" :disabled="row?.isShowEdit===0">编辑</el-button>
                 <el-button size="small" type="primary" @click="delSubplan(row,index)">删除</el-button>
             </template>
             </HcTable>
@@ -326,7 +326,7 @@ const tableSubplanColumn = [
     {key: 'planTarget', name: '完成指标', minWidth: '200', align: 'center', isTooltip: true},
     {key: 'key7', name: '计划起止日期', width: '280', align: 'center'},
     {key: 'planDays', name: '预计工作量（小数/整数/天）', width: '160', align: 'center'},
-    {key: 'action', name: '操作', width: '80', align: 'center', fixed: 'right'},
+    {key: 'action', name: '操作', width: '180', align: 'center', fixed: 'right'},
 ]
 const tableSubplanData = ref([
 

src/views/program/section/form.vue

@@ -58,7 +58,7 @@
         >
             <HcListItem title="原计划起止日期："  :content="pausePlan.planStartTime+'~'+pausePlan.planEndTime"/>
             <HcListItem title="中途暂停计划日期：" isCenter>
-                <el-date-picker type="date" class="block" value-format="YYYY-MM-DD" v-model="pausePlan.pauseTime"/>
+                <el-date-picker type="date" class="block" value-format="YYYY-MM-DD" v-model="pausePlan.pauseTime" disabled/>
             </HcListItem>
             <HcListItem title="中途开启计划起止日期：" :content="pausePlan?.openPlanStartTime+'~'+pausePlan?.openPlanEndTime" v-if="pausePlan?.openPlanStartTime"/>
             <HcListItem title="中途开启计划起止日期：" content="" v-else/>
@@ -229,8 +229,8 @@ const openPlanSaveClick = async() => {
 //日期时间被选择
 const betweenTime = ref(null)
 const betweenTimeUpdate =async ({arr, query}) => {
-    betweenTime.value = arr
-    openPlan.value.openPlanStartTime=arr[0]
+    arr[0]=openPlan.value.openPlanStartTime
+    // openPlan.value.openPlanStartTime=arr[0]
     openPlan.value.openPlanEndTime=arr[1]
     let day=await getWorkDays(openPlan.value.openPlanStartTime,openPlan.value.openPlanEndTime)
     openPlan.value.openPlanStartEndDays=day

src/views/project/cost/form.vue

@@ -284,7 +284,7 @@ const getBudgetStatsById=async()=>{
     const {error, code, data} = await costApi.getBudgetStatsById({id: dataId.value})
     if (!error && code === 200) {
         formBaseModel.value=getObjValue(data)
-        tableData.value= formBaseModel.value?.constructUnit||[]
+        tableData.value= formBaseModel.value?.constructUnit||[{}]
         constructUnitData.value=formBaseModel.value?.constructUnit||[]
         bulidUnitData.value=formBaseModel.value?.buildUnit||[]
         supervisorUnitData.value=formBaseModel.value?.supervisorUnit||[]

src/views/static/plan.vue

@@ -69,9 +69,12 @@
  import {getObjValue,getArrValue} from "js-fast-way"
  import { getdepartmentList,getuserList} from "~api/other";
  import {getDiffYear} from "~uti/tools";
+ import {useAppStore} from "~src/store";
+ const useAppState = useAppStore()
 
  onMounted(()=>{
     getDepartmentDict()
+    getUserDict()
     getImageData()
     planFinishedRatio()
  })
@@ -105,6 +108,7 @@ const resetClick = () => {
     }
     getImageData()
     planFinishedRatio()
+    getUserDict()
 }
 //计划统计图
 const planDatas = ref([])
@@ -182,6 +186,18 @@ const getDepartmentuserDict=async(id)=>{
 
     }
 }
+//获取所有员工
+
+const getUserDict=async()=>{
+    const {error, code, data} = await getuserList({tenantId:useAppState.tenantId})
+    if (!error && code === 200) {
+        departmentPeople.value = getArrValue(data)
+
+    } else {
+        departmentPeople.value = []
+
+    }
+}
 </script>
 <style lang="scss" scoped>
 @import "~src/styles/home/index.scss";

src/views/task/logs/index.vue

@@ -62,8 +62,8 @@
                             <div class="user-item" :class="userItemId.id === items.id?'cur':''" @click="userItemClick(items)">
                                 <img class="avatar" :src="items?.headPicture || avatarPng" alt=""/>
                                 <div class="name">{{items?.logTitle}}</div>
-                                <div class="state">
-                                    <span class="text-xl text-red mr-2">
+                                <div class="state" v-if="items?.isEdit === 0">
+                                    <span class="text-xl text-red mr-2" v-if="items?.isRead === 0">
                                         <HcIcon name="alarm-warning"/>
                                     </span>
                                     <span>{{items?.isRead === 0 ?'未读': '已读'}}</span>
@@ -99,6 +99,7 @@ onActivated(() => {
     isEditState.value = false
     getLogList()
     getDepartmentDict()
+    getUserDict()
    
 
 })
@@ -130,6 +131,18 @@ const getDepartmentuserDict=async(id)=>{
 
     }
 }
+//获取所有员工
+
+const getUserDict=async()=>{
+    const {error, code, data} = await getuserList({tenantId:useAppState.tenantId})
+    if (!error && code === 200) {
+        departmentPeople.value = getArrValue(data)
+
+    } else {
+        departmentPeople.value = []
+
+    }
+}
 //搜索表单
 const searchForm = ref({orgDept: null, userId: null, startTime: null, endTime: null})
 
@@ -145,6 +158,7 @@ const searchClick = () => {
 //重置
 const resetClick = () => {
     searchForm.value = {}
+    getLogList()
 }
 
 //日志填报列表查询
@@ -175,6 +189,7 @@ const userItemClick = (item) => {
     if (!isEditState.value) {
         userItemId.value = item
         isShowEdit.value=false
+        item.isRead=1
         getLogDetail()
     } else {
         window.$message?.warning('请先提交日志或退出填写日志状态')

src/views/user/index.vue

@@ -262,7 +262,7 @@ const saveUserInfoData = async () => {
         })
         if (!error && code === 200) {
             saveUserLoading.value = false
-            window?.$message?.success('保存成功')
+            window?.$message?.success('保存基础信息成功')
             userInfo.value.phone = phone
             useAppState.setUserInfo(userInfo.value)
         } else {