朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 a0655dddddef1799dc8978547c99aca96ed4f5b1 1 个父辈 5cb0073f

转关运抵界面优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 17 行增加 和 11 行删除
@@ -93,7 +93,9 @@ @@ -93,7 +93,9 @@
93 </el-input> 93 </el-input>
94 </el-form-item> 94 </el-form-item>
95 </el-col> 95 </el-col>
96 - <el-col :span="6"style="margin-top: -28px"> 96 + </el-row>
  97 + <el-row style="margin-top:0">
  98 + <el-col :span="6">
97 <el-form-item> 99 <el-form-item>
98 <div style="display: inline-block;background-color: #6F8294;color: white; 100 <div style="display: inline-block;background-color: #6F8294;color: white;
99 border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px; 101 border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px;
@@ -106,7 +108,7 @@ @@ -106,7 +108,7 @@
106 </el-select> 108 </el-select>
107 </el-form-item> 109 </el-form-item>
108 </el-col> 110 </el-col>
109 - <el-col :span="10" style="margin-top: -28px"> 111 + <el-col :span="10">
110 <el-form-item> 112 <el-form-item>
111 <div style="display: inline-block;background-color: #6F8294;color: white; 113 <div style="display: inline-block;background-color: #6F8294;color: white;
112 border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px; 114 border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px;
@@ -125,7 +127,7 @@ @@ -125,7 +127,7 @@
125 </el-date-picker> 127 </el-date-picker>
126 </el-form-item> 128 </el-form-item>
127 </el-col> 129 </el-col>
128 - <el-col :span="8" style="margin-top: -28px"> 130 + <el-col :span="8" >
129 <el-form-item> 131 <el-form-item>
130 <el-button type="primary" icon="el-icon-search" @click="trnList">查&nbsp;&nbsp;询</el-button> 132 <el-button type="primary" icon="el-icon-search" @click="trnList">查&nbsp;&nbsp;询</el-button>
131 </el-form-item> 133 </el-form-item>
@@ -277,17 +279,17 @@ @@ -277,17 +279,17 @@
277 <el-table-column label="操作" align="center" width="410" fixed="right"> 279 <el-table-column label="操作" align="center" width="410" fixed="right">
278 <template slot-scope="scope"> 280 <template slot-scope="scope">
279 <el-row> 281 <el-row>
280 - <el-button type="success" size="mini" @click="editTrn(scope.$index,scope.row)">编辑</el-button>  
281 - <el-button type="warning" size="mini" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="declareTrn(scope.row)"> 282 + <el-button type="success" @click="editTrn(scope.$index,scope.row)">编辑</el-button>
  283 + <el-button type="warning" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="declareTrn(scope.row)">
282 申报 284 申报
283 </el-button> 285 </el-button>
284 - <el-button type="danger" size="mini" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="delTrn(scope.row)"> 286 + <el-button type="danger" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="delTrn(scope.row)">
285 删除 287 删除
286 </el-button> 288 </el-button>
287 - <el-button type="primary" size="mini" @click="check(scope.row)"> 289 + <el-button type="primary" @click="check(scope.row)">
288 回执明细 290 回执明细
289 </el-button> 291 </el-button>
290 - <el-button type="info" size="mini" @click="statusTrn(scope.row)"> 292 + <el-button type="info" @click="statusTrn(scope.row)">
291 修改状态 293 修改状态
292 </el-button> 294 </el-button>
293 </el-row> 295 </el-row>
@@ -317,7 +319,7 @@ @@ -317,7 +319,7 @@
317 width="85%" 319 width="85%"
318 @close="trn_addDialogClosed" 320 @close="trn_addDialogClosed"
319 > 321 >
320 - <el-form ref="form" :inline="true" :model="form" class="demo-form-inline" label-width="110px" style="margin-top: -20px;" label-position="right" :rules="rules" > 322 + <el-form ref="form" :inline="true" :model="form" class="demo-form-inline" label-width="120px" style="margin-top: -20px;" label-position="right" :rules="rules" >
321 <el-divider></el-divider> 323 <el-divider></el-divider>
322 <el-row> 324 <el-row>
323 <el-col :span="24"> 325 <el-col :span="24">
@@ -487,7 +489,7 @@ @@ -487,7 +489,7 @@
487 489
488 </el-col> 490 </el-col>
489 <el-col :span="8"> 491 <el-col :span="8">
490 - <el-form-item label="到达卸货地时间" prop="arrivetime" label-width="110px"> 492 + <el-form-item label="到达卸货地时间" prop="arrivetime">
491 <!-- <el-input v-model="form.arrivetime" size="mini" placeholder="" />--> 493 <!-- <el-input v-model="form.arrivetime" size="mini" placeholder="" />-->
492 <el-date-picker 494 <el-date-picker
493 v-model="form.arrivetime" 495 v-model="form.arrivetime"
@@ -641,7 +643,7 @@ @@ -641,7 +643,7 @@
641 trnmode:'2', 643 trnmode:'2',
642 notes:'', 644 notes:'',
643 opertype:'A', 645 opertype:'A',
644 - sign:'qwer', 646 + sign:'',
645 signdate:'', 647 signdate:'',
646 clientseqno:'', 648 clientseqno:'',
647 hostid:'', 649 hostid:'',
@@ -820,6 +822,9 @@ @@ -820,6 +822,9 @@
820 this.form.arrivetime = new Date().format('yyyyMMddHHmmss') 822 this.form.arrivetime = new Date().format('yyyyMMddHHmmss')
821 this.form.username = this.username 823 this.form.username = this.username
822 this.form.ieflag = 'E' 824 this.form.ieflag = 'E'
  825 + this.form.trnmode = '2'
  826 + this.form.trafmode= '5'
  827 + this.form.trafway = '5'
823 }, 828 },
824 829
825 // 新增功能 830 // 新增功能
@@ -877,6 +882,7 @@ @@ -877,6 +882,7 @@
877 }, 882 },
878 // 申报 883 // 申报
879 declareTrn(row) { 884 declareTrn(row) {
  885 + row.customResponseText = '已申报'
880 row.opertype= "C" 886 row.opertype= "C"
881 send(row).then((response) => { 887 send(row).then((response) => {
882 const res = response.data 888 const res = response.data