朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 ad91a71115b576d7bee5370ced191700f87a11a3 1 个父辈 0e23854e

必填项识别优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 49 行增加 和 33 行删除
... ... @@ -3,38 +3,52 @@
<el-card style="background-color: #F5F7FA">
<el-row class="toolbar" style="height:auto">
<el-form :model="addForm" :rules="rules" ref="addForm" :inline="true">
<el-divider content-position="left"><i class="el-icon-document"></i> 货物信息 <el-tag type="info">流水号: {{addForm.serialnumber}}</el-tag></el-divider>
<el-divider content-position="left"><i class="el-icon-document"></i> 商品 <el-tag>流水号: {{addForm.serialnumber}}</el-tag></el-divider>
<el-row>
<el-col :span="6">
<el-form-item prop="waybill">
<el-input v-model="addForm.waybill" autocomplete="off" suffix-icon="el-icon-shopping-cart-full" clearable>
<template slot="prepend">
&emsp;商品简码
</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left"><i class="el-icon-document"></i> 货物信息</el-tag></el-divider>
<el-row>
<el-col :span="6" v-if="false">
<el-form-item label=" " :label-width="formLabelWidth" prop="serialnumber">
<el-form-item prop="serialnumber">
<el-input v-model="addForm.serialnumber" autocomplete="off" suffix-icon="el-icon-files" disabled>
<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="waybill">
<el-form-item prop="waybill">
<el-input v-model="addForm.waybill" autocomplete="off" suffix-icon="el-icon-document" clearable>
<template slot="prepend">主&emsp;&emsp;单</template>
<template slot="prepend">
单&emsp;&emsp;&emsp;证
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="billfhl">
<el-form-item prop="billfhl">
<el-input v-model="addForm.billfhl" autocomplete="off" suffix-icon="el-icon-document" clearable>
<template slot="prepend">分&emsp;&emsp;单</template>
<template slot="prepend">分&emsp;&emsp;&emsp;单</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="totalpcs">
<el-form-item prop="totalpcs">
<el-input v-model.number="addForm.totalpcs" autocomplete="off" suffix-icon="el-icon-files" clearable >
<template slot="prepend">总&nbsp;件&nbsp;数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="totalweight">
<el-form-item prop="totalweight">
<el-input v-model="addForm.totalweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
<template slot="prepend">总&nbsp;重&nbsp;量</template>
</el-input>
... ... @@ -43,28 +57,30 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="pcs">
<el-form-item prop="pcs">
<el-input v-model.number="addForm.pcs" autocomplete="off" suffix-icon="el-icon-files" clearable >
<template slot="prepend">入库件数</template>
<template slot="prepend">
<i v-if="rules.hasOwnProperty('pcs')" style="color:red;">*</i> 入库件数
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="billweight">
<el-form-item prop="billweight">
<el-input v-model="addForm.billweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
<template slot="prepend">入库重量</template>
<template slot="prepend"><i v-if="rules.hasOwnProperty('billweight')" style="color:red;">*</i> 入库重量</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="feeweight">
<el-form-item prop="feeweight">
<el-input v-model="addForm.feeweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
<template slot="prepend">计费重量</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="packingid">
<el-form-item prop="packingid">
<el-input v-model="addForm.packingid" autocomplete="off" suffix-icon="el-icon-files" clearable>
<template slot="prepend">包裝类型</template>
</el-input>
... ... @@ -90,15 +106,15 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="goodssize">
<el-form-item 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">尺&emsp;&emsp;寸</div>
<div class="el-input-group__prepend prepand"><i v-if="rules.hasOwnProperty('goodssize')" style="color:red;">*</i> 尺&emsp;&emsp;寸</div>
<el-input v-model="goodsSize"
type="textarea"
autosize
placeholder="请输入尺寸"
style="float: left;width:calc(100% - 89px)"
style="float: left;width:calc(100% - 110px)"
>
</el-input>
</div>
... ... @@ -106,28 +122,28 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="goodsvol">
<el-form-item prop="goodsvol">
<el-input v-model="addForm.goodsvol" autocomplete="off" suffix-icon="el-icon-files" disabled>
<template slot="prepend">入库体积</template>
<template slot="prepend">&emsp;入库体积</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="remark4">
<el-form-item prop="remark4">
<el-input v-model="addForm.remark4" autocomplete="off" suffix-icon="el-icon-files" >
<template slot="prepend">随货文件</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="remark1">
<el-form-item prop="remark1">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">备&emsp;&emsp;注</div>
<el-input v-model="addForm.remark1"
type="textarea"
autosize
placeholder="备注信息"
style="float: left;width:calc(100% - 89px)"
style="float: left;width:calc(100% - 110px)"
>
</el-input>
</div>
... ... @@ -137,7 +153,7 @@
<el-divider content-position="left"><i class="el-icon-house"></i> 入库相关</el-divider>
<el-row>
<!-- <el-col :span="6">-->
<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="area">-->
<!-- <el-form-item prop="area">-->
<!-- <el-autocomplete-->
<!-- v-model="addForm.area"-->
<!-- :fetch-suggestions="areaQuerySearch"-->
... ... @@ -157,7 +173,7 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="location">
<el-form-item prop="location">
<el-autocomplete
v-model="addForm.location"
:fetch-suggestions="locationQuerySearch"
... ... @@ -168,7 +184,7 @@
highlight-first-item
style="width: 100%"
>
<template slot="prepend">库&emsp;&emsp;位</template>
<template slot="prepend"><i v-if="rules.hasOwnProperty('location')" style="color:red;">*</i> 库&emsp;&emsp;位</template>
<template slot-scope="{ item }">
<div class="name" style="float: left">{{ item.locationno }}</div>
<div class="addr" style="float: right">{{ item.locationname }}</div>
... ... @@ -177,14 +193,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="licenseplate">
<el-form-item prop="licenseplate">
<el-input v-model="addForm.licenseplate" autocomplete="off" suffix-icon="el-icon-files" >
<template slot="prepend">运输车辆</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="custcode">
<el-form-item prop="custcode">
<el-autocomplete
v-model="addForm.custcode"
:fetch-suggestions="crmQuerySearch"
... ... @@ -204,7 +220,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :label-width="formLabelWidth" prop="opter">
<el-form-item prop="opter">
<el-input v-model="addForm.opter" autocomplete="off" disabled suffix-icon="el-icon-files">
<template slot="prepend">经&nbsp;办&nbsp;人</template>
</el-input>
... ... @@ -248,7 +264,7 @@
<!-- <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">-->
<!-- <el-form-item prop="transtype">-->
<!-- <div class="my-text-area">-->
<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
<!-- <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">-->
... ... @@ -263,7 +279,7 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">-->
<!-- <el-form-item prop="goodstype">-->
<!-- <div class="my-text-area">-->
<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
<!-- <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">-->
... ... @@ -278,7 +294,7 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="ietype">-->
<!-- <el-form-item prop="ietype">-->
<!-- <div class="my-text-area">-->
<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
<!-- <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">-->
... ... @@ -292,7 +308,7 @@
<el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider>
<el-row>
<el-col :span="12">
<el-form-item label=" " :label-width="formLabelWidth" prop="annex">
<el-form-item prop="annex">
<el-input v-model="addForm.annex" autocomplete="off" suffix-icon="el-icon-document" clearable>
<template slot="prepend">图片地址</template>
</el-input>
... ... @@ -1374,7 +1390,7 @@
.my-text-area .prepand{
float: left;
width:89px;
width:110px;
height: 28px;
font-size: 12px;
line-height: 28px;
... ...