Merge remote-tracking branch 'origin/master'

src/views/home/components/TaskTable.vue

@@ -40,7 +40,7 @@
                 <span class="text-orange" v-if="row.status === 1">待审批</span>
                 <span class="text-green" v-if="row.status === 2">已审批</span>
                 <template v-if="row.status === 3">
-                    <el-popover placement="top-start" title="驳回原因" :width="200" :hide-after="0" content="这里是驳回原因说明内容">
+                    <el-popover placement="top-start" title="驳回原因" :width="200" :hide-after="0" :content="row?.rejectDesc">
                         <template #reference>
                             <span class="text-red">已驳回</span>
                         </template>

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

@@ -27,11 +27,11 @@
                                 </el-radio-group>
                             </el-form-item>
                             <el-form-item label="完成时间：" prop="completionTime" class="w-72" v-if="otherInfo.updateType === 1">
-                                <el-date-picker class="block" v-model="otherInfo.completionTime" format="YYYY-MM-DD HH:mm:ss" type="date" value-format="YYYY-MM-DD HH:mm:ss"/>
+                                <el-date-picker class="block" v-model="otherInfo.completionTime" format="YYYY-MM-DD HH:mm:ss" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"/>
                             </el-form-item>
                             <template v-if="otherInfo.updateType === 2">
                                 <el-form-item label="转移时间：" prop="transfer" class="w-72">
-                                    <el-date-picker class="block" v-model="otherInfo.completionTime" format="YYYY-MM-DD HH:mm:ss" type="date" value-format="YYYY-MM-DD HH:mm:ss"/>
+                                    <el-date-picker class="block" v-model="otherInfo.completionTime" format="YYYY-MM-DD HH:mm:ss" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"/>
                                 </el-form-item>
                                 <el-form-item label="转移对象：" prop="type" size="large">
                                     <el-select class="block" v-model="otherInfo.transferObject"  filterable allow-create default-first-option :reserve-keyword="false">

src/views/program/project/form.vue

@@ -247,6 +247,14 @@ const tableColumn = [
     {key: 'planDays', name: '预计工作量（小数/整数/天）', width: '160', align: 'center'},
     {key: 'postTypeValue', name: '投入岗位类型(日单价)', width: '160', align: 'center'},
     {key: 'staffCount', name: '投入人员数量', width: '160', align: 'center'},
+    {key: 'budgetStaffCost', name: '预计人工成本（元）', width: '160', align: 'center'},
+    {key: 'budgetTravelExpense', name: '预计差旅费（元）', width: '160', align: 'center'},
+    {key: 'outsourceUnitPrice', name: '外包单价', width: '160', align: 'center'},
+    {key: 'outsourcePeopleCount', name: '外包数量', width: '160', align: 'center'},
+    {key: 'outsourceCountMoney', name: '外包金额', width: '160', align: 'center'},
+    {key: 'otherBudgetMoney', name: '其他预算额', width: '160', align: 'center'},
+    {key: 'budgetCountMoney', name: '总预算金额', width: '160', align: 'center'},
+    {key: 'budgetRemark	', name: '测算备注', width: '160', align: 'center'},
     {key: 'returnedValue', name: '关联回款里程碑', minWidth: '200', isTooltip: true},
     {key: 'action', name: '操作', width: '280', align: 'center', fixed: 'right'},
 ]

src/views/task/plan/components/TaskTable.vue

@@ -40,7 +40,15 @@
                 <span>变更状态</span>
             </el-button>
         </template>
-        <HcTable :column="tableColumn" :isCheck="isTableKey !== 'all'" :datas="tableData" :loading="tableLoading" @selection-change="tableSelectionChange"/>
+        <HcTable :column="tableColumn" :isCheck="isTableKey !== 'all'" :datas="tableData" :loading="tableLoading" @selection-change="tableSelectionChange">
+            <template #status="{row}">
+                <span class="text-orange" v-if="row.status === 0">未上报</span>
+                <span class="text-orange" v-if="row.status === 1">待审批</span>
+                <span class="text-green" v-if="row.status === 2">已审批</span>
+                <span class="text-red" v-if="row.status === 3">已驳回</span>
+         
+            </template>
+        </HcTable>
         <template #action>
             <HcPages :pages="searchForm" @change="pageChange"/>
         </template>
@@ -62,11 +70,11 @@
                                 </el-radio-group>
                             </el-form-item>
                             <el-form-item label="完成时间：" prop="completionTime" class="w-72" v-if="formModel.updateType === 1">
-                                <el-date-picker class="block" v-model="formModel.completionTime" format="YYYY-MM-DD HH:mm:ss" type="date" value-format="YYYY-MM-DD HH:mm:ss"/>
+                                <el-date-picker class="block" v-model="formModel.completionTime" format="YYYY-MM-DD HH:mm:ss"  type="datetime" value-format="YYYY-MM-DD HH:mm:ss"/>
                             </el-form-item>
                             <template v-if="formModel.updateType === 2">
                                 <el-form-item label="转移时间：" prop="transfer" class="w-72">
-                                    <el-date-picker class="block" v-model="formModel.completionTime" format="YYYY-MM-DD HH:mm:ss" type="date" value-format="YYYY-MM-DD HH:mm:ss"/>
+                                    <el-date-picker class="block" v-model="formModel.completionTime" format="YYYY-MM-DD HH:mm:ss"  type="datetime" value-format="YYYY-MM-DD HH:mm:ss"/>
                                 </el-form-item>
                                 <el-form-item label="转移对象：" prop="type" size="large">
                                     <el-select class="block" v-model="formModel.transferObject"  filterable allow-create default-first-option :reserve-keyword="false">
@@ -178,7 +186,7 @@ const pageChange = ({current, size}) => {
 const tableLoading = ref(false)
 const tableColumn = ref([
     {key: 'projectName', name: '任务所属项目'},
-    {key: 'statusName', name: '状态', width: '120', align: 'center'},
+    {key: 'status', name: '状态', width: '120', align: 'center'},
     {key: 'taskDesc', name: '任务描述'},
     {key: 'planTarget', name: '完成指标'},
     {key: 'startAndEndDate', name: '计划起止日期', width: '220', align: 'center'},
@@ -208,13 +216,30 @@ const tableSelectionChange = (rows) => {
 //变更状态的弹窗
 const changeStateLoading = ref(false)
 const changeStateModal = ref(false)
-
+const isCanchange=ref(false)
 //显示变更状态的弹窗
 const showChangeState = () => {
     changeStateLoading.value = false
-    changeStateModal.value = true
-    formModel.value={}
-    tableStateData.value=tableRows.value
+    if(tableRows.value.length<1){
+        window.$message.warning('请先勾选数据')
+    }else{
+        console.log(tableRows.value,'tableRows.value');
+   
+        tableRows.value.forEach((ele)=>{
+            if(ele.status===1||ele.status===2){
+                isCanchange.value=true
+            }
+        })
+        if(isCanchange.value){
+            window.$message.warning('待审批或者已审批状态不能点击变更')
+        }else{
+            changeStateModal.value = true
+            formModel.value={}
+            tableStateData.value=tableRows.value
+        }
+    
+    }
+   
 }