雷海东 / factory-web · 提交

转到一个项目

作者 张晓杰
提交 f85c87e2b260c06bb48b2342dfa4741370eb2038 1 个父辈 7868a6a6

库存管理出入库修改、贸易库存入库修该改

内嵌 并排对比
正在显示 9 个修改的文件 包含 497 行增加 和 383 行删除
@@ -83,7 +83,7 @@ export const JeecgListMixin = { @@ -83,7 +83,7 @@ export const JeecgListMixin = {
83 this.ipagination.current = 1; 83 this.ipagination.current = 1;
84 } 84 }
85 var params = this.getQueryParams();//查询条件 85 var params = this.getQueryParams();//查询条件
86 - console.log('params========',params) 86 + // console.log('params========',params)
87 this.loading = true; 87 this.loading = true;
88 getAction(this.url.list, params).then((res) => { 88 getAction(this.url.list, params).then((res) => {
89 if (res.success) { 89 if (res.success) {
@@ -5,18 +5,18 @@ @@ -5,18 +5,18 @@
5 <a-form layout="inline" @keyup.enter.native="searchQuery"> 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 <a-row :gutter="24"> 6 <a-row :gutter="24">
7 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 - <a-form-item label="品名">  
9 - <j-input placeholder="请输入品名" v-model="queryParam.productName"></j-input> 8 + <a-form-item label="物料描述">
  9 + <j-input placeholder="请输入物料描述" v-model="queryParam.productName"></j-input>
10 </a-form-item> 10 </a-form-item>
11 </a-col> 11 </a-col>
12 - <a-col :xl="4" :lg="5" :md="6" :sm="24"> 12 + <!-- <a-col :xl="4" :lg="5" :md="6" :sm="24">
13 <a-form-item label="采购性质"> 13 <a-form-item label="采购性质">
14 <j-dict-select-tag placeholder="请选择采购性质" v-model="queryParam.buyingClassify" dictCode="buying_classify" /> 14 <j-dict-select-tag placeholder="请选择采购性质" v-model="queryParam.buyingClassify" dictCode="buying_classify" />
15 </a-form-item> 15 </a-form-item>
16 - </a-col> 16 + </a-col> -->
17 <template v-if="toggleSearchStatus"> 17 <template v-if="toggleSearchStatus">
18 <a-col :xl="8" :lg="9" :md="10" :sm="24"> 18 <a-col :xl="8" :lg="9" :md="10" :sm="24">
19 - <a-form-item label="入库时间"> 19 + <a-form-item label="到货日期">
20 <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.operTime_begin"></j-date> 20 <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.operTime_begin"></j-date>
21 <span class="query-group-split-cust"></span> 21 <span class="query-group-split-cust"></span>
22 <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.operTime_end"></j-date> 22 <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.operTime_end"></j-date>
@@ -52,21 +52,24 @@ @@ -52,21 +52,24 @@
52 <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns" 52 <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns"
53 :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" 53 :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
54 @change="handleTableChange"> 54 @change="handleTableChange">
55 - <template slot="htmlSlot" slot-scope="text"> 55 + <!-- <template slot="htmlSlot" slot-scope="text">
56 <div v-html="text"></div> 56 <div v-html="text"></div>
57 - </template>  
58 - <template slot="imgSlot" slot-scope="text, record"> 57 + </template> -->
  58 + <!-- <template slot="imgSlot" slot-scope="text, record">
59 <span v-if="!text" style="font-size: 12px; font-style: italic;">无图片</span> 59 <span v-if="!text" style="font-size: 12px; font-style: italic;">无图片</span>
60 <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" 60 <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
61 style="max-width: 80px; font-size: 12px; font-style: italic" /> 61 style="max-width: 80px; font-size: 12px; font-style: italic" />
62 - </template>  
63 - <template slot="fileSlot" slot-scope="text"> 62 + </template> -->
  63 + <!-- <template slot="fileSlot" slot-scope="text">
64 <span v-if="!text" style="font-size: 12px; font-style: italic;">无文件</span> 64 <span v-if="!text" style="font-size: 12px; font-style: italic;">无文件</span>
65 <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)"> 65 <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
66 下载 66 下载
67 </a-button> 67 </a-button>
  68 + </template> -->
  69 + <template slot="buyingClassifySlot" slot-scope="text, record">
  70 + <span v-if="text == 'M'">加工</span>
  71 + <span v-else>采购</span>
68 </template> 72 </template>
69 -  
70 <span v-if="deleteFlg" slot="action" slot-scope="text, record"> 73 <span v-if="deleteFlg" slot="action" slot-scope="text, record">
71 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> 74 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
72 <a>删除</a> 75 <a>删除</a>
@@ -251,7 +254,7 @@ export default { @@ -251,7 +254,7 @@ export default {
251 // 表头 254 // 表头
252 columns: [ 255 columns: [
253 { 256 {
254 - title: '#', 257 + title: '序号',
255 dataIndex: '', 258 dataIndex: '',
256 key: 'rowIndex', 259 key: 'rowIndex',
257 width: 60, 260 width: 60,
@@ -261,43 +264,50 @@ export default { @@ -261,43 +264,50 @@ export default {
261 }, 264 },
262 }, 265 },
263 { 266 {
264 - title: '零件编号', 267 + title:'入库储位',
  268 + align:"center",
  269 + dataIndex: 'storageLocation',
  270 + width:80
  271 + },
  272 + {
  273 + title: '物料编码',
265 align: 'center', 274 align: 'center',
266 dataIndex: 'partNumber', 275 dataIndex: 'partNumber',
267 }, 276 },
268 { 277 {
269 - title: '品名', 278 + title: '物料描述',
270 align: 'center', 279 align: 'center',
271 dataIndex: 'productName', 280 dataIndex: 'productName',
272 }, 281 },
273 { 282 {
274 - title: '规格', 283 + title: '到货数量',
275 align: 'center', 284 align: 'center',
276 - dataIndex: 'spec', 285 + dataIndex: 'operNumber',
277 }, 286 },
278 { 287 {
279 - title: '型号', 288 + title: '到货厂家',
280 align: 'center', 289 align: 'center',
281 - dataIndex: 'type', 290 + dataIndex: 'supplierName',
282 }, 291 },
283 { 292 {
284 - title: '采购性质', 293 + title: '到货日期',
285 align: 'center', 294 align: 'center',
286 - dataIndex: 'buyingClassify', 295 + sorter: true,
  296 + dataIndex: 'operTime',
  297 + customRender: function (text) {
  298 + return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
  299 + },
287 }, 300 },
288 { 301 {
289 - title: '数量', 302 + title: '合格证',
290 align: 'center', 303 align: 'center',
291 - dataIndex: 'operNumber', 304 + dataIndex: 'certificate',
  305 + scopedSlots: {customRender: 'fileSlot'}
292 }, 306 },
293 { 307 {
294 - title: '入库时间', 308 + title: '备注',
295 align: 'center', 309 align: 'center',
296 - sorter: true,  
297 - dataIndex: 'operTime',  
298 - customRender: function (text) {  
299 - return !text ? '' : text.length > 10 ? text.substr(0, 10) : text  
300 - }, 310 + dataIndex: 'remark',
301 }, 311 },
302 { 312 {
303 title: '操作', 313 title: '操作',
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 <a-form layout="inline" @keyup.enter.native="searchQuery"> 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 <a-row :gutter="24"> 6 <a-row :gutter="24">
7 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 - <a-form-item label="品名">  
9 - <j-input placeholder="请输入品名" v-model="queryParam.productName"></j-input> 8 + <a-form-item label="物料描述">
  9 + <j-input placeholder="请输入物料描述" v-model="queryParam.productName"></j-input>
10 </a-form-item> 10 </a-form-item>
11 </a-col> 11 </a-col>
12 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 12 <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -14,14 +14,14 @@ @@ -14,14 +14,14 @@
14 <j-input placeholder="请输入工作令" v-model="queryParam.workOrder"></j-input> 14 <j-input placeholder="请输入工作令" v-model="queryParam.workOrder"></j-input>
15 </a-form-item> 15 </a-form-item>
16 </a-col> 16 </a-col>
17 - <a-col :xl="4" :lg="5" :md="6" :sm="24"> 17 + <!-- <a-col :xl="4" :lg="5" :md="6" :sm="24">
18 <a-form-item label="采购性质"> 18 <a-form-item label="采购性质">
19 <j-dict-select-tag placeholder="请选择采购性质" v-model="queryParam.buyingClassify" dictCode="buying_classify" /> 19 <j-dict-select-tag placeholder="请选择采购性质" v-model="queryParam.buyingClassify" dictCode="buying_classify" />
20 </a-form-item> 20 </a-form-item>
21 - </a-col> 21 + </a-col> -->
22 <template v-if="toggleSearchStatus"> 22 <template v-if="toggleSearchStatus">
23 <a-col :xl="8" :lg="9" :md="10" :sm="24"> 23 <a-col :xl="8" :lg="9" :md="10" :sm="24">
24 - <a-form-item label="出库时间"> 24 + <a-form-item label="出库日期">
25 <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.operTime_begin"></j-date> 25 <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.operTime_begin"></j-date>
26 <span class="query-group-split-cust"></span> 26 <span class="query-group-split-cust"></span>
27 <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.operTime_end"></j-date> 27 <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.operTime_end"></j-date>
@@ -226,63 +226,49 @@ export default { @@ -226,63 +226,49 @@ export default {
226 } 226 }
227 }, 227 },
228 { 228 {
229 - title: '零件编号',  
230 - align: "center",  
231 - dataIndex: 'partNumber'  
232 - },  
233 - {  
234 - title: '出库人',  
235 - align: "center",  
236 - dataIndex: 'createBy'  
237 - },  
238 - {  
239 - title: '领料人', 229 + title: '出库日期',
240 align: "center", 230 align: "center",
241 - dataIndex: 'ling' 231 + sorter: true,
  232 + dataIndex: 'operTime',
  233 + customRender: function (text) {
  234 + return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
  235 + }
242 }, 236 },
243 { 237 {
244 - title: '领料环节', 238 + title: '物料编码',
245 align: "center", 239 align: "center",
246 - dataIndex: 'lingSysOrgCode' 240 + dataIndex: 'partNumber'
247 }, 241 },
  242 +
248 { 243 {
249 - title: '品名', 244 + title: '物料描述',
250 align: "center", 245 align: "center",
251 dataIndex: 'productName' 246 dataIndex: 'productName'
252 }, 247 },
253 { 248 {
254 - title: '规格', 249 + title: '出货数量',
255 align: "center", 250 align: "center",
256 - dataIndex: 'spec'  
257 - },  
258 - {  
259 - title: '型号',  
260 - align: "center",  
261 - dataIndex: 'type' 251 + dataIndex: 'operNumber'
262 }, 252 },
263 { 253 {
264 - title: '采购性质', 254 + title: '出货分公司',
265 align: "center", 255 align: "center",
266 - dataIndex: 'buyingClassify' 256 + dataIndex: 'company'
267 }, 257 },
268 { 258 {
269 - title: '数量', 259 + title: '出货工作令',
270 align: "center", 260 align: "center",
271 - dataIndex: 'operNumber' 261 + dataIndex: 'workOrder'
272 }, 262 },
273 { 263 {
274 - title: '工作令', 264 + title: '出货厂家',
275 align: "center", 265 align: "center",
276 - dataIndex: 'workOrder' 266 + dataIndex: 'shippingManufacturer'
277 }, 267 },
278 { 268 {
279 - title: '出库时间', 269 + title: '出货储位',
280 align: "center", 270 align: "center",
281 - sorter: true,  
282 - dataIndex: 'operTime',  
283 - customRender: function (text) {  
284 - return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)  
285 - } 271 + dataIndex: 'storageLocation'
286 }, 272 },
287 { 273 {
288 title: '操作', 274 title: '操作',
@@ -292,6 +278,41 @@ export default { @@ -292,6 +278,41 @@ export default {
292 width: 147, 278 width: 147,
293 scopedSlots: { customRender: 'action' } 279 scopedSlots: { customRender: 'action' }
294 } 280 }
  281 + // {
  282 + // title: '规格',
  283 + // align: "center",
  284 + // dataIndex: 'spec'
  285 + // },
  286 + // {
  287 + // title: '型号',
  288 + // align: "center",
  289 + // dataIndex: 'type'
  290 + // },
  291 + // {
  292 + // title: '采购性质',
  293 + // align: "center",
  294 + // dataIndex: 'buyingClassify'
  295 + // },
  296 + // {
  297 + // title: '工作令',
  298 + // align: "center",
  299 + // dataIndex: 'workOrder'
  300 + // },
  301 + // {
  302 + // title: '出库人',
  303 + // align: "center",
  304 + // dataIndex: 'createBy'
  305 + // },
  306 + // {
  307 + // title: '领料人',
  308 + // align: "center",
  309 + // dataIndex: 'ling'
  310 + // },
  311 + // {
  312 + // title: '领料环节',
  313 + // align: "center",
  314 + // dataIndex: 'lingSysOrgCode'
  315 + // },
295 ], 316 ],
296 url: { 317 url: {
297 list: "/depot/tblDepot/outList", 318 list: "/depot/tblDepot/outList",
@@ -328,13 +349,6 @@ export default { @@ -328,13 +349,6 @@ export default {
328 callRobotMoveShowDialog: false, 349 callRobotMoveShowDialog: false,
329 cabinOptions:[], 350 cabinOptions:[],
330 pointOptions:[], 351 pointOptions:[],
331 - // templateIdOptions:[  
332 - // {id:"dock_cabin_to_move_and_lift_down",value:"调度底盘去某个上仓举起并移动到另外点位放下"},  
333 - // {id:"docking_cabin_and_docking_down",value:"调度底盘移动上舱举起并移动到另外一个舱位放下"},  
334 - // {id:"docking_cabin_and_move_target",value:"调度底盘移动上舱举起并移动到目标点"},  
335 - // {id:"move_target_and_lift_down",value:"托举上舱移动到目的地并且放下上舱"},  
336 - // {id:"dock_cabin_and_move_target_with_wait_action",value:"让某舱到某目的地"}  
337 - // ],  
338 templateIdOptions:[ 352 templateIdOptions:[
339 {id:"docking_cabin_and_move_target",value:"上舱移动到目的地"}, 353 {id:"docking_cabin_and_move_target",value:"上舱移动到目的地"},
340 {id:"dock_cabin_to_move_and_lift_down",value:"上舱移动到目的地并放下上舱"}, 354 {id:"dock_cabin_to_move_and_lift_down",value:"上舱移动到目的地并放下上舱"},
@@ -387,9 +401,6 @@ export default { @@ -387,9 +401,6 @@ export default {
387 let method = '' 401 let method = ''
388 httpurl += this.url.cancleRobotMove 402 httpurl += this.url.cancleRobotMove
389 method = 'post' 403 method = 'post'
390 - // console.log(this.model)  
391 - // console.log(httpurl)  
392 - // return  
393 httpAction(httpurl, this.model, method) 404 httpAction(httpurl, this.model, method)
394 .then((res) => { 405 .then((res) => {
395 if (res.success) { 406 if (res.success) {
@@ -5,28 +5,33 @@ @@ -5,28 +5,33 @@
5 <a-form layout="inline" @keyup.enter.native="searchQuery"> 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 <a-row :gutter="24"> 6 <a-row :gutter="24">
7 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 - <a-form-item label="品名">  
9 - <j-input placeholder="请输入品名" v-model="queryParam.productName"></j-input> 8 + <a-form-item label="储位">
  9 + <j-input placeholder="请输入储位" v-model="queryParam.storageLocation"></j-input>
10 </a-form-item> 10 </a-form-item>
11 </a-col> 11 </a-col>
12 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 12 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  13 + <a-form-item label="物料描述">
  14 + <j-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></j-input>
  15 + </a-form-item>
  16 + </a-col>
  17 + <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
13 <a-form-item label="采购性质"> 18 <a-form-item label="采购性质">
14 <j-dict-select-tag placeholder="请选择采购性质" v-model="queryParam.buyingClassify" dictCode="buying_classify" /> 19 <j-dict-select-tag placeholder="请选择采购性质" v-model="queryParam.buyingClassify" dictCode="buying_classify" />
15 </a-form-item> 20 </a-form-item>
16 - </a-col> 21 + </a-col> -->
17 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 22 <a-col :xl="6" :lg="7" :md="8" :sm="24">
18 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> 23 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
19 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button> 24 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
20 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> 25 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
21 - <a @click="handleToggleSearch" style="margin-left: 8px"> 26 + <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
22 {{ toggleSearchStatus ? '收起' : '展开' }} 27 {{ toggleSearchStatus ? '收起' : '展开' }}
23 <a-icon :type="toggleSearchStatus ? 'up' : 'down'" /> 28 <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
24 - </a> 29 + </a> -->
25 </span> 30 </span>
26 </a-col> 31 </a-col>
27 <a-col :xl="6" :lg="7" :md="8" :sm="24"> 32 <a-col :xl="6" :lg="7" :md="8" :sm="24">
28 - <a-button type="primary" icon="download" @click="handleExportXls('库存报表' + parseTime(new Date().getTime(),'{y}-{m}-{d} {h}:{i}:{s}'))" style="margin-right: 10px;">导出</a-button>  
29 - <a-button type="primary" icon="edit" @click="priceVisible = true">安全库存设置</a-button> 33 +
  34 +
30 </a-col> 35 </a-col>
31 </a-row> 36 </a-row>
32 </a-form> 37 </a-form>
@@ -35,6 +40,18 @@ @@ -35,6 +40,18 @@
35 40
36 <!-- 操作按钮区域 --> 41 <!-- 操作按钮区域 -->
37 <div class="table-operator"> 42 <div class="table-operator">
  43 + <a-button type="primary" icon="edit" @click="priceVisible = true">安全库存设置</a-button>
  44 + <!-- <a-upload
  45 + name="file"
  46 + :showUploadList="false"
  47 + :multiple="false"
  48 + :headers="tokenHeader"
  49 + :action="importExcelUrl"
  50 + @change="handleImportExcel"
  51 + >
  52 + <a-button type="primary" icon="import">导入</a-button>
  53 + </a-upload> -->
  54 + <a-button type="primary" icon="download" @click="handleExportXls('库存报表' + parseTime(new Date().getTime(),'{y}-{m}-{d} {h}:{i}:{s}'))" style="margin-right: 10px;">导出</a-button>
38 <!-- <a-button type="primary" icon="download" @click="handleExportXls('tbl_inventory')">导出</a-button> --> 55 <!-- <a-button type="primary" icon="download" @click="handleExportXls('tbl_inventory')">导出</a-button> -->
39 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrlBoh" @change="handleImportExcel"> 56 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrlBoh" @change="handleImportExcel">
40 <a-button type="primary" icon="import">导入更新BOH</a-button> 57 <a-button type="primary" icon="import">导入更新BOH</a-button>
@@ -88,43 +105,40 @@ @@ -88,43 +105,40 @@
88 </span> 105 </span>
89 <span slot="action" slot-scope="text, record"> 106 <span slot="action" slot-scope="text, record">
90 <a @click="handleDetail(record)">库存明细</a> &nbsp; 107 <a @click="handleDetail(record)">库存明细</a> &nbsp;
91 - <a @click="updateBoh(record)">更新BOH</a> 108 + <a @click="updateBoh(record)">更新BOH</a> &nbsp;
  109 + <a @click="updateSL(record)">更新储位</a>
92 </span> 110 </span>
93 -  
94 </a-table> 111 </a-table>
95 </div> 112 </div>
96 113
97 - <!-- <tbl-inventory-modal ref="modalForm" @ok="modalFormOk"></tbl-inventory-modal> -->  
98 - <view-depot-stock-modal ref="modalForm" @ok="modalFormOk"></view-depot-stock-modal>  
99 <template v-if="priceVisible"> 114 <template v-if="priceVisible">
100 <safety-stock-edit :visible.sync="priceVisible"></safety-stock-edit> 115 <safety-stock-edit :visible.sync="priceVisible"></safety-stock-edit>
101 </template> 116 </template>
102 - 117 + <view-depot-stock-modal ref="modalForm" @ok="modalFormOk"></view-depot-stock-modal>
103 <j-modal 118 <j-modal
104 - :title="title" 119 + title="更新BOH"
105 :width="width" 120 :width="width"
106 :visible="visibleBoh" 121 :visible="visibleBoh"
107 switchFullscreen 122 switchFullscreen
108 @ok="handleOkBohInfo" 123 @ok="handleOkBohInfo"
109 - :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"  
110 @cancel="handleCancelBoh" 124 @cancel="handleCancelBoh"
111 cancelText="关闭"> 125 cancelText="关闭">
112 - 126 + <!-- :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" -->
113 <a-spin :spinning="confirmLoading"> 127 <a-spin :spinning="confirmLoading">
114 - <j-form-container :disabled="disabled"> 128 + <j-form-container >
115 <a-form-model ref="form" :model="model" slot="detail"> 129 <a-form-model ref="form" :model="model" slot="detail">
116 <a-row> 130 <a-row>
117 <a-col :span="24"> 131 <a-col :span="24">
118 - <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">  
119 - <a-input v-model="model.partNumber" placeholder="请输入编号" disabled="disabled"></a-input> 132 + <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  133 + <a-input v-model="model.materialCode" placeholder="请输入物料编码" disabled="disabled"></a-input>
120 </a-form-model-item> 134 </a-form-model-item>
121 </a-col> 135 </a-col>
122 <a-col :span="24"> 136 <a-col :span="24">
123 - <a-form-model-item label="品名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName">  
124 - <a-input v-model="model.productName" placeholder="请输入品名" disabled="disabled" ></a-input> 137 + <a-form-model-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName">
  138 + <a-input v-model="model.materialDescription" placeholder="请输入物料描述" disabled="disabled" ></a-input>
125 </a-form-model-item> 139 </a-form-model-item>
126 </a-col> 140 </a-col>
127 - <a-col :span="24"> 141 + <!-- <a-col :span="24">
128 <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spec"> 142 <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spec">
129 <a-input v-model="model.spec" placeholder="请输入规格" disabled="disabled" ></a-input> 143 <a-input v-model="model.spec" placeholder="请输入规格" disabled="disabled" ></a-input>
130 </a-form-model-item> 144 </a-form-model-item>
@@ -143,10 +157,10 @@ @@ -143,10 +157,10 @@
143 <a-form-model-item label="类别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="meterialType"> 157 <a-form-model-item label="类别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="meterialType">
144 <a-input v-model="model.meterialType" placeholder="请输入类别" disabled="disabled"></a-input> 158 <a-input v-model="model.meterialType" placeholder="请输入类别" disabled="disabled"></a-input>
145 </a-form-model-item> 159 </a-form-model-item>
146 - </a-col> 160 + </a-col> -->
147 <a-col :span="24"> 161 <a-col :span="24">
148 - <a-form-model-item label="当前库存量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentInventory">  
149 - <a-input-number v-model="model.currentInventory" placeholder="请输入当前库存量" style="width: 100%" disabled="disabled"/> 162 + <a-form-model-item label="当前库存量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="actualInventory">
  163 + <a-input-number v-model="model.actualInventory" placeholder="请输入当前库存量" style="width: 100%" disabled="disabled"/>
150 </a-form-model-item> 164 </a-form-model-item>
151 </a-col> 165 </a-col>
152 <a-col :span="24"> 166 <a-col :span="24">
@@ -160,6 +174,50 @@ @@ -160,6 +174,50 @@
160 </a-spin> 174 </a-spin>
161 175
162 </j-modal> 176 </j-modal>
  177 + <j-modal
  178 + title="更新储位"
  179 + :width="width"
  180 + :visible="visibleSL"
  181 + switchFullscreen
  182 + @ok="handleOkSLInfo"
  183 + @cancel="handleCancelSL"
  184 + cancelText="关闭">
  185 + <!-- :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" -->
  186 + <a-spin :spinning="confirmLoading">
  187 + <j-form-container>
  188 + <a-form-model ref="form" :model="model" slot="detail">
  189 + <a-row>
  190 + <a-col :span="24">
  191 + <a-form-model-item label="储位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="storageLocation">
  192 + <a-input v-model="model.storageLocation" placeholder="请输入储位"></a-input>
  193 + </a-form-model-item>
  194 + </a-col>
  195 + <a-col :span="24">
  196 + <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
  197 + <a-input v-model="model.materialCode" placeholder="请输入编号" disabled="disabled"></a-input>
  198 + </a-form-model-item>
  199 + </a-col>
  200 + <a-col :span="24">
  201 + <a-form-model-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialDescription">
  202 + <a-input v-model="model.materialDescription" placeholder="请输入物料描述" disabled="disabled" ></a-input>
  203 + </a-form-model-item>
  204 + </a-col>
  205 + <a-col :span="24">
  206 + <a-form-model-item label="实际库存量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="actualInventory">
  207 + <a-input-number v-model="model.actualInventory" placeholder="请输入实际库存量" style="width: 100%" disabled="disabled"/>
  208 + </a-form-model-item>
  209 + </a-col>
  210 + <a-col :span="24">
  211 + <a-form-model-item label="库存BOH" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryBoh">
  212 + <a-input-number v-model="model.inventoryBoh" placeholder="请输入库存BOH" style="width: 100%" disabled="disabled"/>
  213 + </a-form-model-item>
  214 + </a-col>
  215 + </a-row>
  216 + </a-form-model>
  217 + </j-form-container>
  218 + </a-spin>
  219 +
  220 + </j-modal>
163 </a-card> 221 </a-card>
164 </template> 222 </template>
165 223
@@ -184,10 +242,15 @@ @@ -184,10 +242,15 @@
184 return { 242 return {
185 confirmLoading: false, 243 confirmLoading: false,
186 description: 'tbl_inventory管理页面', 244 description: 'tbl_inventory管理页面',
  245 + kcmxWidth: 1000,
  246 + visibleInfo:false,
  247 + storageLocation:'',
  248 + materialCode:'',
  249 + width:600,
187 // 表头 250 // 表头
188 columns: [ 251 columns: [
189 { 252 {
190 - title: '#', 253 + title: '序号',
191 dataIndex: '', 254 dataIndex: '',
192 key:'rowIndex', 255 key:'rowIndex',
193 width:60, 256 width:60,
@@ -197,55 +260,53 @@ @@ -197,55 +260,53 @@
197 } 260 }
198 }, 261 },
199 { 262 {
200 - title: '编号',  
201 - align: "center",  
202 - dataIndex: 'partNumber',  
203 - // customRender: (text, record) => {//根据状态判断字体  
204 - // console.log(this.safetyStock)  
205 - // }  
206 - },  
207 - {  
208 - title:'品名', 263 + title:'储位',
209 align:"center", 264 align:"center",
210 - dataIndex: 'productName' 265 + dataIndex: 'storageLocation',
  266 + // width:100
211 }, 267 },
212 { 268 {
213 - title:'规格',  
214 - align:"center",  
215 - dataIndex: 'spec'  
216 - },  
217 - {  
218 - title:'型号',  
219 - align:"center",  
220 - dataIndex: 'type' 269 + title: '物料编码',
  270 + align: "center",
  271 + dataIndex: 'materialCode',
  272 + // width:150
  273 + // customRender: (text, record) => {//根据状态判断字体
  274 + // console.log(this.safetyStock)
  275 + // }C
221 }, 276 },
222 { 277 {
223 - title:'采购性质', 278 + title:'物料描述',
224 align:"center", 279 align:"center",
225 - dataIndex: 'buyingClassify' 280 + dataIndex: 'materialDescription',
  281 + // width:200
226 }, 282 },
  283 + // {
  284 + // title:'厂商',
  285 + // align:"center",
  286 + // dataIndex: 'supplierName'
  287 + // },
227 { 288 {
228 - title:'类别', 289 + title:'单位',
229 align:"center", 290 align:"center",
230 - dataIndex: 'meterialType',  
231 - scopedSlots: { customRender: 'meterialTypeSlot' }, 291 + dataIndex: 'measurementUnit'
232 }, 292 },
233 { 293 {
234 - title:'当前库存量', 294 + title:'BOH',
235 align:"center", 295 align:"center",
236 - dataIndex: 'currentInventory' 296 + dataIndex: 'inventoryBoh'
237 }, 297 },
238 { 298 {
239 - title:'BOH', 299 + title:'实际库存量',
240 align:"center", 300 align:"center",
241 - dataIndex: 'inventoryBoh' 301 + dataIndex: 'actualInventory',
  302 + // width:100
242 }, 303 },
243 { 304 {
244 title: '操作', 305 title: '操作',
245 dataIndex: 'action', 306 dataIndex: 'action',
246 align:"center", 307 align:"center",
247 fixed:"right", 308 fixed:"right",
248 - width:147, 309 + width:200,
249 scopedSlots: { customRender: 'action' } 310 scopedSlots: { customRender: 'action' }
250 } 311 }
251 ], 312 ],
@@ -256,7 +317,8 @@ @@ -256,7 +317,8 @@
256 exportXlsUrl: "/depot/tblInventory/exportXls", 317 exportXlsUrl: "/depot/tblInventory/exportXls",
257 importExcelUrl: "depot/tblInventory/importExcel", 318 importExcelUrl: "depot/tblInventory/importExcel",
258 importExcelUrlBoh:"depot/tblInventory/importExcelBoh", 319 importExcelUrlBoh:"depot/tblInventory/importExcelBoh",
259 - updateBoh:"/depot/tblInventory/updateBoh" 320 + updateBoh:"/depot/tblInventory/updateBoh",
  321 + updateSl:"/depot/tblInventory/updateSL"
260 }, 322 },
261 dictOptions:{}, 323 dictOptions:{},
262 superFieldList:[], 324 superFieldList:[],
@@ -264,6 +326,7 @@ @@ -264,6 +326,7 @@
264 safetyStock: null, 326 safetyStock: null,
265 model:{}, 327 model:{},
266 visibleBoh:false, 328 visibleBoh:false,
  329 + visibleSL:false,
267 labelCol: { 330 labelCol: {
268 xs: { span: 24 }, 331 xs: { span: 24 },
269 sm: { span: 5 }, 332 sm: { span: 5 },
@@ -312,12 +375,28 @@ @@ -312,12 +375,28 @@
312 } 375 }
313 }) 376 })
314 }, 377 },
315 - updateBoh(recode){  
316 - console.log("..............",recode) 378 + handleInventoryInfo(record){
  379 + this.materialCode = record.materialCode;
  380 + this.storageLocation = record.storageLocation
  381 + this.visibleInfo = true;
  382 + },
  383 + handleCancelInfo(){
  384 + this.visibleInfo = false;
  385 + },
  386 + updateBoh(record){
  387 +
317 this.model= {} 388 this.model= {}
318 - this.model = recode; 389 + this.model = record;
  390 + console.log("..............",this.model)
319 this.visibleBoh = true; 391 this.visibleBoh = true;
320 }, 392 },
  393 + updateSL(record){
  394 +
  395 + this.model= {}
  396 + this.model = record;
  397 + console.log("..............",this.model)
  398 + this.visibleSL = true;
  399 + },
321 handleOkBohInfo(){ 400 handleOkBohInfo(){
322 this.$refs.form.validate((valid) => { 401 this.$refs.form.validate((valid) => {
323 if (valid){ 402 if (valid){
@@ -330,7 +409,8 @@ @@ -330,7 +409,8 @@
330 } 409 }
331 }) 410 })
332 console.log("提交表单内容") 411 console.log("提交表单内容")
333 - this.visibleBoh = false 412 + // this.visibleBoh = false
  413 + this.handleCancelBoh()
334 } 414 }
335 }) 415 })
336 }, 416 },
@@ -338,6 +418,27 @@ @@ -338,6 +418,27 @@
338 this.visibleBoh = false; 418 this.visibleBoh = false;
339 this.model = {} 419 this.model = {}
340 }, 420 },
  421 + handleOkSLInfo(){
  422 + this.$refs.form.validate((valid) => {
  423 + if (valid){
  424 + postAction(this.url.updateSl,this.model).then(res=>{
  425 + this.reSeach();
  426 + if (res.success){
  427 + this.$message.success("更新成功")
  428 + }else {
  429 + this.$message.error(res.message)
  430 + }
  431 + })
  432 + console.log("提交表单内容")
  433 + // this.visibleSl = false
  434 + this.handleCancelSL()
  435 + }
  436 + })
  437 + },
  438 + handleCancelSL(){
  439 + this.visibleSL = false;
  440 + this.model = {}
  441 + },
341 initDictConfig() { 442 initDictConfig() {
342 }, 443 },
343 getSuperFieldList() { 444 getSuperFieldList() {
@@ -4,8 +4,13 @@ @@ -4,8 +4,13 @@
4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
5 <a-row> 5 <a-row>
6 <a-col :span="24"> 6 <a-col :span="24">
7 - <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">  
8 - <a-input v-model="model.partNumber" placeholder="请输入编号" @blur="autoInput" @keyup.enter.native="autoInput" 7 + <a-form-model-item label="入库储位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="storageLocation">
  8 + <a-input v-model="model.storageLocation" placeholder="请输入入库储位"></a-input>
  9 + </a-form-model-item>
  10 + </a-col>
  11 + <a-col :span="24">
  12 + <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  13 + <a-input v-model="model.partNumber" placeholder="请输入物料编码" @blur="autoInput" @keyup.enter.native="autoInput"
9 @input="inputMathen" > 14 @input="inputMathen" >
10 </a-input> 15 </a-input>
11 <div class="select" v-if="isShow" :style="`height:${menuHeight}`" @mouseenter="flag = true" 16 <div class="select" v-if="isShow" :style="`height:${menuHeight}`" @mouseenter="flag = true"
@@ -17,8 +22,8 @@ @@ -17,8 +22,8 @@
17 </a-form-model-item> 22 </a-form-model-item>
18 </a-col> 23 </a-col>
19 <a-col :span="24"> 24 <a-col :span="24">
20 - <a-form-model-item label="品名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName">  
21 - <a-input v-model="model.productName" placeholder="请输入品名" disabled></a-input> 25 + <a-form-model-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName">
  26 + <a-input v-model="model.productName" placeholder="请输入物料描述" disabled></a-input>
22 </a-form-model-item> 27 </a-form-model-item>
23 </a-col> 28 </a-col>
24 <a-col :span="24"> 29 <a-col :span="24">
@@ -38,9 +43,14 @@ @@ -38,9 +43,14 @@
38 </a-form-model-item> 43 </a-form-model-item>
39 </a-col> 44 </a-col>
40 <a-col :span="24"> 45 <a-col :span="24">
41 - <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operNumber"> 46 + <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementUnit">
  47 + <a-input v-model="model.measurementUnit" placeholder="请输入单位" disabled></a-input>
  48 + </a-form-model-item>
  49 + </a-col>
  50 + <a-col :span="24">
  51 + <a-form-model-item label="到货数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operNumber">
42 <a-input-number v-model="model.operNumber" :min="0" :max="9999" :precision="0" :formatter="limitNumber" 52 <a-input-number v-model="model.operNumber" :min="0" :max="9999" :precision="0" :formatter="limitNumber"
43 - :parser="limitNumber" placeholder="请输入数量" style="width: 100%" /> 53 + :parser="limitNumber" placeholder="请输入到货数量" style="width: 100%" />
44 </a-form-model-item> 54 </a-form-model-item>
45 </a-col> 55 </a-col>
46 <a-col :span="24"> 56 <a-col :span="24">
@@ -48,6 +58,22 @@ @@ -48,6 +58,22 @@
48 <j-date placeholder="请选择入库时间" v-model="model.operTime" style="width: 100%" /> 58 <j-date placeholder="请选择入库时间" v-model="model.operTime" style="width: 100%" />
49 </a-form-model-item> 59 </a-form-model-item>
50 </a-col> 60 </a-col>
  61 + <a-col :span="24">
  62 + <a-form-model-item label="到货厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierName">
  63 + <a-input v-model="model.supplierName" placeholder="请输入到货厂家"></a-input>
  64 + </a-form-model-item>
  65 + </a-col>
  66 + <a-col :span="24">
  67 + <a-form-model-item label="合格证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
  68 + <!-- <a-input v-model="model.certificate" placeholder="请输入合格证"></a-input> -->
  69 + <j-upload v-model="model.certificate" ></j-upload>
  70 + </a-form-model-item>
  71 + </a-col>
  72 + <a-col :span="24">
  73 + <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
  74 + <a-input v-model="model.remark" placeholder="请输入备注"></a-input>
  75 + </a-form-model-item>
  76 + </a-col>
51 <!-- <a-col :span="24"> 77 <!-- <a-col :span="24">
52 <a-form-model-item label="选择机器人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="robotName"> 78 <a-form-model-item label="选择机器人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="robotName">
53 <a-select size="small" v-model="model.robotName" placeholder="请选择机器人" allowClear> 79 <a-select size="small" v-model="model.robotName" placeholder="请选择机器人" allowClear>
@@ -109,11 +135,12 @@ export default { @@ -109,11 +135,12 @@ export default {
109 }, 135 },
110 confirmLoading: false, 136 confirmLoading: false,
111 validatorRules: { 137 validatorRules: {
112 - partNumber: [{ required: true, message: '请输入零件编号!' }],  
113 - productName: [{ required: true, message: '请输入品名!' }], 138 + partNumber: [{ required: true, message: '请输入物料编码!' }],
  139 + productName: [{ required: true, message: '请输入物料描述!' }],
114 spec: [{ required: true, message: '请输入规格!' }], 140 spec: [{ required: true, message: '请输入规格!' }],
115 type: [{ required: true, message: '请输入型号!' }], 141 type: [{ required: true, message: '请输入型号!' }],
116 buyingClassify: [{ required: true, message: '请输入采购性质!' }], 142 buyingClassify: [{ required: true, message: '请输入采购性质!' }],
  143 + operTime: [{ required: true, message: '请输入入库时间!' }],
117 operNumber: [{ required: true, message: '请输入数量!' }], 144 operNumber: [{ required: true, message: '请输入数量!' }],
118 robotName: [{ required: true, message: '请选择机器人!' }], 145 robotName: [{ required: true, message: '请选择机器人!' }],
119 pointId: [{ required: true, message: '请选择目标点位!' }], 146 pointId: [{ required: true, message: '请选择目标点位!' }],
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <j-form-container :disabled="formDisabled"> 3 <j-form-container :disabled="formDisabled">
4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 4 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
5 <a-row> 5 <a-row>
6 - <a-col :span="24"> 6 + <!-- <a-col :span="24">
7 <a-form-model-item label="领料人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ling"> 7 <a-form-model-item label="领料人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ling">
8 <a-input v-model="model.ling" placeholder="请输入领料人"></a-input> 8 <a-input v-model="model.ling" placeholder="请输入领料人"></a-input>
9 </a-form-model-item> 9 </a-form-model-item>
@@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
12 <a-form-model-item label="领料环节" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lingSysOrgCode"> 12 <a-form-model-item label="领料环节" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lingSysOrgCode">
13 <a-input v-model="model.lingSysOrgCode" placeholder="请输入领料环节"></a-input> 13 <a-input v-model="model.lingSysOrgCode" placeholder="请输入领料环节"></a-input>
14 </a-form-model-item> 14 </a-form-model-item>
15 - </a-col> 15 + </a-col> -->
16 <a-col :span="24"> 16 <a-col :span="24">
17 - <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">  
18 - <a-input v-model="model.partNumber" placeholder="请输入编号" @blur="autoInput" @keyup.enter.native="autoInput" 17 + <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
  18 + <a-input v-model="model.partNumber" placeholder="请输入物料编码" @blur="autoInput" @keyup.enter.native="autoInput"
19 @input="inputMathen"> 19 @input="inputMathen">
20 </a-input> 20 </a-input>
21 <div class="select" v-if="isShow" :style="`height:${menuHeight}`" @mouseenter="flag = true" 21 <div class="select" v-if="isShow" :style="`height:${menuHeight}`" @mouseenter="flag = true"
@@ -27,8 +27,8 @@ @@ -27,8 +27,8 @@
27 </a-form-model-item> 27 </a-form-model-item>
28 </a-col> 28 </a-col>
29 <a-col :span="24"> 29 <a-col :span="24">
30 - <a-form-model-item label="品名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName">  
31 - <a-input v-model="model.productName" placeholder="请输入品名" disabled></a-input> 30 + <a-form-model-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName">
  31 + <a-input v-model="model.productName" placeholder="请输入物料描述" disabled></a-input>
32 </a-form-model-item> 32 </a-form-model-item>
33 </a-col> 33 </a-col>
34 <a-col :span="24"> 34 <a-col :span="24">
@@ -48,14 +48,29 @@ @@ -48,14 +48,29 @@
48 </a-form-model-item> 48 </a-form-model-item>
49 </a-col> 49 </a-col>
50 <a-col :span="24"> 50 <a-col :span="24">
51 - <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operNumber"> 51 + <a-form-model-item label="出货数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operNumber">
52 <a-input-number v-model="model.operNumber" :min="0" :max="9999" :precision="0" :formatter="limitNumber" 52 <a-input-number v-model="model.operNumber" :min="0" :max="9999" :precision="0" :formatter="limitNumber"
53 - :parser="limitNumber" placeholder="请输入数量" style="width: 100%" /> 53 + :parser="limitNumber" placeholder="请输入出货数量" style="width: 100%" />
  54 + </a-form-model-item>
  55 + </a-col>
  56 + <a-col :span="24" >
  57 + <a-form-model-item label="出货分公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
  58 + <a-input v-model="model.company" placeholder="请输入出货分公司"></a-input>
  59 + </a-form-model-item>
  60 + </a-col>
  61 + <a-col :span="24" >
  62 + <a-form-model-item label="出货工作令" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrder">
  63 + <a-input v-model="model.workOrder" placeholder="请输入出货工作令"></a-input>
  64 + </a-form-model-item>
  65 + </a-col>
  66 + <a-col :span="24" >
  67 + <a-form-model-item label="出货厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shippingManufacturer">
  68 + <a-input v-model="model.shippingManufacturer" placeholder="请输入出货厂家"></a-input>
54 </a-form-model-item> 69 </a-form-model-item>
55 </a-col> 70 </a-col>
56 - <a-col :span="24" > <!-- v-if="workOrderFlg" -->  
57 - <a-form-model-item label="工作令" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrder">  
58 - <a-input v-model="model.workOrder" placeholder="请输入工作令"></a-input> 71 + <a-col :span="24" >
  72 + <a-form-model-item label="出货储位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="storageLocation">
  73 + <a-input v-model="model.storageLocation" placeholder="请输入出货储位"></a-input>
59 </a-form-model-item> 74 </a-form-model-item>
60 </a-col> 75 </a-col>
61 <a-col :span="24"> 76 <a-col :span="24">
@@ -292,6 +307,8 @@ export default { @@ -292,6 +307,8 @@ export default {
292 this.model.spec = res.result.spec 307 this.model.spec = res.result.spec
293 this.model.type = res.result.type 308 this.model.type = res.result.type
294 this.model.buyingClassify = res.result.buyingClassify 309 this.model.buyingClassify = res.result.buyingClassify
  310 + this.model.storageLocation = res.result.storageLocation
  311 + // this.model.
295 this.model.depotType = '出库' 312 this.model.depotType = '出库'
296 this.confirmLoading = false 313 this.confirmLoading = false
297 this.isShow = false; 314 this.isShow = false;
@@ -50,6 +50,18 @@ @@ -50,6 +50,18 @@
50 <a-badge v-if="record.depotType === '出库'" :count="text" :overflowCount="Number.MAX_SAFE_INTEGER"/> 50 <a-badge v-if="record.depotType === '出库'" :count="text" :overflowCount="Number.MAX_SAFE_INTEGER"/>
51 <a-badge v-else :count="text" :number-style="{ backgroundColor: '#52c41a' } " :overflowCount="Number.MAX_SAFE_INTEGER"/> 51 <a-badge v-else :count="text" :number-style="{ backgroundColor: '#52c41a' } " :overflowCount="Number.MAX_SAFE_INTEGER"/>
52 </template> 52 </template>
  53 + <template slot="depotTypeSlot" slot-scope="text,record">
  54 + <span v-if = "text == '出库'"><a-tag color="red">
  55 + 出库
  56 + </a-tag></span>
  57 + <span v-if = "text == '入库'"><a-tag color="green">
  58 + 入库
  59 + </a-tag></span>
  60 + <span v-if = "text == '更新'"><a-tag color="orange">
  61 + 更新
  62 + </a-tag></span>
  63 + </template>
  64 +
53 </a-table> 65 </a-table>
54 </a-spin> 66 </a-spin>
55 </template> 67 </template>
@@ -92,7 +104,8 @@ @@ -92,7 +104,8 @@
92 /* table加载状态 */ 104 /* table加载状态 */
93 loading:false, 105 loading:false,
94 defaultQuery:{ 106 defaultQuery:{
95 - partNumber:'' 107 + partNumber:'',
  108 + storageLocation:''
96 }, 109 },
97 labelCol: { 110 labelCol: {
98 xs: { span: 24 }, 111 xs: { span: 24 },
@@ -111,7 +124,7 @@ @@ -111,7 +124,7 @@
111 // 表头 124 // 表头
112 columns: [ 125 columns: [
113 { 126 {
114 - title: '#', 127 + title: '序号',
115 dataIndex: '', 128 dataIndex: '',
116 key:'rowIndex', 129 key:'rowIndex',
117 width:60, 130 width:60,
@@ -121,16 +134,38 @@ @@ -121,16 +134,38 @@
121 } 134 }
122 }, 135 },
123 { 136 {
124 - title:'编号', 137 + title:'储位',
  138 + align:"center",
  139 + dataIndex: 'storageLocation',
  140 + // width:100
  141 + },
  142 + {
  143 + title:'物料编码',
125 align:"center", 144 align:"center",
126 dataIndex: 'partNumber' 145 dataIndex: 'partNumber'
127 }, 146 },
128 { 147 {
129 - title:'品名', 148 + title:'物料描述',
130 align:"center", 149 align:"center",
131 dataIndex: 'productName' 150 dataIndex: 'productName'
132 }, 151 },
133 { 152 {
  153 + title:'数量',
  154 + align:"center",
  155 + dataIndex: 'operNumber',
  156 + scopedSlots: { customRender: 'numberSlot' }
  157 + },
  158 + {
  159 + title:'到货厂家',
  160 + align:"center",
  161 + dataIndex: 'supplierName'
  162 + },
  163 + {
  164 + title:'合格证',
  165 + align:"center",
  166 + dataIndex: 'certificate'
  167 + },
  168 + {
134 title:'入库/出库时间', 169 title:'入库/出库时间',
135 align:"center", 170 align:"center",
136 dataIndex: 'operTime' 171 dataIndex: 'operTime'
@@ -141,12 +176,6 @@ @@ -141,12 +176,6 @@
141 dataIndex: 'workOrder' 176 dataIndex: 'workOrder'
142 }, 177 },
143 { 178 {
144 - title:'数量',  
145 - align:"center",  
146 - dataIndex: 'operNumber',  
147 - scopedSlots: { customRender: 'numberSlot' }  
148 - },  
149 - {  
150 title:'当前库存', 179 title:'当前库存',
151 align:"center", 180 align:"center",
152 dataIndex: 'currentInventory', 181 dataIndex: 'currentInventory',
@@ -160,8 +189,13 @@ @@ -160,8 +189,13 @@
160 { 189 {
161 title:'状态', 190 title:'状态',
162 align:"center", 191 align:"center",
163 - dataIndex: 'depotType'  
164 - }, 192 + dataIndex: 'depotType',
  193 + scopedSlots: { customRender: 'depotTypeSlot' }
  194 + },{
  195 + title:'备注',
  196 + align:"center",
  197 + dataIndex: 'remark'
  198 + }
165 ], 199 ],
166 } 200 }
167 }, 201 },
@@ -188,8 +222,10 @@ @@ -188,8 +222,10 @@
188 this.edit(this.modelDefault); 222 this.edit(this.modelDefault);
189 }, 223 },
190 edit (record) { 224 edit (record) {
191 - this.queryParam.partNumber = record.partNumber;  
192 - this.defaultQuery.partNumber = record.partNumber; 225 + this.queryParam.partNumber = record.materialCode;
  226 + // this.queryParam.storageLocation=this.storageLocation;
  227 + this.defaultQuery.partNumber = record.materialCode;
  228 + // this.defaultQuery.storageLocation = record.storageLocation;
193 this.visible = true; 229 this.visible = true;
194 }, 230 },
195 loadData() { 231 loadData() {
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 data () { 23 data () {
24 return { 24 return {
25 title:'', 25 title:'',
26 - width:1000, 26 + width:1500,
27 visible: false, 27 visible: false,
28 disableSubmit: false 28 disableSubmit: false
29 } 29 }
@@ -36,14 +36,8 @@ @@ -36,14 +36,8 @@
36 36
37 <!-- 操作按钮区域 --> 37 <!-- 操作按钮区域 -->
38 <div class="table-operator"> 38 <div class="table-operator">
39 - <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>  
40 - <a-button type="primary" icon="download" @click="handleExportXls('贸易库存表')">导出</a-button>  
41 - <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">  
42 - <a-button type="primary" icon="import">导入</a-button>  
43 - </a-upload> -->  
44 <a-button @click="handleInventoryIn" type="primary" >入库记录</a-button> 39 <a-button @click="handleInventoryIn" type="primary" >入库记录</a-button>
45 <a-button @click="handleInventoryOut" type="primary" >出库记录</a-button> 40 <a-button @click="handleInventoryOut" type="primary" >出库记录</a-button>
46 - <a-button @click="handleInventoryDefective" type="primary" >不良品库</a-button>  
47 <a-upload 41 <a-upload
48 name="file" 42 name="file"
49 :showUploadList="false" 43 :showUploadList="false"
@@ -54,8 +48,6 @@ @@ -54,8 +48,6 @@
54 > 48 >
55 <a-button type="primary" icon="import">更新BOH</a-button> 49 <a-button type="primary" icon="import">更新BOH</a-button>
56 </a-upload> 50 </a-upload>
57 - <!-- 高级查询区域 -->  
58 - <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->  
59 <a-dropdown v-if="selectedRowKeys.length > 0"> 51 <a-dropdown v-if="selectedRowKeys.length > 0">
60 <a-menu slot="overlay"> 52 <a-menu slot="overlay">
61 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> 53 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -185,7 +177,7 @@ @@ -185,7 +177,7 @@
185 <j-form-container :disabled="formDisabled"> 177 <j-form-container :disabled="formDisabled">
186 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> 178 <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
187 <a-row> 179 <a-row>
188 - <a-col :span="12"> 180 + <a-col :span="24">
189 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode"> 181 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
190 <a-input 182 <a-input
191 v-model="model.materialCode" 183 v-model="model.materialCode"
@@ -194,117 +186,63 @@ @@ -194,117 +186,63 @@
194 ></a-input> 186 ></a-input>
195 </a-form-model-item> 187 </a-form-model-item>
196 </a-col> 188 </a-col>
197 - <a-col :span="12">  
198 - <a-form-model-item label="合同/订单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hth">  
199 - <a-input-search  
200 - v-model="model.hth"  
201 - placeholder="请输入合同/订单号"  
202 - @search="searchHth"  
203 -  
204 - />  
205 - </a-form-model-item>  
206 - </a-col>  
207 - <!-- <a-col :span="1">-->  
208 - <!-- <a >查询</a>-->  
209 - <!-- </a-col>-->  
210 - <a-col :span="12">  
211 - <a-form-model-item label="物料长描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialReview"> 189 + <a-col :span="24">
  190 + <a-form-model-item label="物料长描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialDescription">
212 <a-input 191 <a-input
213 - v-model="model.materialReview" 192 + v-model="model.materialDescription"
214 placeholder="请输入物料长描述" 193 placeholder="请输入物料长描述"
215 disabled="disabled" 194 disabled="disabled"
216 ></a-input> 195 ></a-input>
217 </a-form-model-item> 196 </a-form-model-item>
218 </a-col> 197 </a-col>
219 - <a-col :span="12">  
220 - <a-form-model-item label="物流单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wldh">  
221 - <a-input  
222 - v-model="model.wldh"  
223 - placeholder="请输入物流单号"  
224 - disabled="disabled"  
225 - ></a-input>  
226 - </a-form-model-item>  
227 - </a-col>  
228 - <a-col :span="12">  
229 - <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit"> 198 + <a-col :span="24">
  199 + <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementUnit">
230 <a-input 200 <a-input
231 - v-model="model.unit" 201 + v-model="model.measurementUnit"
232 placeholder="请输入单位" 202 placeholder="请输入单位"
233 disabled="disabled" 203 disabled="disabled"
234 ></a-input> 204 ></a-input>
235 </a-form-model-item> 205 </a-form-model-item>
236 </a-col> 206 </a-col>
237 -  
238 - <a-col :span="12">  
239 - <a-form-model-item label="供货商名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cs"> 207 + <a-col :span="24">
  208 + <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
240 <a-input 209 <a-input
241 - v-model="model.cs"  
242 - placeholder="请输入供货商名称" 210 + v-model="model.brand"
  211 + placeholder="请输入品牌"
243 disabled="disabled" 212 disabled="disabled"
244 ></a-input> 213 ></a-input>
245 </a-form-model-item> 214 </a-form-model-item>
246 </a-col> 215 </a-col>
247 -  
248 - <a-col :span="12">  
249 - <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand"> 216 + <a-col :span="24">
  217 + <a-form-model-item label="供货商名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierName">
250 <a-input 218 <a-input
251 - v-model="model.brand"  
252 - placeholder="请输入品牌"  
253 - disabled="disabled" 219 + v-model="model.supplierName"
  220 + placeholder="请输入供货商名称"
254 ></a-input> 221 ></a-input>
255 </a-form-model-item> 222 </a-form-model-item>
256 </a-col> 223 </a-col>
257 - <a-col :span="12">  
258 - <a-form-model-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehouse"> 224 + <a-col :span="24">
  225 + <a-form-model-item label="入库储位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehouse">
259 <a-input 226 <a-input
260 v-model="model.warehouse" 227 v-model="model.warehouse"
261 - placeholder="请输入仓库"  
262 - 228 + placeholder="请输入入库储位"
263 ></a-input> 229 ></a-input>
264 </a-form-model-item> 230 </a-form-model-item>
265 </a-col> 231 </a-col>
266 - <a-col :span="12">  
267 - <a-form-model-item label="入库数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rksl">  
268 - <a-input  
269 - v-model="model.rksl" 232 + <a-col :span="24">
  233 + <a-form-model-item label="入库数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryQuantity">
  234 + <a-input-number :min="0"
  235 + :parser="limitNumber" :precision="0" :formatter="limitNumber"
  236 + v-model="model.inventoryQuantity"
270 placeholder="请输入入库数量" 237 placeholder="请输入入库数量"
271 -  
272 - ></a-input> 238 + ></a-input-number>
273 </a-form-model-item> 239 </a-form-model-item>
274 </a-col> 240 </a-col>
275 - <a-col :span="12">  
276 - <a-form-model-item label="采购员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator">  
277 - <a-input  
278 - v-model="model.operator"  
279 - placeholder="请输入采购员"  
280 -  
281 - ></a-input> 241 + <a-col :span="24">
  242 + <a-form-model-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operTime">
  243 + <j-date placeholder="请选择入库时间" v-model="model.operTime" style="width: 100%" />
282 </a-form-model-item> 244 </a-form-model-item>
283 </a-col> 245 </a-col>
284 -<!-- <a-col :span="12">-->  
285 -<!-- <a-form-model-item label="不良品数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="blpsl">-->  
286 -<!-- <a-input type="number"-->  
287 -<!-- v-model="model.blpsl"-->  
288 -<!-- placeholder="请输入不良品数量"-->  
289 -  
290 -<!-- ></a-input>-->  
291 -<!-- </a-form-model-item>-->  
292 -<!-- </a-col>-->  
293 -  
294 -<!-- <a-col :span="12">-->  
295 -<!-- <a-form-model-item label="异常原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iszt">-->  
296 -<!-- <a-select-->  
297 -<!-- ref="select"-->  
298 -<!-- v-model:value="model.ycyy"-->  
299 -<!-- >-->  
300 -<!-- <a-select-option value="1">来料不良</a-select-option>-->  
301 -<!-- <a-select-option value="2">货损</a-select-option>-->  
302 -<!-- <a-select-option value="3">来料少件</a-select-option>-->  
303 -<!-- <a-select-option value="4">发错货</a-select-option>-->  
304 -<!-- </a-select>-->  
305 -<!-- </a-form-model-item>-->  
306 -<!-- </a-col>-->  
307 -  
308 </a-row> 246 </a-row>
309 247
310 </a-form-model> 248 </a-form-model>
@@ -333,7 +271,7 @@ @@ -333,7 +271,7 @@
333 <j-form-container :disabled="formDisabled"> 271 <j-form-container :disabled="formDisabled">
334 <a-form-model ref="form" :model="model2" :rules="validatorOutRules" slot="detail"> 272 <a-form-model ref="form" :model="model2" :rules="validatorOutRules" slot="detail">
335 <a-row> 273 <a-row>
336 - <a-col :span="12"> 274 + <a-col :span="24">
337 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode"> 275 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
338 <a-input 276 <a-input
339 v-model="model2.materialCode" 277 v-model="model2.materialCode"
@@ -342,54 +280,25 @@ @@ -342,54 +280,25 @@
342 ></a-input> 280 ></a-input>
343 </a-form-model-item> 281 </a-form-model-item>
344 </a-col> 282 </a-col>
345 - <a-col :span="12">  
346 - <a-form-model-item label="供应商合同号/订单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expressDeliveryNumber"> 283 + <a-col :span="24">
  284 + <a-form-model-item label="物料长描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialDescription">
347 <a-input 285 <a-input
348 - v-model="model2.expressDeliveryNumber"  
349 - placeholder="请输入供应商合同号/订单号"  
350 -  
351 -  
352 - />  
353 - </a-form-model-item>  
354 - </a-col>  
355 - <a-col :span="12">  
356 - <a-form-model-item label="物料长描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialReview">  
357 - <a-input  
358 - v-model="model2.materialReview" 286 + v-model="model2.materialDescription"
359 placeholder="请输入物料长描述" 287 placeholder="请输入物料长描述"
360 disabled="disabled" 288 disabled="disabled"
361 ></a-input> 289 ></a-input>
362 </a-form-model-item> 290 </a-form-model-item>
363 </a-col> 291 </a-col>
364 - <a-col :span="12">  
365 - <a-form-model-item label="中标合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryContractNumber"> 292 + <a-col :span="24">
  293 + <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementUnit">
366 <a-input 294 <a-input
367 - v-model="model2.deliveryContractNumber"  
368 - placeholder="请输入中标合同编号"  
369 -  
370 - ></a-input>  
371 - </a-form-model-item>  
372 - </a-col>  
373 - <a-col :span="12">  
374 - <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">  
375 - <a-input  
376 - v-model="model2.unit" 295 + v-model="model2.measurementUnit"
377 placeholder="请输入单位" 296 placeholder="请输入单位"
378 disabled="disabled" 297 disabled="disabled"
379 ></a-input> 298 ></a-input>
380 </a-form-model-item> 299 </a-form-model-item>
381 </a-col> 300 </a-col>
382 - <a-col :span="12">  
383 - <a-form-model-item label="需求单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="demandUnit">  
384 - <a-input  
385 - v-model="model2.demandUnit"  
386 - placeholder="请输入需求单位"  
387 -  
388 - ></a-input>  
389 - </a-form-model-item>  
390 - </a-col>  
391 -  
392 - <a-col :span="12"> 301 + <a-col :span="24">
393 <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand"> 302 <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
394 <a-input 303 <a-input
395 v-model="model2.brand" 304 v-model="model2.brand"
@@ -398,36 +307,40 @@ @@ -398,36 +307,40 @@
398 ></a-input> 307 ></a-input>
399 </a-form-model-item> 308 </a-form-model-item>
400 </a-col> 309 </a-col>
401 - <a-col :span="12">  
402 - <a-form-model-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehouse">  
403 - <a-input  
404 - v-model="model2.warehouse"  
405 - placeholder="请输入仓库"  
406 -  
407 - ></a-input> 310 + <a-col :span="24" >
  311 + <a-form-model-item label="出货分公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
  312 + <a-input v-model="model.company" placeholder="请输入出货分公司"></a-input>
408 </a-form-model-item> 313 </a-form-model-item>
409 </a-col> 314 </a-col>
410 - <a-col :span="12"> 315 + <a-col :span="24" >
  316 + <a-form-model-item label="出货工作令" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrder">
  317 + <a-input v-model="model.workOrder" placeholder="请输入出货工作令"></a-input>
  318 + </a-form-model-item>
  319 + </a-col>
  320 + <a-col :span="24" >
  321 + <a-form-model-item label="出货厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shippingManufacturer">
  322 + <a-input v-model="model.shippingManufacturer" placeholder="请输入出货厂家"></a-input>
  323 + </a-form-model-item>
  324 + </a-col>
  325 + <a-col :span="24" >
  326 + <a-form-model-item label="出货储位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehouse">
  327 + <a-input v-model="model.warehouse" placeholder="请输入出货储位"></a-input>
  328 + </a-form-model-item>
  329 + </a-col>
  330 + <a-col :span="24">
  331 + <a-form-model-item label="出库时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operTime">
  332 + <j-date placeholder="请选择出库时间" v-model="model.operTime" style="width: 100%" />
  333 + </a-form-model-item>
  334 + </a-col>
  335 + <a-col :span="24">
411 <a-form-model-item label="出库数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outboundQuantity"> 336 <a-form-model-item label="出库数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outboundQuantity">
412 <a-input 337 <a-input
413 v-model="model2.outboundQuantity" 338 v-model="model2.outboundQuantity"
414 placeholder="请输入出库数量" 339 placeholder="请输入出库数量"
415 -  
416 - ></a-input>  
417 - </a-form-model-item>  
418 - </a-col>  
419 - <a-col :span="12">  
420 - <a-form-model-item label="销售员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="salesman">  
421 - <a-input  
422 - v-model="model2.salesman"  
423 - placeholder="请输入销售员"  
424 -  
425 ></a-input> 340 ></a-input>
426 </a-form-model-item> 341 </a-form-model-item>
427 </a-col> 342 </a-col>
428 -  
429 </a-row> 343 </a-row>
430 -  
431 </a-form-model> 344 </a-form-model>
432 </j-form-container> 345 </j-form-container>
433 </a-spin> 346 </a-spin>
@@ -585,11 +498,11 @@ @@ -585,11 +498,11 @@
585 align:"center", 498 align:"center",
586 dataIndex: 'actualInventory' 499 dataIndex: 'actualInventory'
587 }, 500 },
588 - {  
589 - title:'在途数量',  
590 - align:"center",  
591 - dataIndex: 'quantityInTransit'  
592 - }, 501 + // {
  502 + // title:'在途数量',
  503 + // align:"center",
  504 + // dataIndex: 'quantityInTransit'
  505 + // },
593 // { 506 // {
594 // title:'总数量', 507 // title:'总数量',
595 // align:"center", 508 // align:"center",
@@ -610,27 +523,27 @@ @@ -610,27 +523,27 @@
610 // align:"center", 523 // align:"center",
611 // dataIndex: 'totalPrice' 524 // dataIndex: 'totalPrice'
612 // }, 525 // },
613 - {  
614 - title:'首次入库时间',  
615 - align:"center",  
616 - dataIndex: 'firstStorageTime',  
617 - customRender:function (text) {  
618 - return !text?"":(text.length>10?text.substr(0,10):text)  
619 - }  
620 - },  
621 - {  
622 - title:'最后一次出库时间',  
623 - align:"center",  
624 - dataIndex: 'lastOutboundTime',  
625 - customRender:function (text) {  
626 - return !text?"":(text.length>10?text.substr(0,10):text)  
627 - }  
628 - },  
629 - {  
630 - title:'在库天数',  
631 - align:"center",  
632 - dataIndex: 'daysInStock'  
633 - }, 526 + // {
  527 + // title:'首次入库时间',
  528 + // align:"center",
  529 + // dataIndex: 'firstStorageTime',
  530 + // customRender:function (text) {
  531 + // return !text?"":(text.length>10?text.substr(0,10):text)
  532 + // }
  533 + // },
  534 + // {
  535 + // title:'最后一次出库时间',
  536 + // align:"center",
  537 + // dataIndex: 'lastOutboundTime',
  538 + // customRender:function (text) {
  539 + // return !text?"":(text.length>10?text.substr(0,10):text)
  540 + // }
  541 + // },
  542 + // {
  543 + // title:'在库天数',
  544 + // align:"center",
  545 + // dataIndex: 'daysInStock'
  546 + // },
634 { 547 {
635 title: '操作', 548 title: '操作',
636 dataIndex: 'action', 549 dataIndex: 'action',
@@ -643,7 +556,8 @@ @@ -643,7 +556,8 @@
643 url: { 556 url: {
644 out: '/trade/tblTradeInventory/out', 557 out: '/trade/tblTradeInventory/out',
645 searchHth: '/trade/tblTradeBidSub/queryHtInfoByHthAndWlbm', 558 searchHth: '/trade/tblTradeBidSub/queryHtInfoByHthAndWlbm',
646 - store: '/trade/tblTradeInventory/add', 559 + // store: '/trade/tblTradeInventory/add',//旧
  560 + store: '/trade/tblTradeInventoryIn/addTradeInventory',
647 list: "/trade/tblTradeInventory/list", 561 list: "/trade/tblTradeInventory/list",
648 delete: "/trade/tblTradeInventory/delete", 562 delete: "/trade/tblTradeInventory/delete",
649 deleteBatch: "/trade/tblTradeInventory/deleteBatch", 563 deleteBatch: "/trade/tblTradeInventory/deleteBatch",
@@ -652,7 +566,7 @@ @@ -652,7 +566,7 @@
652 importExcelUrlBoh: 'trade/tblTradeInventory/importExcelBoh', 566 importExcelUrlBoh: 'trade/tblTradeInventory/importExcelBoh',
653 updateBoh: '/trade/tblTradeInventory/updateBoh' 567 updateBoh: '/trade/tblTradeInventory/updateBoh'
654 568
655 - }, 569 + } ,
656 dictOptions:{}, 570 dictOptions:{},
657 superFieldList:[], 571 superFieldList:[],
658 model: { 572 model: {
@@ -661,7 +575,6 @@ @@ -661,7 +575,6 @@
661 blpsl: 0, 575 blpsl: 0,
662 }, 576 },
663 model2: { 577 model2: {
664 -  
665 }, 578 },
666 materialCode:'', 579 materialCode:'',
667 materialReview:'', 580 materialReview:'',
@@ -692,25 +605,25 @@ @@ -692,25 +605,25 @@
692 hth: [{ required: true, message: '请输入合同/订单号!' },], 605 hth: [{ required: true, message: '请输入合同/订单号!' },],
693 materialReview: [{ required: true, message: '请输入物料长描述!' },], 606 materialReview: [{ required: true, message: '请输入物料长描述!' },],
694 wldh: [{ required: true, message: '请输入物流单号!' },], 607 wldh: [{ required: true, message: '请输入物流单号!' },],
695 - unit: [{ required: true, message: '请输入单位!' },], 608 + measurementUnit: [{ required: true, message: '请输入单位!' },],
696 // iszt: [{ required: true, message: '请选择是否在途!' },], 609 // iszt: [{ required: true, message: '请选择是否在途!' },],
697 - cs: [{ required: true, message: '请输入供货商名称!' },], 610 + supplierName: [{ required: true, message: '请输入供货商名称!' },],
698 brand: [{ required: true, message: '请输入品牌!' },], 611 brand: [{ required: true, message: '请输入品牌!' },],
699 warehouse: [{ required: true, message: '请输入仓库!' },], 612 warehouse: [{ required: true, message: '请输入仓库!' },],
700 - rksl: [{ required: true, message: '请输入入库数量!' },], 613 + inventoryQuantity: [{ required: true, message: '请输入入库数量!' },],
701 operator: [{ required: true, message: '请输入采购员!' },], 614 operator: [{ required: true, message: '请输入采购员!' },],
702 }, 615 },
703 validatorOutRules: { 616 validatorOutRules: {
704 - materialCode: [{ required: true, message: '请输入物料编码!' },], 617 + // materialCode: [{ required: true, message: '请输入物料编码!' },],
705 expressDeliveryNumber: [{ required: true, message: '请输入供应商合同号/订单号!' },], 618 expressDeliveryNumber: [{ required: true, message: '请输入供应商合同号/订单号!' },],
706 - materialReview: [{ required: true, message: '请输入物料长描述!' },], 619 + // materialReview: [{ required: true, message: '请输入物料长描述!' },],
707 deliveryContractNumber: [{ required: true, message: '请输入中标合同编号!' },], 620 deliveryContractNumber: [{ required: true, message: '请输入中标合同编号!' },],
708 unit: [{ required: true, message: '请输入单位!' },], 621 unit: [{ required: true, message: '请输入单位!' },],
709 demandUnit: [{ required: true, message: '请输入需求单位!' },], 622 demandUnit: [{ required: true, message: '请输入需求单位!' },],
710 brand: [{ required: true, message: '请输入品牌!' },], 623 brand: [{ required: true, message: '请输入品牌!' },],
711 - warehouse: [{ required: true, message: '请输入仓库!' },], 624 + // workOrder: [{ required: true, message: '请输入工作令!' },],
712 outboundQuantity: [{ required: true, message: '请输入出库数量!' },], 625 outboundQuantity: [{ required: true, message: '请输入出库数量!' },],
713 - salesman: [{ required: true, message: '请输入销售员!' },], 626 + operTime: [{ required: true, message: '请输入出货时间!' },],
714 }, 627 },
715 purchaseId: '', 628 purchaseId: '',
716 629
@@ -742,6 +655,15 @@ @@ -742,6 +655,15 @@
742 } 655 }
743 }) 656 })
744 }, 657 },
  658 + limitNumber(value) {
  659 + if (typeof value === 'string') {
  660 + return !isNaN(Number(value)) ? value.replace(/\./g, '') : 0
  661 + } else if (typeof value === 'number') {
  662 + return !isNaN(value) ? String(value).replace(/\./g, '') : 0
  663 + } else {
  664 + return 0
  665 + }
  666 + },
745 searchHth(){ 667 searchHth(){
746 getAction(this.url.searchHth,{ 668 getAction(this.url.searchHth,{
747 hth: this.model.hth, 669 hth: this.model.hth,
@@ -770,33 +692,34 @@ @@ -770,33 +692,34 @@
770 handleInventoryDefective(){ 692 handleInventoryDefective(){
771 this.visibleDefective = true; 693 this.visibleDefective = true;
772 }, 694 },
773 - updateInventoryBoh(recode){  
774 - console.log("..............",recode) 695 + updateInventoryBoh(record){
  696 + console.log("..............",record)
775 this.model2= {} 697 this.model2= {}
776 - this.model2 = recode;  
777 - this.model2.materialDescription = recode.materialReview; 698 + this.model2 = record;
  699 + this.model2.materialDescription = record.materialReview;
778 this.visibleBoh = true; 700 this.visibleBoh = true;
779 }, 701 },
780 - handleInventoryInfo(recode){  
781 - this.materialCode = recode.materialCode; 702 + handleInventoryInfo(record){
  703 + this.materialCode = record.materialCode;
782 this.visibleInfo = true; 704 this.visibleInfo = true;
783 }, 705 },
784 - handleInventoryInfoIn(recode){ 706 + handleInventoryInfoIn(record){
785 this.model = {} 707 this.model = {}
786 - console.log(recode)  
787 - this.model.materialCode = recode.materialCode;  
788 - this.model.materialReview = recode.materialReview;  
789 - this.model.unit = recode.unit;  
790 - this.model.brand = recode.brand; 708 + console.log(record)
  709 + this.model = record
  710 + // this.model.materialCode = record.materialCode;
  711 + this.model.materialDescription = record.materialReview;
  712 + this.model.measurementUnit = record.unit;
  713 + // this.model.brand = record.brand;
791 this.visibleInfoIn = true; 714 this.visibleInfoIn = true;
792 }, 715 },
793 - handleInventoryInfoOut(recode){ 716 + handleInventoryInfoOut(record){
794 this.model2= {} 717 this.model2= {}
795 - console.log("..............",recode)  
796 - this.model2.materialCode = recode.materialCode;  
797 - this.model2.materialReview = recode.materialReview;  
798 - this.model2.unit = recode.unit;  
799 - this.model2.brand = recode.brand; 718 + console.log("..............",record)
  719 + this.model2.materialCode = record.materialCode;
  720 + this.model2.materialDescription = record.materialReview;
  721 + this.model2.measurementUnit = record.unit;
  722 + this.model2.brand = record.brand;
800 this.visibleInfoOut = true; 723 this.visibleInfoOut = true;
801 }, 724 },
802 handleCancel(){ 725 handleCancel(){
@@ -855,19 +778,8 @@ @@ -855,19 +778,8 @@
855 handleOkInfoIn(){ 778 handleOkInfoIn(){
856 this.$refs.form.validate((valid) => { 779 this.$refs.form.validate((valid) => {
857 if (valid){ 780 if (valid){
858 - postAction(this.url.store,{  
859 - materialCode: this.model.materialCode, //物料编码  
860 - materialDescription: this.model.materialReview, //长描述  
861 - measurementUnit: this.model.unit, //单位  
862 - brand: this.model.brand,//品牌  
863 - hth: this.model.hth, //合同号  
864 - wldh: this.model.wldh, //物流单号  
865 - warehouse: this.model.warehouse, //仓库  
866 - operator: this.model.operator, //采购员  
867 - rksl: this.model.rksl, //入库数量  
868 - cs: this.model.cs, //厂商  
869 - purchaseId: this.purchaseId //订单id  
870 - }).then(res=>{ 781 + postAction(this.url.store,this.model
  782 + ).then(res=>{
871 this.reSeach(); 783 this.reSeach();
872 if (res.success){ 784 if (res.success){
873 this.$message.success("提交成功") 785 this.$message.success("提交成功")