wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-06-21

master
zelian_wu 2 years ago
parent
164af18d2b
commit
6e100e3105
5 changed files with 77 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/assets/scss/global.scss
  2. 24
      src/views/modules/code/generation.vue
  3. 23
      src/views/modules/code/item.vue
  4. 64
      src/views/modules/code/item/itemValue.vue
  5. 1
      src/views/modules/code/list.vue

2
src/assets/scss/global.scss
View File

@ -320,7 +320,7 @@ input.el-input__inner{
.el-input-number .el-input__inner { .el-input-number .el-input__inner {
text-align: right; text-align: right;
padding-right: 10px !important;
padding-right: 5px !important;
padding-left: 0 !important; padding-left: 0 !important;
} }

24
src/views/modules/code/generation.vue
View File

@ -4,9 +4,23 @@ import {searchCodeGenerationItemValueList} from "../../../api/code/codeItemValue
import {codeNoGenerate, saveDrawing} from "../../../api/code/codeDrawing"; import {codeNoGenerate, saveDrawing} from "../../../api/code/codeDrawing";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {searchCodeParameterById} from "../../../api/code/codeParameterDef"; import {searchCodeParameterById} from "../../../api/code/codeParameterDef";
import itemValue from "./item/itemValue.vue";
export default { export default {
name: "CodeGeneration", name: "CodeGeneration",
computed: {
itemValue() {
return itemValue
},
showConditionName() {
return (val) => {
if (val && val.length > 0){
return val[0].conditionName
}
return ''
};
}
},
data(){ data(){
return { return {
codeItemDefs: [], codeItemDefs: [],
@ -19,7 +33,7 @@ export default {
}, },
codeItemTypes: [], codeItemTypes: [],
codeItemValues: [], codeItemValues: [],
width: 700,
width: 800,
loadingIndex:-1, loadingIndex:-1,
checkCodeFlag:'N', checkCodeFlag:'N',
getCodeNoLoading: false, getCodeNoLoading: false,
@ -107,6 +121,7 @@ export default {
paramsData.itemType = '手工' paramsData.itemType = '手工'
}else if (this.codeItemDefs[i].itemType.includes('选择') && this.codeItemTypes[i] === '选择'){ }else if (this.codeItemDefs[i].itemType.includes('选择') && this.codeItemTypes[i] === '选择'){
// 寻找 简码 // 寻找 简码
paramsData.name = this.codeItemDefs[i].itemValues[0].conditionName
paramsData.value = this.getValueNo(this.codeItemDefs[i].itemValues,this.codeItemValues[i]).valueNo paramsData.value = this.getValueNo(this.codeItemDefs[i].itemValues,this.codeItemValues[i]).valueNo
paramsData.label = this.getValueNo(this.codeItemDefs[i].itemValues,this.codeItemValues[i]).itemValue paramsData.label = this.getValueNo(this.codeItemDefs[i].itemValues,this.codeItemValues[i]).itemValue
paramsData.itemType = '选择' paramsData.itemType = '选择'
@ -228,7 +243,7 @@ export default {
}).catch((error)=>{ }).catch((error)=>{
this.$message.error(error) this.$message.error(error)
}) })
}
},
}, },
} }
</script> </script>
@ -271,7 +286,7 @@ export default {
<el-radio v-if="item.itemType.includes('流水号')" label="流水号">流水号</el-radio> <el-radio v-if="item.itemType.includes('流水号')" label="流水号">流水号</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<div style="display: inline-block;" :style="{width: `${item.itemType.includes('或')?(width-240-105):(width-100)}px`}">
<div style="display: inline-block;" :style="{width: `${item.itemType.includes('或')?(width-240-205):(width-200)}px`}">
<el-select <el-select
:loading="loadingIndex === index" :loading="loadingIndex === index"
:ref="`codeItemValue${index}`" :ref="`codeItemValue${index}`"
@ -285,6 +300,9 @@ export default {
<el-input v-if="codeItemTypes[index] === '手工'" placeholder="请输入" v-model="codeItemValues[index]"></el-input> <el-input v-if="codeItemTypes[index] === '手工'" placeholder="请输入" v-model="codeItemValues[index]"></el-input>
<el-input v-if="codeItemTypes[index] === '流水号'" disabled v-model="codeItemValues[index]"></el-input> <el-input v-if="codeItemTypes[index] === '流水号'" disabled v-model="codeItemValues[index]"></el-input>
</div> </div>
<div style="width: 90px;display: inline-block" v-if="showConditionName(item.itemValues) !== ''">
<span v-if="">(</span><span>{{showConditionName(item.itemValues)}}</span><span>)</span>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

23
src/views/modules/code/item.vue
View File

@ -904,12 +904,18 @@ export default {
<el-dialog title="流水号产生规则" v-drag @close="closeSeqNoGenerate" :visible.sync="seqNoGenerateDialog" width="520px"> <el-dialog title="流水号产生规则" v-drag @close="closeSeqNoGenerate" :visible.sync="seqNoGenerateDialog" width="520px">
<el-form :inline="true" label-position="top" :model="currentRow"> <el-form :inline="true" label-position="top" :model="currentRow">
<el-form-item :label="'序号'">
<el-input v-model="currentRow.itemNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'描述'">
<el-input v-model="currentRow.itemDesc" readonly style="width: 120px"></el-input>
</el-form-item>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'序号'">
<el-input v-model="currentRow.itemNo" readonly ></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :label="'描述'">
<el-input v-model="currentRow.itemDesc" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-transfer class="rq" :props="{key: 'itemNo',label: 'itemDesc' }" <el-transfer class="rq" :props="{key: 'itemNo',label: 'itemDesc' }"
filterable v-model="seqNoGenerateList" filterable v-model="seqNoGenerateList"
@ -929,11 +935,6 @@ export default {
height: auto; height: auto;
line-height: 1.5; line-height: 1.5;
} }
.el-input-number /deep/ .el-input__inner{
text-align: right;
padding-right: 15px !important;
padding-left: 0px !important;
}
/deep/ .el-button{ /deep/ .el-button{
line-height: 13px; line-height: 13px;
height: 21px; height: 21px;

64
src/views/modules/code/item/itemValue.vue
View File

@ -22,6 +22,7 @@ const detailRules = {}
const itemValueRules = {} const itemValueRules = {}
const rulesLabel = { const rulesLabel = {
conditionDesc: "条件描述", conditionDesc: "条件描述",
conditionName: "条件名称",
active: "是否有效", active: "是否有效",
} }
const detailRulesLabel = { const detailRulesLabel = {
@ -161,6 +162,7 @@ export default {
itemNo:this.itemValue.itemNo, itemNo:this.itemValue.itemNo,
site:this.$store.state.user.site, site:this.$store.state.user.site,
active:'Y', active:'Y',
conditionName:'',
} }
this.saveConditionHeaderFlag = true this.saveConditionHeaderFlag = true
}, },
@ -519,7 +521,7 @@ export default {
<div>可选值列举的条件:</div> <div>可选值列举的条件:</div>
<div style="border: 1px solid #ebeef5;padding: 5px 10px;box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1)"> <div style="border: 1px solid #ebeef5;padding: 5px 10px;box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1)">
<el-button type="primary" icon="el-icon-plus" @click="clickSaveConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">新增</el-button> <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-edit" @click="editConditionHeaderBtn" >编辑</el-button>
<el-button type="primary" icon="el-icon-delete" @click="removeConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">删除</el-button> <el-button type="primary" icon="el-icon-delete" @click="removeConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">删除</el-button>
<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-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" icon="el-icon-arrow-left" :disabled="itemValue.itemByCondition === 'N' || conditionHeaderIndex === 0" @click="conditionHeaderIndex--">前条</el-button>
@ -531,7 +533,7 @@ export default {
<div style="display: flex;margin-top: 2px;gap: 2px"> <div style="display: flex;margin-top: 2px;gap: 2px">
<el-card class="box-card" style="width: 84%;"> <el-card class="box-card" style="width: 84%;">
<div slot="header" class="clearfix" style="padding: 10px 0"> <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 v-if="conditionHeaders.length > 0" label-position="left" :model="conditionHeaders[conditionHeaderIndex]">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="序号:"> <el-form-item label="序号:">
@ -540,14 +542,21 @@ export default {
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item label="条件描述:" label-width="70px"> <el-form-item label="条件描述:" label-width="70px">
<el-input readonly v-model="conditionHeaders[conditionHeaderIndex].conditionDesc" style="min-width: 240px;max-width: 240px"></el-input>
<el-input readonly v-model="conditionHeaders[conditionHeaderIndex].conditionDesc"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="有效:"> <el-form-item label="有效:">
<el-checkbox disabled v-model="conditionHeaders[conditionHeaderIndex].active" true-label="Y" false-label="N"></el-checkbox> <el-checkbox disabled v-model="conditionHeaders[conditionHeaderIndex].active" true-label="Y" false-label="N"></el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="14">
<el-form-item label="条件名称:" label-width="70px">
<el-input readonly v-model="conditionHeaders[conditionHeaderIndex].conditionName"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
@ -587,18 +596,35 @@ export default {
</div> </div>
<el-dialog :title="`条件${saveFlag}`" v-drag :visible.sync="saveConditionHeaderFlag" @close="closeSaveConditionHeader" width="400px" append-to-body> <el-dialog :title="`条件${saveFlag}`" v-drag :visible.sync="saveConditionHeaderFlag" @close="closeSaveConditionHeader" width="400px" append-to-body>
<el-form ref="saveForm" label-position="top" :model="conditionHeader" :rules="saveRules" label-width="80px"> <el-form ref="saveForm" label-position="top" :model="conditionHeader" :rules="saveRules" label-width="80px">
<el-form-item label="序号:" prop="conditionId">
<el-input disabled v-model="conditionHeader.conditionId" style="width: 40%"></el-input>
</el-form-item>
<el-form-item label="条件描述:" prop="conditionDesc" :show-message="false">
<el-input v-model="conditionHeader.conditionDesc" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="有效:" prop="active">
<el-select v-model="conditionHeader.active" placeholder="请选择" :show-message="false">
<el-option label="Y" value="Y"></el-option>
<el-option label="N" value="N"></el-option>
</el-select>
</el-form-item>
<el-row :gutter="10">
<el-col :span="4">
<el-form-item label="序号:" prop="conditionId">
<el-input-number :controls="false" disabled v-model="conditionHeader.conditionId"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="条件描述:" prop="conditionDesc" :show-message="false">
<el-input :disabled="itemValue.itemByCondition === 'N'" v-model="conditionHeader.conditionDesc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4">
<!-- <el-form-item label="有效:" prop="active">-->
<el-form-item label=" ">
<el-checkbox :disabled="itemValue.itemByCondition === 'N'" v-model="conditionHeader.active" true-label="Y" false-label="N">有效</el-checkbox>
<!-- <el-select v-model="conditionHeader.active" placeholder="请选择" :show-message="false">-->
<!-- <el-option label="Y" value="Y"></el-option>-->
<!-- <el-option label="N" value="N"></el-option>-->
<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="条件名称:" prop="conditionName" :show-message="false">
<el-input v-model="conditionHeader.conditionName"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-footer style="height:30px;text-align:center;margin-top: 8px"> <el-footer style="height:30px;text-align:center;margin-top: 8px">
<el-button type="primary" @click="saveConditionHeaderBtn">保存</el-button> <el-button type="primary" @click="saveConditionHeaderBtn">保存</el-button>
@ -679,12 +705,6 @@ export default {
line-height: 30px ; line-height: 30px ;
} }
.el-input-number /deep/ .el-input__inner{
text-align: right;
padding-right: 15px !important;
padding-left: 0px !important;
}
.rq /deep/ .el-transfer-panel .el-transfer-panel__header { .rq /deep/ .el-transfer-panel .el-transfer-panel__header {
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;

1
src/views/modules/code/list.vue
View File

@ -181,6 +181,7 @@ export default {
<el-table :data="drawingDetailList" height="400" border style="width: 100%"> <el-table :data="drawingDetailList" height="400" border style="width: 100%">
<el-table-column prop="itemNo" header-align="center" width="140" align="right" label="序号"></el-table-column> <el-table-column prop="itemNo" header-align="center" width="140" align="right" label="序号"></el-table-column>
<el-table-column prop="itemDesc" header-align="center" width="140" align="left" label="描述"></el-table-column> <el-table-column prop="itemDesc" header-align="center" width="140" align="left" label="描述"></el-table-column>
<el-table-column prop="itemName" header-align="center" width="140" align="left" label="元素名称"></el-table-column>
<el-table-column prop="itemType" show-overflow-tooltip header-align="center" align="left" label="类型"></el-table-column> <el-table-column prop="itemType" show-overflow-tooltip header-align="center" align="left" label="类型"></el-table-column>
<el-table-column prop="itemLabel" show-overflow-tooltip header-align="center" align="left" label="选中项描述"></el-table-column> <el-table-column prop="itemLabel" show-overflow-tooltip header-align="center" align="left" label="选中项描述"></el-table-column>
<el-table-column prop="itemValue" show-overflow-tooltip header-align="center" align="left" label="选中项值"></el-table-column> <el-table-column prop="itemValue" show-overflow-tooltip header-align="center" align="left" label="选中项值"></el-table-column>

Write Preview
Loading…
Cancel
Save