Browse Source

【NEV-PC】暂存

ag_report_nev
安虹睿 1 year ago
parent
commit
282a0123a9
  1. 5
      fe/PC/src/components/StepsFormNotView/index.vue
  2. 3
      fe/PC/src/components/StepsFormNotView/style/index.scss
  3. 3
      fe/PC/src/components/currenTable/index.vue
  4. 1
      fe/PC/src/mixins/TableMixins.js
  5. 154
      fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue
  6. 2
      fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue

5
fe/PC/src/components/StepsFormNotView/index.vue

@ -10,7 +10,7 @@
:modal-append-to-body="false"
:show-close="false"
>
<div id="stepsForm">
<div id="StepsFormNotView">
<el-steps
:active="active"
process-status="finish"
@ -114,9 +114,10 @@
:key="item.label"
:type="item.type"
size="medium"
@click="successClick(item.click())"
@click="item.click()"
>{{ item.label }}</el-button
>
<!-- @click="successClick(item.click())" -->
<el-button type="primary" size="medium" @click="close(1)"
>退出</el-button
>

3
fe/PC/src/components/StepsFormNotView/style/index.scss

@ -1,4 +1,4 @@
#stepsForm {
#StepsFormNotView {
width: 100%;
height: 100%;
display: flex;
@ -38,6 +38,7 @@
::v-deep .el-form {
flex: 1;
display: flex;
justify-content: center;
height: 100%;
.el-row {
display: none;

3
fe/PC/src/components/currenTable/index.vue

@ -36,7 +36,7 @@
</template>
<template slot-scope="scope">
<!-- 目的更新数据 -->
<div style="display:none">{{ TableSize }}</div>
<!-- <div style="display:none">{{ TableSize }}</div> -->
<el-form>
<el-form-item
v-if="item.type == 'input'"
@ -428,7 +428,6 @@ export default {
};
},
TableSize(){
console.log('computed',this.tableColumnsFilter())
this.$forceUpdate()
return this.tableColumnsFilter()
}

1
fe/PC/src/mixins/TableMixins.js

@ -332,6 +332,7 @@ export const tableMixins = {
},
// 点击抽屉,获取明细后全局通用操作
inlineDialogCallback(){
if(this.inlineDialogCallbackUser){this.inlineDialogCallbackUser()}
// 如果业务页面设置showDetailBaseFromFE为空,detailsTableColumns.js别忘了删除配置项
if(this.showDetailBaseFromFE && this.showDetailBaseFromFE.length > 0){
this.getItemInfoByItemCodeHandle('detail')

154
fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue

@ -53,9 +53,12 @@
:Options="editOptions"
:detailsTableColumns="AddDetailsTableColumns"
:childTableData="childTableData"
@close="stepsClose(arguments)"
@close="stepsCloseHandle(arguments)"
@detailsDataPush="detailsDataPush"
@detailsClear="detailsClear"
:isShowDeleteButton="false"
:addClickButton="false"
:successHandle="successHandle"
></StepsFormNotView>
</div>
</template>
@ -66,6 +69,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
import { mixins } from "@/mixins/mixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
name: "customerDismantleJob",
mixins: [
@ -74,6 +78,7 @@ export default {
drawerMixins,
TableHeaderMixins,
mixins,
filterSelectMixins,
],
data () {
return {
@ -81,6 +86,7 @@ export default {
detailURL: 'wms/store/product-recycle-note/note-and-back-flush',
//
currenButtonData: [
this.defaultAddBtn(),//
//
this.defaultExportBtn({
url:"wms/store/product-recycle-note/export-note-and-back-flush"
@ -108,7 +114,17 @@ export default {
details:[]
},
CreateForm: [
{ type: "inputNumber", label: "数量", prop: "qty",colSpan: 12,min:1 },
{ type: "inputNumber", label: "数量", prop: "qty",colSpan: 12,min:1,
validator: (rule, value, callback) => {
//todo
let _qty = Number(this.propsData.InventoryQty)
if(_qty < value){
return callback(new Error(`数量不能大于库存数量${_qty}`))
}else{
callback()
}
}
},
],
editRules: {
cerateRule: {
@ -117,11 +133,11 @@ export default {
},
AddDetailsTableColumns: [
{ label: "物料代码", prop: "partCode",width:"auto" },
{ label: "数量", prop: 'qty',width:"auto" },//todo:
{ label: "数量", prop: 'qty',width:"auto" },
{ type: "filterSelect", label: "库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) },
width:"auto", searchButton:false
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '', this.CreateFormData) },
width:"auto",
},
],
childTableData:[{
@ -129,65 +145,93 @@ export default {
qty:undefined,
locationCode:undefined
}],
successHandle:[
{
label:"下载",
click:(()=>{
this.downloadReport()
})
}
]
};
},
mounted () {
this.paging();
},
methods: {//
paging(callback) {
this.Loading.tableLoading = true;
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
getPageList(this.PageListParams, this.URL,true)
.then(res => {
this.tableData = res.items
this.totalCount = res.totalCount
this.tableData.forEach(item=>{
item.itemCode = item.noteAndBackFlushDetails[0].itemCode
item.locationCode = item.noteAndBackFlushDetails[0].locationCode
item.qty = item.noteAndBackFlushDetails[0].qty
item.rawLocationCode = item.noteAndBackFlushDetails[0].rawLocationCode
item.preStartTime = item.noteAndBackFlushDetails[0].preStartTime
item.workHour = item.noteAndBackFlushDetails[0].workHour
})
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
methods: {
//
isFilter (val, data) {
let filter = [
{
logic: "And",
column: val,
action: "==",
value: data
}
]
return filter
},
detailsDataPush(data){
console.log(data)
},
detailsClear(data){
console.log(data)
},
//-
blob(res, fileName) {
let blob = new Blob([res], {
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
})
const href = URL.createObjectURL(blob) //URLblob
const a = document.createElement('a') //a
a.style.display = 'none'
a.href = href //
a.download = fileName //
a.click() //
URL.revokeObjectURL(a.href) //URL
},
//Table
inlineDialog(val) {
this.firstTabs = 'xq'
//
this.Loading.DrawerLoading = true
this.displayDialog.detailsDialog = true;
getDetailed(val.id, 'wms/store/product-recycle-note/note-and-back-flush')
.then(res => {
if (res.details) {
//
this.tableDataDetails = JSON.parse(JSON.stringify(res))
let linshiTableDataDetails = JSON.parse(JSON.stringify(this.tableDataDetails))
this.totalCountDetails = res.details.length
//
linshiTableDataDetails.details.splice(this.MaxResultCountDetails,this.totalCountDetails);
this.propsData = linshiTableDataDetails
} else {
this.propsData = res
//
downloadReport(){
//
// todo:
console.log(241)
// this.blob(res, menuName + '')
},
stepsSubmit (val) {
return new Promise((resolve, reject) => {
resolve()
// todo:
// postUpdate(this.CreateFormData, this.propsData.id, this.URL).then(res => {
// this.propsData = res
// resolve();
// }).catch(err => {
// reject();
// })
});
},
stepsCloseHandle(data){
// todo:
this.displayDialog.detailsDialog = false
this.stepsClose(data)
},
PalletlFunction (val) {
return new Promise((resolve, reject) => {
if(val == 0){
console.log(this.CreateFormData.qty)
// todo:1bom
this.CreateFormData.details = [{
partCode:"CS20231220001D",
qty:2,
locationCode:'WZSX'
}]
// todo:2detailsqtyqty
resolve();
}
if (this.propsData.noteAndBackFlushDetails.length > 0) {
this.propsData.itemCode = this.propsData.noteAndBackFlushDetails[0].itemCode
this.propsData.locationCode = this.propsData.noteAndBackFlushDetails[0].locationCode
this.propsData.qty = this.propsData.noteAndBackFlushDetails[0].qty
this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode
this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime
this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour
//
if(val == 1){
resolve()
}
this.inlineDialogCallback()
})
.catch(err => {
this.Loading.DrawerLoading = false
})
});
},
}
};

2
fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue

@ -66,7 +66,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
import { mixins } from "@/mixins/mixins"
import { processRequest, getDetailed } from '@/api/wms-api'
export default {
name: "PurchaseOrder",
name: "PurchaseOrderHigher",
mixins: [
tableMixins,
LoadingMixins,

Loading…
Cancel
Save