liunan #10

Merged
liunan merged 47 commits from liunan into master 2024-09-13 14:43:34 +08:00
5 changed files with 17 additions and 7 deletions
Showing only changes of commit 703d815339 - Show all commits

View File

@ -31,6 +31,8 @@
<agColorPicker v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-color-picker'" size="small"> <agColorPicker v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-color-picker'" size="small">
</agColorPicker> </agColorPicker>
<el-transfer :data="item.data" v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-transfer'" size="small"></el-transfer> <el-transfer :data="item.data" v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-transfer'" size="small"></el-transfer>
<agNumberRange v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-numberRange'" size="small"/>
<agMultifunctionSearch v-bind="item" v-model="formValue[item.enName]" v-if="item.type=='ag-multifunction-search'" size="small"/>
</slot> </slot>
</el-form-item> </el-form-item>
</ag-col> </ag-col>
@ -56,6 +58,8 @@ import agRow from './../../agRow/src/index.vue';
import agCol from './../../agCol/src/index.vue'; import agCol from './../../agCol/src/index.vue';
import agUpload from './../../agUpload/src/index.vue'; import agUpload from './../../agUpload/src/index.vue';
import agColorPicker from './../../agColorPicker/src/index.vue'; import agColorPicker from './../../agColorPicker/src/index.vue';
import agNumberRange from './../../agNumberRange/src/index.vue';
import agMultifunctionSearch from './../../agMultifunctionSearch/src/index.vue';
export default{ export default{
name:"agForm", name:"agForm",
@ -66,7 +70,9 @@ export default{
agRow, agRow,
agCol, agCol,
agUpload:agUpload, agUpload:agUpload,
agColorPicker agColorPicker,
agNumberRange,
agMultifunctionSearch
}, },
props:{ props:{
data:{ data:{

View File

@ -123,6 +123,10 @@ export default {
listeners:{} listeners:{}
}; };
}, },
model: {
prop: 'value', // prop 'value'
event: 'change' // value
},
watch: { watch: {
value: { value: {
handler(newVal) { handler(newVal) {

View File

@ -375,14 +375,14 @@ export default {
{label:"订单编号",span:12,type:"ag-input",enName:'order_sn',value:'656',placeholder:'请输入洗碗机',size:'small',clearable:true,show:true,value:false,required:true,options:[{label:"是",value:'1'},{label:"否",value:'2'}]}, {label:"订单编号",span:12,type:"ag-input",enName:'order_sn',value:'656',placeholder:'请输入洗碗机',size:'small',clearable:true,show:true,value:false,required:true,options:[{label:"是",value:'1'},{label:"否",value:'2'}]},
{label:"IMEI/机器编号",span:12,type:"ag-input-number",enName:'imei',value:'43543',placeholder:'请输入IMEI/机器编号',size:'small',clearable:true,max:10,min:2,step:2,show:true}, {label:"IMEI/机器编号",span:12,type:"ag-input-number",enName:'imei',value:'43543',placeholder:'请输入IMEI/机器编号',size:'small',clearable:true,max:10,min:2,step:2,show:true},
{label:"质检码",span:12,type:"ag-rate",value:'',enName:'ser_sn',placeholder:'请输入质检码',size:'small',clearable:true,show:true,options:[{value:'1',label:'112'},{value:'2',label:'2223'}]}, {label:"质检码",span:12,type:"ag-rate",value:'',enName:'ser_sn',placeholder:'请输入质检码',size:'small',clearable:true,show:true,options:[{value:'1',label:'112'},{value:'2',label:'2223'}]},
{label:"质检时间",span:12,type:"ag-color-picker",enName:'time',showAlpha:true,size:'small',colorFormat:'hsv',show:true}, {label:"质检时间",span:12,type:"ag-multifunction-search",enName:'time',showAlpha:true,size:'small',colorFormat:'hsv',show:true},
{label:"头像",span:12,type:"ag-upload",enName:'avatar',placeholder:'请输入质检码',size:'small',clearable:true,show:true,limit:4,multiple:true}, {label:"头像",span:12,type:"ag-upload",enName:'avatar',placeholder:'请输入质检码',size:'small',clearable:true,show:true,limit:4,multiple:true},
], ],
formvalue:{ formvalue:{
order_sn:"11", order_sn:"11",
imei:'', imei:'',
ser_sn:2, ser_sn:2,
time:'red', time:['11','2'],
avatar:["https://git.aiguoai.com/assets/img/logo.svg"], avatar:["https://git.aiguoai.com/assets/img/logo.svg"],
} }
} }