Merge branch 'dailyReport' into test

src/utils/dict.ts

@@ -281,7 +281,7 @@ export enum DICT_TYPE {
   PMS_THING_MODEL_UNIT = 'pms_thing_model_unit', // pms属性模板单位
   PMS_PROJECT_TASK_SCHEDULE = 'constructionStatus',  // 日报 项目管理 任务计划
   PMS_PROJECT_TASK_RY_SCHEDULE = 'rigStatus',  // 日报 项目管理 瑞鹰项目进度
-  PMS_PROJECT_TASK_RY_REPAIR_SCHEDULE = 'ryRepairStatus',  // 日报 瑞鹰 修井 项目进度
+  PMS_PROJECT_TASK_RY_REPAIR_SCHEDULE = 'repairStatus',  // 日报 瑞鹰 修井 项目进度
   PMS_PROJECT_SETTLEMENT = 'rq_iot_project_settlement_method',  // 日报 项目管理 结算方式
   PMS_PROJECT_OVERSEA_FLAG = 'rq_iot_project_oversea_flag',  // 日报 项目管理 是否海外项目
   PMS_PROJECT_AREA = 'rq_iot_project_area',  // 日报 项目管理 海外项目所属区域

src/views/pms/iotrydailyreport/IotRyXjDailyReportForm.vue

@@ -16,10 +16,10 @@
       <el-form-item label="任务" prop="taskName">
         <el-input v-model="displayData.taskName" placeholder="" disabled/>
       </el-form-item>
-      <el-form-item :label="t('project.status')" prop="rigStatus">
-        <el-select v-model="formData.rigStatus" placeholder="请选择" clearable>
+      <el-form-item :label="t('project.status')" prop="repairStatus">
+        <el-select v-model="formData.repairStatus" placeholder="请选择" clearable>
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PMS_PROJECT_TASK_RY_SCHEDULE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.PMS_PROJECT_TASK_RY_REPAIR_SCHEDULE)"
             :key="dict.id"
             :label="dict.label"
             :value="dict.value"
@@ -175,6 +175,7 @@ const formData = ref({
   productionStatus: undefined,
   nextPlan: undefined,
   rigStatus: undefined,
+  repairStatus: undefined,
   personnel: undefined,
   totalStaffNum: undefined,
   leaveStaffNum: undefined,

src/views/pms/iotrydailyreport/xjindex.vue

@@ -101,9 +101,9 @@
             <el-table-column label="施工队伍" align="center" prop="deptName" :width="columnWidths.deptName"/>
             <el-table-column label="项目" align="center" prop="contractName" :width="columnWidths.contractName"/>
             <el-table-column label="任务" align="center" prop="taskName" :width="columnWidths.taskName"/>
-            <el-table-column :label="t('project.status')" align="center" prop="rigStatus" :width="columnWidths.rigStatus">
+            <el-table-column :label="t('project.status')" align="center" prop="repairStatus" :width="columnWidths.rigStatus">
               <template #default="scope">
-                <dict-tag :type="DICT_TYPE.PMS_PROJECT_TASK_RY_SCHEDULE" :value="scope.row.rigStatus" />
+                <dict-tag :type="DICT_TYPE.PMS_PROJECT_TASK_RY_REPAIR_SCHEDULE" :value="scope.row.repairStatus" />
               </template>
             </el-table-column>