朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 c93043a4243a63ab8d68d1db441590c4a7090658 1 个父辈 90048340

Merge branch 'master' of /Users/mrz/Documents/java项目/test/vue-admin-master with conflicts.

内嵌 并排对比
正在显示 2 个修改的文件 包含 59 行增加 和 5 行删除
... ... @@ -62,7 +62,7 @@
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left"><i class="el-icon-s-home"></i> 入库相关</el-divider>
<el-divider content-position="left"><i class="el-icon-house"></i> 入库相关</el-divider>
<el-row>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="area">
... ... @@ -217,8 +217,20 @@
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider>
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="picUrl">
<el-input v-model="addForm.picUrl" autocomplete="off" suffix-icon="el-icon-document" clearable>
<template slot="prepend">图片地址</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-button type="success" icon="el-icon-edit" @click="drawerVisible = true">入库图像</el-button>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
<!-- <el-input v-model="addForm.status" autocomplete="off" style="width: 300px">-->
<!-- <template slot="prepend">状&emsp;&emsp;态</template>-->
... ... @@ -425,6 +437,15 @@
</el-pagination>
</el-row>
</el-card>
<el-drawer
title="我是标题"
:visible.sync="drawerVisible"
:with-header="false">
<video width="100%" height="200" autoplay loop controls id="videos">
<source src="/static/login/New-jumbo.mp4" type="video/mp4">
</video>
<el-button class="btns" @click="screenshot">一键截屏</el-button>
</el-drawer>
</el-row>
</template>
... ... @@ -470,6 +491,7 @@
// 编辑对话框
editDialog: false
},
drawerVisible: false,
addForm: {
area: '',
billweight: '',
... ... @@ -498,6 +520,7 @@
remark3:'',
remark4:'',
remark5:'',
picUrl:''
},
options: [{
value: '板箱',
... ... @@ -806,6 +829,9 @@
}
};
},
screenshot(){
}
},
mounted() {
this.getAreaList();
... ...
... ... @@ -345,12 +345,12 @@
key2: +new Date(),
formResource: {
"fields": [],
"formRef": "wms_truck_plan",
"formModel": "wms_truck_plan_Data",
"formRef": "formRef",
"formModel": "formModel",
"size": "mini",
"labelPosition": "left",
"labelWidth": 100,
"formRules": "rules",
"formRules": "",
"gutter": 5,
"disabled": false,
"span": 12,
... ... @@ -511,10 +511,38 @@
_this.key2 = +new Date()
_this.formResource = JSON.parse(data)
}else {
_this.formResource = {
"fields": [],
"formRef": "formRef",
"formModel": "formModel",
"size": "mini",
"labelPosition": "left",
"labelWidth": 100,
"formRules": "",
"gutter": 5,
"disabled": false,
"span": 12,
"formBtns": true,
"unFocusedComponentBorder": true
}
console.log("此任务没有表单定义")
}
}).catch(err => {
_this.$message.error(err)
_this.formResource = {
"fields": [],
"formRef": "formRef",
"formModel": "formModel",
"size": "mini",
"labelPosition": "left",
"labelWidth": 100,
"formRules": "",
"gutter": 5,
"disabled": false,
"span": 12,
"formBtns": true,
"unFocusedComponentBorder": true
}
});
})
... ...