zhangwenya hace 8 meses
padre
commit
22fae132f0

+ 10 - 6
src/views/ms/mstpl/component/editIndicator.vue

@@ -14,9 +14,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="自动发现" prop="findFlag" v-if="!disabled">
-          <el-select v-model="form.findFlag">
-            <el-option v-for="item in sys_yes_no" :key="item.value" :label="item.label" :value="item.value"/>
-          </el-select>
+          <el-switch v-model="form.findFlag"/>
         </el-form-item>
       </el-col>
     </el-row>
@@ -138,19 +136,25 @@ const validateRange = (range) => {
 }
 
 const editData = (row) => {
+
   const keys = Object.keys(form.value)
   keys.forEach(p => {
     form.value[p] = row[p]
   })
-  proxy.$nextTick(() => {
-    proxy.resetForm("fRef");
+
+  form.value.findFlag = row.findFlag === "Y"
+
+  setTimeout(() => {
+    proxy.$refs.fRef.clearValidate()
   })
 }
 
 const handleSubmit = () => {
   proxy.$refs.fRef.validate(valid => {
     if (valid) {
-      handleUpdate({...props.rowsInfo, ...form.value})
+      const data = {...form.value}
+      data.findFlag = data.findFlag ? "Y" : "N"
+      handleUpdate({...props.rowsInfo, ...data})
     }
   })
 }

+ 2 - 2
src/views/ms/mstpl/component/indicatorManger.vue

@@ -111,7 +111,7 @@
   </el-dialog>
 
   <el-dialog title="指标修改" v-model="visible" width="600" append-to-body>
-    <edit-indicator :rowsInfo="rowsInfo" ref="eiRef" @close="visible=false" @reload="getSelectData"/>
+    <edit-indicator :rowsInfo="rowsInfo" ref="eiRef" @close="visible=false" @reload="getSelectDetails(rowTplId)"/>
   </el-dialog>
 </template>
 <script setup lang="ts">
@@ -149,6 +149,7 @@ const queryParams = reactive({
 // 选择指标
 const getSelectDetails = (tplId: number) => {
   loading.value = true;
+  visible.value = false
   editRow.value = [];
   if (tplId) {
     rowTplId.value = tplId;
@@ -214,7 +215,6 @@ const handleAdd = () => {
 }
 
 const getSelectData = () => {
-  visible.value = false
   selectDetails(rowTplId.value, adParams).then(res => {
     addListData.value = res.rows
     adTotal.value = res.total