朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 90048340df870ba9a3085aa0ea56ca30cc8effc1 2 个父辈 f2cb7629 91b0bc44

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 7 个修改的文件 包含 396 行增加 和 245 行删除
@@ -80,8 +80,7 @@ @@ -80,8 +80,7 @@
80 </el-table-column> 80 </el-table-column>
81 <el-table-column 81 <el-table-column
82 prop="totallocation" 82 prop="totallocation"
83 - label="占用库位"  
84 - width="120"> 83 + label="占用库位">
85 </el-table-column> 84 </el-table-column>
86 <!-- <el-table-column--> 85 <!-- <el-table-column-->
87 <!-- prop="xstart"--> 86 <!-- prop="xstart"-->
@@ -140,32 +139,53 @@ @@ -140,32 +139,53 @@
140 <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="80%" > 139 <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="80%" >
141 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px"> 140 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
142 <el-row> 141 <el-row>
143 - <el-col :span="7"> 142 + <el-col :span="12">
144 <el-form-item label="" :label-width="formLabelWidth" prop="houseid"> 143 <el-form-item label="" :label-width="formLabelWidth" prop="houseid">
145 - <!-- <el-input v-model="addForm.houseid" autocomplete="off" size="small" style="width: 300px">-->  
146 - <!-- <template slot="prepend">所属仓库</template>-->  
147 - <!-- </el-input>-->  
148 - <el-select v-model="addForm.houseid"  
149 - filterable  
150 - allow-create  
151 - default-first-option  
152 - remote size="small"  
153 - :remote-method="getHouseid"  
154 - :loading="loading" placeholder="请输入所属仓库" style="width: 300px">  
155 - <el-option  
156 - v-for="item in houseids"  
157 - :key="item.houseid"  
158 - :label="item.housename"  
159 - :value="item.houseid">  
160 - <span style="float: left">{{ item.housename }}</span>  
161 - <span style="float: right; color: #8492a6; font-size: 13px">{{ item.houseid }}</span>  
162 - </el-option>  
163 - </el-select> 144 + <div class="my-text-area">
  145 + <div class="el-input-group__prepend prepand">所属仓库</div>
  146 + <el-select v-model="addForm.houseid" v-if="this.dis === 'create'"
  147 + filterable
  148 + allow-create
  149 + default-first-option
  150 + remote size="small"
  151 + :remote-method="getHouseid"
  152 + :loading="loading" placeholder="请输入所属仓库" style="width: 210px">
  153 + <el-option
  154 + v-for="item in houseids"
  155 + :key="item.houseid"
  156 + :label="item.housename"
  157 + :value="item.houseid">
  158 + <span style="float: left">{{ item.housename }}</span>
  159 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.houseid }}</span>
  160 + </el-option>
  161 + </el-select>
  162 + <el-select v-model="addForm.houseid" v-else disabled
  163 + filterable
  164 + allow-create
  165 + default-first-option
  166 + remote size="small"
  167 + :remote-method="getHouseid"
  168 + :loading="loading" placeholder="请输入所属仓库" style="width: 210px">
  169 + <el-option
  170 + v-for="item in houseids"
  171 + :key="item.houseid"
  172 + :label="item.housename"
  173 + :value="item.houseid">
  174 + <span style="float: left">{{ item.housename }}</span>
  175 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.houseid }}</span>
  176 + </el-option>
  177 + </el-select>
  178 + </div>
164 </el-form-item> 179 </el-form-item>
165 </el-col> 180 </el-col>
166 - <el-col :span="8"> 181 + </el-row>
  182 + <el-row>
  183 + <el-col :span="7">
167 <el-form-item label="" :label-width="formLabelWidth" prop="areano"> 184 <el-form-item label="" :label-width="formLabelWidth" prop="areano">
168 - <el-input v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px"> 185 + <el-input v-if="this.dis === 'create'" v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px">
  186 + <template slot="prepend">库区编号</template>
  187 + </el-input>
  188 + <el-input v-else disabled v-model="addForm.areano" autocomplete="off" size="small" style="width: 300px">
169 <template slot="prepend">库区编号</template> 189 <template slot="prepend">库区编号</template>
170 </el-input> 190 </el-input>
171 </el-form-item> 191 </el-form-item>
@@ -177,7 +197,13 @@ @@ -177,7 +197,13 @@
177 </el-input> 197 </el-input>
178 </el-form-item> 198 </el-form-item>
179 </el-col> 199 </el-col>
180 - 200 + <el-col :span="8">
  201 + <el-form-item label="" :label-width="formLabelWidth" prop="totallocation">
  202 + <el-input v-model="addForm.totallocation" autocomplete="off" size="small" style="width: 300px">
  203 + <template slot="prepend">占用库位</template>
  204 + </el-input>
  205 + </el-form-item>
  206 + </el-col>
181 </el-row> 207 </el-row>
182 <el-row> 208 <el-row>
183 <el-col :span="7"> 209 <el-col :span="7">
@@ -227,13 +253,6 @@ @@ -227,13 +253,6 @@
227 </el-row> 253 </el-row>
228 <el-row> 254 <el-row>
229 <el-col :span="7"> 255 <el-col :span="7">
230 - <el-form-item label="" :label-width="formLabelWidth" prop="totallocation">  
231 - <el-input v-model="addForm.totallocation" autocomplete="off" size="small" style="width: 300px">  
232 - <template slot="prepend">占用库位</template>  
233 - </el-input>  
234 - </el-form-item>  
235 - </el-col>  
236 - <el-col :span="8">  
237 <el-form-item label="" :label-width="formLabelWidth" prop="xstart"> 256 <el-form-item label="" :label-width="formLabelWidth" prop="xstart">
238 <el-input v-model="addForm.xstart" autocomplete="off" size="small" style="width: 300px"> 257 <el-input v-model="addForm.xstart" autocomplete="off" size="small" style="width: 300px">
239 <template slot="prepend">库区X起始位</template> 258 <template slot="prepend">库区X起始位</template>
@@ -247,16 +266,16 @@ @@ -247,16 +266,16 @@
247 </el-input> 266 </el-input>
248 </el-form-item> 267 </el-form-item>
249 </el-col> 268 </el-col>
250 - </el-row>  
251 - <el-row>  
252 - <el-col :span="7"> 269 + <el-col :span="8">
253 <el-form-item label="" :label-width="formLabelWidth" prop="ystart"> 270 <el-form-item label="" :label-width="formLabelWidth" prop="ystart">
254 <el-input v-model="addForm.ystart" autocomplete="off" size="small" style="width: 300px"> 271 <el-input v-model="addForm.ystart" autocomplete="off" size="small" style="width: 300px">
255 <template slot="prepend">库区Y起始位</template> 272 <template slot="prepend">库区Y起始位</template>
256 </el-input> 273 </el-input>
257 </el-form-item> 274 </el-form-item>
258 </el-col> 275 </el-col>
259 - <el-col :span="8"> 276 + </el-row>
  277 + <el-row>
  278 + <el-col :span="7">
260 <el-form-item label="" :label-width="formLabelWidth" prop="yend"> 279 <el-form-item label="" :label-width="formLabelWidth" prop="yend">
261 <el-input v-model="addForm.yend" autocomplete="off" size="small" style="width: 300px"> 280 <el-input v-model="addForm.yend" autocomplete="off" size="small" style="width: 300px">
262 <template slot="prepend">库区Y结束位</template> 281 <template slot="prepend">库区Y结束位</template>
@@ -270,9 +289,7 @@ @@ -270,9 +289,7 @@
270 </el-input> 289 </el-input>
271 </el-form-item> 290 </el-form-item>
272 </el-col> 291 </el-col>
273 - </el-row>  
274 - <el-row>  
275 - <el-col :span="7"> 292 + <el-col :span="8">
276 <el-form-item label="" :label-width="formLabelWidth" prop="zend"> 293 <el-form-item label="" :label-width="formLabelWidth" prop="zend">
277 <el-input v-model="addForm.zend" autocomplete="off" size="small" style="width: 300px"> 294 <el-input v-model="addForm.zend" autocomplete="off" size="small" style="width: 300px">
278 <template slot="prepend">库区Z结束位</template> 295 <template slot="prepend">库区Z结束位</template>
@@ -322,6 +339,7 @@ @@ -322,6 +339,7 @@
322 create: '新增' 339 create: '新增'
323 }, 340 },
324 dialogApply: 'create', 341 dialogApply: 'create',
  342 + dis: undefined,
325 apply_dialog: { 343 apply_dialog: {
326 // 添加对话框 344 // 添加对话框
327 addDialog: false, 345 addDialog: false,
@@ -445,6 +463,7 @@ @@ -445,6 +463,7 @@
445 remark4:'', 463 remark4:'',
446 }; 464 };
447 this.dialogApply= 'create'; 465 this.dialogApply= 'create';
  466 + this.dis= 'create';
448 this.apply_dialog.addDialog = true; 467 this.apply_dialog.addDialog = true;
449 }, 468 },
450 // 添加功能 469 // 添加功能
@@ -473,6 +492,7 @@ @@ -473,6 +492,7 @@
473 applyEdit(row) { 492 applyEdit(row) {
474 this.apply_dialog.addDialog = true; 493 this.apply_dialog.addDialog = true;
475 this.dialogApply = 'update'; 494 this.dialogApply = 'update';
  495 + this.dis= 'update';
476 this.addForm=row; 496 this.addForm=row;
477 }, 497 },
478 // 编辑功能 498 // 编辑功能
@@ -547,5 +567,20 @@ @@ -547,5 +567,20 @@
547 padding: 15px 0 0 20px; 567 padding: 15px 0 0 20px;
548 box-shadow: 0px 5px 5px #e5e8eb; 568 box-shadow: 0px 5px 5px #e5e8eb;
549 } 569 }
  570 + .my-text-area .prepand{
  571 + float: left;
  572 + width:89px;
  573 + height: 28px;
  574 + font-size: 12px;
  575 + line-height: 28px;
  576 + }
  577 +</style>
  578 +<style>
  579 + .my-text-area .el-textarea__inner{
  580 + min-height: 28px;
  581 + height: 28px;
  582 + border-bottom-left-radius: 0;
  583 + border-top-left-radius: 0;
  584 + }
550 </style> 585 </style>
551 586
@@ -132,7 +132,10 @@ @@ -132,7 +132,10 @@
132 <el-row> 132 <el-row>
133 <el-col :span="9"> 133 <el-col :span="9">
134 <el-form-item label="" :label-width="formLabelWidth" prop="houseid"> 134 <el-form-item label="" :label-width="formLabelWidth" prop="houseid">
135 - <el-input v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px"> 135 + <el-input v-if="this.dis === 'create'" v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px">
  136 + <template slot="prepend">仓库编号</template>
  137 + </el-input>
  138 + <el-input v-else disabled v-model="addForm.houseid" autocomplete="off" size="small" style="width: 260px">
136 <template slot="prepend">仓库编号</template> 139 <template slot="prepend">仓库编号</template>
137 </el-input> 140 </el-input>
138 </el-form-item> 141 </el-form-item>
@@ -171,23 +174,23 @@ @@ -171,23 +174,23 @@
171 </el-col> 174 </el-col>
172 <el-col :span="12"> 175 <el-col :span="12">
173 <el-form-item label="" :label-width="formLabelWidth" prop="stationid"> 176 <el-form-item label="" :label-width="formLabelWidth" prop="stationid">
174 -<!-- <el-input v-model="addForm.stationid" autocomplete="off" size="small" style="width: 260px">-->  
175 -<!-- <template slot="prepend">场站&emsp;id</template>-->  
176 -<!-- </el-input>-->  
177 - <el-select v-model="addForm.stationid"  
178 - filterable  
179 - allow-create  
180 - default-first-option  
181 - remote autocomplete="off" size="small"  
182 - :remote-method="getStationno"  
183 - :loading="loading" placeholder="请输入场站id" style="width: 260px">  
184 - <el-option  
185 - v-for="item in stationids"  
186 - :key="item.stationno"  
187 - :label="item.stationno"  
188 - :value="item.stationno">  
189 - </el-option>  
190 - </el-select> 177 + <div class="my-text-area">
  178 + <div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div>
  179 + <el-select v-model="addForm.stationid"
  180 + filterable
  181 + allow-create
  182 + default-first-option
  183 + remote autocomplete="off" size="small"
  184 + :remote-method="getStationno"
  185 + :loading="loading" placeholder="请输入场站id" style="width: 170px">
  186 + <el-option
  187 + v-for="item in stationids"
  188 + :key="item.stationno"
  189 + :label="item.stationno"
  190 + :value="item.stationno">
  191 + </el-option>
  192 + </el-select>
  193 + </div>
191 </el-form-item> 194 </el-form-item>
192 </el-col> 195 </el-col>
193 </el-row> 196 </el-row>
@@ -233,10 +236,13 @@ @@ -233,10 +236,13 @@
233 </el-col> 236 </el-col>
234 <el-col :span="12"> 237 <el-col :span="12">
235 <el-form-item label="" :label-width="formLabelWidth" prop="ismeta"> 238 <el-form-item label="" :label-width="formLabelWidth" prop="ismeta">
236 - <el-select v-model="addForm.ismeta" placeholder="请选择是否虚拟仓库" size="mini" style="width: 260px">  
237 - <el-option label="否" value="0"></el-option>  
238 - <el-option label="是" value="1"></el-option>  
239 - </el-select> 239 + <div class="my-text-area">
  240 + <div class="el-input-group__prepend prepand">虚拟仓库</div>
  241 + <el-select v-model="addForm.ismeta" placeholder="请选择是否虚拟仓库" size="small" style="width: 170px">
  242 + <el-option label="否" value="0"></el-option>
  243 + <el-option label="是" value="1"></el-option>
  244 + </el-select>
  245 + </div>
240 </el-form-item> 246 </el-form-item>
241 </el-col> 247 </el-col>
242 </el-row> 248 </el-row>
@@ -288,6 +294,7 @@ @@ -288,6 +294,7 @@
288 update: '编辑', 294 update: '编辑',
289 create: '新增' 295 create: '新增'
290 }, 296 },
  297 + dis: undefined,
291 dialogApply: 'create', 298 dialogApply: 'create',
292 apply_dialog: { 299 apply_dialog: {
293 // 添加对话框 300 // 添加对话框
@@ -405,6 +412,7 @@ @@ -405,6 +412,7 @@
405 remark3:'' 412 remark3:''
406 }; 413 };
407 this.dialogApply= 'create'; 414 this.dialogApply= 'create';
  415 + this.dis= 'create';
408 this.apply_dialog.addDialog = true; 416 this.apply_dialog.addDialog = true;
409 }, 417 },
410 // 添加功能 418 // 添加功能
@@ -433,6 +441,7 @@ @@ -433,6 +441,7 @@
433 applyEdit(row) { 441 applyEdit(row) {
434 this.apply_dialog.addDialog = true; 442 this.apply_dialog.addDialog = true;
435 this.dialogApply = 'update'; 443 this.dialogApply = 'update';
  444 + this.dis= 'update';
436 this.addForm=row; 445 this.addForm=row;
437 }, 446 },
438 // 编辑功能 447 // 编辑功能
@@ -504,4 +513,19 @@ @@ -504,4 +513,19 @@
504 padding: 15px 0 0 20px; 513 padding: 15px 0 0 20px;
505 box-shadow: 0px 5px 5px #e5e8eb; 514 box-shadow: 0px 5px 5px #e5e8eb;
506 } 515 }
  516 + .my-text-area .prepand{
  517 + float: left;
  518 + width:89px;
  519 + height: 28px;
  520 + font-size: 12px;
  521 + line-height: 28px;
  522 + }
  523 +</style>
  524 +<style>
  525 + .my-text-area .el-textarea__inner{
  526 + min-height: 28px;
  527 + height: 28px;
  528 + border-bottom-left-radius: 0;
  529 + border-top-left-radius: 0;
  530 + }
507 </style> 531 </style>
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <el-row> 7 <el-row>
8 <el-col :span="6"> 8 <el-col :span="6">
9 <el-form-item label=" " :label-width="formLabelWidth" prop="serialnumber"> 9 <el-form-item label=" " :label-width="formLabelWidth" prop="serialnumber">
10 - <el-input v-model="addForm.serialnumber" autocomplete="off" disabled> 10 + <el-input v-model="addForm.serialnumber" autocomplete="off" suffix-icon="el-icon-files" disabled>
11 <template slot="prepend">流&emsp;&emsp;水</template> 11 <template slot="prepend">流&emsp;&emsp;水</template>
12 </el-input> 12 </el-input>
13 </el-form-item> 13 </el-form-item>
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 </el-col> 106 </el-col>
107 <el-col :span="6"> 107 <el-col :span="6">
108 <el-form-item label=" " :label-width="formLabelWidth" prop="transcar"> 108 <el-form-item label=" " :label-width="formLabelWidth" prop="transcar">
109 - <el-input v-model="addForm.transcar" autocomplete="off"> 109 + <el-input v-model="addForm.transcar" autocomplete="off" suffix-icon="el-icon-files" >
110 <template slot="prepend">运输车辆</template> 110 <template slot="prepend">运输车辆</template>
111 </el-input> 111 </el-input>
112 </el-form-item> 112 </el-form-item>
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 </el-col> 133 </el-col>
134 <el-col :span="6"> 134 <el-col :span="6">
135 <el-form-item label=" " :label-width="formLabelWidth" prop="opter"> 135 <el-form-item label=" " :label-width="formLabelWidth" prop="opter">
136 - <el-input v-model="addForm.opter" autocomplete="off" disabled> 136 + <el-input v-model="addForm.opter" autocomplete="off" disabled suffix-icon="el-icon-files">
137 <template slot="prepend">经&nbsp;办&nbsp;人</template> 137 <template slot="prepend">经&nbsp;办&nbsp;人</template>
138 </el-input> 138 </el-input>
139 </el-form-item> 139 </el-form-item>
@@ -175,47 +175,49 @@ @@ -175,47 +175,49 @@
175 --> 175 -->
176 <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider> 176 <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>
177 <el-row> 177 <el-row>
178 - <el-col :span="7">  
179 - <el-form-item label="" :label-width="formLabelWidth" prop="transtype">  
180 - <!-- <el-input v-model="addForm.transtype" autocomplete="off" style="width: 300px">-->  
181 - <!-- <template slot="prepend">交易类型</template>-->  
182 - <!-- </el-input>-->  
183 - <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" style="width: 300px">  
184 - <el-option  
185 - v-for="item in options1"  
186 - :key="item.value"  
187 - :label="item.label"  
188 - :value="item.value">  
189 - </el-option>  
190 - </el-select> 178 + <el-col :span="6">
  179 + <el-form-item label=" " :label-width="formLabelWidth" prop="transtype">
  180 + <div class="my-text-area">
  181 + <div class="el-input-group__prepend prepand">交易类型</div>
  182 + <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">
  183 + <el-option
  184 + v-for="item in options1"
  185 + :key="item.value"
  186 + :label="item.label"
  187 + :value="item.value">
  188 + </el-option>
  189 + </el-select>
  190 + </div>
191 </el-form-item> 191 </el-form-item>
192 </el-col> 192 </el-col>
193 - <el-col :span="7">  
194 - <el-form-item label="" :label-width="formLabelWidth" prop="goodstype">  
195 - <!-- <el-input v-model="addForm.goodstype" autocomplete="off" style="width: 300px">-->  
196 - <!-- <template slot="prepend">出入库货物类型</template>-->  
197 - <!-- </el-input>-->  
198 - <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" style="width: 300px">  
199 - <el-option  
200 - v-for="item in options"  
201 - :key="item.value"  
202 - :label="item.label"  
203 - :value="item.value">  
204 - </el-option>  
205 - </el-select> 193 + <el-col :span="6">
  194 + <el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">
  195 + <div class="my-text-area">
  196 + <div class="el-input-group__prepend prepand">交易类型</div>
  197 + <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">
  198 + <el-option
  199 + v-for="item in options"
  200 + :key="item.value"
  201 + :label="item.label"
  202 + :value="item.value">
  203 + </el-option>
  204 + </el-select>
  205 + </div>
206 </el-form-item> 206 </el-form-item>
207 </el-col> 207 </el-col>
208 <el-col :span="8"> 208 <el-col :span="8">
209 - <el-form-item label="" :label-width="formLabelWidth" prop="ietype">  
210 - <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">  
211 - <el-option label="出入库类型-进" value="I"></el-option>  
212 - <el-option label="出入库类型-出" value="E"></el-option>  
213 - </el-select> 209 + <el-form-item label=" " :label-width="formLabelWidth" prop="ietype">
  210 + <div class="my-text-area">
  211 + <div class="el-input-group__prepend prepand">交易类型</div>
  212 + <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">
  213 + <el-option label="出入库类型-进" value="I"></el-option>
  214 + <el-option label="出入库类型-出" value="E"></el-option>
  215 + </el-select>
  216 + </div>
214 </el-form-item> 217 </el-form-item>
215 </el-col> 218 </el-col>
216 </el-row> 219 </el-row>
217 <el-row> 220 <el-row>
218 -  
219 <el-col :span="8"> 221 <el-col :span="8">
220 <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">--> 222 <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
221 <!-- <el-input v-model="addForm.status" autocomplete="off" style="width: 300px">--> 223 <!-- <el-input v-model="addForm.status" autocomplete="off" style="width: 300px">-->
@@ -254,12 +256,18 @@ @@ -254,12 +256,18 @@
254 </el-row> 256 </el-row>
255 <!-- 搜索区域--> 257 <!-- 搜索区域-->
256 <el-row :gutter="10" class="toolbar"> 258 <el-row :gutter="10" class="toolbar">
257 - <el-col :span="7">  
258 - <el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search" style="width: 280px" 259 + <el-col :span="5.5">
  260 + <el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search"
259 placeholder="货物单号" clearable> 261 placeholder="货物单号" clearable>
260 <template slot="prepend">货物单号</template> 262 <template slot="prepend">货物单号</template>
261 </el-input> 263 </el-input>
262 </el-col> 264 </el-col>
  265 + <el-col :span="5.5" :offset="1">
  266 + <el-input v-model="queryInfo.serialnumber" prefix-icon="el-icon-search"
  267 + placeholder="流水" clearable>
  268 + <template slot="prepend">流&emsp;&emsp;水</template>
  269 + </el-input>
  270 + </el-col>
263 <el-col :span="8"> 271 <el-col :span="8">
264 <el-button type="primary" icon="el-icon-search" @click="getList()"> 272 <el-button type="primary" icon="el-icon-search" @click="getList()">
265 查询 273 查询
@@ -273,36 +281,49 @@ @@ -273,36 +281,49 @@
273 <el-table 281 <el-table
274 :data="tableData" 282 :data="tableData"
275 border 283 border
  284 + @selection-change="trnSelectionChange"
276 :cell-style="{textAlign:'center'}" 285 :cell-style="{textAlign:'center'}"
277 style="border-radius: 10px 10px 0px 0px;line-height: 25px" 286 style="border-radius: 10px 10px 0px 0px;line-height: 25px"
278 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" 287 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
279 > 288 >
  289 + <el-table-column
  290 + type="selection"
  291 + :selectable="checkSelectable"
  292 + fixed="left"
  293 + width="55"
  294 + />
280 <el-table-column 295 <el-table-column
281 fixed 296 fixed
282 prop="waybill" 297 prop="waybill"
283 label="货物单号" 298 label="货物单号"
284 width="120"> 299 width="120">
285 </el-table-column> 300 </el-table-column>
286 - <el-table-column  
287 - prop="vol"  
288 - label="体积"  
289 - width="60">  
290 - </el-table-column> 301 + <el-table-column
  302 + fixed
  303 + prop="serialnumber"
  304 + label="流水号"
  305 + width="120">
  306 + </el-table-column>
  307 + <el-table-column
  308 + prop="pcs"
  309 + label="件数"
  310 + width="60">
  311 + </el-table-column>
291 <el-table-column 312 <el-table-column
292 prop="weight" 313 prop="weight"
293 label="重量" 314 label="重量"
294 width="60"> 315 width="60">
295 </el-table-column> 316 </el-table-column>
296 <el-table-column 317 <el-table-column
297 - prop="pcs"  
298 - label="件数"  
299 - width="60">  
300 - </el-table-column>  
301 - <el-table-column  
302 prop="billweight" 318 prop="billweight"
303 label="计费重量" 319 label="计费重量"
304 width="70"> 320 width="70">
305 </el-table-column> 321 </el-table-column>
  322 + <el-table-column
  323 + prop="vol"
  324 + label="体积"
  325 + width="60">
  326 + </el-table-column>
306 <el-table-column 327 <el-table-column
307 prop="area" 328 prop="area"
308 label="库区" 329 label="库区"
@@ -314,11 +335,6 @@ @@ -314,11 +335,6 @@
314 width="60"> 335 width="60">
315 </el-table-column> 336 </el-table-column>
316 <el-table-column 337 <el-table-column
317 - prop="serialnumber"  
318 - label="流水号"  
319 - width="120">  
320 - </el-table-column>  
321 - <el-table-column  
322 prop="station" 338 prop="station"
323 label="出入库场站" 339 label="出入库场站"
324 width="100"> 340 width="100">
@@ -342,16 +358,16 @@ @@ -342,16 +358,16 @@
342 label="交易类型" 358 label="交易类型"
343 width="100"> 359 width="100">
344 </el-table-column> 360 </el-table-column>
345 - <el-table-column  
346 - prop="custel"  
347 - label="客户联系电话"  
348 - width="140">  
349 - </el-table-column>  
350 - <el-table-column  
351 - prop="customer"  
352 - label="联系人姓名"  
353 - width="100">  
354 - </el-table-column> 361 +<!-- <el-table-column-->
  362 +<!-- prop="custel"-->
  363 +<!-- label="客户联系电话"-->
  364 +<!-- width="140">-->
  365 +<!-- </el-table-column>-->
  366 +<!-- <el-table-column-->
  367 +<!-- prop="customer"-->
  368 +<!-- label="联系人姓名"-->
  369 +<!-- width="100">-->
  370 +<!-- </el-table-column>-->
355 <el-table-column 371 <el-table-column
356 prop="customername" 372 prop="customername"
357 label="客户名称" 373 label="客户名称"
@@ -432,6 +448,7 @@ @@ -432,6 +448,7 @@
432 return { 448 return {
433 queryInfo: { 449 queryInfo: {
434 waybill:'', 450 waybill:'',
  451 + serialnumber:'',
435 // 当前页数 452 // 当前页数
436 pageNum: 1, 453 pageNum: 1,
437 // 每页大小 454 // 每页大小
@@ -287,23 +287,24 @@ @@ -287,23 +287,24 @@
287 </el-col> 287 </el-col>
288 <el-col :span="8"> 288 <el-col :span="8">
289 <el-form-item label="" :label-width="formLabelWidth" prop="ietype"> 289 <el-form-item label="" :label-width="formLabelWidth" prop="ietype">
290 - <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">  
291 - <el-option label="出入库类型-进" value="I"></el-option>  
292 - <el-option label="出入库类型-出" value="E"></el-option>  
293 - </el-select> 290 + <div class="my-text-area">
  291 + <div class="el-input-group__prepend prepand">出入库类型</div>
  292 + <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 210px">
  293 + <el-option label="出入库类型-进" value="I"></el-option>
  294 + <el-option label="出入库类型-出" value="E"></el-option>
  295 + </el-select>
  296 + </div>
294 </el-form-item> 297 </el-form-item>
295 </el-col> 298 </el-col>
296 <el-col :span="8"> 299 <el-col :span="8">
297 - <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->  
298 - <!-- <el-input v-model="addForm.status" autocomplete="off" size="small" style="width: 300px">-->  
299 - <!-- <template slot="prepend">状&emsp;&emsp;态</template>-->  
300 - <!-- </el-input>-->  
301 - <!-- </el-form-item>-->  
302 <el-form-item label="" :label-width="formLabelWidth" prop="status"> 300 <el-form-item label="" :label-width="formLabelWidth" prop="status">
303 - <el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 300px">  
304 - <el-option label="状态-失败" value="0"></el-option>  
305 - <el-option label="状态-成功" value="1"></el-option>  
306 - </el-select> 301 + <div class="my-text-area">
  302 + <div class="el-input-group__prepend prepand">请选择状态</div>
  303 + <el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 210px">
  304 + <el-option label="状态-失败" value="0"></el-option>
  305 + <el-option label="状态-成功" value="1"></el-option>
  306 + </el-select>
  307 + </div>
307 </el-form-item> 308 </el-form-item>
308 </el-col> 309 </el-col>
309 </el-row> 310 </el-row>
@@ -563,6 +564,21 @@ @@ -563,6 +564,21 @@
563 padding: 15px 0 0 20px; 564 padding: 15px 0 0 20px;
564 box-shadow: 0px 5px 5px #e5e8eb; 565 box-shadow: 0px 5px 5px #e5e8eb;
565 } 566 }
  567 + .my-text-area .prepand{
  568 + float: left;
  569 + width:89px;
  570 + height: 28px;
  571 + font-size: 12px;
  572 + line-height: 28px;
  573 + }
  574 +</style>
  575 +<style>
  576 + .my-text-area .el-textarea__inner{
  577 + min-height: 28px;
  578 + height: 28px;
  579 + border-bottom-left-radius: 0;
  580 + border-top-left-radius: 0;
  581 + }
566 </style> 582 </style>
567 583
568 584
@@ -224,17 +224,17 @@ @@ -224,17 +224,17 @@
224 </el-col> 224 </el-col>
225 <el-col :span="8"> 225 <el-col :span="8">
226 <el-form-item label="" :label-width="formLabelWidth" prop="transtype"> 226 <el-form-item label="" :label-width="formLabelWidth" prop="transtype">
227 -<!-- <el-input v-model="addForm.transtype" autocomplete="off" size="small" style="width: 300px">-->  
228 -<!-- <template slot="prepend">交易类型</template>-->  
229 -<!-- </el-input>-->  
230 - <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" size="small" style="width: 300px">  
231 - <el-option  
232 - v-for="item in options1"  
233 - :key="item.value"  
234 - :label="item.label"  
235 - :value="item.value">  
236 - </el-option>  
237 - </el-select> 227 + <div class="my-text-area">
  228 + <div class="el-input-group__prepend prepand">交易类型</div>
  229 + <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" size="small" style="width: 210px">
  230 + <el-option
  231 + v-for="item in options1"
  232 + :key="item.value"
  233 + :label="item.label"
  234 + :value="item.value">
  235 + </el-option>
  236 + </el-select>
  237 + </div>
238 </el-form-item> 238 </el-form-item>
239 </el-col> 239 </el-col>
240 </el-row> 240 </el-row>
@@ -248,17 +248,17 @@ @@ -248,17 +248,17 @@
248 </el-col> 248 </el-col>
249 <el-col :span="8"> 249 <el-col :span="8">
250 <el-form-item label="" :label-width="formLabelWidth" prop="opttime"> 250 <el-form-item label="" :label-width="formLabelWidth" prop="opttime">
251 -<!-- <el-input v-model="addForm.opttime" autocomplete="off" size="small" style="width: 300px">-->  
252 -<!-- <template slot="prepend">出入库时间</template>-->  
253 -<!-- </el-input>-->  
254 - <el-date-picker  
255 - v-model="addForm.opttime"  
256 - type="datetime" size="mini"  
257 - value-format="yyyy-MM-dd HH:mm:ss"  
258 - format="yyyy-MM-dd HH:mm:ss"  
259 - style="width:300px"  
260 - placeholder="选择出入库时间">  
261 - </el-date-picker> 251 + <div class="my-text-area">
  252 + <div class="el-input-group__prepend prepand">交易类型</div>
  253 + <el-date-picker
  254 + v-model="addForm.opttime"
  255 + type="datetime" size="mini"
  256 + value-format="yyyy-MM-dd HH:mm:ss"
  257 + format="yyyy-MM-dd HH:mm:ss"
  258 + style="width:210px"
  259 + placeholder="选择出入库时间">
  260 + </el-date-picker>
  261 + </div>
262 </el-form-item> 262 </el-form-item>
263 </el-col> 263 </el-col>
264 264
@@ -272,6 +272,45 @@ @@ -272,6 +272,45 @@
272 </el-row> 272 </el-row>
273 <el-row> 273 <el-row>
274 <el-col :span="7"> 274 <el-col :span="7">
  275 + <el-form-item label="" :label-width="formLabelWidth" prop="goodstype">
  276 + <div class="my-text-area">
  277 + <div class="el-input-group__prepend prepand">交易类型</div>
  278 + <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" size="small" style="width: 170px">
  279 + <el-option
  280 + v-for="item in options"
  281 + :key="item.value"
  282 + :label="item.label"
  283 + :value="item.value">
  284 + </el-option>
  285 + </el-select>
  286 + </div>
  287 + </el-form-item>
  288 + </el-col>
  289 + <el-col :span="8">
  290 + <el-form-item label="" :label-width="formLabelWidth" prop="ietype">
  291 + <div class="my-text-area">
  292 + <div class="el-input-group__prepend prepand">出入库类型</div>
  293 + <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 210px">
  294 + <el-option label="出入库类型-进" value="I"></el-option>
  295 + <el-option label="出入库类型-出" value="E"></el-option>
  296 + </el-select>
  297 + </div>
  298 + </el-form-item>
  299 + </el-col>
  300 + <el-col :span="8">
  301 + <el-form-item label="" :label-width="formLabelWidth" prop="status">
  302 + <div class="my-text-area">
  303 + <div class="el-input-group__prepend prepand">状&emsp;&emsp;态</div>
  304 + <el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 210px">
  305 + <el-option label="状态-失败" value="0"></el-option>
  306 + <el-option label="状态-成功" value="1"></el-option>
  307 + </el-select>
  308 + </div>
  309 + </el-form-item>
  310 + </el-col>
  311 + </el-row>
  312 + <el-row>
  313 + <el-col :span="7">
275 <el-form-item label="" :label-width="formLabelWidth" prop="transcar"> 314 <el-form-item label="" :label-width="formLabelWidth" prop="transcar">
276 <el-input v-model="addForm.transcar" autocomplete="off" size="small" style="width: 300px"> 315 <el-input v-model="addForm.transcar" autocomplete="off" size="small" style="width: 300px">
277 <template slot="prepend">运输车辆信息</template> 316 <template slot="prepend">运输车辆信息</template>
@@ -295,44 +334,6 @@ @@ -295,44 +334,6 @@
295 </el-row> 334 </el-row>
296 <el-row> 335 <el-row>
297 <el-col :span="7"> 336 <el-col :span="7">
298 - <el-form-item label="" :label-width="formLabelWidth" prop="goodstype">  
299 - <!-- <el-input v-model="addForm.goodstype" autocomplete="off" size="small" style="width: 300px">-->  
300 - <!-- <template slot="prepend">出入库货物类型</template>-->  
301 - <!-- </el-input>-->  
302 - <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" size="small" style="width: 300px">  
303 - <el-option  
304 - v-for="item in options"  
305 - :key="item.value"  
306 - :label="item.label"  
307 - :value="item.value">  
308 - </el-option>  
309 - </el-select>  
310 - </el-form-item>  
311 - </el-col>  
312 - <el-col :span="8">  
313 - <el-form-item label="" :label-width="formLabelWidth" prop="ietype">  
314 - <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">  
315 - <el-option label="出入库类型-进" value="I"></el-option>  
316 - <el-option label="出入库类型-出" value="E"></el-option>  
317 - </el-select>  
318 - </el-form-item>  
319 - </el-col>  
320 - <el-col :span="8">  
321 - <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->  
322 - <!-- <el-input v-model="addForm.status" autocomplete="off" size="small" style="width: 300px">-->  
323 - <!-- <template slot="prepend">状&emsp;&emsp;态</template>-->  
324 - <!-- </el-input>-->  
325 - <!-- </el-form-item>-->  
326 - <el-form-item label="" :label-width="formLabelWidth" prop="status">  
327 - <el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 300px">  
328 - <el-option label="状态-失败" value="0"></el-option>  
329 - <el-option label="状态-成功" value="1"></el-option>  
330 - </el-select>  
331 - </el-form-item>  
332 - </el-col>  
333 - </el-row>  
334 - <el-row>  
335 - <el-col :span="7">  
336 <el-form-item label="" :label-width="formLabelWidth" prop="custel"> 337 <el-form-item label="" :label-width="formLabelWidth" prop="custel">
337 <el-input v-model="addForm.custel" autocomplete="off" size="small" style="width: 300px"> 338 <el-input v-model="addForm.custel" autocomplete="off" size="small" style="width: 300px">
338 <template slot="prepend">出入库客户联系电话</template> 339 <template slot="prepend">出入库客户联系电话</template>
@@ -351,6 +352,7 @@ @@ -351,6 +352,7 @@
351 <div slot="footer" class="dialog-footer"> 352 <div slot="footer" class="dialog-footer">
352 <el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button> 353 <el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button>
353 <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button> 354 <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button>
  355 + <el-button type="primary" @click="zancun()" size="small">暂存</el-button>
354 </div> 356 </div>
355 </el-dialog> 357 </el-dialog>
356 </el-row> 358 </el-row>
@@ -433,6 +435,7 @@ @@ -433,6 +435,7 @@
433 value: '销售入库', 435 value: '销售入库',
434 label: '交易类型-销售入库' 436 label: '交易类型-销售入库'
435 }], 437 }],
  438 + zancundata:[],
436 formLabelWidth: '80px', 439 formLabelWidth: '80px',
437 rules: { 440 rules: {
438 userName: [ 441 userName: [
@@ -456,6 +459,10 @@ @@ -456,6 +459,10 @@
456 } 459 }
457 }, 460 },
458 methods: { 461 methods: {
  462 + zancun(){
  463 + this.zancundata.push(this.addForm);
  464 + console.log(this.zancundata)
  465 + },
459 handleSizeChange(val) { 466 handleSizeChange(val) {
460 this.queryInfo.pageSize = val 467 this.queryInfo.pageSize = val
461 this.getList() 468 this.getList()
@@ -607,5 +614,20 @@ @@ -607,5 +614,20 @@
607 padding: 15px 0 0 20px; 614 padding: 15px 0 0 20px;
608 box-shadow: 0px 5px 5px #e5e8eb; 615 box-shadow: 0px 5px 5px #e5e8eb;
609 } 616 }
  617 + .my-text-area .prepand{
  618 + float: left;
  619 + width:89px;
  620 + height: 28px;
  621 + font-size: 12px;
  622 + line-height: 28px;
  623 + }
  624 +</style>
  625 +<style>
  626 + .my-text-area .el-textarea__inner{
  627 + min-height: 28px;
  628 + height: 28px;
  629 + border-bottom-left-radius: 0;
  630 + border-top-left-radius: 0;
  631 + }
610 </style> 632 </style>
611 633
@@ -74,8 +74,7 @@ @@ -74,8 +74,7 @@
74 </el-table-column> 74 </el-table-column>
75 <el-table-column 75 <el-table-column
76 prop="autodist" 76 prop="autodist"
77 - label="库位自动分配"  
78 - width="120"> 77 + label="库位自动分配">
79 </el-table-column> 78 </el-table-column>
80 <el-table-column 79 <el-table-column
81 fixed="right" 80 fixed="right"
@@ -101,12 +100,52 @@ @@ -101,12 +100,52 @@
101 </el-pagination> 100 </el-pagination>
102 </el-row> 101 </el-row>
103 <el-row> 102 <el-row>
104 - <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="70%" > 103 + <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="70%">
105 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px"> 104 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
106 <el-row> 105 <el-row>
  106 + <el-col :span="12">
  107 + <el-form-item label="" :label-width="formLabelWidth" prop="areaid">
  108 + <div class="my-text-area">
  109 + <div class="el-input-group__prepend prepand">所属库区</div>
  110 + <el-select v-model="addForm.areaid" v-if="this.dis === 'create'"
  111 + filterable
  112 + allow-create
  113 + default-first-option
  114 + remote size="small"
  115 + :remote-method="getArea"
  116 + :loading="loading" placeholder="请输入所属库区" style="width: 170px">
  117 + <el-option
  118 + v-for="item in areaids"
  119 + :key="item.areano"
  120 + :label="item.areano"
  121 + :value="item.areano">
  122 + </el-option>
  123 + </el-select>
  124 + <el-select v-model="addForm.areaid" v-else disabled
  125 + filterable
  126 + allow-create
  127 + default-first-option
  128 + remote size="small"
  129 + :remote-method="getArea"
  130 + :loading="loading" placeholder="请输入所属库区" style="width: 170px">
  131 + <el-option
  132 + v-for="item in areaids"
  133 + :key="item.areano"
  134 + :label="item.areano"
  135 + :value="item.areano">
  136 + </el-option>
  137 + </el-select>
  138 + </div>
  139 + </el-form-item>
  140 + </el-col>
  141 + </el-row>
  142 + <el-row>
107 <el-col :span="9"> 143 <el-col :span="9">
108 <el-form-item label="" :label-width="formLabelWidth" prop="locationno"> 144 <el-form-item label="" :label-width="formLabelWidth" prop="locationno">
109 - <el-input v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px"> 145 + <el-input v-if="this.dis === 'create'" v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px">
  146 + <template slot="prepend">库位编号</template>
  147 + </el-input>
  148 + <el-input v-else disabled v-model="addForm.locationno" autocomplete="off" size="small" style="width: 260px">
110 <template slot="prepend">库位编号</template> 149 <template slot="prepend">库位编号</template>
111 </el-input> 150 </el-input>
112 </el-form-item> 151 </el-form-item>
@@ -121,58 +160,37 @@ @@ -121,58 +160,37 @@
121 </el-row> 160 </el-row>
122 <el-row> 161 <el-row>
123 <el-col :span="9"> 162 <el-col :span="9">
124 - <el-form-item label="" :label-width="formLabelWidth" prop="areaid">  
125 -<!-- <el-input v-model="addForm.areaid" autocomplete="off" size="small" style="width: 260px">-->  
126 -<!-- <template slot="prepend">所属库区</template>-->  
127 -<!-- </el-input>-->  
128 - <el-select v-model="addForm.areaid"  
129 - filterable  
130 - allow-create  
131 - default-first-option  
132 - remote size="small"  
133 - :remote-method="getArea"  
134 - :loading="loading" placeholder="请输入所属库区" style="width: 260px">  
135 - <el-option  
136 - v-for="item in areaids"  
137 - :key="item.areano"  
138 - :label="item.areano"  
139 - :value="item.areano">  
140 - </el-option>  
141 - </el-select>  
142 - </el-form-item>  
143 - </el-col>  
144 - <el-col :span="12">  
145 <el-form-item label="" :label-width="formLabelWidth" prop="length"> 163 <el-form-item label="" :label-width="formLabelWidth" prop="length">
146 <el-input v-model="addForm.length" autocomplete="off" size="small" style="width: 260px"> 164 <el-input v-model="addForm.length" autocomplete="off" size="small" style="width: 260px">
147 <template slot="prepend">库位长度</template> 165 <template slot="prepend">库位长度</template>
148 </el-input> 166 </el-input>
149 </el-form-item> 167 </el-form-item>
150 </el-col> 168 </el-col>
151 - </el-row>  
152 - <el-row>  
153 - <el-col :span="9"> 169 + <el-col :span="12">
154 <el-form-item label="" :label-width="formLabelWidth" prop="width"> 170 <el-form-item label="" :label-width="formLabelWidth" prop="width">
155 <el-input v-model="addForm.width" autocomplete="off" size="small" style="width: 260px"> 171 <el-input v-model="addForm.width" autocomplete="off" size="small" style="width: 260px">
156 <template slot="prepend">库位宽度</template> 172 <template slot="prepend">库位宽度</template>
157 </el-input> 173 </el-input>
158 </el-form-item> 174 </el-form-item>
159 </el-col> 175 </el-col>
160 - <el-col :span="12"> 176 + </el-row>
  177 + <el-row>
  178 + <el-col :span="9">
161 <el-form-item label="" :label-width="formLabelWidth" prop="heigth"> 179 <el-form-item label="" :label-width="formLabelWidth" prop="heigth">
162 <el-input v-model="addForm.heigth" autocomplete="off" size="small" style="width: 260px"> 180 <el-input v-model="addForm.heigth" autocomplete="off" size="small" style="width: 260px">
163 <template slot="prepend">库位高度</template> 181 <template slot="prepend">库位高度</template>
164 </el-input> 182 </el-input>
165 </el-form-item> 183 </el-form-item>
166 </el-col> 184 </el-col>
167 - </el-row>  
168 - <el-row>  
169 - <el-col :span="9"> 185 + <el-col :span="12">
170 <el-form-item label="" :label-width="formLabelWidth" prop="area"> 186 <el-form-item label="" :label-width="formLabelWidth" prop="area">
171 <el-input v-model="addForm.area" autocomplete="off" size="small" style="width: 260px"> 187 <el-input v-model="addForm.area" autocomplete="off" size="small" style="width: 260px">
172 <template slot="prepend">库位面积</template> 188 <template slot="prepend">库位面积</template>
173 </el-input> 189 </el-input>
174 </el-form-item> 190 </el-form-item>
175 </el-col> 191 </el-col>
  192 + </el-row>
  193 + <el-row>
176 <el-col :span="9"> 194 <el-col :span="9">
177 <el-form-item label="" :label-width="formLabelWidth" prop="vol"> 195 <el-form-item label="" :label-width="formLabelWidth" prop="vol">
178 <el-input v-model="addForm.vol" autocomplete="off" size="small" style="width: 260px"> 196 <el-input v-model="addForm.vol" autocomplete="off" size="small" style="width: 260px">
@@ -180,16 +198,16 @@ @@ -180,16 +198,16 @@
180 </el-input> 198 </el-input>
181 </el-form-item> 199 </el-form-item>
182 </el-col> 200 </el-col>
183 - </el-row>  
184 - <el-row>  
185 - <el-col :span="9"> 201 + <el-col :span="12">
186 <el-form-item label="" :label-width="formLabelWidth" prop="xyz"> 202 <el-form-item label="" :label-width="formLabelWidth" prop="xyz">
187 <el-input v-model="addForm.xyz" autocomplete="off" size="small" style="width: 260px"> 203 <el-input v-model="addForm.xyz" autocomplete="off" size="small" style="width: 260px">
188 <template slot="prepend">库位xyz</template> 204 <template slot="prepend">库位xyz</template>
189 </el-input> 205 </el-input>
190 </el-form-item> 206 </el-form-item>
191 </el-col> 207 </el-col>
192 - <el-col :span="12"> 208 + </el-row>
  209 + <el-row>
  210 + <el-col :span="9">
193 <el-form-item label="" :label-width="formLabelWidth" prop="autodist"> 211 <el-form-item label="" :label-width="formLabelWidth" prop="autodist">
194 <el-input v-model="addForm.autodist" autocomplete="off" size="small" style="width: 260px"> 212 <el-input v-model="addForm.autodist" autocomplete="off" size="small" style="width: 260px">
195 <template slot="prepend">库位自动分配</template> 213 <template slot="prepend">库位自动分配</template>
@@ -235,6 +253,7 @@ @@ -235,6 +253,7 @@
235 update: '编辑', 253 update: '编辑',
236 create: '新增' 254 create: '新增'
237 }, 255 },
  256 + dis: undefined,
238 dialogApply: 'create', 257 dialogApply: 'create',
239 apply_dialog: { 258 apply_dialog: {
240 // 添加对话框 259 // 添加对话框
@@ -347,6 +366,7 @@ @@ -347,6 +366,7 @@
347 remark4:'', 366 remark4:'',
348 }; 367 };
349 this.dialogApply= 'create'; 368 this.dialogApply= 'create';
  369 + this.dis= 'create';
350 this.apply_dialog.addDialog = true; 370 this.apply_dialog.addDialog = true;
351 }, 371 },
352 // 添加功能 372 // 添加功能
@@ -375,6 +395,7 @@ @@ -375,6 +395,7 @@
375 applyEdit(row) { 395 applyEdit(row) {
376 this.apply_dialog.addDialog = true; 396 this.apply_dialog.addDialog = true;
377 this.dialogApply = 'update'; 397 this.dialogApply = 'update';
  398 + this.dis= 'update';
378 this.addForm=row; 399 this.addForm=row;
379 }, 400 },
380 // 编辑功能 401 // 编辑功能
@@ -440,5 +461,20 @@ @@ -440,5 +461,20 @@
440 padding: 15px 0 0 20px; 461 padding: 15px 0 0 20px;
441 box-shadow: 0px 5px 5px #e5e8eb; 462 box-shadow: 0px 5px 5px #e5e8eb;
442 } 463 }
  464 + .my-text-area .prepand{
  465 + float: left;
  466 + width:89px;
  467 + height: 28px;
  468 + font-size: 12px;
  469 + line-height: 28px;
  470 + }
  471 +</style>
  472 +<style>
  473 + .my-text-area .el-textarea__inner{
  474 + min-height: 28px;
  475 + height: 28px;
  476 + border-bottom-left-radius: 0;
  477 + border-top-left-radius: 0;
  478 + }
443 </style> 479 </style>
444 480
@@ -83,12 +83,15 @@ @@ -83,12 +83,15 @@
83 </el-pagination> 83 </el-pagination>
84 </el-row> 84 </el-row>
85 <el-row> 85 <el-row>
86 - <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="70%" > 86 + <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog" width="70%" >
87 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px"> 87 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
88 <el-row> 88 <el-row>
89 <el-col :span="9"> 89 <el-col :span="9">
90 <el-form-item label="" :label-width="formLabelWidth" prop="stationno"> 90 <el-form-item label="" :label-width="formLabelWidth" prop="stationno">
91 - <el-input v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px"> 91 + <el-input v-if="this.dis === 'create'" v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px">
  92 + <template slot="prepend">场站编号</template>
  93 + </el-input>
  94 + <el-input v-else disabled v-model="addForm.stationno" autocomplete="off" size="small" style="width: 260px">
92 <template slot="prepend">场站编号</template> 95 <template slot="prepend">场站编号</template>
93 </el-input> 96 </el-input>
94 </el-form-item> 97 </el-form-item>
@@ -135,7 +138,7 @@ @@ -135,7 +138,7 @@
135 </el-row> 138 </el-row>
136 </el-form> 139 </el-form>
137 <div slot="footer" class="dialog-footer"> 140 <div slot="footer" class="dialog-footer">
138 - <el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button> 141 + <el-button @click="apply_dialog = false" size="small">取 消</el-button>
139 <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button> 142 <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button>
140 </div> 143 </div>
141 </el-dialog> 144 </el-dialog>
@@ -164,13 +167,9 @@ @@ -164,13 +167,9 @@
164 update: '编辑', 167 update: '编辑',
165 create: '新增' 168 create: '新增'
166 }, 169 },
  170 + dis: undefined,
167 dialogApply: 'create', 171 dialogApply: 'create',
168 - apply_dialog: {  
169 - // 添加对话框  
170 - addDialog: false,  
171 - // 编辑对话框  
172 - editDialog: false  
173 - }, 172 + apply_dialog: false,
174 addForm: { 173 addForm: {
175 stationno: '', 174 stationno: '',
176 stationname: '', 175 stationname: '',
@@ -265,7 +264,8 @@ @@ -265,7 +264,8 @@
265 remark3:'' 264 remark3:''
266 }; 265 };
267 this.dialogApply= 'create'; 266 this.dialogApply= 'create';
268 - this.apply_dialog.addDialog = true; 267 + this.dis= 'create';
  268 + this.apply_dialog = true;
269 }, 269 },
270 // 添加功能 270 // 添加功能
271 add() { 271 add() {
@@ -281,7 +281,7 @@ @@ -281,7 +281,7 @@
281 // 添加，成功 281 // 添加，成功
282 this.$message.success(res.msg); 282 this.$message.success(res.msg);
283 // 隐藏对话框 283 // 隐藏对话框
284 - this.apply_dialog.addDialog = false; 284 + this.apply_dialog = false;
285 // 刷新列表 285 // 刷新列表
286 this.getList(); 286 this.getList();
287 }).catch(error => { 287 }).catch(error => {
@@ -291,8 +291,9 @@ @@ -291,8 +291,9 @@
291 }, 291 },
292 // 打开编辑 292 // 打开编辑
293 applyEdit(row) { 293 applyEdit(row) {
294 - this.apply_dialog.addDialog = true; 294 + this.apply_dialog = true;
295 this.dialogApply = 'update'; 295 this.dialogApply = 'update';
  296 + this.dis= 'update';
296 this.addForm=row; 297 this.addForm=row;
297 }, 298 },
298 // 编辑功能 299 // 编辑功能
@@ -309,7 +310,7 @@ @@ -309,7 +310,7 @@
309 } 310 }
310 this.$message.success(res.msg) 311 this.$message.success(res.msg)
311 // 隐藏对话框 312 // 隐藏对话框
312 - this.apply_dialog.addDialog = false 313 + this.apply_dialog = false
313 // 刷新列表 314 // 刷新列表
314 this.getList() 315 this.getList()
315 }).catch(error => { 316 }).catch(error => {