朱兆平 / vue_cli · 提交

转到一个项目

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

体积计算

内嵌 并排对比
正在显示 1 个修改的文件 包含 62 行增加 和 60 行删除
@@ -13,15 +13,15 @@ @@ -13,15 +13,15 @@
13 </el-form-item> 13 </el-form-item>
14 </el-col> 14 </el-col>
15 <el-col :span="6"> 15 <el-col :span="6">
16 - <el-form-item label=" " :label-width="formLabelWidth" prop="waybillmaster">  
17 - <el-input v-model="addForm.waybillmaster" autocomplete="off" suffix-icon="el-icon-document" clearable> 16 + <el-form-item label=" " :label-width="formLabelWidth" prop="waybill">
  17 + <el-input v-model="addForm.waybill" autocomplete="off" suffix-icon="el-icon-document" clearable>
18 <template slot="prepend">主&emsp;&emsp;单</template> 18 <template slot="prepend">主&emsp;&emsp;单</template>
19 </el-input> 19 </el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="6"> 22 <el-col :span="6">
23 - <el-form-item label=" " :label-width="formLabelWidth" prop="waybillsub">  
24 - <el-input v-model="addForm.waybillsub" autocomplete="off" suffix-icon="el-icon-document" clearable> 23 + <el-form-item label=" " :label-width="formLabelWidth" prop="billfhl">
  24 + <el-input v-model="addForm.billfhl" autocomplete="off" suffix-icon="el-icon-document" clearable>
25 <template slot="prepend">分&emsp;&emsp;单</template> 25 <template slot="prepend">分&emsp;&emsp;单</template>
26 </el-input> 26 </el-input>
27 </el-form-item> 27 </el-form-item>
@@ -66,9 +66,9 @@ @@ -66,9 +66,9 @@
66 <el-col :span="6"> 66 <el-col :span="6">
67 <el-form-item label=" " :label-width="formLabelWidth" prop="packge"> 67 <el-form-item label=" " :label-width="formLabelWidth" prop="packge">
68 <div class="my-text-area"> 68 <div class="my-text-area">
69 - <div class="el-input-group__prepend prepand">货物包装</div> 69 + <div class="el-input-group__prepend prepand">包装类型</div>
70 <el-select v-model="addForm.packge" 70 <el-select v-model="addForm.packge"
71 - placeholder="货物包装" 71 + placeholder="包装类型"
72 filterable 72 filterable
73 default-first-option 73 default-first-option
74 :filter-method="packgeOptionsFilter"> 74 :filter-method="packgeOptionsFilter">
@@ -221,55 +221,55 @@ @@ -221,55 +221,55 @@
221 </el-col> 221 </el-col>
222 </el-row> 222 </el-row>
223 --> 223 -->
224 - <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>  
225 - <el-row>  
226 - <el-col :span="6">  
227 - <el-form-item label=" " :label-width="formLabelWidth" prop="transtype">  
228 - <div class="my-text-area">  
229 - <div class="el-input-group__prepend prepand">交易类型</div>  
230 - <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">  
231 - <el-option  
232 - v-for="item in options1"  
233 - :key="item.value"  
234 - :label="item.label"  
235 - :value="item.value">  
236 - </el-option>  
237 - </el-select>  
238 - </div>  
239 - </el-form-item>  
240 - </el-col>  
241 - <el-col :span="6">  
242 - <el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">  
243 - <div class="my-text-area">  
244 - <div class="el-input-group__prepend prepand">交易类型</div>  
245 - <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">  
246 - <el-option  
247 - v-for="item in options"  
248 - :key="item.value"  
249 - :label="item.label"  
250 - :value="item.value">  
251 - </el-option>  
252 - </el-select>  
253 - </div>  
254 - </el-form-item>  
255 - </el-col>  
256 - <el-col :span="8">  
257 - <el-form-item label=" " :label-width="formLabelWidth" prop="ietype">  
258 - <div class="my-text-area">  
259 - <div class="el-input-group__prepend prepand">交易类型</div>  
260 - <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">  
261 - <el-option label="出入库类型-进" value="I"></el-option>  
262 - <el-option label="出入库类型-出" value="E"></el-option>  
263 - </el-select>  
264 - </div>  
265 - </el-form-item>  
266 - </el-col>  
267 - </el-row> 224 +<!-- <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>-->
  225 +<!-- <el-row>-->
  226 +<!-- <el-col :span="6">-->
  227 +<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="transtype">-->
  228 +<!-- <div class="my-text-area">-->
  229 +<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
  230 +<!-- <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">-->
  231 +<!-- <el-option-->
  232 +<!-- v-for="item in options1"-->
  233 +<!-- :key="item.value"-->
  234 +<!-- :label="item.label"-->
  235 +<!-- :value="item.value">-->
  236 +<!-- </el-option>-->
  237 +<!-- </el-select>-->
  238 +<!-- </div>-->
  239 +<!-- </el-form-item>-->
  240 +<!-- </el-col>-->
  241 +<!-- <el-col :span="6">-->
  242 +<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">-->
  243 +<!-- <div class="my-text-area">-->
  244 +<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
  245 +<!-- <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">-->
  246 +<!-- <el-option-->
  247 +<!-- v-for="item in options"-->
  248 +<!-- :key="item.value"-->
  249 +<!-- :label="item.label"-->
  250 +<!-- :value="item.value">-->
  251 +<!-- </el-option>-->
  252 +<!-- </el-select>-->
  253 +<!-- </div>-->
  254 +<!-- </el-form-item>-->
  255 +<!-- </el-col>-->
  256 +<!-- <el-col :span="8">-->
  257 +<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="ietype">-->
  258 +<!-- <div class="my-text-area">-->
  259 +<!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
  260 +<!-- <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">-->
  261 +<!-- <el-option label="出入库类型-进" value="I"></el-option>-->
  262 +<!-- <el-option label="出入库类型-出" value="E"></el-option>-->
  263 +<!-- </el-select>-->
  264 +<!-- </div>-->
  265 +<!-- </el-form-item>-->
  266 +<!-- </el-col>-->
  267 +<!-- </el-row>-->
268 <el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider> 268 <el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider>
269 <el-row> 269 <el-row>
270 <el-col :span="6"> 270 <el-col :span="6">
271 - <el-form-item label=" " :label-width="formLabelWidth" prop="picUrl">  
272 - <el-input v-model="addForm.picUrl" autocomplete="off" suffix-icon="el-icon-document" clearable> 271 + <el-form-item label=" " :label-width="formLabelWidth" prop="annex">
  272 + <el-input v-model="addForm.annex" autocomplete="off" suffix-icon="el-icon-document" clearable>
273 <template slot="prepend">图片地址</template> 273 <template slot="prepend">图片地址</template>
274 </el-input> 274 </el-input>
275 </el-form-item> 275 </el-form-item>
@@ -634,6 +634,7 @@ @@ -634,6 +634,7 @@
634 name: "inventroyrecord", 634 name: "inventroyrecord",
635 data() { 635 data() {
636 var checkInputArea = (rule, value, callback) => { 636 var checkInputArea = (rule, value, callback) => {
  637 + let _this = this
637 let tempVol = 0 638 let tempVol = 0
638 if (!value) { 639 if (!value) {
639 return callback(new Error('体积信息必填')); 640 return callback(new Error('体积信息必填'));
@@ -641,6 +642,7 @@ @@ -641,6 +642,7 @@
641 setTimeout(() => { 642 setTimeout(() => {
642 var lineStr = value.replace('\r').split('\n') 643 var lineStr = value.replace('\r').split('\n')
643 lineStr.forEach(((v,index) => { 644 lineStr.forEach(((v,index) => {
  645 + // eslint-disable-next-line no-useless-escape
644 var pattern = /^[0-9\.]+x[0-9\.]+x[0-9\.]+x[0-9\.]+$/; 646 var pattern = /^[0-9\.]+x[0-9\.]+x[0-9\.]+x[0-9\.]+$/;
645 if(!pattern.test(v)){ 647 if(!pattern.test(v)){
646 callback(new Error('行:'+index+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点')); 648 callback(new Error('行:'+index+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点'));
@@ -651,7 +653,7 @@ @@ -651,7 +653,7 @@
651 })) 653 }))
652 654
653 callback(); 655 callback();
654 - this.addForm.volValue = (tempVol/1000000).toFixed(2) 656 + _this.addForm.volValue = (tempVol/1000000).toFixed(2)
655 }, 200); 657 }, 200);
656 }; 658 };
657 return { 659 return {
@@ -707,8 +709,8 @@ @@ -707,8 +709,8 @@
707 transtype:'销售入库', 709 transtype:'销售入库',
708 vol:'', 710 vol:'',
709 volValue:0, 711 volValue:0,
710 - waybillmaster:'',  
711 - waybillsub:'', 712 + waybill:'',
  713 + billfhl:'',
712 //随货文件 714 //随货文件
713 hasFiles:false, 715 hasFiles:false,
714 hasUnusual:false, 716 hasUnusual:false,
@@ -724,7 +726,7 @@ @@ -724,7 +726,7 @@
724 remark3:'', 726 remark3:'',
725 remark4:'', 727 remark4:'',
726 remark5:'', 728 remark5:'',
727 - picUrl:'' 729 + annex:''
728 }, 730 },
729 packgeOptions:packge, 731 packgeOptions:packge,
730 options: [{ 732 options: [{
@@ -753,10 +755,10 @@ @@ -753,10 +755,10 @@
753 damageOptions:damageOP, 755 damageOptions:damageOP,
754 SPHOptions:[], 756 SPHOptions:[],
755 rules: { 757 rules: {
756 - waybillmaster:[ 758 + waybill:[
757 { pattern: /^[0-9\-]+$/, message: '主单号格式只支持数字与-符号' } 759 { pattern: /^[0-9\-]+$/, message: '主单号格式只支持数字与-符号' }
758 ], 760 ],
759 - waybillsub:[ 761 + billfhl:[
760 { pattern: /^[0-9A-Z]+$/, message: '分单号格式只支持数字与大写字母' } 762 { pattern: /^[0-9A-Z]+$/, message: '分单号格式只支持数字与大写字母' }
761 ], 763 ],
762 pcs: [ 764 pcs: [
@@ -1124,7 +1126,7 @@ @@ -1124,7 +1126,7 @@
1124 return this.$message.error(response.msg); 1126 return this.$message.error(response.msg);
1125 } 1127 }
1126 this.$message.success(res.msg); 1128 this.$message.success(res.msg);
1127 - this.addForm.picUrl = res.data.relativePath 1129 + this.addForm.annex = res.data.relativePath
1128 1130
1129 }, 1131 },
1130 submitUpload(formData){ 1132 submitUpload(formData){
@@ -1138,7 +1140,7 @@ @@ -1138,7 +1140,7 @@
1138 return this.$message.error(res.msg); 1140 return this.$message.error(res.msg);
1139 } 1141 }
1140 this.$message.success(res.msg); 1142 this.$message.success(res.msg);
1141 - this.addForm.picUrl = res.data.relativePath 1143 + this.addForm.annex = res.data.relativePath
1142 }).finally(()=>{ 1144 }).finally(()=>{
1143 ld.close() 1145 ld.close()
1144 }) 1146 })