朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 687f26e7f22f1358e5540809692bee1f234c5ca0 1 个父辈 89b19fa1

体积计算

内嵌 并排对比
正在显示 1 个修改的文件 包含 62 行增加 和 60 行删除
... ... @@ -13,15 +13,15 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="waybillmaster">
<el-input v-model="addForm.waybillmaster" autocomplete="off" suffix-icon="el-icon-document" clearable>
<el-form-item label=" " :label-width="formLabelWidth" prop="waybill">
<el-input v-model="addForm.waybill" autocomplete="off" suffix-icon="el-icon-document" clearable>
<template slot="prepend">主&emsp;&emsp;单</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="waybillsub">
<el-input v-model="addForm.waybillsub" autocomplete="off" suffix-icon="el-icon-document" clearable>
<el-form-item label=" " :label-width="formLabelWidth" prop="billfhl">
<el-input v-model="addForm.billfhl" autocomplete="off" suffix-icon="el-icon-document" clearable>
<template slot="prepend">分&emsp;&emsp;单</template>
</el-input>
</el-form-item>
... ... @@ -66,9 +66,9 @@
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="packge">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">货物包装</div>
<div class="el-input-group__prepend prepand">包装类型</div>
<el-select v-model="addForm.packge"
placeholder="货物包装"
placeholder="包装类型"
filterable
default-first-option
:filter-method="packgeOptionsFilter">
... ... @@ -221,55 +221,55 @@
</el-col>
</el-row>
-->
<el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>
<el-row>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="transtype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" " :label-width="formLabelWidth" prop="ietype">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">交易类型</div>
<el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">
<el-option label="出入库类型-进" value="I"></el-option>
<el-option label="出入库类型-出" value="E"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
<!-- <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="transtype">-->
<!-- <div class="my-text-area">-->
<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
<!-- <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">-->
<!-- <el-option-->
<!-- v-for="item in options1"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">-->
<!-- <div class="my-text-area">-->
<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
<!-- <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">-->
<!-- <el-option-->
<!-- v-for="item in options"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="ietype">-->
<!-- <div class="my-text-area">-->
<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
<!-- <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">-->
<!-- <el-option label="出入库类型-进" value="I"></el-option>-->
<!-- <el-option label="出入库类型-出" value="E"></el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider>
<el-row>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="picUrl">
<el-input v-model="addForm.picUrl" autocomplete="off" suffix-icon="el-icon-document" clearable>
<el-form-item label=" " :label-width="formLabelWidth" prop="annex">
<el-input v-model="addForm.annex" autocomplete="off" suffix-icon="el-icon-document" clearable>
<template slot="prepend">图片地址</template>
</el-input>
</el-form-item>
... ... @@ -634,6 +634,7 @@
name: "inventroyrecord",
data() {
var checkInputArea = (rule, value, callback) => {
let _this = this
let tempVol = 0
if (!value) {
return callback(new Error('体积信息必填'));
... ... @@ -641,6 +642,7 @@
setTimeout(() => {
var lineStr = value.replace('\r').split('\n')
lineStr.forEach(((v,index) => {
// eslint-disable-next-line no-useless-escape
var pattern = /^[0-9\.]+x[0-9\.]+x[0-9\.]+x[0-9\.]+$/;
if(!pattern.test(v)){
callback(new Error('行:'+index+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点'));
... ... @@ -651,7 +653,7 @@
}))
callback();
this.addForm.volValue = (tempVol/1000000).toFixed(2)
_this.addForm.volValue = (tempVol/1000000).toFixed(2)
}, 200);
};
return {
... ... @@ -707,8 +709,8 @@
transtype:'销售入库',
vol:'',
volValue:0,
waybillmaster:'',
waybillsub:'',
waybill:'',
billfhl:'',
//随货文件
hasFiles:false,
hasUnusual:false,
... ... @@ -724,7 +726,7 @@
remark3:'',
remark4:'',
remark5:'',
picUrl:''
annex:''
},
packgeOptions:packge,
options: [{
... ... @@ -753,10 +755,10 @@
damageOptions:damageOP,
SPHOptions:[],
rules: {
waybillmaster:[
waybill:[
{ pattern: /^[0-9\-]+$/, message: '主单号格式只支持数字与-符号' }
],
waybillsub:[
billfhl:[
{ pattern: /^[0-9A-Z]+$/, message: '分单号格式只支持数字与大写字母' }
],
pcs: [
... ... @@ -1124,7 +1126,7 @@
return this.$message.error(response.msg);
}
this.$message.success(res.msg);
this.addForm.picUrl = res.data.relativePath
this.addForm.annex = res.data.relativePath
},
submitUpload(formData){
... ... @@ -1138,7 +1140,7 @@
return this.$message.error(res.msg);
}
this.$message.success(res.msg);
this.addForm.picUrl = res.data.relativePath
this.addForm.annex = res.data.relativePath
}).finally(()=>{
ld.close()
})
... ...