...
|
...
|
@@ -90,7 +90,7 @@ |
|
|
<el-form-item label=" " :label-width="formLabelWidth" prop="goodssize">
|
|
|
<el-tooltip class="item" effect="dark" content="单位:厘米,每行录入一个尺寸信息格式如:1x2x3x4(长x宽x高x件数),回车换行" placement="right">
|
|
|
<div class="my-text-area">
|
|
|
<div class="el-input-group__prepend prepand">体  积</div>
|
|
|
<div class="el-input-group__prepend prepand">尺  寸</div>
|
|
|
<el-input v-model="addForm.goodssize"
|
|
|
type="textarea"
|
|
|
autosize
|
...
|
...
|
@@ -355,6 +355,12 @@ |
|
|
/>
|
|
|
<el-table-column
|
|
|
fixed
|
|
|
prop="serialnumber"
|
|
|
label="流水号"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
fixed
|
|
|
prop="waybill"
|
|
|
label="主单号"
|
|
|
width="120">
|
...
|
...
|
@@ -372,12 +378,6 @@ |
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
fixed
|
|
|
prop="serialnumber"
|
|
|
label="流水号"
|
|
|
width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="pcs"
|
|
|
label="入库件数"
|
|
|
width="70">
|
...
|
...
|
@@ -395,7 +395,7 @@ |
|
|
<el-table-column
|
|
|
prop="goodssize"
|
|
|
label="尺寸"
|
|
|
width="60">
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="goodsvol"
|
...
|
...
|
@@ -417,26 +417,26 @@ |
|
|
<!-- label="出入库场站"-->
|
|
|
<!-- width="100">-->
|
|
|
<!-- </el-table-column>-->
|
|
|
<el-table-column
|
|
|
prop="status"
|
|
|
label="状态"
|
|
|
width="80">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.status ==='0'">失败</span>
|
|
|
<span v-if="scope.row.status ==='1'">成功</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column-->
|
|
|
<!-- prop="status"-->
|
|
|
<!-- label="状态"-->
|
|
|
<!-- width="80">-->
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
<!-- <span v-if="scope.row.status ==='0'">失败</span>-->
|
|
|
<!-- <span v-if="scope.row.status ==='1'">成功</span>-->
|
|
|
<!-- </template>-->
|
|
|
<!-- </el-table-column>-->
|
|
|
<el-table-column
|
|
|
prop="licenseplate"
|
|
|
label="运输车辆信息"
|
|
|
width="100">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="transtype"
|
|
|
label="交易类型"
|
|
|
label="运输车辆"
|
|
|
width="100">
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column-->
|
|
|
<!-- prop="transtype"-->
|
|
|
<!-- label="交易类型"-->
|
|
|
<!-- width="100">-->
|
|
|
<!-- </el-table-column>-->
|
|
|
<!-- <el-table-column-->
|
|
|
<!-- prop="custel"-->
|
|
|
<!-- label="客户联系电话"-->
|
|
|
<!-- width="140">-->
|
...
|
...
|
@@ -488,10 +488,10 @@ |
|
|
<el-button type="success" icon="el-icon-check" @click="applyAdd()">入  库</el-button>
|
|
|
</template>
|
|
|
<template slot-scope="scope">
|
|
|
<el-row>
|
|
|
<el-row type="flex" justify="center">
|
|
|
<Print :wmsInfo = "scope.row"></Print>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-row type="flex" justify="space-between">
|
|
|
<el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
|
|
|
<el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">移除</el-button>
|
|
|
</el-row>
|
...
|
...
|
@@ -674,7 +674,7 @@ |
|
|
// eslint-disable-next-line no-useless-escape
|
|
|
var pattern = /^[0-9\.]+[xX][0-9\.]+[xX][0-9\.]+[xX][0-9\.]+$/;
|
|
|
if(!pattern.test(v)){
|
|
|
err = new Error('行:'+index+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点')
|
|
|
err = new Error('行'+(index+1)+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点')
|
|
|
return callback(err);
|
|
|
}else {
|
|
|
const volV = this.multiply(v)
|
...
|
...
|
@@ -1130,7 +1130,8 @@ |
|
|
}
|
|
|
// 若需上传,将base64转为file文件
|
|
|
const blob = new Blob([uInt8Array], { type: 'image/png' })
|
|
|
let fileOfBlob = new File([blob], 'imgCaptureTest' + '.png')
|
|
|
const filename = this.serialNumber()+'';
|
|
|
let fileOfBlob = new File([blob], filename + '.png')
|
|
|
// this.submitUpload(fileOfBlob);
|
|
|
var formData = new FormData()
|
|
|
formData.append('file', fileOfBlob)
|
...
|
...
|
@@ -1148,7 +1149,7 @@ |
|
|
|
|
|
},
|
|
|
submitUpload(formData){
|
|
|
const fileServiceName = '/api/wlpt-custom-service-workflow'
|
|
|
const fileServiceName = '/api/wlpt-custom-service-workflow/'
|
|
|
let ld = this.$loading({
|
|
|
text:"图片数据上传中..."
|
|
|
})
|
...
|
...
|
|