Ver Fonte

瑞鹰可修改任务井

Zimo há 1 dia atrás
pai
commit
751f26bd95

+ 20 - 4
src/views/pms/iotrydailyreport/ry-form.vue

@@ -95,6 +95,8 @@ interface FormOriginal {
   remark: string
   createTime: number
   opinion: string
+
+  auditStatus: number
 }
 
 type Form = Partial<FormOriginal>
@@ -140,7 +142,8 @@ const FORM_KEYS: (keyof FormOriginal)[] = [
   'relocationTime',
   'winterBreakTime',
   'otherNptTime',
-  'otherNptReason'
+  'otherNptReason',
+  'auditStatus'
 ]
 
 const formRef = ref<FormInstance>()
@@ -169,10 +172,18 @@ const isApproval = computed(() => props.type === 'approval')
 const isEdit = computed(() => props.type === 'edit')
 const isMainFieldDisabled = computed(() => formType.value === 'readonly' || isApproval.value)
 
+const wellOptions = ref<{ label: string; value: number }[]>([])
+
 async function loadDetail(id: number) {
   loading.value = true
   try {
     const res = await IotRyDailyReportApi.getIotRyDailyReport(id)
+
+    wellOptions.value = Object.entries(res.wellNamePair).map(([value, label]) => ({
+      label: String(label),
+      value: Number(value)
+    }))
+
     form.value = initFormData()
     // 按需赋值
     FORM_KEYS.forEach((key) => {
@@ -517,9 +528,14 @@ const inputCurrentDepth = useDebounceFn(function inputCurrentDepth(val: any, ind
         <el-form-item label="项目" prop="contractName"
           ><el-input v-model="form.contractName" disabled
         /></el-form-item>
-        <el-form-item label="任务" prop="taskName"
-          ><el-input v-model="form.taskName" disabled
-        /></el-form-item>
+        <el-form-item label="任务井" prop="taskId">
+          <el-select
+            v-model="form.taskId"
+            placeholder="请选择任务井"
+            :options="wellOptions"
+            :disabled="form.auditStatus !== 20 && form.auditStatus !== 30"
+          />
+        </el-form-item>
         <el-form-item label="施工状态" prop="rigStatus">
           <el-select
             v-model="form.rigStatus"

+ 20 - 4
src/views/pms/iotrydailyreport/ry-xj-form.vue

@@ -92,6 +92,8 @@ interface FormOriginal {
   remark: string
   createTime: number
   opinion: string
+
+  auditStatus: number
 }
 
 type Form = Partial<FormOriginal>
@@ -136,7 +138,8 @@ const FORM_KEYS: (keyof FormOriginal)[] = [
   'relocationTime',
   'winterBreakTime',
   'otherNptTime',
-  'otherNptReason'
+  'otherNptReason',
+  'auditStatus'
 ]
 
 const formRef = ref<FormInstance>()
@@ -165,10 +168,18 @@ const isApproval = computed(() => props.type === 'approval')
 const isEdit = computed(() => props.type === 'edit')
 const isMainFieldDisabled = computed(() => formType.value === 'readonly' || isApproval.value)
 
+const wellOptions = ref<{ label: string; value: number }[]>([])
+
 async function loadDetail(id: number) {
   loading.value = true
   try {
     const res = await IotRyDailyReportApi.getIotRyDailyReport(id)
+
+    wellOptions.value = Object.entries(res.wellNamePair).map(([value, label]) => ({
+      label: String(label),
+      value: Number(value)
+    }))
+
     form.value = initFormData()
     // 按需赋值
     FORM_KEYS.forEach((key) => {
@@ -503,9 +514,14 @@ const orange = computed(() => {
         <el-form-item label="项目" prop="contractName"
           ><el-input v-model="form.contractName" disabled
         /></el-form-item>
-        <el-form-item label="任务" prop="taskName"
-          ><el-input v-model="form.taskName" disabled
-        /></el-form-item>
+        <el-form-item label="任务井" prop="taskId">
+          <el-select
+            v-model="form.taskId"
+            placeholder="请选择任务井"
+            :options="wellOptions"
+            :disabled="form.auditStatus !== 20 && form.auditStatus !== 30"
+          />
+        </el-form-item>
         <el-form-item :label="t('project.status')" prop="repairStatus">
           <el-select
             v-model="form.repairStatus"