朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 c98285e6b3f2e9f19f2dd914fdafa2e2dd2287c8 1 个父辈 20fda315

入库业务录入部分完善

内嵌 并排对比
正在显示 1 个修改的文件 包含 26 行增加 和 20 行删除
@@ -6,49 +6,49 @@ @@ -6,49 +6,49 @@
6 <el-divider content-position="left"><i class="el-icon-document"></i> 货物信息</el-divider> 6 <el-divider content-position="left"><i class="el-icon-document"></i> 货物信息</el-divider>
7 <el-row> 7 <el-row>
8 <el-col :span="6"> 8 <el-col :span="6">
9 - <el-form-item label="" :label-width="formLabelWidth" prop="serialnumber"> 9 + <el-form-item label=" " :label-width="formLabelWidth" prop="serialnumber">
10 <el-input v-model="addForm.serialnumber" autocomplete="off" disabled> 10 <el-input v-model="addForm.serialnumber" autocomplete="off" disabled>
11 <template slot="prepend">流&emsp;&emsp;水</template> 11 <template slot="prepend">流&emsp;&emsp;水</template>
12 </el-input> 12 </el-input>
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="waybill"> 16 + <el-form-item label=" " :label-width="formLabelWidth" prop="waybill">
17 <el-input v-model="addForm.waybillmaster" autocomplete="off" suffix-icon="el-icon-document" clearable> 17 <el-input v-model="addForm.waybillmaster" 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="waybill"> 23 + <el-form-item label=" " :label-width="formLabelWidth" prop="waybill">
24 <el-input v-model="addForm.waybillsub" autocomplete="off" suffix-icon="el-icon-document" clearable> 24 <el-input v-model="addForm.waybillsub" 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>
28 </el-col> 28 </el-col>
29 <el-col :span="6"> 29 <el-col :span="6">
30 - <el-form-item label="" :label-width="formLabelWidth" prop="pcs"> 30 + <el-form-item label=" " :label-width="formLabelWidth" prop="pcs">
31 <el-input v-model.number="addForm.pcs" autocomplete="off" suffix-icon="el-icon-files" clearable > 31 <el-input v-model.number="addForm.pcs" autocomplete="off" suffix-icon="el-icon-files" clearable >
32 <template slot="prepend">件&emsp;&emsp;数</template> 32 <template slot="prepend">件&emsp;&emsp;数</template>
33 </el-input> 33 </el-input>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="6"> 36 <el-col :span="6">
37 - <el-form-item label="" :label-width="formLabelWidth" prop="weight"> 37 + <el-form-item label=" " :label-width="formLabelWidth" prop="weight">
38 <el-input v-model="addForm.weight" autocomplete="off" suffix-icon="el-icon-files" clearable> 38 <el-input v-model="addForm.weight" autocomplete="off" suffix-icon="el-icon-files" clearable>
39 <template slot="prepend">重&emsp;&emsp;量</template> 39 <template slot="prepend">重&emsp;&emsp;量</template>
40 </el-input> 40 </el-input>
41 </el-form-item> 41 </el-form-item>
42 </el-col> 42 </el-col>
43 <el-col :span="6"> 43 <el-col :span="6">
44 - <el-form-item label="" :label-width="formLabelWidth" prop="billweight"> 44 + <el-form-item label=" " :label-width="formLabelWidth" prop="billweight">
45 <el-input v-model="addForm.billweight" autocomplete="off" suffix-icon="el-icon-files" clearable> 45 <el-input v-model="addForm.billweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
46 <template slot="prepend">计费重量</template> 46 <template slot="prepend">计费重量</template>
47 </el-input> 47 </el-input>
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 <el-col :span="6"> 50 <el-col :span="6">
51 - <el-form-item label="" :label-width="formLabelWidth" prop="vol"> 51 + <el-form-item label=" " :label-width="formLabelWidth" prop="vol">
52 <div class="my-text-area"> 52 <div class="my-text-area">
53 <div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div> 53 <div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div>
54 <el-input v-model="addForm.vol" 54 <el-input v-model="addForm.vol"
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 <el-divider content-position="left"><i class="el-icon-s-home"></i> 入库相关</el-divider> 65 <el-divider content-position="left"><i class="el-icon-s-home"></i> 入库相关</el-divider>
66 <el-row> 66 <el-row>
67 <el-col :span="6"> 67 <el-col :span="6">
68 - <el-form-item label="" :label-width="formLabelWidth" prop="area"> 68 + <el-form-item label=" " :label-width="formLabelWidth" prop="area">
69 <el-autocomplete 69 <el-autocomplete
70 v-model="addForm.area" 70 v-model="addForm.area"
71 :fetch-suggestions="areaQuerySearch" 71 :fetch-suggestions="areaQuerySearch"
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 </el-form-item> 85 </el-form-item>
86 </el-col> 86 </el-col>
87 <el-col :span="6"> 87 <el-col :span="6">
88 - <el-form-item label="" :label-width="formLabelWidth" prop="location"> 88 + <el-form-item label=" " :label-width="formLabelWidth" prop="location">
89 <el-autocomplete 89 <el-autocomplete
90 v-model="addForm.location" 90 v-model="addForm.location"
91 :fetch-suggestions="locationQuerySearch" 91 :fetch-suggestions="locationQuerySearch"
@@ -105,14 +105,14 @@ @@ -105,14 +105,14 @@
105 </el-form-item> 105 </el-form-item>
106 </el-col> 106 </el-col>
107 <el-col :span="6"> 107 <el-col :span="6">
108 - <el-form-item label="" :label-width="formLabelWidth" prop="transcar"> 108 + <el-form-item label=" " :label-width="formLabelWidth" prop="transcar">
109 <el-input v-model="addForm.transcar" autocomplete="off"> 109 <el-input v-model="addForm.transcar" autocomplete="off">
110 <template slot="prepend">运输车辆</template> 110 <template slot="prepend">运输车辆</template>
111 </el-input> 111 </el-input>
112 </el-form-item> 112 </el-form-item>
113 </el-col> 113 </el-col>
114 <el-col :span="6"> 114 <el-col :span="6">
115 - <el-form-item label="" :label-width="formLabelWidth" prop="customername"> 115 + <el-form-item label=" " :label-width="formLabelWidth" prop="customername">
116 <el-autocomplete 116 <el-autocomplete
117 v-model="addForm.customername" 117 v-model="addForm.customername"
118 :fetch-suggestions="crmQuerySearch" 118 :fetch-suggestions="crmQuerySearch"
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 </el-form-item> 132 </el-form-item>
133 </el-col> 133 </el-col>
134 <el-col :span="6"> 134 <el-col :span="6">
135 - <el-form-item label="" :label-width="formLabelWidth" prop="opter"> 135 + <el-form-item label=" " :label-width="formLabelWidth" prop="opter">
136 <el-input v-model="addForm.opter" autocomplete="off" disabled> 136 <el-input v-model="addForm.opter" autocomplete="off" disabled>
137 <template slot="prepend">经&nbsp;办&nbsp;人</template> 137 <template slot="prepend">经&nbsp;办&nbsp;人</template>
138 </el-input> 138 </el-input>
@@ -422,8 +422,8 @@ @@ -422,8 +422,8 @@
422 } from '../../api/consigner/station'; 422 } from '../../api/consigner/station';
423 import dateUtil from "@/utils/index" 423 import dateUtil from "@/utils/index"
424 import jsutil from "@/common/js/util"; 424 import jsutil from "@/common/js/util";
425 - import {mapActions, mapGetters} from 'vuex'  
426 import { getList as getCRMList } from '@/api/crm_api'; 425 import { getList as getCRMList } from '@/api/crm_api';
  426 + import { loginedUserInfo } from '@/api/user';
427 427
428 428
429 export default { 429 export default {
@@ -516,11 +516,17 @@ @@ -516,11 +516,17 @@
516 { required: true, message: '计费重量为必填项', trigger: 'blur' }, 516 { required: true, message: '计费重量为必填项', trigger: 'blur' },
517 { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' } 517 { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' }
518 ], 518 ],
519 - orginStation: [  
520 - { required: true, message: '请输入起始场站', trigger: 'blur' }, 519 + area: [
  520 + { required: true, message: '库区为必填项', trigger: 'blur' }
521 ], 521 ],
522 - endStation: [  
523 - { required: true, message: '请输入目的场站', trigger: 'blur' }, 522 + location: [
  523 + { required: true, message: '库位为必填项', trigger: 'blur' }
  524 + ],
  525 + customername: [
  526 + { required: true, message: '货主名称为必填项', trigger: 'blur' }
  527 + ],
  528 + opter: [
  529 + { required: true, message: '必须包含经办人信息', trigger: 'blur' }
524 ] 530 ]
525 }, 531 },
526 } 532 }
@@ -781,15 +787,15 @@ @@ -781,15 +787,15 @@
781 this.getLocationList(); 787 this.getLocationList();
782 this.getRoles(); 788 this.getRoles();
783 this.addForm.serialnumber = this.serialNumber() 789 this.addForm.serialnumber = this.serialNumber()
784 - if (!jsutil.checkNull(this.getUserInfoStore) && !jsutil.checkNull(this.getUserInfoStore.username)){ 790 + let userinfo = loginedUserInfo();
  791 + if (!jsutil.checkNull(userinfo) && !jsutil.checkNull(userinfo.username)){
785 this.$message.error("获取用户信息出错") 792 this.$message.error("获取用户信息出错")
786 }else{ 793 }else{
787 - this.addForm.opter = this.getUserInfoStore.username 794 + this.addForm.opter = userinfo.username
788 } 795 }
789 796
790 }, 797 },
791 computed: { 798 computed: {
792 - ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName  
793 }, 799 },
794 800
795 801