youxiw2000 / trash · Commits

Commit f7be3b86fbc09843b519362a80c0758ea0adb1cd

Authored by youxiw2000
2 parents bc53c065 6eb28816

Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

Inline Side-by-side
Showing 3 changed files with 10 additions and 9 deletions
trash-ui/src/views/activiti/task/dropPointinfo.vue
  View file @f7be3b8
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form ref="form" :model="infoData" label-width="128px"> 3 + <el-form ref="form" :model="infoData" label-width="148px">
4 4
5 <el-form-item label="投放点编号" prop="dropPointNo"> 5 <el-form-item label="投放点编号" prop="dropPointNo">
6 <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/> 6 <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 <el-form-item label="投放时间" prop="dropTime"> 60 <el-form-item label="投放时间" prop="dropTime">
61 <el-time-select 61 <el-time-select
62 v-model="infoData.dropTime[0]" 62 v-model="infoData.dropTime[0]"
63 - style="width: 100%" 63 + style="width: 50%"
64 :picker-options="{ 64 :picker-options="{
65 start: '00:00', 65 start: '00:00',
66 step: '00:30', 66 step: '00:30',
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 </el-time-select> 71 </el-time-select>
72 <el-time-select 72 <el-time-select
73 v-model="infoData.dropTime[1]" 73 v-model="infoData.dropTime[1]"
74 - style="width: 100%" 74 + style="width: 50%"
75 :picker-options="{ 75 :picker-options="{
76 start: '00:00', 76 start: '00:00',
77 step: '00:30', 77 step: '00:30',
trash-ui/src/views/h5/task/dropPointinfo.vue
  View file @f7be3b8
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form ref="form" :model="infoData" label-width="128px"> 3 + <el-form ref="form" :model="infoData" label-width="148px">
4 4
5 <el-form-item label="投放点编号" prop="dropPointNo"> 5 <el-form-item label="投放点编号" prop="dropPointNo">
6 <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/> 6 <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 <el-form-item label="投放时间" prop="dropTime"> 60 <el-form-item label="投放时间" prop="dropTime">
61 <el-time-select 61 <el-time-select
62 v-model="infoData.dropTime[0]" 62 v-model="infoData.dropTime[0]"
63 - style="width: 100%" 63 + style="width: 50%"
64 :picker-options="{ 64 :picker-options="{
65 start: '00:00', 65 start: '00:00',
66 step: '00:30', 66 step: '00:30',
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 </el-time-select> 71 </el-time-select>
72 <el-time-select 72 <el-time-select
73 v-model="infoData.dropTime[1]" 73 v-model="infoData.dropTime[1]"
74 - style="width: 100%" 74 + style="width: 50%"
75 :picker-options="{ 75 :picker-options="{
76 start: '00:00', 76 start: '00:00',
77 step: '00:30', 77 step: '00:30',
trash-ui/src/views/unit/dropPointInfo/index.vue
  View file @f7be3b8
@@ -148,7 +148,7 @@ @@ -148,7 +148,7 @@
148 148
149 <!-- 添加或修改投放点信息管理对话框 --> 149 <!-- 添加或修改投放点信息管理对话框 -->
150 <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> 150 <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
151 - <el-form ref="form" :model="form" :rules="rules" label-width="128px"> 151 + <el-form ref="form" :model="form" :rules="rules" label-width="148px">
152 152
153 <el-form-item label="投放点编号" prop="dropPointNo"> 153 <el-form-item label="投放点编号" prop="dropPointNo">
154 <el-input v-model="form.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/> 154 <el-input v-model="form.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
@@ -423,8 +423,9 @@ export default { @@ -423,8 +423,9 @@ export default {
423 this.$message.error("获取区域列表失败"); 423 this.$message.error("获取区域列表失败");
424 return; 424 return;
425 } 425 }
426 - let data = response.filter(data => data.code === "430100");  
427 - this.areas = data[0].items; 426 + let data = response.filter(data => data.code === "430100" && data.code !== "430182" && data.code !== "430183" && data.code !== "430681"&& data.code !== "430624");
  427 + // console.log(data)
  428 + this.areas = data[0].items.filter(data => data.code !== "430182" && data.code !== "430183" && data.code !== "430681"&& data.code !== "430624");
428 console.log(this.areas) 429 console.log(this.areas)
429 // for (let dataKey in data) { 430 // for (let dataKey in data) {
430 // if(data[dataKey].parentCode === '430100'){ 431 // if(data[dataKey].parentCode === '430100'){