Merge remote-tracking branch 'origin/master'

src/views/pms/iotopeationfill/index1.vue

@@ -70,13 +70,30 @@
                 />
               </div>
                 <el-form-item :label='item.name' prop="deviceId"  label-position="top">
+                  <div v-if="fillStatus === '1'">
+
+                    <el-select
+                      disabled
+                      v-model="item.fillContent"
+                      v-if="item.type === 'enum' && item.description !== null"
+                      style="width: 200px">
+                      <el-option
+                        v-for="dict in getIntDictOptions(item.description)"
+                        :key="dict.label"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
                     <el-input
-                      v-if="fillStatus === '1'"
+                      v-else
                       v-model="item.fillContent"
                       clearable
-                      style="width: 200px"
+                      style="width: 200px; margin-right: 10px"
                       disabled
                     />
+                  </div>
+
+
                     <el-input
                       v-else-if="item.type === 'textarea'"
                       v-model="item.fillContent"
@@ -84,7 +101,11 @@
                       clearable
                       style="width: 200px"
                     />
-                    <el-select  v-model="item.fillContent" clearable v-else-if="item.type === 'enum' && item.description !== null" style="width: 200px" filterable>
+                    <el-select  v-model="item.fillContent"
+                                clearable
+                                v-else-if="item.type === 'enum' && item.description !== null"
+                                style="width: 200px"
+                                filterable>
                       <el-option
                         v-for="dict in getIntDictOptions(item.description)"
                         :key="dict.label"
@@ -346,6 +367,7 @@ const getAttrList = async () => {
       item.deviceId = queryParams.deviceId;
       item.deviceCategoryId = queryParams.deviceCategoryId;
       item.modelId = item.id;
+      console.log(item.fillContent)
     })
     attrList1.value.forEach(function (item,index){
       item.deviceCode = queryParams.deviceCode;
@@ -585,4 +607,5 @@ onMounted(() => {
   padding: 2px 4px;
   border-radius: 4px;
 }
+
 </style>

src/views/pms/iotrydailyreport/IotRyDailyReportForm.vue

@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="120px"
       v-loading="formLoading"
     >
       <el-form-item label="施工队伍" prop="deptName">
@@ -23,7 +23,7 @@
       </el-form-item>
       <el-form-item label="上井次完井时间" prop="latestWellDoneTime">
         <el-date-picker
-          v-model="formData.lastestWellDoneTime"
+          v-model="formData.latestWellDoneTime"
           type="date"
           value-format="x"
           placeholder=""
@@ -116,7 +116,6 @@ watch(() => props.rowData, (newVal) => {
     displayData.value.deptName = newVal.deptName || ''
     displayData.value.contractName = newVal.contractName || ''
     displayData.value.taskName = newVal.taskName || ''
-    displayData.value.relocationDays = newVal.relocationDays || ''
     displayData.value.designWellStruct = newVal.designWellStruct || ''
   }
 }, { immediate: true })
@@ -190,7 +189,7 @@ const open = async (type: string, id?: number) => {
     displayData.value.deptName = props.rowData.deptName || ''
     displayData.value.contractName = props.rowData.contractName || ''
     displayData.value.taskName = props.rowData.taskName || ''
-    displayData.value.relocationDays = props.rowData.relocationDays || ''
+    displayData.value.designWellStruct = props.rowData.designWellStruct || ''
   }
 
   // 修改时，设置数据
@@ -282,4 +281,4 @@ const resetForm = () => {
 
   formRef.value?.resetFields()
 }
-</script>
+</script>