|
|
@@ -261,7 +261,6 @@ const formOption = reactive({
|
|
|
rules: [],
|
|
|
});
|
|
|
const formConfig = computed(() => {
|
|
|
-<<<<<<< Updated upstream
|
|
|
return [
|
|
|
{
|
|
|
type: "input",
|
|
|
@@ -338,86 +337,6 @@ const formConfig = computed(() => {
|
|
|
},
|
|
|
];
|
|
|
});
|
|
|
-=======
|
|
|
- return [
|
|
|
- {
|
|
|
- type: 'input',
|
|
|
- prop: 'name',
|
|
|
- label: 'label名称',
|
|
|
- required: true,
|
|
|
- itemWidth: 100,
|
|
|
- //disabled:true,
|
|
|
- itemType: 'textarea',
|
|
|
- //配置隐藏显示
|
|
|
- isShow:formData.userType === 1,
|
|
|
- },
|
|
|
- {
|
|
|
- type: 'select',
|
|
|
- prop: 'xiala',
|
|
|
- label: '下拉框',
|
|
|
- multiple: true,
|
|
|
- style: {
|
|
|
- width: '300px',
|
|
|
- },
|
|
|
- isLoad: {
|
|
|
- url: '/getRouters',
|
|
|
- resUrl: 'data',
|
|
|
- //如果接口回来为stringArray，可以把labelkey和labelval都设置为stringArray
|
|
|
- labelKey: 'name',
|
|
|
- labelVal: 'path',
|
|
|
- },
|
|
|
- //所有组件的change事件监听
|
|
|
- fn: (e) => {
|
|
|
- console.log(e)
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- type: 'date',
|
|
|
- prop: 'date',
|
|
|
- label: '时间',
|
|
|
- itemType: 'date',
|
|
|
- },
|
|
|
- {
|
|
|
- type: 'radio',
|
|
|
- prop: 'radio',
|
|
|
- label: '单选',
|
|
|
- },
|
|
|
- {
|
|
|
- type: 'slot',
|
|
|
- slotName: 'slot',
|
|
|
- label: '插槽',
|
|
|
- },
|
|
|
-
|
|
|
- {
|
|
|
- //使用此功能需要初始化prop数据至少是对象
|
|
|
- type: 'json',
|
|
|
- prop: 'standardJson',
|
|
|
- json: [
|
|
|
- {
|
|
|
- type: 'input',
|
|
|
- prop: 'englishName',
|
|
|
- label: '英文名',
|
|
|
- },
|
|
|
- {
|
|
|
- type: 'input',
|
|
|
- prop: 'code',
|
|
|
- label: '备注',
|
|
|
- },
|
|
|
- {
|
|
|
- type: 'input',
|
|
|
- prop: 'netWeight',
|
|
|
- label: '净重',
|
|
|
- },
|
|
|
- {
|
|
|
- type: 'input',
|
|
|
- prop: 'customhouse',
|
|
|
- label: '海关编码',
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- ]
|
|
|
-})
|
|
|
->>>>>>> Stashed changes
|
|
|
|
|
|
const sleep = (time = 1000) => {
|
|
|
return new Promise((resolve) => setTimeout(resolve, time));
|
asd26269546