|
|
|
@ -253,7 +253,7 @@ export default { |
|
|
|
this.$message.error(`该"简码"位数超出了元素设置最大值${this.itemValue.bits}!`); |
|
|
|
return; |
|
|
|
} |
|
|
|
if (this.itemValueList.some(item=>item.valueNo === this.itemValueModal.valueNo)){ |
|
|
|
if (this.itemValueList.some(item=>item.valueNo === this.itemValueModal.valueNo) && this.saveFlag === "新增"){ |
|
|
|
this.$confirm(`该"简码"${this.itemValueModal.valueNo}已存在, 继续保存?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
@ -278,8 +278,9 @@ export default { |
|
|
|
if (this.saveFlag === "新增"){ |
|
|
|
saveCodeItemValue(this.itemValueModal).then(({data})=>{ |
|
|
|
if (data && data.code === 0){ |
|
|
|
this.saveItemValueFlag = false |
|
|
|
this.$message.success(data.msg) |
|
|
|
// this.saveItemValueFlag = false |
|
|
|
this.$message.success(data.msg); |
|
|
|
this.$refs.saveItemValueForm.resetFields(); |
|
|
|
this.searchCodeItemValueListItem() |
|
|
|
}else { |
|
|
|
this.$message.warning(data.msg) |
|
|
|
@ -517,39 +518,42 @@ export default { |
|
|
|
<div> |
|
|
|
<div>可选值列举的条件:</div> |
|
|
|
<div style="border: 1px solid #ebeef5;padding: 5px 10px;box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1)"> |
|
|
|
<span style="border-right: 1px solid #acacac;padding-right: 10px;"> |
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="clickSaveConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">新增</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-edit" @click="editConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">编辑</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-delete" @click="removeConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">删除</el-button> |
|
|
|
</span> |
|
|
|
<span style="border-right: 1px solid #acacac;padding-right: 10px;"> |
|
|
|
<el-button type="primary" icon="el-icon-d-arrow-left" :disabled="itemValue.itemByCondition === 'N'" @click="conditionHeaderIndex = 0">首条</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-arrow-left" :disabled="itemValue.itemByCondition === 'N' || conditionHeaderIndex === 0" @click="conditionHeaderIndex--">前条</el-button> |
|
|
|
<el-button type="primary" :disabled="itemValue.itemByCondition === 'N' || conditionHeaderIndex === conditionHeaders.length - 1" @click="conditionHeaderIndex++">后条<i class="el-icon-arrow-right el-icon--right"></i></el-button> |
|
|
|
<el-button type="primary" :disabled="itemValue.itemByCondition === 'N'" @click="conditionHeaderIndex = conditionHeaders.length - 1">末条<i class="el-icon-d-arrow-right el-icon--right"></i></el-button> |
|
|
|
</span> |
|
|
|
<span> |
|
|
|
<el-button type="primary" icon="el-icon-close" plain @click="$emit('close')">关闭</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-refresh" plain @click="searchConditionHeader">刷新</el-button> |
|
|
|
</span> |
|
|
|
</div> |
|
|
|
<div style="display: flex;margin-top: 2px;gap: 2px"> |
|
|
|
<el-card class="box-card" style="width: 80%;"> |
|
|
|
<el-card class="box-card" style="width: 84%;"> |
|
|
|
<div slot="header" class="clearfix" style="padding: 10px 0"> |
|
|
|
<el-form v-if="conditionHeaders.length > 0" :inline="true" label-position="left" :model="conditionHeaders[conditionHeaderIndex]"> |
|
|
|
<el-form-item label="序号:"> |
|
|
|
<el-input-number disabled v-model="conditionHeaders[conditionHeaderIndex].conditionId" style="width: 100%" :min="1" :controls="false"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="条件描述:" label-width="70px"> |
|
|
|
<el-input readonly v-model="conditionHeaders[conditionHeaderIndex].conditionDesc" style="width: 100%"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="有效:"> |
|
|
|
<el-checkbox disabled v-model="conditionHeaders[conditionHeaderIndex].active" true-label="Y" false-label="N"></el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-form-item label="序号:"> |
|
|
|
<el-input-number disabled v-model="conditionHeaders[conditionHeaderIndex].conditionId" style="width: 100%;min-width: 60px;max-width: 80px" :min="1" :controls="false"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="14"> |
|
|
|
<el-form-item label="条件描述:" label-width="70px"> |
|
|
|
<el-input readonly v-model="conditionHeaders[conditionHeaderIndex].conditionDesc" style="width: 100%;min-width: 180px;max-width: 200px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item label="有效:"> |
|
|
|
<el-checkbox disabled v-model="conditionHeaders[conditionHeaderIndex].active" true-label="Y" false-label="N"></el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
<div style="height: 200px;overflow-y: auto;"> |
|
|
|
<div v-for="(o, index) in conditionDetails" :key="o.seqNo" @click="selectionDetailIndex = index" :style="{backgroundColor: selectionDetailIndex === index? '#E8F7F6' : '#FFF'}" style="padding: 5px 0;cursor:pointer;border-bottom: 1px solid #ebeef5;color: #606266"> |
|
|
|
<div v-for="(o, index) in conditionDetails" :key="o.seqNo" @click="selectionDetailIndex = index" :style="{backgroundColor: selectionDetailIndex === index? '#E8F7F6' : '#FFF'}" |
|
|
|
style="padding: 5px 0;cursor:pointer;border-bottom: 1px solid #ebeef5;color: #606266;font-size: 12px;line-height: 14px;"> |
|
|
|
{{ `${o.SQLStatementExecuteCalculate === '1' ? '并且' : '或者' }(${o.itemDesc}=${o.itemValue})` }} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -613,7 +617,7 @@ export default { |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:30px;text-align:center;margin-top: 8px"> |
|
|
|
<el-button type="primary" @click="saveItemValue">保存</el-button> |
|
|
|
<el-button type="primary" @click="saveItemValue">{{saveFlag==='新增'?'应用':'保存'}}</el-button> |
|
|
|
<el-button type="primary" @click="saveItemValueFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
