فهرست منبع

划分树的参数、设计值/频率的提示信息

iZaiZaiA 2 سال پیش
والد
کامیت
29677fb54b
2فایلهای تغییر یافته به همراه10 افزوده شده و 5 حذف شده
  1. 4 2
      src/views/data-fill/components/ListItem.vue
  2. 6 3
      src/views/data-fill/division.vue

+ 4 - 2
src/views/data-fill/components/ListItem.vue

@@ -99,10 +99,12 @@
                 </el-radio-group>
             </div>
             <el-form-item label="设计值">
-                <el-input v-model="formIDVFModel.design" placeholder="请输入设计值" onkeyup="value = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g,'$1')"/>
+                <!-- onkeyup="value = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g,'$1')" -->
+                <el-input v-model="formIDVFModel.design" placeholder="如果设计值存在两个,则使用则使用'*',或者'/'连接,例如45*78,12/23"/>
             </el-form-item>
             <el-form-item label="频率" v-if="formIDVFModel.type === 1">
-                <el-input v-model="formIDVFModel.size" placeholder="请输入频率" onkeyup="value = value.replace(/^(0+)|[^\d]+/g,'')"/>
+                <!--  onkeyup="value = value.replace(/^(0+)|[^\d]+/g,'')" -->
+                <el-input v-model="formIDVFModel.size" placeholder="如果频率存在两个,则使用'*',或者'/'连接例如2*4,5/7"/>
             </el-form-item>
             <el-form-item label="容量" v-if="formIDVFModel.type === 2">
                 <el-input v-model="formIDVFModel.capacity" placeholder="请输入容量" onkeyup="value = value.replace(/^(0+)|[^\d]+/g,'')"/>

+ 6 - 3
src/views/data-fill/division.vue

@@ -996,7 +996,9 @@ const addingFormTreeLoadNode = async (node, resolve) => {
         const resData = await tabTypeLazyTree()
         resolve(resData?.data)
     } else {
-        const resData = await tabTypeLazyTree(node?.data?.primaryKeyId)
+        const resData = await tabTypeLazyTree(node?.data?.primaryKeyId, '' , false, {
+            current: 1, size: 2000,
+        })
         resolve(resData?.data)
     }
 }
@@ -1082,7 +1084,7 @@ const dialogTableSelection = (rows) => {
 }
 
 //获取数据
-const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search = false) => {
+const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search = false, form = {}) => {
     let obj = {}, searchObj = {}
     if(parentId) obj.parentId = parentId
     if(titleName) obj.titleName = titleName
@@ -1092,7 +1094,8 @@ const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search
         projectId: projectId.value,
         contractId: contractId.value,
         ...obj,
-        ...searchObj
+        ...searchObj,
+        ...form
     })
     const records = getArrValue(data?.records)
     records.forEach(item => {