Merge remote-tracking branch 'origin/master'

src/views/attendance/business-trip/index.vue

@@ -33,7 +33,7 @@
     </template>
     <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
       <template #tripDesc="{row}">
-                <span class="text-blue text-hover">{{row.tripDesc}}</span>
+                <span class="text-blue">{{row.tripDesc}}</span>
         </template>
       <!-- <template #action="{row, index}">
          <el-button hc-btn type="primary" size="small">撤销</el-button>

src/views/expense/finReimburse/index.vue

@@ -37,7 +37,7 @@
 
         <HcTable :isIndex="false" :column="tableColumn" :datas="tableData" :loading="tableLoading">
             <template #frNumber="{row}">
-                <span class="text-blue text-hover" @click="rowNameTap(row)">{{row.frNumber}}</span>
+                <span class="text-blue " @click="rowNameTap(row)">{{row.frNumber}}</span>
             </template>
             <template #action="{row,index}">
                 <el-popconfirm title="是否确认撤销?" hide-icon @confirm="rowCancel(row)">

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

@@ -22,14 +22,14 @@
             <el-form ref="formRef" :model="otherInfo"  label-width="" disabled>
                             <el-form-item label="变更类别：" prop="updateType" size="large">
                                 <el-radio-group v-model="otherInfo.updateType" size="large">
-                                    <el-radio label="1">已完成</el-radio>
-                                    <el-radio label="2" class="ml-8">任务转移</el-radio>
+                                    <el-radio :label="1">已完成</el-radio>
+                                    <el-radio :label="2" class="ml-8">任务转移</el-radio>
                                 </el-radio-group>
                             </el-form-item>
-                            <el-form-item label="完成时间：" prop="completionTime" class="w-72" v-if="otherInfo.updateType === '1'">
+                            <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-form-item>
-                            <template v-if="otherInfo.updateType === '2'">
+                            <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-form-item>

src/views/program/annual/index.vue

@@ -15,7 +15,7 @@
         </template>
         <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
             <template #name="{row}">
-                <span class="text-blue" @click="rowNameClick(row)">{{row.name}}</span>
+                <span class="text-blue text-hover" @click="rowNameClick(row)">{{row.name}}</span>
             </template>
             <template #key2="{row}">
                 <span >{{row.budgetStartTime?row.budgetStartTime:''}}</span>

src/views/program/project/index.vue

@@ -29,7 +29,7 @@
         </template>
         <HcTable :isIndex="false" :column="tableColumn" :datas="tableData" :loading="tableLoading">
             <template #name="{row}">
-                <span class="text-blue" @click="rowNameClick(row)">{{row.name}}</span>
+                <span class="text-blue text-hover" @click="rowNameClick(row)">{{row.name}}</span>
             </template>
         </HcTable>
         <template #action>

src/views/project/contract/index.vue

@@ -40,7 +40,7 @@
 
         <HcTable :isIndex="false" :column="tableColumn" :datas="tableData" :loading="tableLoading">
             <template #name="{row}">
-                <span class="text-blue" @click="rowNameTap(row)">{{row.name}}</span>
+                <span class="text-blue text-hover" @click="rowNameTap(row)">{{row.name}}</span>
             </template>
             <template #key4="{row}">
                 <span >{{row.startTime+'~'+row.endTime}}</span>

src/views/project/cost/index.vue

@@ -26,7 +26,7 @@
 
         <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
             <template #projectName="{row}">
-                <span class="text-blue" @click="rowNameTap(row)">{{row.projectName}}</span>
+                <span class="text-blue text-hover" @click="rowNameTap(row)">{{row.projectName}}</span>
             </template>
             <template #action="{row,index}">
                 <el-button plain size="small" type="success" @click="approvalRowClick(row)"  :disabled="row?.approveStatus!=='1'">提交审批</el-button>

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

@@ -57,14 +57,14 @@
                         <el-form ref="formRef" :model="formModel" :rules="formRules" label-width="">
                             <el-form-item label="变更类别：" prop="updateType" size="large">
                                 <el-radio-group v-model="formModel.updateType" size="large">
-                                    <el-radio label="1">已完成</el-radio>
-                                    <el-radio label="2" class="ml-8">任务转移</el-radio>
+                                    <el-radio :label="1">已完成</el-radio>
+                                    <el-radio :label="2" class="ml-8">任务转移</el-radio>
                                 </el-radio-group>
                             </el-form-item>
-                            <el-form-item label="完成时间：" prop="completionTime" class="w-72" v-if="formModel.updateType === '1'">
+                            <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-form-item>
-                            <template v-if="formModel.updateType === '2'">
+                            <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-form-item>