Просмотр исходного кода

fix: 完善方案中的规则条件

wuguojie 9 месяцев назад
Родитель
Сommit
267c9f3728

+ 1 - 1
src/components/ruleConditionContainer/index.vue

@@ -8,7 +8,7 @@
         </el-col>
         </el-col>
         <el-col :span="3">
         <el-col :span="3">
           <el-select v-model="item.operator" placeholder="运算符" style="width: 100px; margin: 0 10px;"
           <el-select v-model="item.operator" placeholder="运算符" style="width: 100px; margin: 0 10px;"
-            :disabled="item.attrType !== 'inputNumber' && item.attrType !== 'datetime' && item.attrType !== 'inputTag' || disabled">
+            :disabled="item.attrType !== 'inputNumber' && item.attrType !== 'datetime' && item.attrType !== 'inputTag'">
             <template v-if="item.attrType == 'inputTag'">
             <template v-if="item.attrType == 'inputTag'">
               <el-option label="包含" value="1"></el-option>
               <el-option label="包含" value="1"></el-option>
               <el-option label="不包含" value="2"></el-option>
               <el-option label="不包含" value="2"></el-option>

+ 4 - 3
src/layouts/components/ruleSelect/index.vue

@@ -107,17 +107,14 @@ const handleSubClick = (item, index) => {
     } else {
     } else {
         selectList.value = selectList.value.filter(a => a.attrName != item.attrName)
         selectList.value = selectList.value.filter(a => a.attrName != item.attrName)
     }
     }
-    console.log('变化后的数据', selectList.value)
 }
 }
 
 
 // 取消
 // 取消
 const handleCancel = () => {
 const handleCancel = () => {
-    console.log('取消', selectedList.value)
     emit('close', selectedList.value)
     emit('close', selectedList.value)
 }
 }
 // 确定
 // 确定
 const handleSubmit = () => {
 const handleSubmit = () => {
-    console.log('确定', dataStore.value)
     let arr = []
     let arr = []
     dataStore.value.forEach(a => {
     dataStore.value.forEach(a => {
         a.list?.forEach(b => {
         a.list?.forEach(b => {
@@ -138,6 +135,8 @@ const initEditData = (data) => {
         })
         })
         dataStore.value = arr
         dataStore.value = arr
         if(data&&data.length>0) {
         if(data&&data.length>0) {
+            console.log(11111, dataStore.value)
+            console.log(2222, data)
             selectedList.value = JSON.parse(JSON.stringify(data))
             selectedList.value = JSON.parse(JSON.stringify(data))
             selectList.value = JSON.parse(JSON.stringify(data))
             selectList.value = JSON.parse(JSON.stringify(data))
             dataStore.value.forEach(a => {
             dataStore.value.forEach(a => {
@@ -145,6 +144,8 @@ const initEditData = (data) => {
                     b.checked = false
                     b.checked = false
                     data.forEach(c => {
                     data.forEach(c => {
                         if(c.attrName === b.attrName) {
                         if(c.attrName === b.attrName) {
+                            b.minArray = c.minArray
+                            b.operator = c.operator
                             b.checked = true
                             b.checked = true
                         }
                         }
                     })
                     })

+ 1 - 3
src/views/quoteConfig/project/modules/projectAdd.vue

@@ -194,7 +194,7 @@ const handleRuleSelectClose = (data) => {
             return {
             return {
                 ...a,
                 ...a,
                 min: a.attrName == '能源类型'? '0':'',
                 min: a.attrName == '能源类型'? '0':'',
-                minArray: a.attrName == '使用性质' || a.attrName == '车辆种类'?[a.dictLabal[0].code]:[]
+                minArray: a.minArray&&a.minArray.length>0?a.minArray:a.attrName == '使用性质' || a.attrName == '车辆种类' || a.attrName == '能源类型'?[a.dictLabal[0].code]:[],
             }
             }
         })
         })
     }
     }
@@ -307,7 +307,6 @@ const initProduct = (e) => {
       })
       })
     }
     }
   if(projectAddFrom.value.companyId&&projectAddFrom.value.productId&&projectAddFrom.value.schemeType) {
   if(projectAddFrom.value.companyId&&projectAddFrom.value.productId&&projectAddFrom.value.schemeType) {
-      console.log('选项123', energyType)
     api.projectApi.getSchemeByCompany({
     api.projectApi.getSchemeByCompany({
       companyId: projectAddFrom.value.companyId,
       companyId: projectAddFrom.value.companyId,
       productId: projectAddFrom.value.productId,
       productId: projectAddFrom.value.productId,
@@ -475,7 +474,6 @@ const addRules = () => {
 let rulesAttrList = ref([])
 let rulesAttrList = ref([])
 let defaultAttrList = ref([])
 let defaultAttrList = ref([])
 // const saveRule = (data) => {
 // const saveRule = (data) => {
-//     console.log(123123123, data)
 //   if(data && data.length > 0) {
 //   if(data && data.length > 0) {
 //     rulesAttrList.value = data
 //     rulesAttrList.value = data
 //   }
 //   }