朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 b5f8d1031e35db79024d0d4a492c20934bef5121 1 个父辈 0a2fbc55

修改首页样式 

增加模板下载
优化预配界面功能
优化收发货人功能
预配收发货人 绑定用户id 企业id
内嵌 并排对比
正在显示 5 个修改的文件 包含 270 行增加 和 1017 行删除
@@ -296,7 +296,7 @@ let routes = [ @@ -296,7 +296,7 @@ let routes = [
296 }, 296 },
297 { 297 {
298 path: '/output', 298 path: '/output',
299 - component: Home, 299 + component: HomeNew,
300 name: '国内进港业务申报', 300 name: '国内进港业务申报',
301 iconCls: 'el-icon-collection', 301 iconCls: 'el-icon-collection',
302 children: [ 302 children: [
@@ -406,7 +406,7 @@ let routes = [ @@ -406,7 +406,7 @@ let routes = [
406 }, 406 },
407 { 407 {
408 path: '/con', 408 path: '/con',
409 - component: Home, 409 + component: HomeNew,
410 name: '收发货人管理', 410 name: '收发货人管理',
411 iconCls:'el-icon-goods', 411 iconCls:'el-icon-goods',
412 children:[ 412 children:[
@@ -417,12 +417,12 @@ let routes = [ @@ -417,12 +417,12 @@ let routes = [
417 ] 417 ]
418 }, 418 },
419 { 419 {
420 - path: '/shipper',  
421 - component: Home, 420 + path: '/cargo_shipper',
  421 + component: HomeNew,
422 name: '货主信息管理', 422 name: '货主信息管理',
423 - iconCls:'el-icon-setting', 423 + iconCls:'el-icon-goods',
424 children:[ 424 children:[
425 - {path:'/shipper',component:Shipper,name:'货主信息管理'}, 425 + {path: '/shipper',component: Shipper,name: '货主信息管理'}
426 ] 426 ]
427 }, 427 },
428 { 428 {
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input size="small" v-model="filters.companyName" placeholder="关键字查询"></el-input> 7 + <el-input size="small" v-model="filters.companyName" placeholder="公司名称"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsignee()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button> 13 <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
@@ -31,8 +31,8 @@ @@ -31,8 +31,8 @@
31 </el-table-column> 31 </el-table-column>
32 <el-table-column prop="conPhone" label="收货人电话" > 32 <el-table-column prop="conPhone" label="收货人电话" >
33 </el-table-column> 33 </el-table-column>
34 - <el-table-column prop="enterprise" label="收货人企业代码" >  
35 - </el-table-column> 34 +<!-- <el-table-column prop="enterprise" label="收货人企业代码" >-->
  35 +<!-- </el-table-column>-->
36 <el-table-column label="操作" min-width="150"> 36 <el-table-column label="操作" min-width="150">
37 <template slot-scope="scope"> 37 <template slot-scope="scope">
38 <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 38 <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
@@ -40,28 +40,27 @@ @@ -40,28 +40,27 @@
40 </template> 40 </template>
41 </el-table-column> 41 </el-table-column>
42 </el-table> 42 </el-table>
43 -  
44 <!--编辑界面--> 43 <!--编辑界面-->
45 - <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">  
46 - <el-form :model="editForm" :rules="editFormRules" ref="editForm" label-width="145px" style="margin-top: -10px"> 44 + <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="coneeVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
  45 + <el-form :model="coneeForm" :rules="coneeRules" ref="coneeForm" label-width="145px" style="margin-top: -10px">
47 <el-row> 46 <el-row>
48 - <el-col :span="4"> 47 + <el-col :span="4" style="display: none">
49 <el-form-item label="ID"> 48 <el-form-item label="ID">
50 - <span>{{editForm.id}}</span> 49 + <span>{{coneeForm.id}}</span>
51 </el-form-item> 50 </el-form-item>
52 </el-col> 51 </el-col>
53 </el-row> 52 </el-row>
54 <el-row> 53 <el-row>
55 <el-col :span="8" style="margin-right: 20px"> 54 <el-col :span="8" style="margin-right: 20px">
56 <el-form-item label="" prop="companyName"> 55 <el-form-item label="" prop="companyName">
57 - <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small"> 56 + <el-input v-model="coneeForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
58 <template slot="prepend" >公司</template> 57 <template slot="prepend" >公司</template>
59 </el-input> 58 </el-input>
60 </el-form-item> 59 </el-form-item>
61 </el-col> 60 </el-col>
62 <el-col :span="8"> 61 <el-col :span="8">
63 <el-form-item label="" prop="conAddress"> 62 <el-form-item label="" prop="conAddress">
64 - <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small"> 63 + <el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
65 <template slot="prepend" >地址</template> 64 <template slot="prepend" >地址</template>
66 </el-input> 65 </el-input>
67 </el-form-item> 66 </el-form-item>
@@ -70,14 +69,14 @@ @@ -70,14 +69,14 @@
70 <el-row> 69 <el-row>
71 <el-col :span="8" style="margin-right: 20px"> 70 <el-col :span="8" style="margin-right: 20px">
72 <el-form-item label="" prop="conPhone"> 71 <el-form-item label="" prop="conPhone">
73 - <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small"> 72 + <el-input v-model="coneeForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
74 <template slot="prepend" >电话</template> 73 <template slot="prepend" >电话</template>
75 </el-input> 74 </el-input>
76 </el-form-item> 75 </el-form-item>
77 </el-col> 76 </el-col>
78 <el-col :span="8"> 77 <el-col :span="8">
79 <el-form-item label="" prop="conFax"> 78 <el-form-item label="" prop="conFax">
80 - <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small"> 79 + <el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
81 <template slot="prepend" >传真</template> 80 <template slot="prepend" >传真</template>
82 </el-input> 81 </el-input>
83 </el-form-item> 82 </el-form-item>
@@ -87,14 +86,14 @@ @@ -87,14 +86,14 @@
87 <el-row> 86 <el-row>
88 <el-col :span="8" style="margin-right: 20px"> 87 <el-col :span="8" style="margin-right: 20px">
89 <el-form-item label="" prop="conPostcode"> 88 <el-form-item label="" prop="conPostcode">
90 - <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small"> 89 + <el-input v-model="coneeForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
91 <template slot="prepend" >邮编</template> 90 <template slot="prepend" >邮编</template>
92 </el-input> 91 </el-input>
93 </el-form-item> 92 </el-form-item>
94 </el-col> 93 </el-col>
95 <el-col :span="8"> 94 <el-col :span="8">
96 <el-form-item label="" prop="conCity"> 95 <el-form-item label="" prop="conCity">
97 - <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small"> 96 + <el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
98 <template slot="prepend" >城市</template> 97 <template slot="prepend" >城市</template>
99 </el-input> 98 </el-input>
100 </el-form-item> 99 </el-form-item>
@@ -103,14 +102,14 @@ @@ -103,14 +102,14 @@
103 <el-row> 102 <el-row>
104 <el-col :span="8" style="margin-right: 20px"> 103 <el-col :span="8" style="margin-right: 20px">
105 <el-form-item label="" prop="country"> 104 <el-form-item label="" prop="country">
106 - <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small"> 105 + <el-input v-model="coneeForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
107 <template slot="prepend" >国家代码</template> 106 <template slot="prepend" >国家代码</template>
108 </el-input> 107 </el-input>
109 </el-form-item> 108 </el-form-item>
110 </el-col> 109 </el-col>
111 <el-col :span="8"> 110 <el-col :span="8">
112 <el-form-item label="" prop="conName"> 111 <el-form-item label="" prop="conName">
113 - <el-input v-model="editForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small"> 112 + <el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">
114 <template slot="prepend" >收货人名称</template> 113 <template slot="prepend" >收货人名称</template>
115 </el-input> 114 </el-input>
116 </el-form-item> 115 </el-form-item>
@@ -119,151 +118,24 @@ @@ -119,151 +118,24 @@
119 <el-row> 118 <el-row>
120 <el-col :span="8"> 119 <el-col :span="8">
121 <el-form-item label="" prop="conAeo"> 120 <el-form-item label="" prop="conAeo">
122 - <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small"> 121 + <el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">
123 <template slot="prepend" >收货人AEO</template> 122 <template slot="prepend" >收货人AEO</template>
124 </el-input> 123 </el-input>
125 </el-form-item> 124 </el-form-item>
126 </el-col> 125 </el-col>
127 </el-row> 126 </el-row>
128 - <el-row>  
129 - <el-col :span="6">  
130 - <el-form-item label="" prop="enterprise">  
131 - <el-select v-model="editForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">  
132 - <el-option  
133 - v-for="item in options"  
134 - :key="item.value"  
135 - :label="item.label"  
136 - :value="item.value">  
137 - </el-option>  
138 - </el-select>  
139 - </el-form-item>  
140 - </el-col>  
141 - <el-col :span="6">  
142 - <el-form-item label="+" prop="enterprise">  
143 - <el-input v-model="editForm.ent" style="width:200px" size="small"/>  
144 - </el-form-item>  
145 - </el-col>  
146 - </el-row>  
147 </el-form> 127 </el-form>
148 <div slot="footer" class="dialog-footer" style="text-align: center"> 128 <div slot="footer" class="dialog-footer" style="text-align: center">
149 - <el-button @click.native="editFormVisible = false" style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" >取消</el-button>  
150 - <el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit">提交</el-button>  
151 - </div>  
152 - </el-dialog>  
153 -  
154 - <!--新增界面-->  
155 - <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false" tyle="margin-top: -20px"  
156 - width="60%" text-align="center">  
157 - <el-form :model="addForm" label-width="145px" :rules="addFormRules" ref="addForm" style="margin-top: -10px" >  
158 - <el-row>  
159 - <el-col :span="8" style="margin-right: 20px">  
160 - <el-form-item label="" prop="companyName">  
161 - <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">  
162 - <template slot="prepend" >公司</template>  
163 - </el-input>  
164 - </el-form-item>  
165 - </el-col>  
166 - <el-col :span="8">  
167 - <el-form-item label="" prop="conAddress">  
168 - <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">  
169 - <template slot="prepend" >地址</template>  
170 - </el-input>  
171 - </el-form-item>  
172 - </el-col>  
173 - </el-row>  
174 - <el-row>  
175 - <el-col :span="8" style="margin-right: 20px">  
176 - <el-form-item label="" prop="conPhone">  
177 - <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">  
178 - <template slot="prepend" >电话</template>  
179 - </el-input>  
180 - </el-form-item>  
181 - </el-col>  
182 - <el-col :span="8">  
183 - <el-form-item label="" prop="conFax">  
184 - <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">  
185 - <template slot="prepend" >传真</template>  
186 - </el-input>  
187 - </el-form-item>  
188 - </el-col>  
189 - </el-row>  
190 -  
191 - <el-row>  
192 - <el-col :span="8" style="margin-right: 20px">  
193 - <el-form-item label="" prop="conPostcode">  
194 - <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">  
195 - <template slot="prepend" >邮编</template>  
196 - </el-input>  
197 - </el-form-item>  
198 - </el-col>  
199 - <el-col :span="8">  
200 - <el-form-item label="" prop="conCity">  
201 - <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">  
202 - <template slot="prepend" >城市</template>  
203 - </el-input>  
204 - </el-form-item>  
205 - </el-col>  
206 - </el-row>  
207 - <el-row>  
208 - <el-col :span="8" style="margin-right: 20px">  
209 - <el-form-item label="" prop="country">  
210 - <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">  
211 - <template slot="prepend" >国家代码</template>  
212 - </el-input>  
213 - </el-form-item>  
214 - </el-col>  
215 - <el-col :span="8">  
216 - <el-form-item label="" prop="conAddress">  
217 - <el-form-item label="" prop="conName">  
218 - <el-input v-model="addForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">  
219 - <template slot="prepend" >收货人名称</template>  
220 - </el-input>  
221 - </el-form-item>  
222 - </el-form-item>  
223 - </el-col>  
224 - </el-row>  
225 - <el-row>  
226 - <el-col :span="8">  
227 - <el-form-item label="" prop="conAeo">  
228 - <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">  
229 - <template slot="prepend" >收货人AEO</template>  
230 - </el-input>  
231 - </el-form-item>  
232 - </el-col>  
233 - </el-row>  
234 - <el-row>  
235 - <el-col :span="6">  
236 - <el-form-item label="" prop="enterprise">  
237 - <el-select v-model="addForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">  
238 - <el-option  
239 - v-for="item in options"  
240 - :key="item.value"  
241 - :label="item.label"  
242 - :value="item.value">  
243 - </el-option>  
244 - </el-select>  
245 - </el-form-item>  
246 - </el-col>  
247 - <el-col :span="6">  
248 - <el-form-item label="+" prop="enterprise">  
249 - <el-input v-model="addForm.ent" style="width:200px" size="small"/>  
250 - </el-form-item>  
251 - </el-col>  
252 - </el-row>  
253 - </el-form>  
254 - <div slot="footer" class="dialog-footer" style="text-align: center">  
255 - <el-button style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" @click.native="addFormVisible = false">取消</el-button>  
256 - <el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit">提交</el-button> 129 + <el-button @click.native="coneeVisible = false" style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" >取消</el-button>
  130 + <el-button type="success" size="medium" style="width: 120px" @click.native="dialogStatus ==='create'? addSubmit():editSubmit()">保存</el-button>
257 </div> 131 </div>
258 </el-dialog> 132 </el-dialog>
259 </section> 133 </section>
260 </template> 134 </template>
261 135
262 <script> 136 <script>
263 - import util from '../../common/js/util'  
264 - import NProgress from 'nprogress'  
265 import { getList, remove, add, edit} from '../../api/consigner/consignee'; 137 import { getList, remove, add, edit} from '../../api/consigner/consignee';
266 - import moment from 'moment' 138 + import loginUserInfo from '../../api/base';
267 139
268 export default { 140 export default {
269 data() { 141 data() {
@@ -289,14 +161,17 @@ @@ -289,14 +161,17 @@
289 limitSize: 5, 161 limitSize: 5,
290 listLoading: false, 162 listLoading: false,
291 //编辑界面是否显示 163 //编辑界面是否显示
292 - editFormVisible: false, 164 + coneeVisible: false,
  165 + dialogStatus: undefined,
293 editLoading: false, 166 editLoading: false,
294 - editFormRules: {  
295 - 167 + dialogMap: {
  168 + update: '编辑',
  169 + create: '新增'
  170 + },
  171 + coneeRules: {
296 companyName: [ 172 companyName: [
297 { required: true, message: '不能为空！！!', trigger: 'blur' } 173 { required: true, message: '不能为空！！!', trigger: 'blur' }
298 ], 174 ],
299 -  
300 conName: [ 175 conName: [
301 { required: true, message: '不能为空！！!', trigger: 'blur' } 176 { required: true, message: '不能为空！！!', trigger: 'blur' }
302 ], 177 ],
@@ -311,10 +186,22 @@ @@ -311,10 +186,22 @@
311 ], 186 ],
312 conAddress: [ 187 conAddress: [
313 { required: true, message: '不能为空！！!', trigger: 'blur' } 188 { required: true, message: '不能为空！！!', trigger: 'blur' }
  189 + ],
  190 + conPhone: [
  191 + { required: true, message: '手机号不能为空', trigger: 'blur' },
  192 + { type: 'number', message: '手机号格式不正确', trigger: 'blur',
  193 + transform(value){
  194 + var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
  195 + if (!phone.test(value)){
  196 + return false;
  197 + }else {
  198 + return Number(value);
  199 + }
  200 + }}
314 ] 201 ]
315 }, 202 },
316 - //编辑界面数据  
317 - editForm: { 203 + //实体数据
  204 + coneeForm: {
318 id:'', 205 id:'',
319 companyName: '', 206 companyName: '',
320 conAddress: '', 207 conAddress: '',
@@ -326,59 +213,25 @@ @@ -326,59 +213,25 @@
326 conPostcode: '', 213 conPostcode: '',
327 country: '', 214 country: '',
328 enterprise: '', 215 enterprise: '',
329 - ent: '' 216 + ent: '',
  217 + enterpriseId:'',
  218 + userId:''
330 }, 219 },
331 - //新增界面是否显示  
332 - addFormVisible: false,  
333 - addFormRules: {  
334 - companyName: [  
335 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
336 - ],  
337 - conName: [  
338 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
339 - ],  
340 - country: [  
341 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
342 - ],  
343 - enterprise: [  
344 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
345 - ],  
346 - conCity: [  
347 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
348 - ],  
349 - conAddress: [  
350 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
351 - ]  
352 - },  
353 -  
354 - //新增界面数据  
355 - addForm: {  
356 - companyName: '',  
357 - conAddress: '',  
358 - conAeo: '',  
359 - conCity: '',  
360 - conFax: '',  
361 - conName: '',  
362 - conPhone: '',  
363 - conPostcode: '',  
364 - country: '',  
365 - enterprise: '',  
366 - ent: ''  
367 - }  
368 } 220 }
369 }, 221 },
370 mounted() { 222 mounted() {
371 - this.getConsigner(); 223 + this.getConsignee();
372 224
373 }, 225 },
374 methods: { 226 methods: {
375 227
376 //获取收货人列表 228 //获取收货人列表
377 - getConsigner() { 229 + getConsignee() {
378 let para = { 230 let para = {
379 pageSize: this.pageSize, 231 pageSize: this.pageSize,
380 limitSize: this.limitSize, 232 limitSize: this.limitSize,
381 - companyName: this.filters.companyName 233 + companyName: this.filters.companyName,
  234 + enterpriseId: loginUserInfo.companyId
382 }; 235 };
383 this.listLoading = true; 236 this.listLoading = true;
384 getList(para).then((res) => { 237 getList(para).then((res) => {
@@ -398,8 +251,6 @@ @@ -398,8 +251,6 @@
398 }); 251 });
399 252
400 }, 253 },
401 -  
402 -  
403 //删除 254 //删除
404 handleDel: function (index, row) { 255 handleDel: function (index, row) {
405 this.$confirm('确认删除该记录吗?', '提示', { 256 this.$confirm('确认删除该记录吗?', '提示', {
@@ -414,14 +265,14 @@ @@ -414,14 +265,14 @@
414 message: '删除成功', 265 message: '删除成功',
415 type: 'success' 266 type: 'success'
416 }); 267 });
417 - this.getConsigner(); 268 + this.getConsignee();
418 }else { 269 }else {
419 this.listLoading = false; 270 this.listLoading = false;
420 this.$message({ 271 this.$message({
421 message: '删除失败', 272 message: '删除失败',
422 type: 'error' 273 type: 'error'
423 }); 274 });
424 - this.getConsigner(); 275 + this.getConsignee();
425 } 276 }
426 277
427 }).catch((error) => { 278 }).catch((error) => {
@@ -436,33 +287,29 @@ @@ -436,33 +287,29 @@
436 * @param row 为这行的数据对象 287 * @param row 为这行的数据对象
437 */ 288 */
438 handleEdit: function (index, row) { 289 handleEdit: function (index, row) {
439 - this.editFormVisible = true;  
440 - let strings = row.enterprise.split("+");  
441 - row.enterprise = strings[0];  
442 - row.ent = strings[1]  
443 - this.editForm = Object.assign({}, row);  
444 - this.getConsigner(); 290 + this.dialogStatus = 'update'
  291 + this.coneeVisible = true;
  292 + this.coneeForm = Object.assign({}, row);
  293 + // this.getConsignee();
  294 + this.userId()
445 }, 295 },
446 -  
447 //编辑 296 //编辑
448 editSubmit: function () { 297 editSubmit: function () {
449 -  
450 - this.$refs.editForm.validate((valid) => { 298 + this.$refs.coneeForm.validate((valid) => {
451 if (valid) { 299 if (valid) {
452 this.$confirm('确认提交吗？', '提示', {}).then(() => { 300 this.$confirm('确认提交吗？', '提示', {}).then(() => {
453 this.editLoading = true; 301 this.editLoading = true;
454 - this.editForm.enterprise = this.editForm.enterprise+"+"+this.editForm.ent;  
455 - let para = Object.assign({}, this.editForm); 302 + let para = Object.assign({}, this.coneeForm);
456 this.editLoading = true; 303 this.editLoading = true;
457 edit(para).then((res) => { 304 edit(para).then((res) => {
458 - if (res.data.code == 200){ 305 + if (res.data.code == '200'){
459 this.$message({ 306 this.$message({
460 message: '提交成功', 307 message: '提交成功',
461 type: 'success' 308 type: 'success'
462 }); 309 });
463 - this.$refs['editForm'].resetFields();  
464 - this.editFormVisible = false;  
465 - this.getConsigner(); 310 + this.$refs['coneeForm'].resetFields();
  311 + this.coneeVisible = false;
  312 + this.getConsignee();
466 }else { 313 }else {
467 this.$message({ 314 this.$message({
468 message: '提交失败', 315 message: '提交失败',
@@ -475,31 +322,31 @@ @@ -475,31 +322,31 @@
475 } 322 }
476 }); 323 });
477 }, 324 },
478 -  
479 //显示新增界面，每次点开初始化数据 325 //显示新增界面，每次点开初始化数据
480 companyAdd: function () { 326 companyAdd: function () {
481 - this.addFormVisible = true;  
482 - this.getConsigner(); 327 + this.dialogStatus = 'create'
  328 + this.coneeVisible = true;
  329 + this.tableForm();
  330 + this.userId();
483 }, 331 },
484 //新增 332 //新增
485 addSubmit: function () { 333 addSubmit: function () {
486 - this.$refs.addForm.validate((valid) => { 334 + this.$refs.coneeForm.validate((valid) => {
487 if (valid) { 335 if (valid) {
488 this.$confirm('确认提交吗？', '提示', {}).then(() => { 336 this.$confirm('确认提交吗？', '提示', {}).then(() => {
489 //NProgress.start(); 337 //NProgress.start();
490 this.listLoading = true; 338 this.listLoading = true;
491 - this.addForm.enterprise = this.addForm.enterprise+"+"+this.addForm.ent;  
492 - let para = Object.assign({}, this.addForm); 339 + let para = Object.assign({}, this.coneeForm);
493 add(para).then((res) => { 340 add(para).then((res) => {
494 - if (res.data.code == 200){ 341 + if (res.data.code == '200'){
495 //NProgress.done(); 342 //NProgress.done();
496 this.$message({ 343 this.$message({
497 message: '提交成功', 344 message: '提交成功',
498 type: 'success' 345 type: 'success'
499 }); 346 });
500 - this.$refs['addForm'].resetFields();  
501 - this.addFormVisible = false;  
502 - this.getConsigner(); 347 + this.$refs['coneeForm'].resetFields();
  348 + this.coneeVisible = false;
  349 + this.getConsignee();
503 }else { 350 }else {
504 this.$message({ 351 this.$message({
505 message: '提交失败', 352 message: '提交失败',
@@ -530,11 +377,33 @@ @@ -530,11 +377,33 @@
530 message: '删除成功', 377 message: '删除成功',
531 type: 'success' 378 type: 'success'
532 }); 379 });
533 - this.getConsigner(); 380 + this.getConsignee();
534 }); 381 });
535 }).catch(() => { 382 }).catch(() => {
536 383
537 }); 384 });
  385 + },
  386 + // 实体重置
  387 + tableForm(){
  388 + this.coneeForm = {
  389 + id:'',
  390 + companyName: '',
  391 + conAddress: '',
  392 + conAeo: '',
  393 + conCity: '',
  394 + conFax: '',
  395 + conName: '',
  396 + conPhone: '',
  397 + conPostcode: '',
  398 + country: '',
  399 + enterprise: '',
  400 + ent: ''
  401 + }
  402 + },
  403 + //设置 用户id 企业id
  404 + userId(){
  405 + this.coneeForm.userId = loginUserInfo.userId;
  406 + this.coneeForm.enterpriseId = loginUserInfo.companyId;
538 } 407 }
539 }, 408 },
540 409
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input size="small" v-model="filters.companyName" placeholder="关键字查询"></el-input> 7 + <el-input size="small" v-model="filters.companyName" placeholder="公司名称"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsignee()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button> 13 <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button>
@@ -23,16 +23,16 @@ @@ -23,16 +23,16 @@
23 </el-table-column> 23 </el-table-column>
24 <el-table-column label="序号" type="index"> 24 <el-table-column label="序号" type="index">
25 </el-table-column> 25 </el-table-column>
26 - <el-table-column prop="companyName" label="发货人公司" > 26 + <el-table-column prop="companyName" label="收货人公司" >
27 </el-table-column> 27 </el-table-column>
28 - <el-table-column prop="conCity" label="发货人城市" > 28 + <el-table-column prop="conCity" label="收货人城市" >
29 </el-table-column> 29 </el-table-column>
30 - <el-table-column prop="country" label="发货人国家代码" > 30 + <el-table-column prop="country" label="收货人国家代码" >
31 </el-table-column> 31 </el-table-column>
32 - <el-table-column prop="conPhone" label="发货人电话" >  
33 - </el-table-column>  
34 - <el-table-column prop="enterprise" label="发货人企业代码" > 32 + <el-table-column prop="conPhone" label="收货人电话" >
35 </el-table-column> 33 </el-table-column>
  34 + <!-- <el-table-column prop="enterprise" label="收货人企业代码" >-->
  35 + <!-- </el-table-column>-->
36 <el-table-column label="操作" min-width="150"> 36 <el-table-column label="操作" min-width="150">
37 <template slot-scope="scope"> 37 <template slot-scope="scope">
38 <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 38 <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
@@ -40,28 +40,27 @@ @@ -40,28 +40,27 @@
40 </template> 40 </template>
41 </el-table-column> 41 </el-table-column>
42 </el-table> 42 </el-table>
43 -  
44 <!--编辑界面--> 43 <!--编辑界面-->
45 - <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">  
46 - <el-form :model="editForm" :rules="editFormRules" ref="editForm" label-width="145px" style="margin-top: -10px"> 44 + <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="conerVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
  45 + <el-form :model="conerForm" :rules="conerRules" ref="conerForm" label-width="145px" style="margin-top: -10px">
47 <el-row> 46 <el-row>
48 - <el-col :span="4"> 47 + <el-col :span="4" style="display: none">
49 <el-form-item label="ID"> 48 <el-form-item label="ID">
50 - <span>{{editForm.id}}</span> 49 + <span>{{conerForm.id}}</span>
51 </el-form-item> 50 </el-form-item>
52 </el-col> 51 </el-col>
53 </el-row> 52 </el-row>
54 <el-row> 53 <el-row>
55 <el-col :span="8" style="margin-right: 20px"> 54 <el-col :span="8" style="margin-right: 20px">
56 <el-form-item label="" prop="companyName"> 55 <el-form-item label="" prop="companyName">
57 - <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small"> 56 + <el-input v-model="conerForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
58 <template slot="prepend" >公司</template> 57 <template slot="prepend" >公司</template>
59 </el-input> 58 </el-input>
60 </el-form-item> 59 </el-form-item>
61 </el-col> 60 </el-col>
62 <el-col :span="8"> 61 <el-col :span="8">
63 <el-form-item label="" prop="conAddress"> 62 <el-form-item label="" prop="conAddress">
64 - <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small"> 63 + <el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
65 <template slot="prepend" >地址</template> 64 <template slot="prepend" >地址</template>
66 </el-input> 65 </el-input>
67 </el-form-item> 66 </el-form-item>
@@ -70,134 +69,31 @@ @@ -70,134 +69,31 @@
70 <el-row> 69 <el-row>
71 <el-col :span="8" style="margin-right: 20px"> 70 <el-col :span="8" style="margin-right: 20px">
72 <el-form-item label="" prop="conPhone"> 71 <el-form-item label="" prop="conPhone">
73 - <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small"> 72 + <el-input v-model="conerForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
74 <template slot="prepend" >电话</template> 73 <template slot="prepend" >电话</template>
75 </el-input> 74 </el-input>
76 </el-form-item> 75 </el-form-item>
77 </el-col> 76 </el-col>
78 <el-col :span="8"> 77 <el-col :span="8">
79 <el-form-item label="" prop="conFax"> 78 <el-form-item label="" prop="conFax">
80 - <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small"> 79 + <el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
81 <template slot="prepend" >传真</template> 80 <template slot="prepend" >传真</template>
82 </el-input> 81 </el-input>
83 </el-form-item> 82 </el-form-item>
84 </el-col> 83 </el-col>
85 </el-row> 84 </el-row>
86 - <el-row>  
87 - <el-col :span="8" style="margin-right: 20px">  
88 - <el-form-item label="" prop="conPostcode">  
89 - <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">  
90 - <template slot="prepend" >邮编</template>  
91 - </el-input>  
92 - </el-form-item>  
93 - </el-col>  
94 - <el-col :span="8">  
95 - <el-form-item label="" prop="conCity">  
96 - <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">  
97 - <template slot="prepend" >城市</template>  
98 - </el-input>  
99 - </el-form-item>  
100 - </el-col>  
101 - </el-row>  
102 - <el-row>  
103 - <el-col :span="8" style="margin-right: 20px">  
104 - <el-form-item label="" prop="country">  
105 - <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">  
106 - <template slot="prepend" >国家代码</template>  
107 - </el-input>  
108 - </el-form-item>  
109 - </el-col>  
110 - <el-col :span="8">  
111 - <el-form-item label="" prop="conName">  
112 - <el-input v-model="editForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" size="small">  
113 - <template slot="prepend" >发货人名称</template>  
114 - </el-input>  
115 - </el-form-item>  
116 - </el-col>  
117 -  
118 - </el-row>  
119 - <el-row>  
120 - <el-col :span="8">  
121 - <el-form-item label="" prop="conAeo">  
122 - <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px" size="small">  
123 - <template slot="prepend" >发货人AEO</template>  
124 - </el-input>  
125 - </el-form-item>  
126 - </el-col>  
127 - </el-row>  
128 - <el-row>  
129 - <el-col :span="6">  
130 - <el-form-item label="" prop="enterprise">  
131 - <el-select v-model="editForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">  
132 - <el-option  
133 - v-for="item in options"  
134 - :key="item.value"  
135 - :label="item.label"  
136 - :value="item.value">  
137 - </el-option>  
138 - </el-select>  
139 - </el-form-item>  
140 - </el-col>  
141 - <el-col :span="6">  
142 - <el-form-item label="+" prop="enterprise">  
143 - <el-input v-model="editForm.ent" style="width:200px" size="small"></el-input>  
144 - </el-form-item>  
145 - </el-col>  
146 - </el-row>  
147 - </el-form>  
148 - <div slot="footer" class="dialog-footer" style="text-align: center">  
149 - <el-button @click.native="editFormVisible = false" style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" >取消</el-button>  
150 - <el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit" :loading="editLoading">提交</el-button>  
151 - </div>  
152 - </el-dialog>  
153 85
154 - <!--新增界面-->  
155 - <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false" tyle="margin-top: -20px"  
156 - width="60%" text-align="center">  
157 - <el-form :model="addForm" label-width="145px" :rules="addFormRules" ref="addForm" style="margin-top: -10px" >  
158 - <el-row>  
159 - <el-col :span="8" style="margin-right: 20px">  
160 - <el-form-item label="" prop="companyName">  
161 - <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">  
162 - <template slot="prepend" >公司</template>  
163 - </el-input>  
164 - </el-form-item>  
165 - </el-col>  
166 - <el-col :span="8">  
167 - <el-form-item label="" prop="conAddress">  
168 - <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">  
169 - <template slot="prepend" >地址</template>  
170 - </el-input>  
171 - </el-form-item>  
172 - </el-col>  
173 - </el-row>  
174 - <el-row>  
175 - <el-col :span="8" style="margin-right: 20px">  
176 - <el-form-item label="" prop="conPhone">  
177 - <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">  
178 - <template slot="prepend" >电话</template>  
179 - </el-input>  
180 - </el-form-item>  
181 - </el-col>  
182 - <el-col :span="8">  
183 - <el-form-item label="" prop="conFax">  
184 - <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">  
185 - <template slot="prepend" >传真</template>  
186 - </el-input>  
187 - </el-form-item>  
188 - </el-col>  
189 - </el-row>  
190 <el-row> 86 <el-row>
191 <el-col :span="8" style="margin-right: 20px"> 87 <el-col :span="8" style="margin-right: 20px">
192 <el-form-item label="" prop="conPostcode"> 88 <el-form-item label="" prop="conPostcode">
193 - <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small"> 89 + <el-input v-model="conerForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
194 <template slot="prepend" >邮编</template> 90 <template slot="prepend" >邮编</template>
195 </el-input> 91 </el-input>
196 </el-form-item> 92 </el-form-item>
197 </el-col> 93 </el-col>
198 <el-col :span="8"> 94 <el-col :span="8">
199 <el-form-item label="" prop="conCity"> 95 <el-form-item label="" prop="conCity">
200 - <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small"> 96 + <el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
201 <template slot="prepend" >城市</template> 97 <template slot="prepend" >城市</template>
202 </el-input> 98 </el-input>
203 </el-form-item> 99 </el-form-item>
@@ -206,63 +102,40 @@ @@ -206,63 +102,40 @@
206 <el-row> 102 <el-row>
207 <el-col :span="8" style="margin-right: 20px"> 103 <el-col :span="8" style="margin-right: 20px">
208 <el-form-item label="" prop="country"> 104 <el-form-item label="" prop="country">
209 - <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small"> 105 + <el-input v-model="conerForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
210 <template slot="prepend" >国家代码</template> 106 <template slot="prepend" >国家代码</template>
211 </el-input> 107 </el-input>
212 </el-form-item> 108 </el-form-item>
213 </el-col> 109 </el-col>
214 <el-col :span="8"> 110 <el-col :span="8">
215 <el-form-item label="" prop="conName"> 111 <el-form-item label="" prop="conName">
216 - <el-input v-model="addForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" size="small">  
217 - <template slot="prepend" >发货人名称</template> 112 + <el-input v-model="conerForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">
  113 + <template slot="prepend" >收货人名称</template>
218 </el-input> 114 </el-input>
219 </el-form-item> 115 </el-form-item>
220 </el-col> 116 </el-col>
221 -  
222 </el-row> 117 </el-row>
223 -  
224 <el-row> 118 <el-row>
225 <el-col :span="8"> 119 <el-col :span="8">
226 <el-form-item label="" prop="conAeo"> 120 <el-form-item label="" prop="conAeo">
227 - <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px" size="small">  
228 - <template slot="prepend" >发货人AEO</template> 121 + <el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">
  122 + <template slot="prepend" >收货人AEO</template>
229 </el-input> 123 </el-input>
230 </el-form-item> 124 </el-form-item>
231 </el-col> 125 </el-col>
232 </el-row> 126 </el-row>
233 - <el-row>  
234 - <el-col :span="6">  
235 - <el-form-item label="" prop="enterprise">  
236 - <el-select v-model="addForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">  
237 - <el-option  
238 - v-for="item in options"  
239 - :key="item.value"  
240 - :label="item.label"  
241 - :value="item.value">  
242 - </el-option>  
243 - </el-select>  
244 - </el-form-item>  
245 - </el-col>  
246 - <el-col :span="6">  
247 - <el-form-item label="+" prop="enterprise">  
248 - <el-input v-model="addForm.ent" style="width:200px" size="small"></el-input>  
249 - </el-form-item>  
250 - </el-col>  
251 - </el-row>  
252 </el-form> 127 </el-form>
253 <div slot="footer" class="dialog-footer" style="text-align: center"> 128 <div slot="footer" class="dialog-footer" style="text-align: center">
254 - <el-button style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" @click.native="addFormVisible = false">取消</el-button>  
255 - <el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit">提交</el-button> 129 + <el-button @click.native="conerVisible = false" style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" >取消</el-button>
  130 + <el-button type="success" size="medium" style="width: 120px" @click.native="dialogStatus ==='create'? addSubmit():editSubmit()">保存</el-button>
256 </div> 131 </div>
257 </el-dialog> 132 </el-dialog>
258 </section> 133 </section>
259 </template> 134 </template>
260 135
261 <script> 136 <script>
262 - import util from '../../common/js/util'  
263 - import NProgress from 'nprogress'  
264 import { getList, remove, add, edit} from '../../api/consigner/consigner'; 137 import { getList, remove, add, edit} from '../../api/consigner/consigner';
265 - import moment from 'moment' 138 + import loginUserInfo from '../../api/base';
266 139
267 export default { 140 export default {
268 data() { 141 data() {
@@ -288,14 +161,17 @@ @@ -288,14 +161,17 @@
288 limitSize: 5, 161 limitSize: 5,
289 listLoading: false, 162 listLoading: false,
290 //编辑界面是否显示 163 //编辑界面是否显示
291 - editFormVisible: false, 164 + conerVisible: false,
  165 + dialogStatus: undefined,
292 editLoading: false, 166 editLoading: false,
293 - editFormRules: {  
294 - 167 + dialogMap: {
  168 + update: '编辑',
  169 + create: '新增'
  170 + },
  171 + conerRules: {
295 companyName: [ 172 companyName: [
296 { required: true, message: '不能为空！！!', trigger: 'blur' } 173 { required: true, message: '不能为空！！!', trigger: 'blur' }
297 ], 174 ],
298 -  
299 conName: [ 175 conName: [
300 { required: true, message: '不能为空！！!', trigger: 'blur' } 176 { required: true, message: '不能为空！！!', trigger: 'blur' }
301 ], 177 ],
@@ -310,10 +186,22 @@ @@ -310,10 +186,22 @@
310 ], 186 ],
311 conAddress: [ 187 conAddress: [
312 { required: true, message: '不能为空！！!', trigger: 'blur' } 188 { required: true, message: '不能为空！！!', trigger: 'blur' }
  189 + ],
  190 + conPhone: [
  191 + { required: true, message: '手机号不能为空', trigger: 'blur' },
  192 + { type: 'number', message: '手机号格式不正确', trigger: 'blur',
  193 + transform(value){
  194 + var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
  195 + if (!phone.test(value)){
  196 + return false;
  197 + }else {
  198 + return Number(value);
  199 + }
  200 + }}
313 ] 201 ]
314 }, 202 },
315 - //编辑界面数据  
316 - editForm: { 203 + //实体数据
  204 + conerForm: {
317 id:'', 205 id:'',
318 companyName: '', 206 companyName: '',
319 conAddress: '', 207 conAddress: '',
@@ -325,59 +213,25 @@ @@ -325,59 +213,25 @@
325 conPostcode: '', 213 conPostcode: '',
326 country: '', 214 country: '',
327 enterprise: '', 215 enterprise: '',
328 - ent: ''  
329 - },  
330 - //新增界面是否显示  
331 - addFormVisible: false,  
332 - addFormRules: {  
333 - companyName: [  
334 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
335 - ],  
336 - conName: [  
337 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
338 - ],  
339 - country: [  
340 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
341 - ],  
342 - enterprise: [  
343 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
344 - ],  
345 - conCity: [  
346 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
347 - ],  
348 - conAddress: [  
349 - { required: true, message: '不能为空！！!', trigger: 'blur' }  
350 - ] 216 + ent: '',
  217 + enterpriseId:'',
  218 + userId:''
351 }, 219 },
352 -  
353 - //新增界面数据  
354 - addForm: {  
355 - companyName: '',  
356 - conAddress: '',  
357 - conAeo: '',  
358 - conCity: '',  
359 - conFax: '',  
360 - conName: '',  
361 - conPhone: '',  
362 - conPostcode: '',  
363 - country: '',  
364 - enterprise: '',  
365 - ent: ''  
366 - }  
367 } 220 }
368 }, 221 },
369 mounted() { 222 mounted() {
370 - this.getConsigner(); 223 + this.getConsignee();
371 224
372 }, 225 },
373 methods: { 226 methods: {
374 227
375 - //获取发货人列表  
376 - getConsigner() { 228 + //获取收货人列表
  229 + getConsignee() {
377 let para = { 230 let para = {
378 pageSize: this.pageSize, 231 pageSize: this.pageSize,
379 limitSize: this.limitSize, 232 limitSize: this.limitSize,
380 - companyName: this.filters.companyName 233 + companyName: this.filters.companyName,
  234 + enterpriseId: loginUserInfo.companyId
381 }; 235 };
382 this.listLoading = true; 236 this.listLoading = true;
383 getList(para).then((res) => { 237 getList(para).then((res) => {
@@ -397,8 +251,6 @@ @@ -397,8 +251,6 @@
397 }); 251 });
398 252
399 }, 253 },
400 -  
401 -  
402 //删除 254 //删除
403 handleDel: function (index, row) { 255 handleDel: function (index, row) {
404 this.$confirm('确认删除该记录吗?', '提示', { 256 this.$confirm('确认删除该记录吗?', '提示', {
@@ -413,14 +265,14 @@ @@ -413,14 +265,14 @@
413 message: '删除成功', 265 message: '删除成功',
414 type: 'success' 266 type: 'success'
415 }); 267 });
416 - this.getConsigner(); 268 + this.getConsignee();
417 }else { 269 }else {
418 this.listLoading = false; 270 this.listLoading = false;
419 this.$message({ 271 this.$message({
420 message: '删除失败', 272 message: '删除失败',
421 type: 'error' 273 type: 'error'
422 }); 274 });
423 - this.getConsigner(); 275 + this.getConsignee();
424 } 276 }
425 277
426 }).catch((error) => { 278 }).catch((error) => {
@@ -435,33 +287,29 @@ @@ -435,33 +287,29 @@
435 * @param row 为这行的数据对象 287 * @param row 为这行的数据对象
436 */ 288 */
437 handleEdit: function (index, row) { 289 handleEdit: function (index, row) {
438 - this.editFormVisible = true;  
439 - let strings = row.enterprise.split("+");  
440 - row.enterprise = strings[0];  
441 - row.ent = strings[1]  
442 - this.editForm = Object.assign({}, row);  
443 - this.getConsigner(); 290 + this.dialogStatus = 'update'
  291 + this.conerVisible = true;
  292 + this.conerForm = Object.assign({}, row);
  293 + // this.getConsignee();
  294 + this.userId()
444 }, 295 },
445 -  
446 //编辑 296 //编辑
447 editSubmit: function () { 297 editSubmit: function () {
448 -  
449 - this.$refs.editForm.validate((valid) => { 298 + this.$refs.conerForm.validate((valid) => {
450 if (valid) { 299 if (valid) {
451 this.$confirm('确认提交吗？', '提示', {}).then(() => { 300 this.$confirm('确认提交吗？', '提示', {}).then(() => {
452 this.editLoading = true; 301 this.editLoading = true;
453 - this.editForm.enterprise = this.editForm.enterprise+"+"+this.editForm.ent;  
454 - let para = Object.assign({}, this.editForm); 302 + let para = Object.assign({}, this.conerForm);
455 this.editLoading = true; 303 this.editLoading = true;
456 edit(para).then((res) => { 304 edit(para).then((res) => {
457 - if (res.data.code == 200){ 305 + if (res.data.code == '200'){
458 this.$message({ 306 this.$message({
459 message: '提交成功', 307 message: '提交成功',
460 type: 'success' 308 type: 'success'
461 }); 309 });
462 - this.$refs['editForm'].resetFields();  
463 - this.editFormVisible = false;  
464 - this.getConsigner(); 310 + this.$refs['conerForm'].resetFields();
  311 + this.conerVisible = false;
  312 + this.getConsignee();
465 }else { 313 }else {
466 this.$message({ 314 this.$message({
467 message: '提交失败', 315 message: '提交失败',
@@ -474,31 +322,31 @@ @@ -474,31 +322,31 @@
474 } 322 }
475 }); 323 });
476 }, 324 },
477 -  
478 //显示新增界面，每次点开初始化数据 325 //显示新增界面，每次点开初始化数据
479 companyAdd: function () { 326 companyAdd: function () {
480 - this.addFormVisible = true;  
481 - this.getConsigner(); 327 + this.dialogStatus = 'create'
  328 + this.conerVisible = true;
  329 + this.tableForm();
  330 + this.userId();
482 }, 331 },
483 //新增 332 //新增
484 addSubmit: function () { 333 addSubmit: function () {
485 - this.$refs.addForm.validate((valid) => { 334 + this.$refs.conerForm.validate((valid) => {
486 if (valid) { 335 if (valid) {
487 this.$confirm('确认提交吗？', '提示', {}).then(() => { 336 this.$confirm('确认提交吗？', '提示', {}).then(() => {
488 //NProgress.start(); 337 //NProgress.start();
489 this.listLoading = true; 338 this.listLoading = true;
490 - this.addForm.enterprise = this.addForm.enterprise+"+"+this.addForm.ent;  
491 - let para = Object.assign({}, this.addForm); 339 + let para = Object.assign({}, this.conerForm);
492 add(para).then((res) => { 340 add(para).then((res) => {
493 - if (res.data.code == 200){ 341 + if (res.data.code == '200'){
494 //NProgress.done(); 342 //NProgress.done();
495 this.$message({ 343 this.$message({
496 message: '提交成功', 344 message: '提交成功',
497 type: 'success' 345 type: 'success'
498 }); 346 });
499 - this.$refs['addForm'].resetFields();  
500 - this.addFormVisible = false;  
501 - this.getConsigner(); 347 + this.$refs['conerForm'].resetFields();
  348 + this.conerVisible = false;
  349 + this.getConsignee();
502 }else { 350 }else {
503 this.$message({ 351 this.$message({
504 message: '提交失败', 352 message: '提交失败',
@@ -529,11 +377,33 @@ @@ -529,11 +377,33 @@
529 message: '删除成功', 377 message: '删除成功',
530 type: 'success' 378 type: 'success'
531 }); 379 });
532 - this.getConsigner(); 380 + this.getConsignee();
533 }); 381 });
534 }).catch(() => { 382 }).catch(() => {
535 383
536 }); 384 });
  385 + },
  386 + // 实体重置
  387 + tableForm(){
  388 + this.conerForm = {
  389 + id:'',
  390 + companyName: '',
  391 + conAddress: '',
  392 + conAeo: '',
  393 + conCity: '',
  394 + conFax: '',
  395 + conName: '',
  396 + conPhone: '',
  397 + conPostcode: '',
  398 + country: '',
  399 + enterprise: '',
  400 + ent: ''
  401 + }
  402 + },
  403 + //设置 用户id 企业id
  404 + userId(){
  405 + this.conerForm.userId = loginUserInfo.userId;
  406 + this.conerForm.enterpriseId = loginUserInfo.companyId;
537 } 407 }
538 }, 408 },
539 409
@@ -41,6 +41,9 @@ @@ -41,6 +41,9 @@
41 style="width:150px" icon="el-icon-plus" 41 style="width:150px" icon="el-icon-plus"
42 @click="handleAddpre">新增预配舱单 42 @click="handleAddpre">新增预配舱单
43 </el-button> 43 </el-button>
  44 + <el-button @click="download" style="width:150px" size="small" type="primary">
  45 + 模板下载
  46 + </el-button>
44 <el-upload 47 <el-upload
45 style="display: inline; margin-left: 10px;margin-right: 10px;" 48 style="display: inline; margin-left: 10px;margin-right: 10px;"
46 action="" 49 action=""
@@ -185,503 +188,6 @@ @@ -185,503 +188,6 @@
185 188
186 <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize" 189 <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize"
187 @pagination="getList"/> 190 @pagination="getList"/>
188 -  
189 -<!-- <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">-->  
190 -<!-- <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"-->  
191 -<!-- label-width="80px" size="mini" class="el-dialog-div">-->  
192 -<!-- <div class="grid-content content" style="font-size: 10px">-->  
193 -<!-- 运单信息-->  
194 -<!-- </div>-->  
195 -<!-- <el-row>-->  
196 -<!-- <el-col :span="7.5">-->  
197 -<!-- <el-form-item label="" prop="awba">-->  
198 -<!-- <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable>-->  
199 -<!-- <template slot="prepend" >主单号</template>-->  
200 -<!-- </el-input>-->  
201 -<!-- </el-form-item>-->  
202 -<!-- </el-col>-->  
203 -<!-- <el-col :span="7.5" v-if="fenStatus === 'addAwbh'">-->  
204 -<!-- <el-form-item label="" prop="awbh">-->  
205 -<!-- <el-input v-model="awbh" clearable>-->  
206 -<!-- <template slot="prepend" >分单号</template>-->  
207 -<!-- </el-input>-->  
208 -<!-- </el-form-item>-->  
209 -<!-- </el-col>-->  
210 -<!-- </el-row>-->  
211 -<!-- <div class="grid-content content" style="font-size: 10px">-->  
212 -<!-- 航班信息-->  
213 -<!-- </div>-->  
214 -<!-- <el-row>-->  
215 -<!-- <el-col :span="7.5">-->  
216 -<!-- <el-form-item label="" prop="carrier">-->  
217 -<!-- <el-input v-model="carrier" :disabled="fenStatus === 'addAwbh'" clearable>-->  
218 -<!-- <template slot="prepend" >承运人</template>-->  
219 -<!-- </el-input>-->  
220 -<!-- </el-form-item>-->  
221 -<!-- </el-col>-->  
222 -<!-- <el-col :span="7.5">-->  
223 -<!-- <el-form-item label="" prop="flightno">-->  
224 -<!-- <el-input v-model="flightno" :disabled="fenStatus === 'addAwbh'" clearable>-->  
225 -<!-- <template slot="prepend" >航班号</template>-->  
226 -<!-- </el-input>-->  
227 -<!-- </el-form-item>-->  
228 -<!-- </el-col>-->  
229 -<!-- <el-col :span="7.5">-->  
230 -<!-- <el-form-item label="" prop="flightdate">-->  
231 -<!-- <el-date-picker :disabled="fenStatus === 'addAwbh'"-->  
232 -<!-- value-format="yyyy-MM-dd" style="width: 270px"-->  
233 -<!-- v-model="preModel.flightdate" align="right"-->  
234 -<!-- type="date" placeholder="请输入航班日期" clearable/>-->  
235 -<!-- </el-form-item>-->  
236 -<!-- </el-col>-->  
237 -<!-- <el-col :span="7.5">-->  
238 -<!-- <el-form-item label="" prop="originstation">-->  
239 -<!-- <el-select-->  
240 -<!-- filterable-->  
241 -<!-- clearable-->  
242 -<!-- placeholder="请选择起始站"-->  
243 -<!-- :remote-method="remoteMethodAirport"-->  
244 -<!-- allow-create remote-->  
245 -<!-- v-model="originstation"-->  
246 -<!-- :loading="airportLoading"-->  
247 -<!-- style="width: 270px">-->  
248 -<!-- <el-option v-for="item in airportCode"-->  
249 -<!-- :key="item.airportid" :label="item.airportid"-->  
250 -<!-- :value="item.airportid" :disabled="fenStatus === 'addAwbh'">-->  
251 -<!-- <span style="float: left">{{ item.airportdescchn }}</span>-->  
252 -<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>-->  
253 -<!-- </el-option>-->  
254 -<!-- </el-select>-->  
255 -<!-- </el-form-item>-->  
256 -<!-- </el-col>-->  
257 -<!-- <el-col :span="7.5">-->  
258 -<!-- <el-form-item label="" prop="destinationstation">-->  
259 -<!-- <el-select filterable clearable placeholder="请选择目的站" allow-create remote-->  
260 -<!-- v-model="destinationstation" :remote-method="remoteMethodAirport" style="width: 270px">-->  
261 -<!-- <el-option v-for="item in airportCode"-->  
262 -<!-- :key="item.airportid" :label="item.airportid"-->  
263 -<!-- :value="item.airportid" :disabled="fenStatus === 'addAwbh'" >-->  
264 -<!-- <span style="float: left">{{ item.airportdescchn }}</span>-->  
265 -<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>-->  
266 -<!-- </el-option>-->  
267 -<!-- </el-select>-->  
268 -<!-- </el-form-item>-->  
269 -<!-- </el-col>-->  
270 -<!-- </el-row>-->  
271 -<!-- <div class="grid-content content" style="font-size: 10px">-->  
272 -<!-- 航程信息-->  
273 -<!-- </div>-->  
274 -<!-- <div>-->  
275 -<!-- <el-row>-->  
276 -<!-- <el-col :span="5">-->  
277 -<!-- <el-form-item label="" prop="carrier">-->  
278 -<!-- <el-input v-model="carrier" disabled clearable>-->  
279 -<!-- <template slot="prepend" >承运人</template>-->  
280 -<!-- </el-input>-->  
281 -<!-- </el-form-item>-->  
282 -<!-- </el-col>-->  
283 -<!-- <el-col :span="5">-->  
284 -<!-- <el-form-item label="" prop="destinationstation">-->  
285 -<!-- <el-input v-model="destinationstation" disabled clearable>-->  
286 -<!-- <template slot="prepend" >到达航站</template>-->  
287 -<!-- </el-input>-->  
288 -<!-- </el-form-item>-->  
289 -<!-- </el-col>-->  
290 -<!-- <el-col :span="5">-->  
291 -<!-- <el-form-item label="">-->  
292 -<!-- <el-input v-model="by1" clearable>-->  
293 -<!-- <template slot="prepend" >承运人1</template>-->  
294 -<!-- </el-input>-->  
295 -<!-- </el-form-item>-->  
296 -<!-- </el-col>-->  
297 -<!-- <el-col :span="5">-->  
298 -<!-- <el-form-item label="">-->  
299 -<!-- <el-input v-model="dest1" clearable>-->  
300 -<!-- <template slot="prepend" >到达航站1</template>-->  
301 -<!-- </el-input>-->  
302 -<!-- </el-form-item>-->  
303 -<!-- </el-col>-->  
304 -<!-- <el-col :span="5">-->  
305 -<!-- <el-form-item label="">-->  
306 -<!-- <el-input v-model="by2" clearable>-->  
307 -<!-- <template slot="prepend" >承运人2</template>-->  
308 -<!-- </el-input>-->  
309 -<!-- </el-form-item>-->  
310 -<!-- </el-col>-->  
311 -<!-- <el-col :span="5">-->  
312 -<!-- <el-form-item label="">-->  
313 -<!-- <el-input v-model="dest2" clearable>-->  
314 -<!-- <template slot="prepend" >到达航站2</template>-->  
315 -<!-- </el-input>-->  
316 -<!-- </el-form-item>-->  
317 -<!-- </el-col>-->  
318 -<!-- </el-row>-->  
319 -<!-- </div>-->  
320 -<!-- <div class="grid-content content" style="font-size: 10px">-->  
321 -<!-- 货物信息-->  
322 -<!-- </div>-->  
323 -<!-- <el-row>-->  
324 -<!-- <el-col :span="5">-->  
325 -<!-- <el-form-item label="" prop="awbinfo.pcs">-->  
326 -<!-- <el-input v-model="preModel.awbinfo.pcs" clearable>-->  
327 -<!-- <template slot="prepend" >运单件数</template>-->  
328 -<!-- </el-input>-->  
329 -<!-- </el-form-item>-->  
330 -<!-- </el-col>-->  
331 -<!-- <el-col :span="5">-->  
332 -<!-- <el-form-item label="" prop="awbinfo.weight">-->  
333 -<!-- <el-input v-model="preModel.awbinfo.weight" clearable>-->  
334 -<!-- <template slot="prepend" >运单重量</template>-->  
335 -<!-- </el-input>-->  
336 -<!-- </el-form-item>-->  
337 -<!-- </el-col>-->  
338 -<!-- <el-col :span="5">-->  
339 -<!-- <el-form-item label="" prop="goodsname">-->  
340 -<!-- <el-input v-model="goodsname" clearable>-->  
341 -<!-- <template slot="prepend" >货物描述</template>-->  
342 -<!-- </el-input>-->  
343 -<!-- </el-form-item>-->  
344 -<!-- </el-col>-->  
345 -<!-- <el-col :span="5" v-if="fenStatus !=='addAwbh'">-->  
346 -<!-- <el-form-item label="" prop="piece">-->  
347 -<!-- <el-input v-model="preModel.piece" clearable>-->  
348 -<!-- <template slot="prepend" >预配件数</template>-->  
349 -<!-- </el-input>-->  
350 -<!-- </el-form-item>-->  
351 -<!-- </el-col>-->  
352 -<!-- <el-col :span="5" v-if="fenStatus ==='addAwbh'">-->  
353 -<!-- <el-form-item label="" prop="piece">-->  
354 -<!-- <el-input v-model="preModel.piece" clearable>-->  
355 -<!-- <template slot="prepend" >预配件数</template>-->  
356 -<!-- </el-input>-->  
357 -<!-- </el-form-item>-->  
358 -<!-- </el-col>-->  
359 -<!-- <el-col :span="5" v-if="fenStatus !=='addAwbh'">-->  
360 -<!-- <el-form-item label="" prop="weight">-->  
361 -<!-- <el-input v-model="preModel.weight" clearable>-->  
362 -<!-- <template slot="prepend" >预配重量</template>-->  
363 -<!-- </el-input>-->  
364 -<!-- </el-form-item>-->  
365 -<!-- </el-col>-->  
366 -<!-- <el-col :span="5" v-if="fenStatus ==='addAwbh'">-->  
367 -<!-- <el-form-item label="" prop="weight">-->  
368 -<!-- <el-input v-model="preModel.weight" clearable>-->  
369 -<!-- <template slot="prepend" >预配重量</template>-->  
370 -<!-- </el-input>-->  
371 -<!-- </el-form-item>-->  
372 -<!-- </el-col>-->  
373 -<!-- <el-col :span="5">-->  
374 -<!-- <el-form-item label="" prop="actime">-->  
375 -<!-- <el-date-picker value-format="yyyy-MM-dd HH:mm:ss"-->  
376 -<!-- v-model="preModel.actime" align="right" style="width: 180px"-->  
377 -<!-- type="datetime" placeholder="请选择预配时间"/>-->  
378 -<!-- </el-form-item>-->  
379 -<!-- </el-col>-->  
380 -<!-- <el-col :span="5">-->  
381 -<!-- <el-form-item label="" prop="customcode">-->  
382 -<!-- <el-select v-model="preModel.customcode" placeholder="请选择关区代码"-->  
383 -<!-- filterable clearable :remote-method="remoteMethodCustomCode" :loading="customLoading" remote-->  
384 -<!-- :disabled="fenStatus === 'addAwbh'">-->  
385 -<!-- <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"-->  
386 -<!-- :value="item.customcode">-->  
387 -<!-- <span style="float: left">{{ item.customcode }}</span>-->  
388 -<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span>-->  
389 -<!-- </el-option>-->  
390 -<!-- </el-select>-->  
391 -<!-- </el-form-item>-->  
392 -<!-- </el-col>-->  
393 -<!-- <el-col :span="5">-->  
394 -<!-- <el-form-item label="">-->  
395 -<!-- <el-select v-model="preModel.awbinfo.awbtype" class="filter-item" placeholder="请录入货物类型">-->  
396 -<!-- <el-option v-for="item in customTypes" :key="item.value"-->  
397 -<!-- :label="item.label"-->  
398 -<!-- :value="item.value">-->  
399 -<!-- </el-option>-->  
400 -<!-- </el-select>-->  
401 -<!-- </el-form-item>-->  
402 -<!-- </el-col>-->  
403 -<!-- <el-col :span="5">-->  
404 -<!-- <el-form-item label="" prop="awbinfo.paymodel">-->  
405 -<!-- <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="请选择付费方式">-->  
406 -<!-- <el-option-->  
407 -<!-- v-for="item in payTypes"-->  
408 -<!-- :key="item.value"-->  
409 -<!-- :label="item.label"-->  
410 -<!-- :value="item.value">-->  
411 -<!-- </el-option>-->  
412 -<!-- </el-select>-->  
413 -<!-- </el-form-item>-->  
414 -<!-- </el-col>-->  
415 -<!-- <el-col :span="5">-->  
416 -<!-- <el-form-item label="" prop="">-->  
417 -<!-- <el-input v-model="specopeid" clearable>-->  
418 -<!-- <template slot="prepend" >卸货地</template>-->  
419 -<!-- </el-input>-->  
420 -<!-- </el-form-item>-->  
421 -<!-- </el-col>-->  
422 -<!-- <el-col :span="5">-->  
423 -<!-- <el-form-item label="" prop="">-->  
424 -<!-- <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>-->  
425 -<!-- <template slot="prepend" >代理人代码</template>-->  
426 -<!-- </el-input>-->  
427 -<!-- </el-form-item>-->  
428 -<!-- </el-col>-->  
429 -<!-- <el-col :span="5">-->  
430 -<!-- <el-form-item label="" prop="">-->  
431 -<!-- <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>-->  
432 -<!-- <template slot="prepend" >代理人名称</template>-->  
433 -<!-- </el-input>-->  
434 -<!-- </el-form-item>-->  
435 -<!-- </el-col>-->  
436 -<!-- </el-row>-->  
437 -<!-- <el-row style="margin-bottom: 10px">-->  
438 -<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->  
439 -<!-- <span>-->  
440 -<!-- 货物剩余信息：-->  
441 -<!-- </span>-->  
442 -<!-- </el-col>-->  
443 -<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->  
444 -<!-- <span>剩余件数:{{awbPiece}}</span>-->  
445 -<!-- </el-col>-->  
446 -<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->  
447 -<!-- <span>剩余重量:{{awbWeight}}</span>-->  
448 -<!-- </el-col>-->  
449 -<!-- </el-row>-->  
450 -<!-- <div class="grid-content content" style="font-size: 10px">-->  
451 -<!-- 发货人信息-->  
452 -<!-- <el-button type="primary" size="mini" @click="consignerSelect()">选择发货人信息</el-button>-->  
453 -<!-- </div>-->  
454 -<!-- <el-row>-->  
455 -<!-- <el-col :span="5">-->  
456 -<!-- <el-form-item label="" prop="awbinfo.shprname">-->  
457 -<!-- <el-input v-model="shprname" clearable>-->  
458 -<!-- <template slot="prepend" >发货人名称</template>-->  
459 -<!-- </el-input>-->  
460 -<!-- </el-form-item>-->  
461 -<!-- </el-col>-->  
462 -<!-- <el-col :span="5">-->  
463 -<!-- <el-form-item label="" prop="awbinfo.shpraddress">-->  
464 -<!-- <el-input v-model="shpraddress" clearable>-->  
465 -<!-- <template slot="prepend" >地址</template>-->  
466 -<!-- </el-input>-->  
467 -<!-- </el-form-item>-->  
468 -<!-- </el-col>-->  
469 -<!-- <el-col :span="5">-->  
470 -<!-- <el-form-item label="">-->  
471 -<!-- <el-input v-model="scityid" maxlength="5" clearable>-->  
472 -<!-- <template slot="prepend" >城市代码</template>-->  
473 -<!-- </el-input>-->  
474 -<!-- </el-form-item>-->  
475 -<!-- </el-col>-->  
476 -<!-- <el-col :span="5">-->  
477 -<!-- <el-form-item label="">-->  
478 -<!-- <el-input v-model="preModel.awbinfo.shprmobiletype" clearable>-->  
479 -<!-- <template slot="prepend" >传真</template>-->  
480 -<!-- </el-input>-->  
481 -<!-- </el-form-item>-->  
482 -<!-- </el-col>-->  
483 -<!-- <el-col :span="5">-->  
484 -<!-- <el-form-item label="" prop="awbinfo.shprcountyr">-->  
485 -<!-- <el-select-->  
486 -<!-- :remote-method="remoteMethod"-->  
487 -<!-- :loading="listLoading"-->  
488 -<!-- v-model="shprcountyr"-->  
489 -<!-- filterable-->  
490 -<!-- allow-create-->  
491 -<!-- remote-->  
492 -<!-- placeholder="请选择国家代码" clearable>目的站-->  
493 -<!-- <el-option-->  
494 -<!-- v-for="item in countryOption"-->  
495 -<!-- :key="item.value"-->  
496 -<!-- :label="item.value"-->  
497 -<!-- :value="item.value">-->  
498 -<!-- <span style="float: left">{{ item.label }}</span>-->  
499 -<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>-->  
500 -<!-- </el-option>-->  
501 -<!-- </el-select>-->  
502 -<!-- </el-form-item>-->  
503 -<!-- </el-col>-->  
504 -<!-- <el-col :span="7.5">-->  
505 -<!-- <el-form-item label="" prop="awbinfo.shprtel">-->  
506 -<!-- <el-input v-model="preModel.awbinfo.shprtel" clearable>-->  
507 -<!-- <template slot="prepend" >电话</template>-->  
508 -<!-- </el-input>-->  
509 -<!-- </el-form-item>-->  
510 -<!-- </el-col>-->  
511 -  
512 -<!-- <el-col :span="7.5">-->  
513 -<!-- <el-form-item label="" prop="awbinfo.shpaeocode">-->  
514 -<!-- <el-input v-model="shpaeocode" clearable style="width: 270px">-->  
515 -<!-- <template slot="prepend" >发货人AEO编码</template>-->  
516 -<!-- </el-input>-->  
517 -<!-- </el-form-item>-->  
518 -<!-- </el-col>-->  
519 -  
520 -<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->  
521 -<!-- &lt;!&ndash;<el-form-item label="企业代码类型" prop="awbinfo.shpcomidpre">&ndash;&gt;-->  
522 -<!-- &lt;!&ndash;<el-select&ndash;&gt;-->  
523 -<!-- &lt;!&ndash;v-model="shpcomidpre"&ndash;&gt;-->  
524 -<!-- &lt;!&ndash;filterable&ndash;&gt;-->  
525 -<!-- &lt;!&ndash;placeholder="请选择企业代码类型" style="width: 200px;">&ndash;&gt;-->  
526 -<!-- &lt;!&ndash;<el-option&ndash;&gt;-->  
527 -<!-- &lt;!&ndash;v-for="item in shpCompnyTypeOption"&ndash;&gt;-->  
528 -<!-- &lt;!&ndash;:key="item.value"&ndash;&gt;-->  
529 -<!-- &lt;!&ndash;:label="item.label"&ndash;&gt;-->  
530 -<!-- &lt;!&ndash;:value="item.value"/>&ndash;&gt;-->  
531 -<!-- &lt;!&ndash;</el-select>&ndash;&gt;-->  
532 -<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->  
533 -<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->  
534 -<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->  
535 -<!-- &lt;!&ndash;<el-form-item prop="awbinfo.shpcomidpno" label-width="10px">&ndash;&gt;-->  
536 -<!-- &lt;!&ndash;<el-input v-model="shpcomidpno" placeholder="企业代码"/>&ndash;&gt;-->  
537 -<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->  
538 -<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->  
539 -<!-- </el-row>-->  
540 -<!-- <div class="grid-content content" style="font-size: 10px">-->  
541 -<!-- 收货人信息-->  
542 -<!-- <el-button type="primary" size="mini" @click="consigneeSelect()">选择收货人信息</el-button>-->  
543 -<!-- </div>-->  
544 -<!-- <el-row>-->  
545 -<!-- <el-col :span="5">-->  
546 -<!-- <el-form-item label="" prop="awbinfo.cnsnname">-->  
547 -<!-- <el-input v-model="cnsnname" clearable>-->  
548 -<!-- <template slot="prepend" >收货人名称</template>-->  
549 -<!-- </el-input>-->  
550 -<!-- </el-form-item>-->  
551 -<!-- </el-col>-->  
552 -<!-- <el-col :span="5">-->  
553 -<!-- <el-form-item label="" prop="awbinfo.cnsnaddress">-->  
554 -<!-- <el-input v-model="cnsnaddress" clearable>-->  
555 -<!-- <template slot="prepend" >地址</template>-->  
556 -<!-- </el-input>-->  
557 -<!-- </el-form-item>-->  
558 -<!-- </el-col>-->  
559 -<!-- <el-col :span="5">-->  
560 -<!-- <el-form-item label="">-->  
561 -<!-- <el-input v-model="ecityid" clearable maxlength="5">-->  
562 -<!-- <template slot="prepend" >城市代码</template>-->  
563 -<!-- </el-input>-->  
564 -<!-- </el-form-item>-->  
565 -<!-- </el-col>-->  
566 -<!-- <el-col :span="5">-->  
567 -<!-- <el-form-item label="">-->  
568 -<!-- <el-input v-model="preModel.awbinfo.cnsrmobiletype" clearable>-->  
569 -<!-- <template slot="prepend" >传真</template>-->  
570 -<!-- </el-input>-->  
571 -<!-- </el-form-item>-->  
572 -<!-- </el-col>-->  
573 -<!-- <el-col :span="5">-->  
574 -<!-- <el-form-item label="" prop="awbinfo.cnscountyr">-->  
575 -<!-- <el-select-->  
576 -<!-- :remote-method="remoteMethod"-->  
577 -<!-- :listLoading="listLoading"-->  
578 -<!-- v-model="cnscountyr"-->  
579 -<!-- filterable-->  
580 -<!-- allow-create-->  
581 -<!-- remote-->  
582 -<!-- placeholder="请选择国家代码" clearable>-->  
583 -<!-- <el-option-->  
584 -<!-- v-for="item in countryOption"-->  
585 -<!-- :key="item.value"-->  
586 -<!-- :label="item.value"-->  
587 -<!-- :value="item.value">-->  
588 -<!-- <span style="float: left">{{ item.label }}</span>-->  
589 -<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>-->  
590 -<!-- </el-option>-->  
591 -<!-- </el-select>-->  
592 -<!-- </el-form-item>-->  
593 -<!-- </el-col>-->  
594 -<!-- <el-col :span="7.5">-->  
595 -<!-- <el-form-item label="" prop="awbinfo.cnsntel">-->  
596 -<!-- <el-input v-model="preModel.awbinfo.cnsntel" clearable>-->  
597 -<!-- <template slot="prepend" >电话</template>-->  
598 -<!-- </el-input>-->  
599 -<!-- </el-form-item>-->  
600 -<!-- </el-col>-->  
601 -  
602 -<!-- <el-col :span="7.5">-->  
603 -<!-- <el-form-item label="" prop="awbinfo.cnsaeocode">-->  
604 -<!-- <el-input v-model="cnsaeocode" clearable style="width: 270px">-->  
605 -<!-- <template slot="prepend" >收货人AEO编码</template>-->  
606 -<!-- </el-input>-->  
607 -<!-- </el-form-item>-->  
608 -<!-- </el-col>-->  
609 -  
610 -<!-- </el-row>-->  
611 -<!-- <el-row>-->  
612 -<!-- <el-col :span="6">-->  
613 -<!-- <el-form-item label="" prop="awbinfo.cnsrctcname">-->  
614 -<!-- <el-input v-model="cnsrctcname" clearable>-->  
615 -<!-- <template slot="prepend" >收货人名称</template>-->  
616 -<!-- </el-input>-->  
617 -<!-- </el-form-item>-->  
618 -<!-- </el-col>-->  
619 -<!-- <el-col :span="6">-->  
620 -<!-- <el-form-item label="" prop="awbinfo.cnsrctctel">-->  
621 -<!-- <el-input v-model="preModel.awbinfo.cnsrctctel" clearable style="width: 270px">-->  
622 -<!-- <template slot="prepend" >收货人电话</template>-->  
623 -<!-- </el-input>-->  
624 -<!-- </el-form-item>-->  
625 -<!-- </el-col>-->  
626 -<!-- </el-row>-->  
627 -  
628 -<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->  
629 -<!-- &lt;!&ndash;<el-form-item label="企业代码类型" prop="awbinfo.csgcustomerid">&ndash;&gt;-->  
630 -<!-- &lt;!&ndash;<el-select&ndash;&gt;-->  
631 -<!-- &lt;!&ndash;v-model="cnscomidpre"&ndash;&gt;-->  
632 -<!-- &lt;!&ndash;filterable&ndash;&gt;-->  
633 -<!-- &lt;!&ndash;placeholder="请选择企业代码类型" style="width: 200px;">&ndash;&gt;-->  
634 -<!-- &lt;!&ndash;<el-option&ndash;&gt;-->  
635 -<!-- &lt;!&ndash;v-for="item in shpCompnyTypeOption"&ndash;&gt;-->  
636 -<!-- &lt;!&ndash;:key="item.value"&ndash;&gt;-->  
637 -<!-- &lt;!&ndash;:label="item.label"&ndash;&gt;-->  
638 -<!-- &lt;!&ndash;:value="item.value"/>&ndash;&gt;-->  
639 -<!-- &lt;!&ndash;</el-select>&ndash;&gt;-->  
640 -<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->  
641 -<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->  
642 -<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->  
643 -<!-- &lt;!&ndash;<el-form-item prop="awbinfo.cnscomidno" label-width="10px">&ndash;&gt;-->  
644 -<!-- &lt;!&ndash;<el-input v-model="cnscomidno" placeholder="企业代码"/>&ndash;&gt;-->  
645 -<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->  
646 -<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->  
647 -<!-- <div v-if="dialogStatus === 'sendUpdate'">-->  
648 -<!-- <div class="grid-content content">-->  
649 -<!-- 运单信息-->  
650 -<!-- </div>-->  
651 -<!-- <el-row>-->  
652 -<!-- <el-col :span="6">-->  
653 -<!-- <el-form-item label="" prop="reason">-->  
654 -<!-- <el-input v-model="preModel.reason" clearable>-->  
655 -<!-- <template slot="prepend" >修改原因</template>-->  
656 -<!-- </el-input>-->  
657 -<!-- </el-form-item>-->  
658 -<!-- </el-col>-->  
659 -<!-- <el-col :span="6">-->  
660 -<!-- <el-form-item label="" prop="contactName">-->  
661 -<!-- <el-input v-model="preModel.contactName" clearable>-->  
662 -<!-- <template slot="prepend" >修改人</template>-->  
663 -<!-- </el-input>-->  
664 -<!-- </el-form-item>-->  
665 -<!-- </el-col>-->  
666 -<!-- <el-col :span="6">-->  
667 -<!-- <el-form-item label="" prop="contactTel">-->  
668 -<!-- <el-input v-model="preModel.contactTel" clearable maxlength="5">-->  
669 -<!-- <template slot="prepend" >修改人Tel</template>-->  
670 -<!-- </el-input>-->  
671 -<!-- </el-form-item>-->  
672 -<!-- </el-col>-->  
673 -<!-- </el-row>-->  
674 -<!-- </div>-->  
675 -  
676 -<!-- </el-form>-->  
677 -<!-- <div slot="footer" class="dialog-footer" style="text-align: center">-->  
678 -<!-- <el-button @click="dialogFormVisible = false" size="medium"-->  
679 -<!-- style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button>-->  
680 -<!-- <el-button type="success" size="medium" style="width: 100px" v-show="dialogStatus!=='sendUpdate'"-->  
681 -<!-- @click="dialogStatus ==='create'? createData():updateData()">保存</el-button>-->  
682 -<!-- <el-button type="primary" size="medium" style="width: 100px" v-show="dialogStatus==='sendUpdate'" @click="sendUpdate()">发送</el-button>-->  
683 -<!-- </div>-->  
684 -<!-- </el-dialog>-->  
685 <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%"> 191 <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">
686 <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right" 192 <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"
687 label-width="80px" size="mini" class="el-dialog-div"> 193 label-width="80px" size="mini" class="el-dialog-div">
@@ -693,19 +199,21 @@ @@ -693,19 +199,21 @@
693 <el-row class="flight-info" style="padding-left: 90px;padding-right: 90px"> 199 <el-row class="flight-info" style="padding-left: 90px;padding-right: 90px">
694 <el-col :span="6"> 200 <el-col :span="6">
695 <el-form-item label="主单号" prop="awba"> 201 <el-form-item label="主单号" prop="awba">
696 - <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable style="width: 140px"> 202 + <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable v-if="fenStatus === 'addAwbh'" disabled style="width: 140px">
  203 + </el-input>
  204 + <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable v-else style="width: 140px">
697 </el-input> 205 </el-input>
698 </el-form-item> 206 </el-form-item>
699 </el-col> 207 </el-col>
700 <el-col :span="6" v-if="fenStatus === 'addAwbh'"> 208 <el-col :span="6" v-if="fenStatus === 'addAwbh'">
701 - <el-form-item label="分单号" prop="awbh">  
702 - <el-input v-model="awbh" clearable> 209 + <el-form-item label="分单号" prop="awbh" >
  210 + <el-input v-model="awbh" clearable style="width: 140px">
703 </el-input> 211 </el-input>
704 </el-form-item> 212 </el-form-item>
705 </el-col> 213 </el-col>
706 <el-col :span="6"> 214 <el-col :span="6">
707 <el-form-item label="提前运抵"> 215 <el-form-item label="提前运抵">
708 - <el-select v-model="preModel.ext3" class="filter-item" style="width: 140px" placeholder="请录入报关类型"> 216 + <el-select v-model="preModel.ext3" class="filter-item" clearable style="width: 140px" placeholder="请选择">
709 <el-option v-for="item in ext3" :key="item.value" 217 <el-option v-for="item in ext3" :key="item.value"
710 :label="item.label" 218 :label="item.label"
711 :value="item.value"> 219 :value="item.value">
@@ -715,7 +223,7 @@ @@ -715,7 +223,7 @@
715 </el-col> 223 </el-col>
716 <el-col :span="6"> 224 <el-col :span="6">
717 <el-form-item label="报关类型"> 225 <el-form-item label="报关类型">
718 - <el-select v-model="preModel.ext4" class="filter-item" style="width: 140px" placeholder="请录入报关类型"> 226 + <el-select v-model="preModel.ext4" class="filter-item" style="width: 140px" clearable placeholder="请选择报关类型">
719 <el-option v-for="item in customsDeclarationType" :key="item.value" 227 <el-option v-for="item in customsDeclarationType" :key="item.value"
720 :label="item.label" 228 :label="item.label"
721 :value="item.value"> 229 :value="item.value">
@@ -725,7 +233,7 @@ @@ -725,7 +233,7 @@
725 </el-col> 233 </el-col>
726 <el-col :span="6"> 234 <el-col :span="6">
727 <el-form-item label="货物属性"> 235 <el-form-item label="货物属性">
728 - <el-select v-model="preModel.awbinfo.goodsAttribute" class="filter-item" style="width: 140px" placeholder="请录入货物属性"> 236 + <el-select v-model="preModel.awbinfo.goodsAttribute" class="filter-item" clearable style="width: 140px" placeholder="请选择货物属性">
729 <el-option v-for="item in goodsAttribute" :key="item.value" 237 <el-option v-for="item in goodsAttribute" :key="item.value"
730 :label="item.label" 238 :label="item.label"
731 :value="item.value"> 239 :value="item.value">
@@ -750,7 +258,7 @@ @@ -750,7 +258,7 @@
750 <el-form-item label="航班日期" prop="flightdate"> 258 <el-form-item label="航班日期" prop="flightdate">
751 <el-date-picker :disabled="fenStatus === 'addAwbh'" 259 <el-date-picker :disabled="fenStatus === 'addAwbh'"
752 value-format="yyyy-MM-dd" 260 value-format="yyyy-MM-dd"
753 - style="width: 280px" 261 + style="width: 140px"
754 v-model="preModel.flightdate" align="left" 262 v-model="preModel.flightdate" align="left"
755 class="flight-date-tianbo" 263 class="flight-date-tianbo"
756 type="date" placeholder="请输入航班日期" clearable/> 264 type="date" placeholder="请输入航班日期" clearable/>
@@ -840,7 +348,7 @@ @@ -840,7 +348,7 @@
840 <el-row class="flight-info" v-if="fenStatus !=='addAwbh'" style="padding-left: 90px;padding-right: 90px"> 348 <el-row class="flight-info" v-if="fenStatus !=='addAwbh'" style="padding-left: 90px;padding-right: 90px">
841 <el-col :span="6"> 349 <el-col :span="6">
842 <el-form-item label="订舱代理"> 350 <el-form-item label="订舱代理">
843 - <el-select v-model="preModel.bookingAgentId" class="filter-item" style="width: 140px" placeholder="请录入订舱代理"> 351 + <el-select v-model="preModel.bookingAgentId" clearable class="filter-item" style="width: 140px" placeholder="请录入订舱代理">
844 <el-option v-for="item in bookingAgentList" :key="item.id" 352 <el-option v-for="item in bookingAgentList" :key="item.id"
845 :label="item.forShort" 353 :label="item.forShort"
846 :value="item.id"> 354 :value="item.id">
@@ -850,7 +358,7 @@ @@ -850,7 +358,7 @@
850 </el-col> 358 </el-col>
851 <el-col :span="6"> 359 <el-col :span="6">
852 <el-form-item label="操作代理"> 360 <el-form-item label="操作代理">
853 - <el-select v-model="preModel.operatingAgentId" class="filter-item" placeholder="请录入操作代理"> 361 + <el-select v-model="preModel.operatingAgentId" clearable class="filter-item" placeholder="请录入操作代理">
854 <el-option v-for="item in operatingAgentList" :key="item.id" 362 <el-option v-for="item in operatingAgentList" :key="item.id"
855 :label="item.forShort" 363 :label="item.forShort"
856 :value="item.id"> 364 :value="item.id">
@@ -1042,7 +550,7 @@ @@ -1042,7 +550,7 @@
1042 </el-col> 550 </el-col>
1043 <el-col :span="6"> 551 <el-col :span="6">
1044 <el-form-item label="所属关区" prop="customcode"> 552 <el-form-item label="所属关区" prop="customcode">
1045 - <el-select v-model="preModel.customcode" class="filter-item" style="width: 140px" placeholder="请选择所属关区"> 553 + <el-select v-model="preModel.customcode" clearable class="filter-item" style="width: 140px" placeholder="请选择所属关区">
1046 <el-option v-for="item in custom" :key="item.value" 554 <el-option v-for="item in custom" :key="item.value"
1047 :label="item.label" 555 :label="item.label"
1048 :value="item.value"> 556 :value="item.value">
@@ -1064,7 +572,7 @@ @@ -1064,7 +572,7 @@
1064 </el-col> 572 </el-col>
1065 <el-col :span="6"> 573 <el-col :span="6">
1066 <el-form-item label="货物类型" prop="awbinfo.awbtype"> 574 <el-form-item label="货物类型" prop="awbinfo.awbtype">
1067 - <el-select v-model="preModel.awbinfo.awbtype" class="filter-item" style="width: 140px" placeholder="请录入货物类型"> 575 + <el-select v-model="preModel.awbinfo.awbtype" clearable class="filter-item" style="width: 120px" placeholder="请录入货物类型">
1068 <el-option v-for="item in customTypess" :key="item.value" 576 <el-option v-for="item in customTypess" :key="item.value"
1069 :label="item.label" 577 :label="item.label"
1070 :value="item.value"> 578 :value="item.value">
@@ -1213,8 +721,6 @@ @@ -1213,8 +721,6 @@
1213 </el-table-column> 721 </el-table-column>
1214 <el-table-column prop="conPhone" label="发货人电话" > 722 <el-table-column prop="conPhone" label="发货人电话" >
1215 </el-table-column> 723 </el-table-column>
1216 - <el-table-column prop="enterprise" label="发货人企业代码" >  
1217 - </el-table-column>  
1218 <el-table-column label="操作"> 724 <el-table-column label="操作">
1219 <template slot-scope="scope"> 725 <template slot-scope="scope">
1220 <el-button type="success" size="mini" @click="consignerClick(scope.row)">选择</el-button> 726 <el-button type="success" size="mini" @click="consignerClick(scope.row)">选择</el-button>
@@ -1252,8 +758,6 @@ @@ -1252,8 +758,6 @@
1252 </el-table-column> 758 </el-table-column>
1253 <el-table-column prop="conPhone" label="收货人电话" > 759 <el-table-column prop="conPhone" label="收货人电话" >
1254 </el-table-column> 760 </el-table-column>
1255 - <el-table-column prop="enterprise" label="收货人企业代码" >  
1256 - </el-table-column>  
1257 <el-table-column label="操作"> 761 <el-table-column label="操作">
1258 <template slot-scope="scope"> 762 <template slot-scope="scope">
1259 <el-button type="success" @click="consigneeClick(scope.row)" size="small">选择</el-button> 763 <el-button type="success" @click="consigneeClick(scope.row)" size="small">选择</el-button>
@@ -1281,11 +785,13 @@ @@ -1281,11 +785,13 @@
1281 sendDeleteMt2201, 785 sendDeleteMt2201,
1282 sendUpdateMt2201, 786 sendUpdateMt2201,
1283 uploadFileExcel 787 uploadFileExcel
1284 - } from '@/api/exitPre' 788 + } from '@/api/exitPre';
  789 + import loginUserInfo from '../../api/base';
1285 import {Message} from "element-ui"; 790 import {Message} from "element-ui";
1286 import {getResponseForParam} from '@/api/responseDetail' 791 import {getResponseForParam} from '@/api/responseDetail'
1287 import { getList} from '../../api/consigner/consigner'; 792 import { getList} from '../../api/consigner/consigner';
1288 import { getList as neeList} from '../../api/consigner/consignee'; 793 import { getList as neeList} from '../../api/consigner/consignee';
  794 + import {getListHzTypeList} from '../../api/shipper/shipper'
1289 import { 795 import {
1290 validAwb, 796 validAwb,
1291 validAlphabets, 797 validAlphabets,
@@ -1350,6 +856,7 @@ @@ -1350,6 +856,7 @@
1350 limitSize: 5, 856 limitSize: 5,
1351 }, 857 },
1352 dialogSelectVisible: false, 858 dialogSelectVisible: false,
  859 + loginUserInfo: loginUserInfo,
1353 preQuery: { 860 preQuery: {
1354 pageSize: 1, 861 pageSize: 1,
1355 limitSize: 30, 862 limitSize: 30,
@@ -1359,9 +866,9 @@ @@ -1359,9 +866,9 @@
1359 flightdate: '', 866 flightdate: '',
1360 originstation: '', 867 originstation: '',
1361 destinationstation: '', 868 destinationstation: '',
1362 - userId:'', 869 + userId:loginUserInfo.userId,
1363 customCode:'', 870 customCode:'',
1364 - enterpriseId:'', 871 + enterpriseId:loginUserInfo.companyId,
1365 messageType: '' 872 messageType: ''
1366 }, 873 },
1367 dialogMap: { 874 dialogMap: {
@@ -1452,7 +959,7 @@ @@ -1452,7 +959,7 @@
1452 awba: [{required: true, trigger: 'blur', validator: validatorAwb}], 959 awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
1453 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}], 960 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
1454 'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}], 961 'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}],
1455 - goodsname: [{required: true, trigger: 'change', validator: validAlphabetsSpanceKey}], 962 + goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}],
1456 ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}], 963 ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}],
1457 reason:[{required: true, message: '修改原因不能为空', trigger: 'blur'}], 964 reason:[{required: true, message: '修改原因不能为空', trigger: 'blur'}],
1458 contactName:[{required: true, message: '修改操作人不能为空', trigger: 'blur'}], 965 contactName:[{required: true, message: '修改操作人不能为空', trigger: 'blur'}],
@@ -1494,6 +1001,8 @@ @@ -1494,6 +1001,8 @@
1494 contactTel: undefined, 1001 contactTel: undefined,
1495 bookingAgentId: undefined, 1002 bookingAgentId: undefined,
1496 operatingAgentId: undefined, 1003 operatingAgentId: undefined,
  1004 + userId: undefined,
  1005 + enterpriseId: undefined,
1497 awbinfo: { 1006 awbinfo: {
1498 pcs: undefined, 1007 pcs: undefined,
1499 weight: undefined, 1008 weight: undefined,
@@ -1534,7 +1043,7 @@ @@ -1534,7 +1043,7 @@
1534 awbtype: undefined 1043 awbtype: undefined
1535 }, 1044 },
1536 user: { 1045 user: {
1537 - username: this.username 1046 + username: loginUserInfo.username
1538 } 1047 }
1539 }, 1048 },
1540 respModel: { 1049 respModel: {
@@ -1911,6 +1420,7 @@ @@ -1911,6 +1420,7 @@
1911 this.preModel.customcode = this.preQuery.customcode 1420 this.preModel.customcode = this.preQuery.customcode
1912 this.dialogStatus = 'create' 1421 this.dialogStatus = 'create'
1913 this.dialogFormVisible = true 1422 this.dialogFormVisible = true
  1423 + this.userId();
1914 this.$nextTick(() => { 1424 this.$nextTick(() => {
1915 this.$refs.preFormData.clearValidate() 1425 this.$refs.preFormData.clearValidate()
1916 }) 1426 })
@@ -1947,7 +1457,8 @@ @@ -1947,7 +1457,8 @@
1947 let para = { 1457 let para = {
1948 pageSize: this.consignerQuery.pageSize, 1458 pageSize: this.consignerQuery.pageSize,
1949 limitSize: this.consignerQuery.limitSize, 1459 limitSize: this.consignerQuery.limitSize,
1950 - companyName: this.consignerQuery.companyName 1460 + companyName: this.consignerQuery.companyName,
  1461 + enterpriseId: loginUserInfo.companyId
1951 }; 1462 };
1952 getList(para).then((res) => { 1463 getList(para).then((res) => {
1953 this.consignerQuery.total = res.data.data.total; 1464 this.consignerQuery.total = res.data.data.total;
@@ -1972,7 +1483,8 @@ @@ -1972,7 +1483,8 @@
1972 let para = { 1483 let para = {
1973 pageSize: this.consigneeQuery.pageSize, 1484 pageSize: this.consigneeQuery.pageSize,
1974 limitSize: this.consigneeQuery.limitSize, 1485 limitSize: this.consigneeQuery.limitSize,
1975 - companyName: this.consigneeQuery.companyName 1486 + companyName: this.consigneeQuery.companyName,
  1487 + enterpriseId: loginUserInfo.companyId
1976 }; 1488 };
1977 neeList(para).then((res) => { 1489 neeList(para).then((res) => {
1978 this.consigneeQuery.total = res.data.data.total; 1490 this.consigneeQuery.total = res.data.data.total;
@@ -2076,6 +1588,7 @@ @@ -2076,6 +1588,7 @@
2076 this.dialogStatus = undefined; 1588 this.dialogStatus = undefined;
2077 this.fenStatus = undefined; 1589 this.fenStatus = undefined;
2078 this.preModel = Object.assign({}, row) 1590 this.preModel = Object.assign({}, row)
  1591 + this.userId();
2079 this.preModel.flightno = row.carrier+row.flightno; 1592 this.preModel.flightno = row.carrier+row.flightno;
2080 this.dialogStatus = 'update' 1593 this.dialogStatus = 'update'
2081 if (row.awbh !== undefined && row.awbh !== ""){ 1594 if (row.awbh !== undefined && row.awbh !== ""){
@@ -2303,10 +1816,9 @@ @@ -2303,10 +1816,9 @@
2303 this.preModel.uuid = template.uuid 1816 this.preModel.uuid = template.uuid
2304 this.preModel.awba = template.awba 1817 this.preModel.awba = template.awba
2305 this.preModel.flightdate = template.flightdate 1818 this.preModel.flightdate = template.flightdate
2306 - this.preModel.flightno = template.flightno 1819 + this.preModel.flightno = template.carrier+template.flightno
2307 this.preModel.destinationstation = template.destinationstation 1820 this.preModel.destinationstation = template.destinationstation
2308 this.preModel.customcode = template.customcode 1821 this.preModel.customcode = template.customcode
2309 - this.preModel.carrier = template.carrier  
2310 this.preModel.awbinfo.shprcountyr = template.awbinfo.shprcountyr 1822 this.preModel.awbinfo.shprcountyr = template.awbinfo.shprcountyr
2311 this.preModel.originstation = template.originstation 1823 this.preModel.originstation = template.originstation
2312 this.preModel.awbinfo.paymodel = template.awbinfo.paymodel 1824 this.preModel.awbinfo.paymodel = template.awbinfo.paymodel
@@ -2320,25 +1832,25 @@ @@ -2320,25 +1832,25 @@
2320 this.preQuery.destinationstation = template.destinationstation 1832 this.preQuery.destinationstation = template.destinationstation
2321 this.preQuery.customcode = template.customcode 1833 this.preQuery.customcode = template.customcode
2322 this.preQuery.carrier = template.carrier 1834 this.preQuery.carrier = template.carrier
2323 - getMt2201ListForParam(this.preQuery).then(res => {  
2324 - this.awbPiece = 0  
2325 - this.awbWeight = 0  
2326 - let residuePiece = 0  
2327 - let residueWeight = 0  
2328 - const childrenList = res.data.dataList[0].children  
2329 -  
2330 - if (childrenList.length < 1) {  
2331 - this.awbPiece = res.data.dataList[0].piece  
2332 - this.awbWeight = res.data.dataList[0].weight  
2333 - } else {  
2334 - for (var i = 0; i < childrenList.length; i++) {  
2335 - residuePiece += childrenList[i].piece  
2336 - residueWeight += childrenList[i].weight  
2337 - }  
2338 - this.awbPiece = res.data.dataList[0].piece - residuePiece  
2339 - this.awbWeight = res.data.dataList[0].weight - residueWeight  
2340 - }  
2341 - }) 1835 + // getMt2201ListForParam(this.preQuery).then(res => {
  1836 + // this.awbPiece = 0
  1837 + // this.awbWeight = 0
  1838 + // let residuePiece = 0
  1839 + // let residueWeight = 0
  1840 + // const childrenList = res.data.dataList[0].children
  1841 + //
  1842 + // if (childrenList.length < 1) {
  1843 + // this.awbPiece = res.data.dataList[0].piece
  1844 + // this.awbWeight = res.data.dataList[0].weight
  1845 + // } else {
  1846 + // for (var i = 0; i < childrenList.length; i++) {
  1847 + // residuePiece += childrenList[i].piece
  1848 + // residueWeight += childrenList[i].weight
  1849 + // }
  1850 + // this.awbPiece = res.data.dataList[0].piece - residuePiece
  1851 + // this.awbWeight = res.data.dataList[0].weight - residueWeight
  1852 + // }
  1853 + // })
2342 this.dialogStatus = 'create' 1854 this.dialogStatus = 'create'
2343 this.fenStatus = 'addAwbh' 1855 this.fenStatus = 'addAwbh'
2344 this.dialogFormVisible = true 1856 this.dialogFormVisible = true
@@ -2419,7 +1931,9 @@ @@ -2419,7 +1931,9 @@
2419 uploadFile (item) { 1931 uploadFile (item) {
2420 const form = new FormData() 1932 const form = new FormData()
2421 form.append('file', item.file) 1933 form.append('file', item.file)
2422 - form.append("username", JSON.parse(sessionStorage.getItem('user')).username); 1934 + form.append('userId', loginUserInfo.userId);
  1935 + form.append('enterpriseId', loginUserInfo.companyId);
  1936 + form.append("username", loginUserInfo.username);
2423 uploadFileExcel(form).then(res =>{ 1937 uploadFileExcel(form).then(res =>{
2424 if(res.data.count >0){ 1938 if(res.data.count >0){
2425 Message.success(res.data.respMessage) 1939 Message.success(res.data.respMessage)
@@ -2429,6 +1943,15 @@ @@ -2429,6 +1943,15 @@
2429 } 1943 }
2430 }) 1944 })
2431 }, 1945 },
  1946 + //模板下载
  1947 + download () {
  1948 + window.location.href = 'http://localhost:12021/static/excel导入模板.xls'
  1949 + },
  1950 + // 用户id 企业id 赋值
  1951 + userId(){
  1952 + this.preModel.userId = loginUserInfo.userId;
  1953 + this.preModel.enterpriseId = loginUserInfo.companyId;
  1954 + }
2432 } 1955 }
2433 } 1956 }
2434 1957
@@ -2490,15 +2013,6 @@ @@ -2490,15 +2013,6 @@
2490 text-align: center; 2013 text-align: center;
2491 } 2014 }
2492 2015
2493 - .el-dialog-div .flight-info .el-select--mini{  
2494 - width: calc(100% - 100px)!important;  
2495 - }  
2496 -  
2497 - .el-dialog-div .flight-info .el-select--mini .el-input__inner,.el-dialog-div .flight-info .el-date-editor .el-input__inner{  
2498 - border-top-left-radius: 0;  
2499 - border-bottom-left-radius: 0;  
2500 - }  
2501 -  
2502 .el-dialog-div .flight-info .select-lable{ 2016 .el-dialog-div .flight-info .select-lable{
2503 line-height: 27px; 2017 line-height: 27px;
2504 float:left; 2018 float:left;
@@ -242,19 +242,19 @@ @@ -242,19 +242,19 @@
242 addFormVisible: false, 242 addFormVisible: false,
243 addFormRules: { 243 addFormRules: {
244 forShort: [ 244 forShort: [
245 - { required: true, message: '请输入全称', trigger: 'blur' } 245 + { required: true, message: '请输入全称', trigger: 'change' }
246 ], 246 ],
247 fullName: [ 247 fullName: [
248 - { required: true, message: '请输入简称', trigger: 'blur' } 248 + { required: true, message: '请输入简称', trigger: 'change' }
249 ], 249 ],
250 theShipperTypeList: [ 250 theShipperTypeList: [
251 - { required: true, message: '请选择货主类型', trigger: 'blur' } 251 + { required: true, message: '请选择货主类型', trigger: 'change' }
252 ], 252 ],
253 contacts: [ 253 contacts: [
254 - { required: true, message: '请输入联系人', trigger: 'blur' } 254 + { required: true, message: '请输入联系人', trigger: 'change' }
255 ], 255 ],
256 phone: [ 256 phone: [
257 - { required: true, message: '请输入电话', trigger: 'blur' } 257 + { required: true, message: '请输入电话', trigger: 'change' }
258 ] 258 ]
259 }, 259 },
260 260