朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 0b407914b28f3c3b3334d101bce109791b73a779 1 个父辈 abfc175f

处理 卡口 获取用户id

内嵌 并排对比
正在显示 9 个修改的文件 包含 730 行增加 和 83 行删除
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 "dependencies": { 12 "dependencies": {
13 "@xkeshi/vue-barcode": "^1.0.0", 13 "@xkeshi/vue-barcode": "^1.0.0",
14 "axios": "^0.19.0", 14 "axios": "^0.19.0",
  15 + "common": "^0.2.5",
15 "echarts": "^3.3.2", 16 "echarts": "^3.3.2",
16 "element-ui": "^2.13.0", 17 "element-ui": "^2.13.0",
17 "eslint": "^5.14.1", 18 "eslint": "^5.14.1",
  1 +
  2 +export function formatDate(date, fmt) {
  3 + if (/(y+)/.test(fmt)) {
  4 + fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
  5 + }
  6 + let o = {
  7 + 'M+': date.getMonth() + 1,
  8 + 'd+': date.getDate(),
  9 + 'h+': date.getHours(),
  10 + 'm+': date.getMinutes(),
  11 + 's+': date.getSeconds()
  12 + };
  13 + for (let k in o) {
  14 + if (new RegExp(`(${k})`).test(fmt)) {
  15 + let str = o[k] + '';
  16 + fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
  17 + }
  18 + }
  19 + return fmt;
  20 +};
@@ -46,8 +46,8 @@ export default { @@ -46,8 +46,8 @@ export default {
46 login: data =>{ 46 login: data =>{
47 return axios({ 47 return axios({
48 method: 'POST', // 请求协议 48 method: 'POST', // 请求协议
49 - url: 'cloud-user-center/login', // 请求的地址  
50 - // url: 'cloud-kako-user-center/login', // 请求的地址 49 + // url: 'cloud-user-center/login', // 请求的地址
  50 + url: 'cloud-kako-user-center/login', // 请求的地址
51 data: qs.stringify(data), // post 请求的数据 51 data: qs.stringify(data), // post 请求的数据
52 timeout: 30000, // 超时时间, 单位毫秒 52 timeout: 30000, // 超时时间, 单位毫秒
53 headers: { 53 headers: {
@@ -9,7 +9,13 @@ export const list = params => {return http.get(`${base}/businesstype/list`, para @@ -9,7 +9,13 @@ export const list = params => {return http.get(`${base}/businesstype/list`, para
9 9
10 export const aisleList = params => {return http.get(`${base}/businesstype/aisleList`, params);}; 10 export const aisleList = params => {return http.get(`${base}/businesstype/aisleList`, params);};
11 11
  12 +export const barCodeDel = params => {return http.get(`${base}/businesstype/barCodeDel`, params);};
  13 +
  14 +export const remove = params => {return http.get(`${base}/businesstype/remove`, params);};
  15 +
12 export const save = params => {return axios.post(`${base}/businesstype/save`, params);}; 16 export const save = params => {return axios.post(`${base}/businesstype/save`, params);};
13 17
  18 +export const edit = params => {return axios.post(`${base}/businesstype/edit`, params);};
  19 +
14 20
15 21
1 import http from './http.js' 1 import http from './http.js'
2 -let baseUrl = '/cloud-user-center/user'  
3 -// let baseUrl = '/cloud-kako-user-center/user' 2 +// let baseUrl = '/cloud-user-center/user'
  3 +let baseUrl = '/cloud-kako-user-center/user'
  4 +let baseCode = '/cloud-kako-user-center/randCode'
4 export const getUserList = params => { return http.get(`${baseUrl}/list`, params); }; 5 export const getUserList = params => { return http.get(`${baseUrl}/list`, params); };
5 6
  7 +export const getRandCode = params => { return http.get(`${baseCode}`, params); };
  8 +
6 export const getUserListPage = params => { return http.get(`/user/list`,params) }; 9 export const getUserListPage = params => { return http.get(`/user/list`,params) };
7 10
8 export const removeUser = params => { return http.del(`${baseUrl}/del`,params)}; 11 export const removeUser = params => { return http.del(`${baseUrl}/del`,params)};
@@ -8,6 +8,9 @@ @@ -8,6 +8,9 @@
8 <el-form-item prop="checkPass"> 8 <el-form-item prop="checkPass">
9 <el-input type="password" v-model="ruleForm2.checkPass" placeholder="密码" @keyup.enter.native="handleSubmit2"></el-input> 9 <el-input type="password" v-model="ruleForm2.checkPass" placeholder="密码" @keyup.enter.native="handleSubmit2"></el-input>
10 </el-form-item> 10 </el-form-item>
  11 +<!-- <el-form-item prop="checkPass">-->
  12 +<!-- <el-input type="password" v-model="ruleForm2.checkPass" placeholder="密码" @keyup.enter.native="handleSubmit2"></el-input>-->
  13 +<!-- </el-form-item>-->
11 <el-checkbox v-model="checked" checked class="remeberme">记住密码</el-checkbox> 14 <el-checkbox v-model="checked" checked class="remeberme">记住密码</el-checkbox>
12 <el-form-item style="width:100%;"> 15 <el-form-item style="width:100%;">
13 <el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining" :plain="true">登录</el-button> 16 <el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining" :plain="true">登录</el-button>
@@ -34,6 +37,7 @@ @@ -34,6 +37,7 @@
34 <script> 37 <script>
35 import axios from 'axios' 38 import axios from 'axios'
36 import http from '../api/http'; 39 import http from '../api/http';
  40 + import {getRandCode} from '../api/user';
37 //import NProgress from 'nprogress' 41 //import NProgress from 'nprogress'
38 export default { 42 export default {
39 data() { 43 data() {
@@ -43,7 +47,8 @@ @@ -43,7 +47,8 @@
43 logining: false, 47 logining: false,
44 ruleForm2: { 48 ruleForm2: {
45 account: 'admin', 49 account: 'admin',
46 - checkPass: 'vmvnv1v2VV' 50 + checkPass: 'ZZJCsamples@123'
  51 + // checkPass: 'vmvnv1v2VV'
47 }, 52 },
48 rules2: { 53 rules2: {
49 account: [ 54 account: [
@@ -96,6 +101,13 @@ @@ -96,6 +101,13 @@
96 // 本地存储用户目录 ，防刷新目录丢失用 101 // 本地存储用户目录 ，防刷新目录丢失用
97 sessionStorage.setItem('menu', JSON.stringify(_this.$router.options.routes)); 102 sessionStorage.setItem('menu', JSON.stringify(_this.$router.options.routes));
98 }, 103 },
  104 + randCode: function(){
  105 + getRandCode().then((res) =>{
  106 +
  107 + }).catch({
  108 +
  109 + });
  110 + },
99 handleSubmit2: function (ev) { 111 handleSubmit2: function (ev) {
100 var _this = this; 112 var _this = this;
101 this.$refs.ruleForm2.validate((valid) => { 113 this.$refs.ruleForm2.validate((valid) => {
@@ -178,7 +190,8 @@ @@ -178,7 +190,8 @@
178 } 190 }
179 } 191 }
180 } 192 }
181 - window.onresize() 193 + window.onresize();
  194 + // this.randCode();
182 } 195 }
183 } 196 }
184 197
@@ -54,7 +54,9 @@ @@ -54,7 +54,9 @@
54 v-loading="businesstypeListLoading" 54 v-loading="businesstypeListLoading"
55 style="width: 100%"> 55 style="width: 100%">
56 <el-table-column fixed prop="date" label="操作"> 56 <el-table-column fixed prop="date" label="操作">
57 - <el-button @click="handleClick(scope.row)" type="primary" size="small">查看</el-button> 57 + <template slot-scope="scope">
  58 + <el-button @click="selectOne(scope.$index, scope.row)" type="primary" size="small">查看</el-button>
  59 + </template>
58 </el-table-column> 60 </el-table-column>
59 <el-table-column prop="isvalid" :formatter="isvalidFormatter" label="是否失效"> 61 <el-table-column prop="isvalid" :formatter="isvalidFormatter" label="是否失效">
60 </el-table-column> 62 </el-table-column>
@@ -62,9 +64,9 @@ @@ -62,9 +64,9 @@
62 </el-table-column> 64 </el-table-column>
63 <el-table-column prop="agentname" label="挂靠单位"> 65 <el-table-column prop="agentname" label="挂靠单位">
64 </el-table-column> 66 </el-table-column>
65 - <el-table-column prop="endport" label="目的关区"> 67 + <el-table-column prop="endstation" :formatter="endstationName" label="目的场站" width="100">
66 </el-table-column> 68 </el-table-column>
67 - <el-table-column prop="aisle" label="卡口" width="100"> 69 + <el-table-column prop="aisle" :formatter="aisleName" label="卡口" width="100">
68 </el-table-column> 70 </el-table-column>
69 <el-table-column prop="aislewt" label="地磅称重"> 71 <el-table-column prop="aislewt" label="地磅称重">
70 </el-table-column> 72 </el-table-column>
@@ -88,10 +90,10 @@ @@ -88,10 +90,10 @@
88 </el-table-column> 90 </el-table-column>
89 <el-table-column fixed="right" label="操作" width="150"> 91 <el-table-column fixed="right" label="操作" width="150">
90 <template slot-scope="scope"> 92 <template slot-scope="scope">
91 - <el-button type="success" size="mini">修改</el-button>  
92 - <el-button type="danger" size="mini">删除</el-button> 93 + <el-button type="success" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button>
  94 + <el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>
93 <el-button type="warning" size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button> 95 <el-button type="warning" size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>
94 - <el-button type="info" size="mini">异常</el-button> 96 + <el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>
95 </template> 97 </template>
96 </el-table-column> 98 </el-table-column>
97 </el-table> 99 </el-table>
@@ -108,12 +110,269 @@ @@ -108,12 +110,269 @@
108 :total="this.total"> 110 :total="this.total">
109 </el-pagination> 111 </el-pagination>
110 </div> 112 </div>
  113 + <!-- 编辑表单信息-->
  114 + <el-dialog title="编辑" :visible.sync="editFormVisible" width="80%" height="80%" :close-on-click-modal="false">
  115 + <!-- 工具条-->
  116 + <el-row class="toolbar" style="padding-bottom: 0px;">
  117 + <el-form :inline="true" ref="filtersForm" :model="filtersForm" :rules="rules" >
  118 + <el-row>
  119 + <el-col :span="8">
  120 + <el-form-item label="主单号：" prop="waybill">
  121 + <el-input v-model="filtersForm.waybill" placeholder="" size="small" style="width: 240px"></el-input>
  122 + </el-form-item>
  123 + </el-col>
  124 + <el-col :span="8">
  125 + <el-form-item>
  126 + <el-button type="primary" @click="getWaybillList()" size="small" style="margin-left: 40px">查询</el-button>
  127 + <span style="color: red;margin-left: 10px">查询单号前请先选定业务类型</span>
  128 + </el-form-item>
  129 + </el-col>
  130 + </el-row>
  131 + </el-form>
  132 + </el-row>
  133 + <!-- 列表-->
  134 + <el-row>
  135 + <el-table :data="awbaList" v-loading="commonLoading" style="width: 100%">
  136 + <el-table-column fixed label="操作">
  137 + <template slot-scope="scope">
  138 + <el-button @click="addWaybill(scope.$index, scope.row)" type="primary" size="small">添加</el-button>
  139 + </template>
  140 + </el-table-column>
  141 + <el-table-column prop="flightno" label="航班号">
  142 + <template slot-scope="scope">
  143 + <span v-if="scope.row.flightno.length > 4" >{{scope.row.flightno}}</span>
  144 + <span v-else>{{scope.row.carrier}}{{scope.row.flightno}}</span>
  145 + </template>
  146 + </el-table-column>
  147 + <el-table-column prop="flightDate" label="航班日期">
  148 + <template slot-scope="scope">
  149 + <span v-if="scope.row.flightDate !=null">{{scope.row.flightDate | formatDate}}</span>
  150 + <span v-else>{{scope.row.flightdate | formatDate}}</span>
  151 + </template>
  152 + </el-table-column>
  153 + <el-table-column prop="segment" label="航段">
  154 + <template slot-scope="scope">
  155 + <span v-if="scope.row.segment != null" >{{scope.row.segment}}</span>
  156 + <span v-else>{{scope.row.originatingstation}}-{{scope.row.destinationstation}}</span>
  157 + </template>
  158 + </el-table-column>
  159 + <el-table-column prop="waybillnomaster" label="主单号">
  160 + </el-table-column>
  161 + <el-table-column prop="totalpiece" label="件数">
  162 + </el-table-column>
  163 + <el-table-column prop="totalweight" label="重量">
  164 + </el-table-column>
  165 + <el-table-column prop="customscode" label="关区">
  166 + </el-table-column>
  167 + <el-table-column prop="createdate" :formatter="formatDate" label="时间">
  168 + </el-table-column>
  169 + <el-table-column prop="receiptinformation" label="回执内容" width="280px">
  170 + </el-table-column>
  171 + </el-table>
  172 + </el-row>
  173 + <el-form ref="editForm" :model="editForm">
  174 + <el-row>
  175 + <el-col :span="10">
  176 + <el-row>
  177 + <el-form-item label="输入备注：">
  178 + <el-input
  179 + type="text"
  180 + v-model="editForm.remark3"
  181 + maxlength="10"
  182 + show-word-limit
  183 + size="small" style="width: 180px">
  184 + </el-input>
  185 + </el-form-item>
  186 + </el-row>
  187 + <el-row>
  188 + <el-form-item label="车牌号码：" prop="trailerFrameNo">
  189 + <el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号" size="small" style="width: 180px"></el-input>
  190 + </el-form-item>
  191 + </el-row>
  192 + <el-row>
  193 + <el-form-item label="货物类型：" prop="cocode">
  194 + <el-select v-model="editForm.cocode" placeholder="请选择" size="small" style="width: 180px">
  195 + <el-option label="转关货" value="转关货"></el-option>
  196 + <el-option label="换单货" value="换单货"></el-option>
  197 + <el-option label="普通货" value="普通货"></el-option>
  198 + <el-option label="退库货" value="退库货"></el-option>
  199 + <el-option label="查验货" value="查验货"></el-option>
  200 + </el-select>
  201 + </el-form-item>
  202 + </el-row>
  203 + <el-row>
  204 + <el-form-item label="场站选择：" prop="endstation">
  205 + <el-select v-model="editForm.endstation" disabled placeholder="请选择">
  206 + <el-option
  207 + v-for="item in options"
  208 + :key="item.stationId"
  209 + :label="item.name"
  210 + :value="item.stationId">
  211 + </el-option>
  212 + </el-select>
  213 + </el-form-item>
  214 + </el-row>
  215 + <el-row>
  216 + <el-form-item label="运输公司：">
  217 + <el-input v-model="editForm.agentno" placeholder="" size="small" style="width: 180px"></el-input>
  218 + </el-form-item>
  219 + </el-row>
  220 + <el-row>
  221 + <el-form-item label="挂靠单位：">
  222 + <el-input v-model="editForm.agentname" placeholder="" size="small" style="width: 180px"></el-input>
  223 + </el-form-item>
  224 + </el-row>
  225 + </el-col>
  226 + <el-col :span="7">
  227 + <el-row>
  228 + <el-form-item label="业务类型：" prop="businesstype">
  229 + <el-select v-model="editForm.businesstype" clearable placeholder="请选择" size="small" style="width: 180px">
  230 + <el-option label="进口提货" value="进口提货"></el-option>
  231 + <el-option label="出口送货" value="出口送货"></el-option>
  232 + <el-option label="分拨业务" value="分拨业务"></el-option>
  233 + <el-option label="调拨业务" value="调拨业务"></el-option>
  234 + </el-select>
  235 + </el-form-item>
  236 +
  237 + </el-row>
  238 + <el-row>
  239 + <el-form-item label="申请单位：">
  240 + <el-input v-model="editForm.veProperty" disabled size="small" style="width: 180px"></el-input>
  241 + </el-form-item>
  242 + </el-row>
  243 + <el-row>
  244 + <el-form-item label="备案单位：">
  245 + <el-input v-model="editForm.trailerLicenseNo" disabled size="small" style="width: 180px"></el-input>
  246 + </el-form-item>
  247 +
  248 + </el-row>
  249 + <el-row>
  250 + <el-form-item label="主单列表：">
  251 + <el-input
  252 + type="textarea"
  253 + :rows="4"
  254 + placeholder="请输入主单号，例如17212341234，多个单号以‘，’（英文）分割"
  255 + v-model="editForm.masterList"
  256 + style="width: 180px">
  257 + </el-input>
  258 + </el-form-item>
  259 + </el-row>
  260 + </el-col>
  261 + </el-row>
  262 + <el-row style="margin-left: 320px">
  263 + <el-button type="primary" @click="editSubmit()" >保存</el-button>
  264 + </el-row>
  265 +
  266 + </el-form>
  267 + </el-dialog>
  268 + <!-- 查看表单信息-->
  269 + <el-dialog title="查看" :visible.sync="selectOneVisible" width="80%" height="80%" :close-on-click-modal="false">
  270 + <el-form ref="editForm" :model="editForm">
  271 + <el-row>
  272 + <el-col :span="10">
  273 + <el-row>
  274 + <el-form-item label="输入备注：">
  275 + <el-input
  276 + type="text"
  277 + v-model="editForm.remark3"
  278 + maxlength="10"
  279 + show-word-limit
  280 + size="small" style="width: 180px">
  281 + </el-input>
  282 + </el-form-item>
  283 + </el-row>
  284 + <el-row>
  285 + <el-form-item label="车牌号码：" prop="trailerFrameNo">
  286 + <el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号" size="small" style="width: 180px"></el-input>
  287 + </el-form-item>
  288 + </el-row>
  289 + <el-row>
  290 + <el-form-item label="货物类型：" prop="cocode">
  291 + <el-select v-model="editForm.cocode" placeholder="请选择" size="small" style="width: 180px">
  292 + <el-option label="转关货" value="转关货"></el-option>
  293 + <el-option label="换单货" value="换单货"></el-option>
  294 + <el-option label="普通货" value="普通货"></el-option>
  295 + <el-option label="退库货" value="退库货"></el-option>
  296 + <el-option label="查验货" value="查验货"></el-option>
  297 + </el-select>
  298 + </el-form-item>
  299 + </el-row>
  300 + <el-row>
  301 + <el-form-item label="场站选择：" prop="endstation">
  302 + <el-select v-model="editForm.endstation" disabled placeholder="请选择">
  303 + <el-option
  304 + v-for="item in options"
  305 + :key="item.stationId"
  306 + :label="item.name"
  307 + :value="item.stationId">
  308 + </el-option>
  309 + </el-select>
  310 + </el-form-item>
  311 + </el-row>
  312 + <el-row>
  313 + <el-form-item label="运输公司：">
  314 + <el-input v-model="editForm.agentno" placeholder="" size="small" style="width: 180px"></el-input>
  315 + </el-form-item>
  316 + </el-row>
  317 + <el-row>
  318 + <el-form-item label="挂靠单位：">
  319 + <el-input v-model="editForm.agentname" placeholder="" size="small" style="width: 180px"></el-input>
  320 + </el-form-item>
  321 + </el-row>
  322 + </el-col>
  323 + <el-col :span="7">
  324 + <el-row>
  325 + <el-form-item label="业务类型：" prop="businesstype">
  326 + <el-select v-model="editForm.businesstype" clearable placeholder="请选择" size="small" style="width: 180px">
  327 + <el-option label="进口提货" value="进口提货"></el-option>
  328 + <el-option label="出口送货" value="出口送货"></el-option>
  329 + <el-option label="分拨业务" value="分拨业务"></el-option>
  330 + <el-option label="调拨业务" value="调拨业务"></el-option>
  331 + </el-select>
  332 + </el-form-item>
  333 +
  334 + </el-row>
  335 + <el-row>
  336 + <el-form-item label="申请单位：">
  337 + <el-input v-model="editForm.veProperty" disabled size="small" style="width: 180px"></el-input>
  338 + </el-form-item>
  339 + </el-row>
  340 + <el-row>
  341 + <el-form-item label="备案单位：">
  342 + <el-input v-model="editForm.trailerLicenseNo" disabled size="small" style="width: 180px"></el-input>
  343 + </el-form-item>
  344 +
  345 + </el-row>
  346 + <el-row>
  347 + <el-form-item label="主单列表：">
  348 + <el-input
  349 + type="textarea"
  350 + :rows="4"
  351 + placeholder="请输入主单号，例如17212341234，多个单号以‘，’（英文）分割"
  352 + v-model="editForm.masterList"
  353 + style="width: 180px">
  354 + </el-input>
  355 + </el-form-item>
  356 + </el-row>
  357 + </el-col>
  358 + </el-row>
  359 + </el-form>
  360 + </el-dialog>
111 </section> 361 </section>
112 </template> 362 </template>
113 <script> 363 <script>
114 - import {list, aisleList} from '../../api/remote_interface/byont_import'; 364 + import {list, aisleList, barCodeDel, remove, edit} from '../../api/remote_interface/byont_import';
115 import {getYardList as yartList} from "../../api/station_dispatch"; 365 import {getYardList as yartList} from "../../api/station_dispatch";
116 export default { 366 export default {
  367 + filters: {
  368 + formatDate(value) {
  369 + if(value == null) {
  370 + return null
  371 + }
  372 + let dt = new Date(value)
  373 + return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();
  374 + }
  375 + },
117 data() { 376 data() {
118 return { 377 return {
119 businesstypeList: [], 378 businesstypeList: [],
@@ -121,15 +380,54 @@ @@ -121,15 +380,54 @@
121 limitSize: 10, 380 limitSize: 10,
122 total: 1, 381 total: 1,
123 options: [], 382 options: [],
  383 + awbaList:[],
124 aisleOptions: [], 384 aisleOptions: [],
  385 + filtersForm: {
  386 + waybill: ''
  387 + },
125 disabled: true, 388 disabled: true,
  389 + commonLoading: false,
  390 + editFormVisible: false,
  391 + selectOneVisible: false,
126 filters: { 392 filters: {
127 trailerFrameNo: '', 393 trailerFrameNo: '',
128 agentname: '', 394 agentname: '',
129 endstation: '', 395 endstation: '',
130 aisle: '', 396 aisle: '',
131 }, 397 },
132 - businesstypeListLoading: false 398 + businesstypeListLoading: false,
  399 + editForm: {
  400 + // 备注
  401 + remark3: '',
  402 + // 业务类型
  403 + businesstype: '',
  404 + // 车牌号
  405 + trailerFrameNo: '',
  406 + //备案单位
  407 + trailerLicenseNo: '',
  408 + // 主单列表
  409 + masterList: '',
  410 + // 场站编号
  411 + endstation: '',
  412 + endstationList: '',
  413 + stationId: '',
  414 + // 运输公司
  415 + agentno: '',
  416 + // 挂靠单位
  417 + agentname: '',
  418 + //申请单位
  419 + veProperty: '',
  420 + // 货物类型
  421 + cocode:'',
  422 + // 货物重量
  423 + remark: ''
  424 + },
  425 + weightFloat: 0,
  426 + rules:{
  427 + waybill: [
  428 + { required: true, message: '请输入运单号', trigger: 'change' }
  429 + ]
  430 + },
133 } 431 }
134 }, 432 },
135 methods: { 433 methods: {
@@ -141,6 +439,52 @@ @@ -141,6 +439,52 @@
141 return "失效" 439 return "失效"
142 } 440 }
143 }, 441 },
  442 +
  443 + aisleName: function(row, cloumn){
  444 + if (row.aisle=="4600010005"){
  445 + return "5号卡口-出"
  446 + }else if (row.aisle=="4600011005"){
  447 + return "5号卡口-进"
  448 + }else if (row.aisle=="4604333311"){
  449 + return "1号卡口-进"
  450 + }else if (row.aisle=="4604333312"){
  451 + return "1号卡口-出"
  452 + }else if (row.aisle=="4604444412"){
  453 + return "1号卡口-出"
  454 + }else if (row.aisle=="4600011006"){
  455 + return "6号卡口-进"
  456 + }else if (row.aisle=="4604110112"){
  457 + return "1号卡口-出"
  458 + }else if (row.aisle=="4612031001"){
  459 + return "内三卡口-进"
  460 + }else if (row.aisle=="4600010006"){
  461 + return "6号卡口-出"
  462 + }else if (row.aisle=="4604111111"){
  463 + return "1号卡口-进"
  464 + }else if (row.aisle=="4612030001"){
  465 + return "内三卡口-出"
  466 + }else if (row.aisle=="4604444411"){
  467 + return "1号卡口-进"
  468 + }else if (row.aisle=="4604333321"){
  469 + return "2号卡口-进"
  470 + }else if (row.aisle=="4604333322"){
  471 + return "2号卡口-出"
  472 + }
  473 +
  474 + },
  475 + endstationName: function(row, cloumn){
  476 + if (row.endstation == "4604511001"){
  477 + return "快邮货站"
  478 + }else if (row.endstation == "4600329012"){
  479 + return "综保区货站"
  480 + }else if (row.endstation == "4604000000"){
  481 + return "西货站"
  482 + }else if (row.endstation == "4604000006"){
  483 + return "冷链货站"
  484 + }else if (row.endstation == "4604499001"){
  485 + return "三号货站"
  486 + }
  487 + },
144 turnoverflagFormatter: function(row, column){ 488 turnoverflagFormatter: function(row, column){
145 if (row.turnoverflag == 'I'){ 489 if (row.turnoverflag == 'I'){
146 return "进场站" 490 return "进场站"
@@ -156,10 +500,13 @@ @@ -156,10 +500,13 @@
156 trailerFrameNo: this.filters.trailerFrameNo, 500 trailerFrameNo: this.filters.trailerFrameNo,
157 agentname: this.filters.agentname, 501 agentname: this.filters.agentname,
158 endstation: this.filters.endstation, 502 endstation: this.filters.endstation,
159 - aisle: this.filters.aisle 503 + aisle: this.filters.aisle,
  504 + userId: this.userid = JSON.parse(sessionStorage.getItem('user')).id
160 }; 505 };
  506 + if(JSON.parse(sessionStorage.getItem('user')).roles[0].roleName == "ROLE_admin"){
  507 + para.userId = '';
  508 + }
161 this.businesstypeListLoading = true; 509 this.businesstypeListLoading = true;
162 - console.log(para);  
163 list(para).then((res) => { 510 list(para).then((res) => {
164 this.total = res.data.data.total; 511 this.total = res.data.data.total;
165 this.businesstypeList = res.data.data.list; 512 this.businesstypeList = res.data.data.list;
@@ -177,7 +524,6 @@ @@ -177,7 +524,6 @@
177 }); 524 });
178 525
179 }, 526 },
180 -  
181 // 获取场站 527 // 获取场站
182 getYardList(){ 528 getYardList(){
183 yartList().then((res) =>{ 529 yartList().then((res) =>{
@@ -213,9 +559,109 @@ @@ -213,9 +559,109 @@
213 559
214 }); 560 });
215 }, 561 },
216 - onSubmit() {  
217 - console.log('submit!'); 562 + // 二维码异常处理
  563 + barCodeDelete(index, row) {
  564 + this.$confirm('确认处理吗？', '提示', {}).then(() => {
  565 + let para = {
  566 + trailerFrameNo: row.trailerFrameNo,
  567 + barCode: row.barcode
  568 + }
  569 + barCodeDel(para).then((res) =>{
  570 + this.$message({
  571 + message: res.data.msg,
  572 + type: 'success'
  573 +
  574 + });
  575 + this.getList();
  576 + }).catch((error)=>{
  577 + this.$message({
  578 + message: error,
  579 + type: 'error'
  580 +
  581 + });
  582 + });
  583 + }).catch(() =>{
  584 +
  585 + });
  586 + },
  587 + // 删除
  588 + deleteClick(index, row){
  589 + this.$confirm('确认删除吗？', '提示', {}).then(() => {
  590 + let para = {
  591 + id: row.id,
  592 + }
  593 + remove(para).then((res) =>{
  594 + this.$message({
  595 + message: res.data.msg,
  596 + type: 'success'
  597 +
  598 + });
  599 + this.getList();
  600 + }).catch((error)=>{
  601 + this.$message({
  602 + message: error,
  603 + type: 'error'
  604 +
  605 + });
  606 + });
  607 + }).catch(() =>{
  608 +
  609 + });
218 }, 610 },
  611 + // 修改
  612 + opneEdit(index, row){
  613 + this.editFormVisible = true;
  614 +
  615 + if (this.$refs.filtersForm !== undefined) {
  616 + this.$refs.filtersForm.resetFields();
  617 + }
  618 + this.editForm = Object.assign({}, row);
  619 + },
  620 + // 查看
  621 + selectOne(index, row){
  622 + this.selectOneVisible = true;
  623 + this.editForm = Object.assign({}, row);
  624 + },
  625 + // 运单列表赋值
  626 + addWaybill: function(index, row){
  627 + this.editForm.masterList += row.waybillnomaster + ',';
  628 + },
  629 + // 运单查询
  630 + getWaybillList(){
  631 + let businesstype = this.editForm.businesstype;
  632 + if (businesstype != undefined && businesstype != null && businesstype != ''){
  633 + this.$refs.filtersForm.validate((valid) => {
  634 + if (valid) {
  635 + this.commonLoading = true;
  636 + let _this = this;
  637 + var url = "http://tjfx.15miaoo.com:8003/orig/orig";
  638 + var xhr = new XMLHttpRequest();
  639 + // 访问nginx中的代理服务器
  640 + xhr.open('get', url+'?waybill='+this.filtersForm.waybill+'&imp='+this.getBusinesstype(), true);
  641 + xhr.send();
  642 + xhr.onreadystatechange = function(){
  643 + if(xhr.readyState == 4){
  644 + if(xhr.status ==200){
  645 + var data = JSON.parse(xhr.responseText);
  646 + _this.awbaList=data;
  647 + //console.log(data);
  648 + _this.commonLoading = false;
  649 + }
  650 + }
  651 + }
  652 + } else {
  653 + console.log('error submit!!');
  654 + return false;
  655 + }
  656 + });
  657 + }else {
  658 + this.$message({
  659 + message: '请在下列选择业务类型',
  660 + type: "error"
  661 + })
  662 + }
  663 + },
  664 + // 分页
219 handleSizeChange(val) { 665 handleSizeChange(val) {
220 this.limitSize = val; 666 this.limitSize = val;
221 this.getList(); 667 this.getList();
@@ -224,11 +670,145 @@ @@ -224,11 +670,145 @@
224 this.pageSize = val; 670 this.pageSize = val;
225 this.getList(); 671 this.getList();
226 672
  673 + },
  674 + // 日期格式转换
  675 + flightDate: function (row, column) {
  676 + // 获取单元格数据
  677 + let data = row.flightDate
  678 + if(data == null) {
  679 + return null
  680 + }
  681 + let dt = new Date(data)
  682 + return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();
  683 + },
  684 + formatDate: function (row, column) {
  685 + // 获取单元格数据
  686 + let data = row.createdate;
  687 + if(data == null) {
  688 + return null
  689 + }
  690 + let dt = new Date(data)
  691 + return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()+ ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds();
  692 + },
  693 + editweight(){
  694 + var _this = this;
  695 + // 运单重量累加
  696 + let lists = _this.wayBillList();
  697 + var split = lists.split(",");
  698 + _this.weightFloat = 0;
  699 + // 判断进出港 进出港返回字段不一样
  700 + if(_this.getBusinesstype() == "I"){
  701 + split.forEach((item) =>{
  702 + var url = "http://tjfx.15miaoo.com:8003/orig/orig";
  703 + var xhr = new XMLHttpRequest();
  704 + // 访问nginx中的代理服务器
  705 + xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);
  706 + xhr.send();
  707 + xhr.onreadystatechange = function(){
  708 + if(xhr.readyState == 4){
  709 + if(xhr.status ==200){
  710 + var data = JSON.parse(xhr.responseText);
  711 + data.forEach((itmeData => {
  712 + if (itmeData != null){
  713 + _this.weightFloat += parseFloat(itmeData.manifesttotalweight);
  714 + }
  715 + }));
  716 + }
  717 + }
  718 + }
  719 + });
  720 + }else {
  721 + split.forEach((item) =>{
  722 + var url = "http://tjfx.15miaoo.com:8003/orig/orig";
  723 + var xhr = new XMLHttpRequest();
  724 + // 访问nginx中的代理服务器
  725 + xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);
  726 + xhr.send();
  727 + xhr.onreadystatechange = function(){
  728 + if(xhr.readyState == 4){
  729 + if(xhr.status ==200){
  730 + var data = JSON.parse(xhr.responseText);
  731 + data.forEach((itmeData => {
  732 + if (itmeData != null){
  733 + _this.weightFloat += parseFloat(itmeData.preparetotalweight);
  734 + }
  735 + }));
  736 + }
  737 + }
  738 + }
  739 + });
  740 + }
  741 + return _this.weightFloat;
  742 + },
  743 + editsubmit(){
  744 + this.editForm.masterList = this.wayBillList();
  745 + this.editForm.remark = this.weightFloat.toString();
  746 + let para = Object.assign({}, this.editForm);
  747 + edit(para).then((res) => {
  748 + if (res.data.code == 200){
  749 + this.$message({
  750 + message: '提交成功',
  751 + type: 'success'
  752 + });
  753 + this.editFormVisible = false;
  754 + this.getList();
  755 + }else {
  756 + this.$message({
  757 + message: '提交失败',
  758 + type: 'error'
  759 + });
  760 + }
  761 + }).catch(error => alert(error));
  762 + },
  763 + getBusinesstype:function(){
  764 + let businesstype = this.editForm.businesstype;
  765 + if (businesstype == '进口提货'){
  766 + businesstype = 'I';
  767 + }else if (businesstype == '出口送货'){
  768 + businesstype = 'E';
  769 + }else if (businesstype == '分拨业务'){
  770 + businesstype = 'I';
  771 + }else if (businesstype == '调拨业务'){
  772 + businesstype = 'E';
  773 + }
  774 + return businesstype;
  775 + },
  776 + // 添加页面主单列表 结尾逗号处理
  777 + wayBillList:function () {
  778 + if (this.editForm.masterList.endsWith(",")){
  779 + return this.editForm.masterList.substring(0,this.editForm.masterList.length-1);
  780 + }else {
  781 + return this.editForm.masterList
  782 + }
  783 + },
  784 + // 申请添加
  785 + editSubmit (){
  786 + let _this = this;
  787 + this.$refs.editForm.validate((valid) => {
  788 + if (valid) {
  789 + this.$confirm('确认提交吗？', '提示', {}).then(() => {
  790 + _this.editsubmit();
  791 + }).catch(() =>{
  792 +
  793 + });
  794 + } else {
  795 + return false;
  796 + }
  797 + });
227 } 798 }
228 }, 799 },
229 mounted() { 800 mounted() {
230 this.getYardList(); 801 this.getYardList();
231 this.getList(); 802 this.getList();
  803 + },
  804 + watch: {
  805 + 'editForm.masterList':{
  806 + handler: function() {
  807 + this.editForm.remark = "";
  808 + this.editForm.masterList = this.editForm.masterList.replaceAll("，",",");
  809 + this.editweight();
  810 + },
  811 + }
232 } 812 }
233 } 813 }
234 </script> 814 </script>
@@ -27,10 +27,22 @@ @@ -27,10 +27,22 @@
27 </template> 27 </template>
28 </el-table-column> 28 </el-table-column>
29 <el-table-column prop="flightno" label="航班号"> 29 <el-table-column prop="flightno" label="航班号">
  30 + <template slot-scope="scope">
  31 + <span v-if="scope.row.flightno.length > 4" >{{scope.row.flightno}}</span>
  32 + <span v-else>{{scope.row.carrier}}{{scope.row.flightno}}</span>
  33 + </template>
30 </el-table-column> 34 </el-table-column>
31 - <el-table-column prop="flightDate" :formatter="flightDate" label="航班日期"> 35 + <el-table-column prop="flightDate" label="航班日期">
  36 + <template slot-scope="scope">
  37 + <span v-if="scope.row.flightDate !=null">{{scope.row.flightDate | formatDate}}</span>
  38 + <span v-else>{{scope.row.flightdate | formatDate}}</span>
  39 + </template>
32 </el-table-column> 40 </el-table-column>
33 <el-table-column prop="segment" label="航段"> 41 <el-table-column prop="segment" label="航段">
  42 + <template slot-scope="scope">
  43 + <span v-if="scope.row.segment != null" >{{scope.row.segment}}</span>
  44 + <span v-else>{{scope.row.originatingstation}}-{{scope.row.destinationstation}}</span>
  45 + </template>
34 </el-table-column> 46 </el-table-column>
35 <el-table-column prop="waybillnomaster" label="主单号"> 47 <el-table-column prop="waybillnomaster" label="主单号">
36 </el-table-column> 48 </el-table-column>
@@ -138,8 +150,8 @@ @@ -138,8 +150,8 @@
138 </el-col> 150 </el-col>
139 </el-row> 151 </el-row>
140 <el-row style="margin-left: 320px"> 152 <el-row style="margin-left: 320px">
141 -<!-- <el-button type="primary" @click="saveSubmit()" :disabled="disabledStr">保存</el-button>-->  
142 - <el-button type="primary" @click="saveSubmit()" :disabledStr="disabledStr" >保存</el-button> 153 + <el-button type="primary" @click="saveSubmit()" :disabled="disabledStr">保存</el-button>
  154 +<!-- <el-button type="primary" @click="saveSubmit()" :disabledStr="disabledStr" >保存</el-button>-->
143 </el-row> 155 </el-row>
144 156
145 </el-form> 157 </el-form>
@@ -150,9 +162,19 @@ @@ -150,9 +162,19 @@
150 <script> 162 <script>
151 import {getYardList as yartList} from '../../api/station_dispatch' 163 import {getYardList as yartList} from '../../api/station_dispatch'
152 import {trailerFrameNoSuccess, save} from '../../api/remote_interface/byont_import' 164 import {trailerFrameNoSuccess, save} from '../../api/remote_interface/byont_import'
  165 + // import {formatDate} from '../../api/comcommonUtil'
153 import loginUserInfo from "../../api/base"; 166 import loginUserInfo from "../../api/base";
154 import {add} from "../../api/security/security"; 167 import {add} from "../../api/security/security";
155 export default { 168 export default {
  169 + filters: {
  170 + formatDate(value) {
  171 + if(value == null) {
  172 + return null
  173 + }
  174 + let dt = new Date(value)
  175 + return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();
  176 + }
  177 + },
156 data() { 178 data() {
157 return { 179 return {
158 rules:{ 180 rules:{
@@ -176,7 +198,7 @@ @@ -176,7 +198,7 @@
176 }, 198 },
177 options:[], 199 options:[],
178 filters: { 200 filters: {
179 - waybill: '828-12161085', 201 + waybill: ''
180 }, 202 },
181 radio:'', 203 radio:'',
182 awbaList:[], 204 awbaList:[],
@@ -189,9 +211,9 @@ @@ -189,9 +211,9 @@
189 // 备注 211 // 备注
190 remark3: '', 212 remark3: '',
191 // 业务类型 213 // 业务类型
192 - businesstype: '进口提货', 214 + businesstype: '',
193 // 车牌号 215 // 车牌号
194 - trailerFrameNo: '苏H63D50', 216 + trailerFrameNo: '',
195 //备案单位 217 //备案单位
196 trailerLicenseNo: '', 218 trailerLicenseNo: '',
197 // 主单列表 219 // 主单列表
@@ -208,8 +230,10 @@ @@ -208,8 +230,10 @@
208 // 货物类型 230 // 货物类型
209 cocode:'', 231 cocode:'',
210 // 货物重量 232 // 货物重量
211 - remark: '' 233 + remark: '',
  234 + createBy: this.userid = JSON.parse(sessionStorage.getItem('user')).id
212 }, 235 },
  236 + weightFloat: 0
213 237
214 } 238 }
215 }, 239 },
@@ -317,16 +341,6 @@ @@ -317,16 +341,6 @@
317 341
318 }); 342 });
319 }, 343 },
320 - // 日期格式转换  
321 - flightDate: function (row, column) {  
322 - // 获取单元格数据  
323 - let data = row.flightDate  
324 - if(data == null) {  
325 - return null  
326 - }  
327 - let dt = new Date(data)  
328 - return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();  
329 - },  
330 formatDate: function (row, column) { 344 formatDate: function (row, column) {
331 // 获取单元格数据 345 // 获取单元格数据
332 let data = row.createdate; 346 let data = row.createdate;
@@ -343,28 +357,56 @@ @@ -343,28 +357,56 @@
343 addweight(){ 357 addweight(){
344 var _this = this; 358 var _this = this;
345 // 运单重量累加 359 // 运单重量累加
346 - let lists =this.addForm.masterList.substring(0,this.addForm.masterList.length-1); 360 + let lists = _this.wayBillList();
347 var split = lists.split(","); 361 var split = lists.split(",");
348 - split.forEach((item) =>{  
349 - var url = "http://tjfx.15miaoo.com:8003/orig/orig";  
350 - var xhr = new XMLHttpRequest();  
351 - // 访问nginx中的代理服务器  
352 - xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);  
353 - xhr.send();  
354 - xhr.onreadystatechange = function(){  
355 - if(xhr.readyState == 4){  
356 - if(xhr.status ==200){  
357 - var data = JSON.parse(xhr.responseText);  
358 - data.forEach((itmeData => {  
359 - _this.addForm.remark += itmeData.manifesttotalweight+",";  
360 - })); 362 + _this.weightFloat = 0;
  363 + // 判断进出港 进出港返回字段不一样
  364 + if(_this.getBusinesstype() == "I"){
  365 + split.forEach((item) =>{
  366 + var url = "http://tjfx.15miaoo.com:8003/orig/orig";
  367 + var xhr = new XMLHttpRequest();
  368 + // 访问nginx中的代理服务器
  369 + xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);
  370 + xhr.send();
  371 + xhr.onreadystatechange = function(){
  372 + if(xhr.readyState == 4){
  373 + if(xhr.status ==200){
  374 + var data = JSON.parse(xhr.responseText);
  375 + data.forEach((itmeData => {
  376 + if (itmeData != null){
  377 + _this.weightFloat += parseFloat(itmeData.manifesttotalweight);
  378 + }
  379 + }));
  380 + }
361 } 381 }
362 } 382 }
363 - }  
364 - });  
365 - return _this.addForm.remark; 383 + });
  384 + }else {
  385 + split.forEach((item) =>{
  386 + var url = "http://tjfx.15miaoo.com:8003/orig/orig";
  387 + var xhr = new XMLHttpRequest();
  388 + // 访问nginx中的代理服务器
  389 + xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);
  390 + xhr.send();
  391 + xhr.onreadystatechange = function(){
  392 + if(xhr.readyState == 4){
  393 + if(xhr.status ==200){
  394 + var data = JSON.parse(xhr.responseText);
  395 + data.forEach((itmeData => {
  396 + if (itmeData != null){
  397 + _this.weightFloat += parseFloat(itmeData.preparetotalweight);
  398 + }
  399 + }));
  400 + }
  401 + }
  402 + }
  403 + });
  404 + }
  405 + return _this.weightFloat;
366 }, 406 },
367 addsubmit(){ 407 addsubmit(){
  408 + this.addForm.masterList = this.wayBillList();
  409 + this.addForm.remark = this.weightFloat.toString();
368 let para = Object.assign({}, this.addForm); 410 let para = Object.assign({}, this.addForm);
369 save(para).then((res) => { 411 save(para).then((res) => {
370 if (res.data.code == 200){ 412 if (res.data.code == 200){
@@ -400,32 +442,7 @@ @@ -400,32 +442,7 @@
400 this.$refs.addForm.validate((valid) => { 442 this.$refs.addForm.validate((valid) => {
401 if (valid) { 443 if (valid) {
402 this.$confirm('确认提交吗？', '提示', {}).then(() => { 444 this.$confirm('确认提交吗？', '提示', {}).then(() => {
403 - let businesstype = _this.getBusinesstype();  
404 - if (this.addForm.masterList.indexOf(",") !== -1){  
405 - _this.addsubmit();  
406 -  
407 - }else {  
408 - console.log("进入远程调用");  
409 - let sum = 0;  
410 - var url = "http://tjfx.15miaoo.com:8003/orig/orig";  
411 - var xhr = new XMLHttpRequest();  
412 - // 访问nginx中的代理服务器  
413 - xhr.open('get', url+'?waybill='+this.addForm.masterList+'&imp='+businesstype, true);  
414 - xhr.send();  
415 - xhr.onreadystatechange = function(){  
416 - if(xhr.readyState == 4){  
417 - if(xhr.status ==200){  
418 - var data = JSON.parse(xhr.responseText);  
419 - data.forEach((itme => {  
420 - _this.addForm.remark += parseInt(itme.manifesttotalweight);  
421 - }));  
422 -  
423 - }  
424 - }  
425 - }  
426 - }  
427 - console.log(_this.addForm.remark);  
428 - console.log(_this.addForm); 445 + _this.addsubmit();
429 }).catch(() =>{ 446 }).catch(() =>{
430 447
431 }); 448 });
@@ -434,6 +451,14 @@ @@ -434,6 +451,14 @@
434 return false; 451 return false;
435 } 452 }
436 }); 453 });
  454 + },
  455 + // 添加页面主单列表 结尾逗号处理
  456 + wayBillList:function () {
  457 + if (this.addForm.masterList.endsWith(",")==true){
  458 + return this.addForm.masterList.substring(0,this.addForm.masterList.length-1);
  459 + }else {
  460 + return this.addForm.masterList
  461 + }
437 } 462 }
438 }, 463 },
439 mounted() { 464 mounted() {
@@ -446,7 +471,6 @@ @@ -446,7 +471,6 @@
446 handler: function() { 471 handler: function() {
447 this.addForm.remark = ""; 472 this.addForm.remark = "";
448 this.addForm.masterList = this.addForm.masterList.replaceAll("，",","); 473 this.addForm.masterList = this.addForm.masterList.replaceAll("，",",");
449 - console.log("运单列表变了"+this.addForm.masterList);  
450 this.addweight(); 474 this.addweight();
451 }, 475 },
452 } 476 }
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <el-table-column type="index" align="center"></el-table-column> 30 <el-table-column type="index" align="center"></el-table-column>
31 <el-table-column label="场站名称" prop="name" align="center" width="120"></el-table-column> 31 <el-table-column label="场站名称" prop="name" align="center" width="120"></el-table-column>
32 <el-table-column label="区域代码" prop="areaCode" align="center" width="120"></el-table-column> 32 <el-table-column label="区域代码" prop="areaCode" align="center" width="120"></el-table-column>
33 - <el-table-column label="场站ID" prop="stationId" align="center" width="120"></el-table-column> 33 + <el-table-column label="场站编号" prop="stationId" align="center" width="120"></el-table-column>
34 <el-table-column label="关区代码" prop="customsCode" align="center" width="120"></el-table-column> 34 <el-table-column label="关区代码" prop="customsCode" align="center" width="120"></el-table-column>
35 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column> 35 <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>
36 <el-table-column label="操作" width="140px" align="center"> 36 <el-table-column label="操作" width="140px" align="center">
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 placeholder="请输入区域代码"> 86 placeholder="请输入区域代码">
87 </el-input> 87 </el-input>
88 </el-form-item> 88 </el-form-item>
89 - <el-form-item label="场站ID：" prop="stationId"> 89 + <el-form-item label="场站编号：" prop="stationId">
90 <el-input v-model="yard_addForm.stationId" style="width:300px" size="mini" clearable 90 <el-input v-model="yard_addForm.stationId" style="width:300px" size="mini" clearable
91 placeholder="请输入场站ID"> 91 placeholder="请输入场站ID">
92 </el-input> 92 </el-input>
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 placeholder="请输入区域代码"> 138 placeholder="请输入区域代码">
139 </el-input> 139 </el-input>
140 </el-form-item> 140 </el-form-item>
141 - <el-form-item label="场站ID：" prop="stationId"> 141 + <el-form-item label="场站编号：" prop="stationId">
142 <el-input v-model="yard_editForm.stationId" style="width:300px" size="mini" clearable 142 <el-input v-model="yard_editForm.stationId" style="width:300px" size="mini" clearable
143 placeholder="请输入场站ID"> 143 placeholder="请输入场站ID">
144 </el-input> 144 </el-input>