朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 f99dd873f023336b670b5cfa6ebc63317e40ba0a 1 个父辈 28090c5d

入库业务录入部分完善

内嵌 并排对比
正在显示 5 个修改的文件 包含 640 行增加 和 15 行删除
@@ -2,12 +2,13 @@ import axios from 'axios' @@ -2,12 +2,13 @@ import axios from 'axios'
2 import http from "../http"; 2 import http from "../http";
3 3
4 4
5 -let baseUrl = 'wms-server-warehouse/wms/station/'  
6 -let baseUrl1 = 'wms-server-warehouse/wms/house/'  
7 -let baseUrl2 = 'wms-server-warehouse/wms/inventroyrecord/'  
8 -let baseUrl3 = 'wms-server-warehouse/wms/location/'  
9 -let baseUrl4 = 'wms-server-warehouse/wms/inventroy/'  
10 -let baseUrl5 = 'wms-server-warehouse/wms/area/' 5 +let baseUrl = 'wms-server-warehouse/wms/station'
  6 +let baseUrl1 = 'wms-server-warehouse/wms/house'
  7 +let baseUrl2 = 'wms-server-warehouse/wms/inventroyrecord'
  8 +let baseUrl3 = 'wms-server-warehouse/wms/location'
  9 +let baseUrl4 = 'wms-server-warehouse/wms/inventroy'
  10 +let baseUrl5 = 'wms-server-warehouse/wms/area'
  11 +let baseUrl6 = 'wms-server-warehouse/wms/newbasesphcode'
11 12
12 13
13 14
@@ -69,3 +70,6 @@ export const addArea = params => { return http.post(`${baseUrl5}/addArea`,params @@ -69,3 +70,6 @@ export const addArea = params => { return http.post(`${baseUrl5}/addArea`,params
69 export const ediArea = params => { return http.post(`${baseUrl5}/ediArea`,params)}; 70 export const ediArea = params => { return http.post(`${baseUrl5}/ediArea`,params)};
70 71
71 export const selectByAreaid = params => { return axios.get(`${baseUrl5}/selectByAreaid`, { params: params }); }; 72 export const selectByAreaid = params => { return axios.get(`${baseUrl5}/selectByAreaid`, { params: params }); };
  73 +//特货管理
  74 +export const getSPHCode = params => { return http.get(`${baseUrl6}/selectByCode`,params)};
  75 +
  1 +export default [
  2 +
  3 + {
  4 + "code":"CT",
  5 + "name":"纸箱/纸板箱"
  6 + },
  7 + {
  8 + "code":"PE",
  9 + "name":"托盘"
  10 + },
  11 + {
  12 + "code":"LG",
  13 + "name":"木箱/木材"
  14 + },
  15 + {
  16 + "code":"ID",
  17 + "name":"铁笼/铁桶"
  18 + },
  19 + {
  20 + "code":"BT",
  21 + "name":"卷轴/纸卷"
  22 + },
  23 + {
  24 + "code":"NE",
  25 + "name":"裸妆/无包装"
  26 + },
  27 + {
  28 + "code":"MT",
  29 + "name":"麻袋"
  30 + },
  31 + {
  32 + "code":"PL",
  33 + "name":"桶"
  34 + },
  35 + {
  36 + "code":"AE",
  37 + "name":"按扭式喷雾器瓶"
  38 + },
  39 + {
  40 + "code":"AM",
  41 + "name":"未加保护玻璃瓶"
  42 + },
  43 + {
  44 + "code":"AP",
  45 + "name":"加保护玻璃瓶"
  46 + },
  47 + {
  48 + "code":"AT",
  49 + "name":"喷雾器"
  50 + },
  51 + {
  52 + "code":"BA",
  53 + "name":"桶"
  54 + },
  55 + {
  56 + "code":"BB",
  57 + "name":"细绳"
  58 + },
  59 + {
  60 + "code":"BC",
  61 + "name":"带有瓶架的板条箱"
  62 + },
  63 + {
  64 + "code":"BD",
  65 + "name":"板"
  66 + },
  67 + {
  68 + "code":"BE",
  69 + "name":"捆扎"
  70 + },
  71 + {
  72 + "code":"BF",
  73 + "name":"未加保护球形瓶"
  74 + },
  75 + {
  76 + "code":"BG",
  77 + "name":"袋"
  78 + },
  79 + {
  80 + "code":"BH",
  81 + "name":"线束"
  82 + },
  83 + {
  84 + "code":"BI",
  85 + "name":"料箱"
  86 + },
  87 + {
  88 + "code":"BJ",
  89 + "name":"吊桶"
  90 + },
  91 + {
  92 + "code":"BK",
  93 + "name":"筐"
  94 + },
  95 + {
  96 + "code":"BL",
  97 + "name":"已压缩包"
  98 + },
  99 + {
  100 + "code":"BN",
  101 + "name":"未压缩包"
  102 + },
  103 + {
  104 + "code":"BO",
  105 + "name":"未加保护圆柱形瓶"
  106 + },
  107 + {
  108 + "code":"BP",
  109 + "name":"加保护球形瓶"
  110 + },
  111 + {
  112 + "code":"BQ",
  113 + "name":"加保护圆柱形瓶"
  114 + },
  115 + {
  116 + "code":"BR",
  117 + "name":"棒"
  118 + },
  119 + {
  120 + "code":"BS",
  121 + "name":"未加保护球形瓶"
  122 + },
  123 + {
  124 + "code":"BU",
  125 + "name":"散装"
  126 + },
  127 + {
  128 + "code":"BV",
  129 + "name":"加保护球形瓶"
  130 + },
  131 + {
  132 + "code":"BX",
  133 + "name":"盒"
  134 + },
  135 + {
  136 + "code":"BY",
  137 + "name":"以堆/束/捆形式的板"
  138 + },
  139 + {
  140 + "code":"BZ",
  141 + "name":"以堆/束/捆形式的钢条"
  142 + },
  143 + {
  144 + "code":"CA",
  145 + "name":"矩形罐"
  146 + },
  147 + {
  148 + "code":"CB",
  149 + "name":"装啤酒板条箱"
  150 + },
  151 + {
  152 + "code":"CC",
  153 + "name":"盛奶器"
  154 + },
  155 + {
  156 + "code":"CE",
  157 + "name":"柳条鱼篮"
  158 + },
  159 + {
  160 + "code":"CF",
  161 + "name":"保险箱"
  162 + },
  163 + {
  164 + "code":"CG",
  165 + "name":"笼"
  166 + },
  167 + {
  168 + "code":"CH",
  169 + "name":"箱，柜"
  170 + },
  171 + {
  172 + "code":"CI",
  173 + "name":"金属罐"
  174 + },
  175 + {
  176 + "code":"CJ",
  177 + "name":"屏蔽容器"
  178 + },
  179 + {
  180 + "code":"CK",
  181 + "name":"木桶"
  182 + },
  183 + {
  184 + "code":"CL",
  185 + "name":"圈"
  186 + },
  187 + {
  188 + "code":"CN",
  189 + "name":"Cones"
  190 + },
  191 + {
  192 + "code":"CO",
  193 + "name":"未加保护的坛"
  194 + },
  195 + {
  196 + "code":"CP",
  197 + "name":"加保护的坛"
  198 + },
  199 + {
  200 + "code":"CQ",
  201 + "name":"罐头"
  202 + },
  203 + {
  204 + "code":"CR",
  205 + "name":"板条箱"
  206 + },
  207 + {
  208 + "code":"CS",
  209 + "name":"箱"
  210 + },
  211 + {
  212 + "code":"CU",
  213 + "name":"杯"
  214 + },
  215 + {
  216 + "code":"CV",
  217 + "name":"包裹"
  218 + },
  219 + {
  220 + "code":"CX",
  221 + "name":"圆柱形罐"
  222 + },
  223 + {
  224 + "code":"CY",
  225 + "name":"圆筒"
  226 + },
  227 + {
  228 + "code":"CZ",
  229 + "name":"帆布"
  230 + },
  231 + {
  232 + "code":"DJ",
  233 + "name":"未加保护细颈坛"
  234 + },
  235 + {
  236 + "code":"DP",
  237 + "name":"加保护细颈坛"
  238 + },
  239 + {
  240 + "code":"DR",
  241 + "name":"金属桶"
  242 + },
  243 + {
  244 + "code":"EN",
  245 + "name":"包，封"
  246 + },
  247 + {
  248 + "code":"FC",
  249 + "name":"装水果板条箱"
  250 + },
  251 + {
  252 + "code":"FD",
  253 + "name":"框架板条箱"
  254 + },
  255 + {
  256 + "code":"FI",
  257 + "name":"小桶"
  258 + },
  259 + {
  260 + "code":"FL",
  261 + "name":"细颈瓶"
  262 + },
  263 + {
  264 + "code":"FO",
  265 + "name":"底箱"
  266 + },
  267 + {
  268 + "code":"FP",
  269 + "name":"薄膜包装"
  270 + },
  271 + {
  272 + "code":"FR",
  273 + "name":"框架"
  274 + },
  275 + {
  276 + "code":"GB",
  277 + "name":"气瓶"
  278 + },
  279 + {
  280 + "code":"GG",
  281 + "name":"粗麻袋"
  282 + },
  283 + {
  284 + "code":"GI",
  285 + "name":"(支)袈"
  286 + },
  287 + {
  288 + "code":"GL",
  289 + "name":"粗麻包"
  290 + },
  291 + {
  292 + "code":"GZ",
  293 + "name":"以堆/束/捆形式的(支柱)架"
  294 + },
  295 + {
  296 + "code":"HG",
  297 + "name":"大啤酒桶"
  298 + },
  299 + {
  300 + "code":"HR",
  301 + "name":"带盖的篮"
  302 + },
  303 + {
  304 + "code":"IN",
  305 + "name":"锭"
  306 + },
  307 + {
  308 + "code":"IZ",
  309 + "name":"以堆/束/捆形式的锭"
  310 + },
  311 + {
  312 + "code":"JC",
  313 + "name":"矩形五加仑液体罐"
  314 + },
  315 + {
  316 + "code":"JG",
  317 + "name":"带柄的水罐"
  318 + },
  319 + {
  320 + "code":"JR",
  321 + "name":"大口瓶"
  322 + },
  323 + {
  324 + "code":"JT",
  325 + "name":"黄麻包"
  326 + },
  327 + {
  328 + "code":"JY",
  329 + "name":"圆柱形五加仑液体罐"
  330 + },
  331 + {
  332 + "code":"KG",
  333 + "name":"小桶(小于30加仑)"
  334 + },
  335 + {
  336 + "code":"LV",
  337 + "name":"吊装货箱"
  338 + },
  339 + {
  340 + "code":"LZ",
  341 + "name":"以堆/束/捆形式的木材"
  342 + },
  343 + {
  344 + "code":"MB",
  345 + "name":"多用包"
  346 + },
  347 + {
  348 + "code":"MC",
  349 + "name":"装奶板条箱"
  350 + },
  351 + {
  352 + "code":"MS",
  353 + "name":"多层包"
  354 + },
  355 + {
  356 + "code":"MX",
  357 + "name":"火柴盒"
  358 + },
  359 +
  360 + {
  361 + "code":"NS",
  362 + "name":"成套器具"
  363 + },
  364 + {
  365 + "code":"NT",
  366 + "name":"集装箱"
  367 + },
  368 + {
  369 + "code":"PA",
  370 + "name":"小包裹"
  371 + },
  372 + {
  373 + "code":"PB",
  374 + "name":"纸袋"
  375 + },
  376 + {
  377 + "code":"PC",
  378 + "name":"包裹"
  379 + },
  380 + {
  381 + "code":"PG",
  382 + "name":"金属板"
  383 + },
  384 + {
  385 + "code":"PH",
  386 + "name":"大水瓶"
  387 + },
  388 + {
  389 + "code":"PI",
  390 + "name":"管子"
  391 + },
  392 + {
  393 + "code":"PK",
  394 + "name":"包"
  395 + },
  396 + {
  397 + "code":"PN",
  398 + "name":"厚木板"
  399 + },
  400 + {
  401 + "code":"PO",
  402 + "name":"袋装"
  403 + }
  404 +]
  1 +export default [
  2 + '撕裂',
  3 + '凹陷',
  4 + '刺痕',
  5 + '折痕',
  6 + '压痕',
  7 + '托盘损坏',
  8 + '刮擦',
  9 + '污渍',
  10 + '脚印',
  11 + '水渍',
  12 + '湿烂',
  13 + '戳破坑洞',
  14 + '撕裂豁口',
  15 + '压碎变形',
  16 + '积压变形',
  17 + '防震指示标异常',
  18 + '防倾斜指示标异常'
  19 +]
  1 +export default [
  2 + '有危险品标签/标记(拒绝入库,并通知仓库主管)',
  3 + '无有效分货文件',
  4 + '送货人自分货',
  5 + '箱唛与分货文件不符',
  6 + '翻用箱',
  7 + '锂电池标签不合规',
  8 + '封条断开',
  9 + '油污油渍',
  10 + '包装顶部不平',
  11 + '包装松散',
  12 + '开箱检查过',
  13 + '其他异常'
  14 +]
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="6"> 22 <el-col :span="6">
23 - <el-form-item label=" " :label-width="formLabelWidth" prop="waybill"> 23 + <el-form-item label=" " :label-width="formLabelWidth" prop="waybillsub">
24 <el-input v-model="addForm.waybillsub" autocomplete="off" suffix-icon="el-icon-document" clearable> 24 <el-input v-model="addForm.waybillsub" autocomplete="off" suffix-icon="el-icon-document" clearable>
25 <template slot="prepend">分&emsp;&emsp;单</template> 25 <template slot="prepend">分&emsp;&emsp;单</template>
26 </el-input> 26 </el-input>
@@ -48,6 +48,27 @@ @@ -48,6 +48,27 @@
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 <el-col :span="6"> 50 <el-col :span="6">
  51 + <el-form-item label=" " :label-width="formLabelWidth" prop="packge">
  52 + <div class="my-text-area">
  53 + <div class="el-input-group__prepend prepand">货物包装</div>
  54 + <el-select v-model="addForm.packge"
  55 + placeholder="货物包装"
  56 + filterable
  57 + default-first-option
  58 + :filter-method="packgeOptionsFilter">
  59 + <el-option
  60 + v-for="item in packgeOptions"
  61 + :key="item.code"
  62 + :label="item.name"
  63 + :value="item.code">
  64 + <span style="float: left">{{ item.code }}</span>
  65 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
  66 + </el-option>
  67 + </el-select>
  68 + </div>
  69 + </el-form-item>
  70 + </el-col>
  71 + <el-col :span="6">
51 <el-form-item label=" " :label-width="formLabelWidth" prop="vol"> 72 <el-form-item label=" " :label-width="formLabelWidth" prop="vol">
52 <div class="my-text-area"> 73 <div class="my-text-area">
53 <div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div> 74 <div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div>
@@ -227,7 +248,10 @@ @@ -227,7 +248,10 @@
227 </el-form-item> 248 </el-form-item>
228 </el-col> 249 </el-col>
229 <el-col :span="6"> 250 <el-col :span="6">
230 - <el-button type="success" icon="el-icon-edit" @click="drawerVisible = true">入库图像</el-button> 251 + <el-button type="success" icon="el-icon-edit" @click="imgdrawerVisible = true">入库图像</el-button>
  252 + </el-col>
  253 + <el-col :span="6">
  254 + <el-button type="warning" icon="el-icon-edit" @click="otherDrawerVisible = true">其他入库信息</el-button>
231 </el-col> 255 </el-col>
232 256
233 <!-- <el-col :span="8">--> 257 <!-- <el-col :span="8">-->
@@ -242,7 +266,7 @@ @@ -242,7 +266,7 @@
242 <!-- <el-option label="状态-成功" value="1"></el-option>--> 266 <!-- <el-option label="状态-成功" value="1"></el-option>-->
243 <!-- </el-select>--> 267 <!-- </el-select>-->
244 <!-- </el-form-item>--> 268 <!-- </el-form-item>-->
245 - </el-col> 269 +<!-- </el-col>-->
246 </el-row> 270 </el-row>
247 <!-- <el-row> 271 <!-- <el-row>
248 <el-col :span="7"> 272 <el-col :span="7">
@@ -439,15 +463,20 @@ @@ -439,15 +463,20 @@
439 </el-card> 463 </el-card>
440 <el-drawer 464 <el-drawer
441 title="我是标题" 465 title="我是标题"
442 - :visible.sync="drawerVisible" 466 + :visible.sync="imgdrawerVisible"
443 :with-header="false"> 467 :with-header="false">
444 <video width="100%" height="200" autoplay loop controls id="videos"> 468 <video width="100%" height="200" autoplay loop controls id="videos">
445 <source src="/static/login/New-jumbo.mp4" type="video/mp4"> 469 <source src="/static/login/New-jumbo.mp4" type="video/mp4">
446 </video> 470 </video>
447 <el-row> 471 <el-row>
448 <el-image 472 <el-image
449 - :src="imgBase64" width="200" height="200"  
450 - fit="fill"></el-image> 473 + :src="imgBase64"
  474 + style="width: 200px; height: 200px"
  475 + fit="fill">
  476 + <div slot="error" class="image-slot">
  477 + 未截图<i class="el-icon-picture-outline"></i>
  478 + </div>
  479 + </el-image>
451 </el-row> 480 </el-row>
452 <el-button type="success" class="btns" @click="screenshot">一键截屏上传</el-button> 481 <el-button type="success" class="btns" @click="screenshot">一键截屏上传</el-button>
453 <!-- <el-upload--> 482 <!-- <el-upload-->
@@ -467,6 +496,89 @@ @@ -467,6 +496,89 @@
467 <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>--> 496 <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
468 497
469 </el-drawer> 498 </el-drawer>
  499 + <el-drawer
  500 + title="其他入库信息"
  501 + :visible.sync="otherDrawerVisible"
  502 + :with-header="false">
  503 + <el-row style="margin-top:0;padding-top:0">
  504 + <el-card shadow="always" >
  505 + <div slot="header" class="clearfix">
  506 + <span>随货文件</span>
  507 + <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
  508 + </div>
  509 + <el-switch
  510 + v-model="addForm.hasFiles"
  511 + active-text="有随货文件"
  512 + inactive-text="无随货文件"
  513 + active-color="#13ce66"
  514 + inactive-color="#ff4949"
  515 + >
  516 + </el-switch>
  517 + <el-card shadow="always" style="margin-top:10px;" v-if="addForm.hasFiles">
  518 + <el-checkbox-group v-model="addForm.files" @change="handleCheckedfilessChange">
  519 + <el-checkbox v-for="filename in flieOptions" :label="filename" :key="filename">{{filename}}</el-checkbox>
  520 + </el-checkbox-group>
  521 + </el-card>
  522 + </el-card>
  523 +
  524 + </el-row>
  525 + <el-row>
  526 + <el-card shadow="always" >
  527 + <div slot="header" class="clearfix">
  528 + <span>异常状况</span>
  529 + <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
  530 + </div>
  531 + <el-switch
  532 + v-model="addForm.hasUnusual"
  533 + active-text="有异常"
  534 + inactive-text="无异常"
  535 + active-color="#13ce66"
  536 + inactive-color="#ff4949"
  537 + >
  538 + </el-switch>
  539 + <el-card shadow="always" style="margin-top:10px;" v-if="addForm.hasUnusual">
  540 + <el-checkbox-group v-model="addForm.unusuals" @change="handleCheckedfilessChange">
  541 + <el-checkbox v-for="op in unusualOptions" :label="op" :key="op">
  542 + {{op}}
  543 + </el-checkbox>
  544 + </el-checkbox-group>
  545 + </el-card>
  546 + </el-card>
  547 + </el-row>
  548 + <el-row>
  549 + <el-card shadow="always" >
  550 + <div slot="header" class="clearfix">
  551 + <span>破损状况</span>
  552 + <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
  553 + </div>
  554 + <el-card shadow="always" style="margin-top:10px;">
  555 + <el-checkbox-group v-model="addForm.damages" @change="handleCheckedfilessChange">
  556 + <el-checkbox v-for="op in damageOptions" :label="op" :key="op">
  557 + {{op}}
  558 + </el-checkbox>
  559 + </el-checkbox-group>
  560 + </el-card>
  561 + </el-card>
  562 + </el-row>
  563 + <el-row>
  564 + <el-card shadow="always" >
  565 + <div slot="header" class="clearfix">
  566 + <span>特殊操作情况</span>
  567 + <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
  568 + </div>
  569 + <el-card shadow="always" style="margin-top:10px;">
  570 + <el-checkbox-group v-model="addForm.sphCodes" @change="handleCheckedfilessChange">
  571 + <el-checkbox v-for="op in SPHOptions" :label="op.code" :key="op.code" border>
  572 + <template>
  573 + ({{op.code}}){{op.desCn}}
  574 + </template>
  575 + </el-checkbox>
  576 + </el-checkbox-group>
  577 + </el-card>
  578 + </el-card>
  579 + </el-row>
  580 +
  581 + </el-drawer>
470 </el-row> 582 </el-row>
471 </template> 583 </template>
472 584
@@ -476,7 +588,9 @@ @@ -476,7 +588,9 @@
476 delInventoryrecord, 588 delInventoryrecord,
477 addInventoryrecord, 589 addInventoryrecord,
478 ediInventroyrecord, 590 ediInventroyrecord,
479 - selectAreas, selectLocations 591 + selectAreas,
  592 + selectLocations,
  593 + getSPHCode
480 } from '../../api/consigner/station'; 594 } from '../../api/consigner/station';
481 import dateUtil from "@/utils/index" 595 import dateUtil from "@/utils/index"
482 import jsutil from "@/common/js/util"; 596 import jsutil from "@/common/js/util";
@@ -484,6 +598,9 @@ @@ -484,6 +598,9 @@
484 import { loginedUserInfo } from '@/api/user'; 598 import { loginedUserInfo } from '@/api/user';
485 import html2canvas from 'html2canvas' 599 import html2canvas from 'html2canvas'
486 import {uploadPath,upfileWithPost} from "../../api/technological"; 600 import {uploadPath,upfileWithPost} from "../../api/technological";
  601 + import packge from '@/api/nmms/packge'
  602 + import unusualOP from '@/api/wms/unusualOptions'
  603 + import damageOP from '@/api/wms/damageOptions'
487 604
488 605
489 export default { 606 export default {
@@ -520,7 +637,8 @@ @@ -520,7 +637,8 @@
520 // 编辑对话框 637 // 编辑对话框
521 editDialog: false 638 editDialog: false
522 }, 639 },
523 - drawerVisible: false, 640 + imgdrawerVisible: false,
  641 + otherDrawerVisible: false,
524 addForm: { 642 addForm: {
525 area: '', 643 area: '',
526 billweight: '', 644 billweight: '',
@@ -542,7 +660,15 @@ @@ -542,7 +660,15 @@
542 vol:'', 660 vol:'',
543 waybillmaster:'', 661 waybillmaster:'',
544 waybillsub:'', 662 waybillsub:'',
  663 + //随货文件
  664 + hasFiles:false,
  665 + hasUnusual:false,
  666 + unusuals:[],
  667 + files:[],
  668 + damages:[],
  669 + sphCodes:[],
545 weight:'', 670 weight:'',
  671 + packge:'',
546 remark:'', 672 remark:'',
547 remark1:'', 673 remark1:'',
548 remark2:'', 674 remark2:'',
@@ -551,6 +677,7 @@ @@ -551,6 +677,7 @@
551 remark5:'', 677 remark5:'',
552 picUrl:'' 678 picUrl:''
553 }, 679 },
  680 + packgeOptions:packge,
554 options: [{ 681 options: [{
555 value: '板箱', 682 value: '板箱',
556 label: '货物类型-板箱' 683 label: '货物类型-板箱'
@@ -572,7 +699,17 @@ @@ -572,7 +699,17 @@
572 label: '交易类型-销售入库' 699 label: '交易类型-销售入库'
573 }], 700 }],
574 formLabelWidth: '5px', 701 formLabelWidth: '5px',
  702 + flieOptions:['报关单证','关封','运单','信封','保函','安检申报清单','随机文件','备案清单','放行通知书','货物运输条件鉴定书(磁化/化工品)','其他'],
  703 + unusualOptions:unusualOP,
  704 + damageOptions:damageOP,
  705 + SPHOptions:[],
575 rules: { 706 rules: {
  707 + waybillmaster:[
  708 + { pattern: /^[0-9\-]+$/, message: '主单号格式只支持数字与-符号' }
  709 + ],
  710 + waybillsub:[
  711 + { pattern: /^[0-9A-Z]+$/, message: '分单号格式只支持数字与大写字母' }
  712 + ],
576 pcs: [ 713 pcs: [
577 { required: true, message: '件数必填', trigger: 'blur' }, 714 { required: true, message: '件数必填', trigger: 'blur' },
578 { type:"number", message: '件数必须为整数'} 715 { type:"number", message: '件数必须为整数'}
@@ -649,6 +786,7 @@ @@ -649,6 +786,7 @@
649 transcar: '', 786 transcar: '',
650 transtype:'', 787 transtype:'',
651 vol:'', 788 vol:'',
  789 + pacage:'',
652 waybill:'', 790 waybill:'',
653 weight:'', 791 weight:'',
654 remark:'', 792 remark:'',
@@ -666,7 +804,9 @@ @@ -666,7 +804,9 @@
666 this.$refs.addForm.validate(valid => { 804 this.$refs.addForm.validate(valid => {
667 // 未通过，表单预校验 805 // 未通过，表单预校验
668 if (!valid) return; 806 if (!valid) return;
669 - this.tableData.push(this.addForm); 807 + const wmslog = Object.assign({},this.addForm)
  808 + this.tableData.push(wmslog)
  809 + this.addForm.serialnumber = this.serialNumber()
670 }) 810 })
671 }, 811 },
672 // 添加功能 812 // 添加功能
@@ -808,6 +948,26 @@ @@ -808,6 +948,26 @@
808 ld.close() 948 ld.close()
809 }) 949 })
810 }, 950 },
  951 + getSPHCode() {
  952 + const _this = this
  953 + let ld = this.$loading({
  954 + text:"特货代码数加载中..."
  955 + })
  956 + getSPHCode({}).then((response) => {
  957 + const res = response.data
  958 + if (res.code !== '200') {
  959 + return _this.$message.error('获取特货代码记录，失败！')
  960 + }
  961 + // 获取列表数据
  962 + _this.SPHOptions = res.data
  963 + _this.$message.success('获取特货代码记录，成功！')
  964 + }).catch(error => {
  965 + // 关闭加载
  966 + _this.$message.error(error.toString())
  967 + }).finally(()=>{
  968 + ld.close()
  969 + })
  970 + },
811 locationQuerySearch(queryString, cb){ 971 locationQuerySearch(queryString, cb){
812 var restaurants = this.locationData; 972 var restaurants = this.locationData;
813 var results = queryString ? restaurants.filter(this.locationFilter(queryString)) : restaurants; 973 var results = queryString ? restaurants.filter(this.locationFilter(queryString)) : restaurants;
@@ -938,12 +1098,36 @@ @@ -938,12 +1098,36 @@
938 }, 1098 },
939 checkSelectable(){ 1099 checkSelectable(){
940 1100
  1101 + },
  1102 + handleCheckedfilessChange(value){
  1103 + console.log(JSON.stringify(value))
  1104 + },
  1105 + packgeOptionsFilter(searchStr){
  1106 + let tempIndex = -1
  1107 + if (searchStr){
  1108 + this.packgeOptions = packge.filter((item,index,arr) =>{
  1109 + if (item.code.toLocaleUpperCase().indexOf(searchStr.toLocaleUpperCase()) > -1){
  1110 + tempIndex = index
  1111 + return true
  1112 + }else{
  1113 + return false
  1114 + }
  1115 + })
  1116 + if (tempIndex === -1){
  1117 + this.packgeOptions = packge
  1118 + }
  1119 + }else {
  1120 + this.packgeOptions = packge
  1121 + }
  1122 +
  1123 +
941 } 1124 }
942 }, 1125 },
943 mounted() { 1126 mounted() {
944 this.getAreaList(); 1127 this.getAreaList();
945 this.getLocationList(); 1128 this.getLocationList();
946 this.getRoles(); 1129 this.getRoles();
  1130 + this.getSPHCode()
947 this.addForm.serialnumber = this.serialNumber() 1131 this.addForm.serialnumber = this.serialNumber()
948 let userinfo = loginedUserInfo(); 1132 let userinfo = loginedUserInfo();
949 if (!jsutil.checkNull(userinfo) && !jsutil.checkNull(userinfo.username)){ 1133 if (!jsutil.checkNull(userinfo) && !jsutil.checkNull(userinfo.username)){