zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【nev-pc】成品发运打印调取接口开发+字段调整

ag_report_nev
安虹睿 11 months ago
parent
2faed2463d
commit
625293dc90
4 changed files with 38 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      fe/PC/src/utils/tableColumns/index.js
  2. 20
      fe/PC/src/utils/tabsDesTions/index.js
  3. 17
      fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
  4. 2
      fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue

21
fe/PC/src/utils/tableColumns/index.js
View File

@ -3398,8 +3398,8 @@ export const IssueJobZS = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
// { label: "要货单号", prop: 'kittingRequestNumber'},
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
// { label: "任务描述", prop: 'jobDescription' },
@ -3442,8 +3442,8 @@ export const IssueJobPT = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -3484,8 +3484,8 @@ export const IssueJobZP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -3526,8 +3526,8 @@ export const IssueJobBP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -3568,8 +3568,9 @@ export const KittingIssueJob = [
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },

20
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -2219,8 +2219,8 @@ export const IssueJobZS = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
// { label: "要货单号", prop: 'kittingRequestNumber'},
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
// { label: "任务描述", prop: 'jobDescription' },
@ -2266,8 +2266,8 @@ export const IssueJobPT = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -2308,8 +2308,8 @@ export const IssueJobZP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -2350,8 +2350,8 @@ export const IssueJobBP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -2392,8 +2392,8 @@ export const KittingIssueJob = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },

17
fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
View File

@ -44,7 +44,7 @@
</div>
</template>
<script>
import { getPageListWip,sumPrint,getOneCustomerInfoByCode } from "@/api/wms-api"
import { getPageListWip,sumPrint,getOneCustomerInfoByCode,getDetailed } from "@/api/wms-api"
import { tableMixins } from "@/mixins/TableMixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { drawerMixins } from "@/mixins/drawerMixins"
@ -128,7 +128,22 @@ export default {
let data = initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option);
// todo:打印单据更改
// let data = initPrintAllData(this.tableDataDetails,'fhd.rdlx',false,_option);
this.Loading.appMainLoading = true
this.Print(data)
sumPrint(this.propsData.number, this.URL).then(res => {
this.paging()
getDetailed(this.propsData.id, this.URL).then(res => {
this.propsData = res
this.Loading.appMainLoading = false
})
.catch(err => {
console.log(err)
this.Loading.appMainLoading = false
})
}).catch(err => {
console.log(err)
this.Loading.appMainLoading = false
})
})
}
},

2
fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue
View File

@ -95,7 +95,7 @@ export default {
}
}
// todo:打印单据更改
// let _data = initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,_option);
// let _data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,_option);
let _data = initPrintAllData(this.tableDataDetails,'xbctl.rdlx',false,_option);
this.Print(_data)
}

Write Preview
Loading…
Cancel
Save