朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 e09ea650d9361447de7c64bd9f543279cc0b266a 2 个父辈 32d3de9f a71c75c9

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 3 个修改的文件 包含 43 行增加 和 29 行删除
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 :value="wmsInfo.serialnumber" 31 :value="wmsInfo.serialnumber"
32 :options="barcodeOptions1" 32 :options="barcodeOptions1"
33 > 33 >
34 - 条形码显示失败时的内容 34 + 条形码生成失败
35 </barcode> 35 </barcode>
36 </div> 36 </div>
37 </div> 37 </div>
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <el-form-item label=" " :label-width="formLabelWidth" prop="goodssize"> 90 <el-form-item label=" " :label-width="formLabelWidth" prop="goodssize">
91 <el-tooltip class="item" effect="dark" content="单位:厘米,每行录入一个尺寸信息格式如:1x2x3x4(长x宽x高x件数),回车换行" placement="right"> 91 <el-tooltip class="item" effect="dark" content="单位:厘米,每行录入一个尺寸信息格式如:1x2x3x4(长x宽x高x件数),回车换行" placement="right">
92 <div class="my-text-area"> 92 <div class="my-text-area">
93 - <div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div> 93 + <div class="el-input-group__prepend prepand">尺&emsp;&emsp;寸</div>
94 <el-input v-model="addForm.goodssize" 94 <el-input v-model="addForm.goodssize"
95 type="textarea" 95 type="textarea"
96 autosize 96 autosize
@@ -355,6 +355,12 @@ @@ -355,6 +355,12 @@
355 /> 355 />
356 <el-table-column 356 <el-table-column
357 fixed 357 fixed
  358 + prop="serialnumber"
  359 + label="流水号"
  360 + >
  361 + </el-table-column>
  362 + <el-table-column
  363 + fixed
358 prop="waybill" 364 prop="waybill"
359 label="主单号" 365 label="主单号"
360 width="120"> 366 width="120">
@@ -372,12 +378,6 @@ @@ -372,12 +378,6 @@
372 </template> 378 </template>
373 </el-table-column> 379 </el-table-column>
374 <el-table-column 380 <el-table-column
375 - fixed  
376 - prop="serialnumber"  
377 - label="流水号"  
378 - width="120">  
379 - </el-table-column>  
380 - <el-table-column  
381 prop="pcs" 381 prop="pcs"
382 label="入库件数" 382 label="入库件数"
383 width="70"> 383 width="70">
@@ -395,7 +395,7 @@ @@ -395,7 +395,7 @@
395 <el-table-column 395 <el-table-column
396 prop="goodssize" 396 prop="goodssize"
397 label="尺寸" 397 label="尺寸"
398 - width="60"> 398 + >
399 </el-table-column> 399 </el-table-column>
400 <el-table-column 400 <el-table-column
401 prop="goodsvol" 401 prop="goodsvol"
@@ -417,26 +417,26 @@ @@ -417,26 +417,26 @@
417 <!-- label="出入库场站"--> 417 <!-- label="出入库场站"-->
418 <!-- width="100">--> 418 <!-- width="100">-->
419 <!-- </el-table-column>--> 419 <!-- </el-table-column>-->
420 - <el-table-column  
421 - prop="status"  
422 - label="状态"  
423 - width="80">  
424 - <template slot-scope="scope">  
425 - <span v-if="scope.row.status ==='0'">失败</span>  
426 - <span v-if="scope.row.status ==='1'">成功</span>  
427 - </template>  
428 - </el-table-column> 420 +<!-- <el-table-column-->
  421 +<!-- prop="status"-->
  422 +<!-- label="状态"-->
  423 +<!-- width="80">-->
  424 +<!-- <template slot-scope="scope">-->
  425 +<!-- <span v-if="scope.row.status ==='0'">失败</span>-->
  426 +<!-- <span v-if="scope.row.status ==='1'">成功</span>-->
  427 +<!-- </template>-->
  428 +<!-- </el-table-column>-->
429 <el-table-column 429 <el-table-column
430 prop="licenseplate" 430 prop="licenseplate"
431 - label="运输车辆信息"  
432 - width="100">  
433 - </el-table-column>  
434 - <el-table-column  
435 - prop="transtype"  
436 - label="交易类型" 431 + label="运输车辆"
437 width="100"> 432 width="100">
438 </el-table-column> 433 </el-table-column>
439 <!-- <el-table-column--> 434 <!-- <el-table-column-->
  435 +<!-- prop="transtype"-->
  436 +<!-- label="交易类型"-->
  437 +<!-- width="100">-->
  438 +<!-- </el-table-column>-->
  439 +<!-- <el-table-column-->
440 <!-- prop="custel"--> 440 <!-- prop="custel"-->
441 <!-- label="客户联系电话"--> 441 <!-- label="客户联系电话"-->
442 <!-- width="140">--> 442 <!-- width="140">-->
@@ -488,10 +488,10 @@ @@ -488,10 +488,10 @@
488 <el-button type="success" icon="el-icon-check" @click="applyAdd()">入&emsp;&emsp;库</el-button> 488 <el-button type="success" icon="el-icon-check" @click="applyAdd()">入&emsp;&emsp;库</el-button>
489 </template> 489 </template>
490 <template slot-scope="scope"> 490 <template slot-scope="scope">
491 - <el-row> 491 + <el-row type="flex" justify="center">
492 <Print :wmsInfo = "scope.row"></Print> 492 <Print :wmsInfo = "scope.row"></Print>
493 </el-row> 493 </el-row>
494 - <el-row> 494 + <el-row type="flex" justify="space-between">
495 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button> 495 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
496 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">移除</el-button> 496 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">移除</el-button>
497 </el-row> 497 </el-row>
@@ -674,7 +674,7 @@ @@ -674,7 +674,7 @@
674 // eslint-disable-next-line no-useless-escape 674 // eslint-disable-next-line no-useless-escape
675 var pattern = /^[0-9\.]+[xX][0-9\.]+[xX][0-9\.]+[xX][0-9\.]+$/; 675 var pattern = /^[0-9\.]+[xX][0-9\.]+[xX][0-9\.]+[xX][0-9\.]+$/;
676 if(!pattern.test(v)){ 676 if(!pattern.test(v)){
677 - err = new Error('行:'+index+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点') 677 + err = new Error('行'+(index+1)+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点')
678 return callback(err); 678 return callback(err);
679 }else { 679 }else {
680 const volV = this.multiply(v) 680 const volV = this.multiply(v)
@@ -1130,7 +1130,8 @@ @@ -1130,7 +1130,8 @@
1130 } 1130 }
1131 // 若需上传，将base64转为file文件 1131 // 若需上传，将base64转为file文件
1132 const blob = new Blob([uInt8Array], { type: 'image/png' }) 1132 const blob = new Blob([uInt8Array], { type: 'image/png' })
1133 - let fileOfBlob = new File([blob], 'imgCaptureTest' + '.png') 1133 + const filename = this.serialNumber()+'';
  1134 + let fileOfBlob = new File([blob], filename + '.png')
1134 // this.submitUpload(fileOfBlob); 1135 // this.submitUpload(fileOfBlob);
1135 var formData = new FormData() 1136 var formData = new FormData()
1136 formData.append('file', fileOfBlob) 1137 formData.append('file', fileOfBlob)
@@ -1148,7 +1149,7 @@ @@ -1148,7 +1149,7 @@
1148 1149
1149 }, 1150 },
1150 submitUpload(formData){ 1151 submitUpload(formData){
1151 - const fileServiceName = '/api/wlpt-custom-service-workflow' 1152 + const fileServiceName = '/api/wlpt-custom-service-workflow/'
1152 let ld = this.$loading({ 1153 let ld = this.$loading({
1153 text:"图片数据上传中..." 1154 text:"图片数据上传中..."
1154 }) 1155 })
  1 +<template>
  2 +
  3 +</template>
  4 +
  5 +<script>
  6 + export default {
  7 + name: "WMSExportForm"
  8 + }
  9 +</script>
  10 +
  11 +<style scoped>
  12 +
  13 +</style>