|
@@ -38,29 +38,29 @@
|
|
|
>
|
|
|
<el-form-item
|
|
|
label="提出人"
|
|
|
- prop="reason"
|
|
|
+ prop="proposer"
|
|
|
:rules="{
|
|
|
required: true,
|
|
|
message: '提出人不能为空',
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
|
>
|
|
|
- <el-input v-model="add_form.reason"></el-input>
|
|
|
+ <el-input v-model="add_form.proposer"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="联系电话"
|
|
|
- prop="precautions"
|
|
|
+ prop="telephone"
|
|
|
:rules="{
|
|
|
required: true,
|
|
|
message: '联系电话不能为空',
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
|
>
|
|
|
- <el-input v-model="add_form.precautions"></el-input>
|
|
|
+ <el-input v-model="add_form.telephone"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="网格划分需求"
|
|
|
- prop="desc"
|
|
|
+ prop="wanggeText"
|
|
|
:rules="{
|
|
|
required: true,
|
|
|
message: '网格划分需求不能为空',
|
|
@@ -69,7 +69,7 @@
|
|
|
>
|
|
|
<el-input
|
|
|
type="textarea"
|
|
|
- v-model="add_form.desc"
|
|
|
+ v-model="add_form.wanggeText"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -143,7 +143,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
page:1,
|
|
|
- row:10,
|
|
|
+ rows:10,
|
|
|
total:0,
|
|
|
table_search:{},
|
|
|
// 新建模态框
|
|
@@ -164,12 +164,12 @@ export default {
|
|
|
table_form: [
|
|
|
{
|
|
|
label: "公司名称",
|
|
|
- props: "name",
|
|
|
+ props: "companyName",
|
|
|
type: "input",
|
|
|
},
|
|
|
{
|
|
|
label: "状态",
|
|
|
- props: "status",
|
|
|
+ props: "approve",
|
|
|
type: "select",
|
|
|
// 0.待办 1.已办
|
|
|
dictionary: [
|
|
@@ -186,20 +186,20 @@ export default {
|
|
|
],
|
|
|
// 列表数据
|
|
|
table_list: [
|
|
|
- {
|
|
|
- number: 1,
|
|
|
- cpmName: "xq",
|
|
|
- person: "mll",
|
|
|
- createTime: 1654563154824,
|
|
|
- status: 0,
|
|
|
- },
|
|
|
- {
|
|
|
- number: 2,
|
|
|
- cpmName: "xq",
|
|
|
- person: "mll",
|
|
|
- createTime: 1654963568455,
|
|
|
- status: 1,
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // number: 1,
|
|
|
+ // cpmName: "xq",
|
|
|
+ // person: "mll",
|
|
|
+ // createTime: 1654563154824,
|
|
|
+ // status: 0,
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // number: 2,
|
|
|
+ // cpmName: "xq",
|
|
|
+ // person: "mll",
|
|
|
+ // createTime: 1654963568455,
|
|
|
+ // status: 1,
|
|
|
+ // },
|
|
|
],
|
|
|
table_loading: false,
|
|
|
// 表格里的操作按钮
|
|
@@ -220,15 +220,15 @@ export default {
|
|
|
table_config: [
|
|
|
{
|
|
|
label: "序号",
|
|
|
- props: "number",
|
|
|
+ props: "createId",
|
|
|
},
|
|
|
{
|
|
|
label: "公司名称",
|
|
|
- props: "cpmName",
|
|
|
+ props: "companyName",
|
|
|
},
|
|
|
{
|
|
|
label: "发起人",
|
|
|
- props: "person",
|
|
|
+ props: "proposer",
|
|
|
},
|
|
|
{
|
|
|
label: "发起时间",
|
|
@@ -283,21 +283,26 @@ export default {
|
|
|
page: this.page,
|
|
|
pageSize: this.rows,
|
|
|
})
|
|
|
+ this.handleInit()
|
|
|
},
|
|
|
methods: {
|
|
|
// 表格数据初始化
|
|
|
- handleInit(){
|
|
|
- // this.table_loading = true
|
|
|
- // this.$http({
|
|
|
- // url:'/mkWangge/queryPage',
|
|
|
- // method:'get',
|
|
|
- // headers:{
|
|
|
- // "Content-Type": "application/json",
|
|
|
- // },
|
|
|
- // data:{}
|
|
|
- // }).then(res => {
|
|
|
- // console.log(res);
|
|
|
- // })
|
|
|
+ handleInit(data){
|
|
|
+ this.table_loading = true
|
|
|
+ // console.log(data);
|
|
|
+ this.$http({
|
|
|
+ url:'/mkWangge/queryPage',
|
|
|
+ method:'post',
|
|
|
+ headers:{
|
|
|
+ "Content-Type": "application/json",
|
|
|
+ },
|
|
|
+ data:data
|
|
|
+ }).then(({data:{count,data}}) => {
|
|
|
+ this.table_loading = false
|
|
|
+ this.total = count
|
|
|
+ this.table_list = data || []
|
|
|
+ console.log(data);
|
|
|
+ })
|
|
|
},
|
|
|
// 搜索事件
|
|
|
handleSearch(data) {
|
|
@@ -345,6 +350,7 @@ export default {
|
|
|
handleSubmit() {
|
|
|
this.edit_visible = false
|
|
|
this.add_visible = false
|
|
|
+ console.log(this.add_form);
|
|
|
},
|
|
|
handleSummary(){},
|
|
|
handleChange(page) {
|
|
@@ -363,7 +369,7 @@ export default {
|
|
|
.workersList-container {
|
|
|
background: #ffffff;
|
|
|
padding-top: 20px;
|
|
|
- padding-left: 20px;
|
|
|
+ padding: 0 20px;
|
|
|
margin: 15px;
|
|
|
overflow: auto;
|
|
|
width: calc(100% - 30px);
|