root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-09 13:16:11 +08:00
parent 387b591596
commit ed8511c07c
17 changed files with 779 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
View File

@@ -204,6 +204,8 @@
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="is_upload" label="是否回传" :formatter="formatIsUpload" />
<el-table-column show-overflow-tooltip prop="upload_mes" label="回传MES" :formatter="formatUploadMes" />
<el-table-column show-overflow-tooltip prop="upload_sap" label="回传SAP" :formatter="formatUploadSap" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
@@ -374,11 +376,10 @@ export default {
const data = {}
data.rows = res
inandoutreturn.disupload(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).catch(() => {
}).finally(() => {
this.fullscreenLoading = false
this.crud.toQuery()
})
},
uploadSAP() {
@@ -391,11 +392,10 @@ export default {
const data = {}
data.rows = res
inandoutreturn.uploadSAP(data).then(res => {
this.fullscreenLoading = false
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).catch(() => {
}).finally(() => {
this.fullscreenLoading = false
this.crud.toQuery()
})
},
uploadMES() {
@@ -421,6 +421,20 @@ export default {
} else if (row.is_upload === '1') {
return '是'
}
},
formatUploadMes(row) {
if (row.upload_mes === '0') {
return '否'
} else if (row.upload_mes === '1') {
return '是'
}
},
formatUploadSap(row) {
if (row.upload_sap === '0') {
return '否'
} else if (row.upload_sap === '1') {
return '是'
}
}
}
}

6
lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
View File

@@ -154,6 +154,7 @@
</el-button>-->
<el-button
slot="left"
:loading="divBtn"
class="filter-item"
type="primary"
icon="el-icon-plus"
@@ -267,6 +268,7 @@ export default {
bucketProp: {},
structShow: false,
bucketObj: null,
divBtn: false,
bucketShow: false,
sects: [],
sect_val: null,
@@ -508,6 +510,7 @@ export default {
this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.divBtn = true
this.form.sect_id = this.sect_id
this.form.stor_id = this.stor_id
this.form.is_pc = '1'
@@ -517,8 +520,11 @@ export default {
})
crudRawAssist.getDisDtl(this.form.dtl_row).then(res => {
this.form.tableMater = res
this.divBtn = false
this.crud.notify('分配货位成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}).finally(() => {
this.divBtn = false
})
} else {
this.structShow = true

10
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -103,6 +103,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="交货单号">
<el-input
v-model="query.vbeln"
size="mini"
clearable
placeholder="交货单号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -201,6 +210,7 @@
<el-table-column label="总重量" align="center" prop="total_qty" width="100" />
<el-table-column show-overflow-tooltip label="客户" align="center" prop="cust_simple_name" width="100" />
<el-table-column show-overflow-tooltip label="客户编码" align="center" prop="cust_code" width="100" />
<el-table-column show-overflow-tooltip label="交货单号" align="center" prop="vbeln" width="100" />
<el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
<el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
<el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />

26
lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
View File

@@ -126,9 +126,18 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="品质类型">
<el-form-item label="交货单号">
<el-input
v-model="query.vbeln"
size="mini"
clearable
placeholder="批次模糊查询"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="是否冲销">
<el-select
v-model="query.quality_scode"
v-model="query.is_writeoff"
clearable
size="mini"
placeholder="全部"
@@ -136,7 +145,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_QUALITY_SCODE"
v-for="item in dict.IS_OR_NOT"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -213,12 +222,15 @@
{{ fun(scope.row.total_qty) }}
</template>
</el-table-column>
<el-table-column label="交货单号" align="center" prop="vbeln" />
<el-table-column label="制单人" align="center" prop="input_optname" />
<el-table-column label="制单时间" align="center" prop="input_time" width="150" />
<el-table-column label="修改人" align="center" prop="update_optname" />
<el-table-column label="修改时间" align="center" prop="update_time" width="150" />
<el-table-column label="确认人" align="center" prop="confirm_optname" width="150" />
<el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
<el-table-column label="是否冲销" align="center" :formatter="writeoffFormat" prop="is_writeoff" width="150" />
<el-table-column label="是否回传" align="center" :formatter="uploadFormat" prop="is_upload" width="150" />
<el-table-column label="回传人" align="center" prop="upload_name" width="150" />
<el-table-column label="回传时间" align="center" prop="upload_time" width="150" />
</el-table>
@@ -262,7 +274,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload', 'ST_INV_IN_TYPE', 'ST_INV_OUT_TYPE'],
dicts: ['io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload', 'ST_INV_IN_TYPE', 'ST_INV_OUT_TYPE', 'IS_OR_NOT'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -347,6 +359,12 @@ export default {
create_modeFormat(row) {
return this.dict.label.ST_CREATE_MODE[row.create_mode]
},
writeoffFormat(row) {
return this.dict.label.IS_OR_NOT[row.create_mode]
},
uploadFormat(row) {
return this.dict.label.IS_OR_NOT[row.create_mode]
},
handleCurrentChange(current) {
if (current === null) {
this.dis_flag = true