1
This commit is contained in:
		| @ -308,7 +308,6 @@ | ||||
|                     v-for="(item, index) in strategyTemplateTypeOptions" | ||||
|                     :key="'strategyTemplateType' + index" | ||||
|                     :label="item.value" | ||||
|                     :disabled="item.value === 1" | ||||
|                   >{{ item.label }}</el-radio> | ||||
|                 </el-radio-group> | ||||
|               </el-form-item> | ||||
| @ -974,7 +973,7 @@ export default { | ||||
|     validateStopLoss(rule, value, callback) { | ||||
|       if (value < 0) { | ||||
|         callback(new Error('止损价不能小于0')) | ||||
|       } else if (this.form.price_pattern !== 'mixture' && value > 100) { | ||||
|       } else if (this.inForm.price_pattern !== 'mixture' && value > 100) { | ||||
|         callback(new Error('止损价不能大于100')) | ||||
|       } else { | ||||
|         callback() | ||||
|  | ||||
| @ -513,7 +513,7 @@ | ||||
|                   >{{ item.label }}</el-radio> | ||||
|                 </el-radio-group> | ||||
|               </el-form-item> | ||||
|               <el-form-item v-if="form.strategy_template_type === 1" label="策略模板"> | ||||
|               <el-form-item v-if="form.strategy_template_type === 1" label="策略模板" prop="strategy_template_id"> | ||||
|                 <el-select | ||||
|                   v-model="form.strategy_template_id" | ||||
|                   style="width: 100%;" | ||||
| @ -551,10 +551,10 @@ | ||||
|                   <el-radio label="aicoin" :disabled="title === '批量添加'">aiCoin买入点</el-radio> | ||||
|                 </el-radio-group> | ||||
|               </el-form-item> | ||||
|               <el-form-item v-if="form.price_pattern === 'percentage'" label="下单百分比" prop="price"> | ||||
|               <el-form-item v-if="form.price_pattern === 'percentage'&&form.strategy_template_type === 0" label="下单百分比" prop="price"> | ||||
|                 <el-input v-model="form.price" placeholder="下单百分比" /> | ||||
|               </el-form-item> | ||||
|               <el-row v-else type="flex"> | ||||
|               <el-row v-else-if="form.price_pattern!=='percentage'&form.strategy_template_type === 0" type="flex"> | ||||
|                 <el-col :span="14"> | ||||
|                   <el-form-item label="下单价(实际价格)" prop="price"> | ||||
|                     <el-input v-model="form.price" placeholder="下单价(实际价格)"> | ||||
| @ -1305,7 +1305,8 @@ export default { | ||||
|         slSlPriceRatio: [{ required: true, message: '第二止损价格百分比不能为空', trigger: 'blur' }], | ||||
|         expirateHour: [{ required: true, message: '请输入过期时间(H)', trigger: 'blur' }], | ||||
|         api_id_type: [{ required: true, message: '请选择用户类型', trigger: 'blur' }], | ||||
|         api_user_group_id: [{ required: true, message: '请选择用户组', trigger: 'blur' }] | ||||
|         api_user_group_id: [{ required: true, message: '请选择用户组', trigger: 'blur' }], | ||||
|         strategy_template_id: [{ required: true, message: '请选择策略模板', trigger: 'blur' }] | ||||
|       }, | ||||
|       currentExpandId: undefined, | ||||
|       cacheRefresh: {}, | ||||
| @ -1559,6 +1560,7 @@ export default { | ||||
|       } else { | ||||
|         this.form.strategy_template_id = undefined | ||||
|       } | ||||
|       this.form.price = '0' | ||||
|     }, | ||||
|     onchangeMode() { | ||||
|       this.getListLineApiUser(this.modeForm.exchangeType) | ||||
|  | ||||
| @ -84,12 +84,12 @@ | ||||
|             </template> | ||||
|           </el-table-column> | ||||
|           <el-table-column | ||||
|             label="时间段开始(分)" | ||||
|             label="时间段(分)" | ||||
|             align="center" | ||||
|             prop="timeSlotStart" | ||||
|             :show-overflow-tooltip="true" | ||||
|           /> | ||||
|           <el-table-column label="时间断截至(分)" align="center" prop="timeSlotEnd" :show-overflow-tooltip="true" /> | ||||
|           <!-- <el-table-column label="时间断截至(分)" align="center" prop="timeSlotEnd" :show-overflow-tooltip="true" /> --> | ||||
|  | ||||
|           <el-table-column | ||||
|             label="创建时间" | ||||
| @ -170,12 +170,12 @@ | ||||
|                 /> | ||||
|               </el-select> | ||||
|             </el-form-item> | ||||
|             <el-form-item label="时间段开始(分)" prop="timeSlotStart"> | ||||
|               <el-input v-model.number="form.timeSlotStart" placeholder="时间段开始(分)" /> | ||||
|             <el-form-item label="时间段(分)" prop="timeSlotStart"> | ||||
|               <el-input v-model.number="form.timeSlotStart" placeholder="时间段(分)" /> | ||||
|             </el-form-item> | ||||
|             <el-form-item label="时间断截至(分)" prop="timeSlotEnd"> | ||||
|             <!-- <el-form-item label="时间断截至(分)" prop="timeSlotEnd"> | ||||
|               <el-input v-model.number="form.timeSlotEnd" placeholder="时间断截至(分)" /> | ||||
|             </el-form-item> | ||||
|             </el-form-item> --> | ||||
|           </el-form> | ||||
|           <div slot="footer" class="dialog-footer"> | ||||
|             <el-button type="primary" @click="submitForm">确 定</el-button> | ||||
| @ -243,15 +243,17 @@ export default { | ||||
|         value: 2, | ||||
|         label: '>=', | ||||
|         description: '大于等于' | ||||
|       }, { | ||||
|         value: 3, | ||||
|         label: '<', | ||||
|         description: '小于' | ||||
|       }, { | ||||
|         value: 4, | ||||
|         label: '<=', | ||||
|         description: '小于等于' | ||||
|       }, { | ||||
|       }, | ||||
|       // { | ||||
|       //   value: 3, | ||||
|       //   label: '<', | ||||
|       //   description: '小于' | ||||
|       // }, { | ||||
|       //   value: 4, | ||||
|       //   label: '<=', | ||||
|       //   description: '小于等于' | ||||
|       // }, | ||||
|       { | ||||
|         value: 5, | ||||
|         label: '=', | ||||
|         description: '等于' | ||||
|  | ||||
		Reference in New Issue
	
	Block a user