朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 24c20604629c51a784cb142dade1ea6ec1beafef 1 个父辈 a310e0c5

转关运抵新增查看功能

内嵌 并排对比
正在显示 1 个修改的文件 包含 37 行增加 和 32 行删除
@@ -175,6 +175,11 @@ @@ -175,6 +175,11 @@
175 fixed="left" 175 fixed="left"
176 width="55" 176 width="55"
177 /> 177 />
  178 + <el-table-column label="总提运单号" width="140">
  179 + <template slot-scope="scope">
  180 + <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="selectOne(scope.$index, scope.row)">{{ scope.row.billno }}</a>
  181 + </template>
  182 + </el-table-column>
178 <el-table-column label="统一编号" width="150"> 183 <el-table-column label="统一编号" width="150">
179 <template slot-scope="scope"> 184 <template slot-scope="scope">
180 <span>{{ scope.row.seqno }}</span> 185 <span>{{ scope.row.seqno }}</span>
@@ -194,21 +199,16 @@ @@ -194,21 +199,16 @@
194 <!--&lt;!&ndash; <span>{{ scope.row.trnmode }}</span>&ndash;&gt;--> 199 <!--&lt;!&ndash; <span>{{ scope.row.trnmode }}</span>&ndash;&gt;-->
195 <!-- </template>--> 200 <!-- </template>-->
196 <!-- </el-table-column>--> 201 <!-- </el-table-column>-->
197 - <el-table-column label="申报地海关" width="90">  
198 - <template slot-scope="scope">  
199 - <span>{{ scope.row.customscode }}</span>  
200 - </template>  
201 - </el-table-column> 202 +<!-- <el-table-column label="申报地海关" width="90">-->
  203 +<!-- <template slot-scope="scope">-->
  204 +<!-- <span>{{ scope.row.customscode }}</span>-->
  205 +<!-- </template>-->
  206 +<!-- </el-table-column>-->
202 <!-- <el-table-column label="集装箱（器）编号" width="140">--> 207 <!-- <el-table-column label="集装箱（器）编号" width="140">-->
203 <!-- <template slot-scope="scope">--> 208 <!-- <template slot-scope="scope">-->
204 <!-- <span>{{ scope.row.contaid }}</span>--> 209 <!-- <span>{{ scope.row.contaid }}</span>-->
205 <!-- </template>--> 210 <!-- </template>-->
206 <!-- </el-table-column>--> 211 <!-- </el-table-column>-->
207 - <el-table-column label="总提运单号" width="140">  
208 - <template slot-scope="scope">  
209 - <span>{{ scope.row.billno }}</span>  
210 - </template>  
211 - </el-table-column>  
212 <!-- <el-table-column label="进出境运输方式代码" width="120">--> 212 <!-- <el-table-column label="进出境运输方式代码" width="120">-->
213 <!-- <template slot-scope="scope">--> 213 <!-- <template slot-scope="scope">-->
214 <!-- <span v-if="scope.row.trafmode ==='2'">江海运输</span>--> 214 <!-- <span v-if="scope.row.trafmode ==='2'">江海运输</span>-->
@@ -229,16 +229,16 @@ @@ -229,16 +229,16 @@
229 <!-- <span>{{ scope.row.voyageno }}</span>--> 229 <!-- <span>{{ scope.row.voyageno }}</span>-->
230 <!-- </template>--> 230 <!-- </template>-->
231 <!-- </el-table-column>--> 231 <!-- </el-table-column>-->
232 - <el-table-column label="境内运输方式" width="120">  
233 - <template slot-scope="scope">  
234 - <span v-if="scope.row.trafway ==='2'">江海运输</span>  
235 - <span v-if="scope.row.trafway ==='3'">铁路运输</span>  
236 - <span v-if="scope.row.trafway ==='4'">汽车运输</span>  
237 - <span v-if="scope.row.trafway ==='5'">航空运输</span>  
238 - <span v-if="scope.row.trafway ==='6'">邮件运输</span>  
239 -<!-- <span>{{ scope.row.trafway }}</span>-->  
240 - </template>  
241 - </el-table-column> 232 +<!-- <el-table-column label="境内运输方式" width="120">-->
  233 +<!-- <template slot-scope="scope">-->
  234 +<!-- <span v-if="scope.row.trafway ==='2'">江海运输</span>-->
  235 +<!-- <span v-if="scope.row.trafway ==='3'">铁路运输</span>-->
  236 +<!-- <span v-if="scope.row.trafway ==='4'">汽车运输</span>-->
  237 +<!-- <span v-if="scope.row.trafway ==='5'">航空运输</span>-->
  238 +<!-- <span v-if="scope.row.trafway ==='6'">邮件运输</span>-->
  239 +<!--&lt;!&ndash; <span>{{ scope.row.trafway }}</span>&ndash;&gt;-->
  240 +<!-- </template>-->
  241 +<!-- </el-table-column>-->
242 <el-table-column label="托运货物件数" width="100"> 242 <el-table-column label="托运货物件数" width="100">
243 <template slot-scope="scope"> 243 <template slot-scope="scope">
244 <span>{{ scope.row.packno }}</span> 244 <span>{{ scope.row.packno }}</span>
@@ -249,11 +249,11 @@ @@ -249,11 +249,11 @@
249 <span>{{ scope.row.grosswt }}</span> 249 <span>{{ scope.row.grosswt }}</span>
250 </template> 250 </template>
251 </el-table-column> 251 </el-table-column>
252 - <el-table-column label="卸货地代码" width="120">  
253 - <template slot-scope="scope">  
254 - <span>{{ scope.row.unloadcode }}</span>  
255 - </template>  
256 - </el-table-column> 252 +<!-- <el-table-column label="卸货地代码" width="120">-->
  253 +<!-- <template slot-scope="scope">-->
  254 +<!-- <span>{{ scope.row.unloadcode }}</span>-->
  255 +<!-- </template>-->
  256 +<!-- </el-table-column>-->
257 <el-table-column label="时间" width="180"> 257 <el-table-column label="时间" width="180">
258 <template slot-scope="scope"> 258 <template slot-scope="scope">
259 <span>{{ scope.row.creattime }}</span> 259 <span>{{ scope.row.creattime }}</span>
@@ -358,9 +358,6 @@ @@ -358,9 +358,6 @@
358 </el-select> 358 </el-select>
359 </el-form-item> 359 </el-form-item>
360 </el-col> 360 </el-col>
361 -  
362 -  
363 -  
364 <!-- <el-col :span="6">--> 361 <!-- <el-col :span="6">-->
365 <!-- <el-form-item label="操作员卡号" prop="inputopid">--> 362 <!-- <el-form-item label="操作员卡号" prop="inputopid">-->
366 <!-- <el-input v-model="form.inputopid" placeholder="" />--> 363 <!-- <el-input v-model="form.inputopid" placeholder="" />-->
@@ -535,8 +532,8 @@ @@ -535,8 +532,8 @@
535 <el-row align="middle"> 532 <el-row align="middle">
536 <el-col :span="24" :offset="9"> 533 <el-col :span="24" :offset="9">
537 <el-form-item > 534 <el-form-item >
538 - <el-button style="width: 100px" type="info" @click="trn_dialog.addDialog = false">取消</el-button>  
539 - <el-button type="primary" style="width: 100px" @click="dialogStatus==='create'?trn_add():trn_edit()">提交</el-button> 535 + <el-button v-if="dialogStatus!=='find'" style="width: 100px" type="info" @click="trn_dialog.addDialog = false">取消</el-button>
  536 + <el-button v-if="dialogStatus!=='find'" type="primary" style="width: 100px" @click="dialogStatus==='create'?trn_add():trn_edit()">提交</el-button>
540 </el-form-item> 537 </el-form-item>
541 </el-col> 538 </el-col>
542 </el-row> 539 </el-row>
@@ -614,7 +611,8 @@ @@ -614,7 +611,8 @@
614 total: 0, 611 total: 0,
615 dialogMap: { 612 dialogMap: {
616 update: '编辑', 613 update: '编辑',
617 - create: '新增' 614 + create: '新增',
  615 + find: '查看',
618 }, 616 },
619 dialogStatus: 'create', 617 dialogStatus: 'create',
620 trn_dialog: { 618 trn_dialog: {
@@ -796,7 +794,7 @@ @@ -796,7 +794,7 @@
796 //编辑按钮使用权限 794 //编辑按钮使用权限
797 isButtonDisabled3(row) { 795 isButtonDisabled3(row) {
798 // 已申报或关务不能编辑 796 // 已申报或关务不能编辑
799 - if (row.dstatus ==='001' || this.names == true) { 797 + if (row.dstatus ==='001') {
800 return true; // 禁用按钮 798 return true; // 禁用按钮
801 } else { 799 } else {
802 return false; // 不禁用按钮 800 return false; // 不禁用按钮
@@ -935,6 +933,13 @@ @@ -935,6 +933,13 @@
935 }) 933 })
936 }) 934 })
937 }, 935 },
  936 + // 查看
  937 + selectOne(index, row){
  938 + this.form = Object.assign({}, row)
  939 + this.trn_dialog.addDialog = true
  940 + this.dialogStatus = 'find'
  941 +
  942 + },
938 // 打开编辑 943 // 打开编辑
939 editTrn(index, row) { 944 editTrn(index, row) {
940 this.form = Object.assign({}, row) 945 this.form = Object.assign({}, row)