Browse Source

修改发料任务承接

pda_nev
李俊城 11 months ago
parent
commit
5c5395cf0c
  1. 14
      fe/PDA/api/index.js
  2. 6
      fe/PDA/pages.js
  3. 6
      fe/PDA/pages.json
  4. 7
      fe/PDA/pages/request/assembleIssueRequestList.vue
  5. 8
      fe/PDA/pages/request/assembleIssueRequestListDetail.vue
  6. 7
      fe/PDA/pages/request/coatingIssueRequestList.vue
  7. 7
      fe/PDA/pages/request/coatingIssueRequestListDetail.vue
  8. 7
      fe/PDA/pages/request/injectionIssueRequestList.vue
  9. 7
      fe/PDA/pages/request/injectionIssueRequestListDetail.vue
  10. 174
      fe/PDA/pages/request/injectionPlanRequest.vue
  11. 7
      fe/PDA/pages/request/kittingIssueRequestList.vue
  12. 7
      fe/PDA/pages/request/kittingIssueRequestListDetail.vue
  13. 7
      fe/PDA/pages/request/sparePartIssueRequestList.vue
  14. 7
      fe/PDA/pages/request/sparePartIssueRequestListDetail.vue
  15. 37
      fe/PDA/pages/task/assembleIssueJobDetail.vue
  16. 9
      fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
  17. 37
      fe/PDA/pages/task/coatingIssuleJobDetail.vue
  18. 37
      fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
  19. 8
      fe/PDA/pages/task/injectionIssueJobDetail.vue
  20. 8
      fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
  21. 9
      fe/PDA/pages/task/kittingIssueJobDetail.vue
  22. 9
      fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
  23. 9
      fe/PDA/pages/task/sparePartIssueJobDetail.vue
  24. 9
      fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue

14
fe/PDA/api/index.js

@ -1672,6 +1672,20 @@ export const injectionIssuePlanRequest = (params) => request(
data: params,
method: "post"
})
//注塑计划 申请 类别获取详情
export const injectionIssuePlanRequestItemCategory = (categoryName) => request(
devUrl + "/api/pda/store/injection-plan-request/list/item-category?categoryName="+categoryName, { //
data: {},
method: "get"
})
//注塑计划 申请分类
export const injectionIssuePlanRequestItemCategoryName = () => request(
devUrl + "/api/pda/store/injection-plan-request/item-category-name", { //
data: {},
method: "get"
})
//注塑计划任务列表
export const getInjectionPlanJobList = (params) => request(

6
fe/PDA/pages.js

@ -772,21 +772,21 @@ module.exports = () => ({
{
"path": "pages/request/injectionPlanRequest",
"style": {
"navigationBarTitleText": "注塑计划申请",
"navigationBarTitleText": "涂装上线计划申请",
"enablePullDownRefresh": false
}
},
{
"path": "pages/task/injectionPlanJob",
"style": {
"navigationBarTitleText": "注塑计划任务",
"navigationBarTitleText": "涂装上线计划任务",
"enablePullDownRefresh": false
}
},
{
"path": "pages/task/injectionPlanJobDetail",
"style": {
"navigationBarTitleText": "注塑计划任务详情",
"navigationBarTitleText": "涂装上线计划任务详情",
"enablePullDownRefresh": false
}
},

6
fe/PDA/pages.json

@ -760,21 +760,21 @@
{
"path": "pages/request/injectionPlanRequest",
"style": {
"navigationBarTitleText": "注塑计划申请",
"navigationBarTitleText": "涂装上线计划申请",
"enablePullDownRefresh": false
}
},
{
"path": "pages/task/injectionPlanJob",
"style": {
"navigationBarTitleText": "注塑计划任务",
"navigationBarTitleText": "涂装上线计划任务",
"enablePullDownRefresh": false
}
},
{
"path": "pages/task/injectionPlanJobDetail",
"style": {
"navigationBarTitleText": "注塑计划任务详情",
"navigationBarTitleText": "涂装上线计划任务详情",
"enablePullDownRefresh": false
}
},

7
fe/PDA/pages/request/assembleIssueRequestList.vue

@ -118,8 +118,11 @@
})
var isHaveNewJob = await isAssembleHasNewJob(item.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
this.getList('refresh')
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
this.getList('refresh')
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

8
fe/PDA/pages/request/assembleIssueRequestListDetail.vue

@ -193,8 +193,12 @@
})
var isHaveNewJob = await isAssembleHasNewJob(this.datacontent.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
navigateBack(1)
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
navigateBack(1)
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

7
fe/PDA/pages/request/coatingIssueRequestList.vue

@ -117,8 +117,11 @@
})
var isHaveNewJob = await isCoatingHasNewJob(item.number, isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
this.getList('refresh')
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
this.getList('refresh')
}
} catch (error) {
uni.hideLoading()
this.showMessage(error)

7
fe/PDA/pages/request/coatingIssueRequestListDetail.vue

@ -193,8 +193,11 @@
})
var isHaveNewJob = await isCoatingHasNewJob(this.datacontent.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
navigateBack(1)
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
navigateBack(1)
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

7
fe/PDA/pages/request/injectionIssueRequestList.vue

@ -118,8 +118,11 @@
})
var isHaveNewJob = await isInjectionHasNewJob(item.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
this.getList('refresh')
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
this.getList('refresh')
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

7
fe/PDA/pages/request/injectionIssueRequestListDetail.vue

@ -193,8 +193,11 @@
})
var isHaveNewJob = await isInjectionHasNewJob(this.datacontent.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
navigateBack(1)
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
navigateBack(1)
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

174
fe/PDA/pages/request/injectionPlanRequest.vue

@ -3,9 +3,18 @@
<view class="page-wraper">
<view class="page-header">
<view class="" style="margin: 10rpx;">
<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="button"
activeColor="#007AFF"></uni-segmented-control>
<view class="" style="margin-bottom: 8rpx; margin-top: 8rpx; background-color: #fff">
<scroll-view scroll-x="true" class="scrollview-box">
<block v-for="(item, index) in tabs" :key="index" >
<view
:class="tabIndex==index ? 'item_select' : 'item'"
:data-current="index" @click="ontabtap">
<text class="name">{{item}}</text>
</view>
</block>
</scroll-view>
</view>
</view>
@ -15,8 +24,8 @@
<view class="uni-flex uni-row" style="flex-wrap: wrap; margin: 10rpx;">
<view class="uni-flex" style=" width: 50%; justify-content: center; margin-top: 40rpx; "
v-for="(item, index) in showList" :key="index">
<uni-tag style="width: 100%; margin-left: 20rpx;" :inverted="!item.checked" :circle="false" :text="item.code+'\n'+item.desc1" type="primary"
@click="setContainerModel(item)" />
<uni-tag style="width: 100%; margin-left: 20rpx;" :inverted="!item.checked" :circle="false"
:text="item.code+'\n'+item.desc1" type="primary" @click="setContainerModel(item)" />
</view>
</view>
@ -41,6 +50,8 @@
import {
injectionIssuePlanRequest,
getItemCategoryList,
injectionIssuePlanRequestItemCategoryName,
injectionIssuePlanRequestItemCategory,
locations
} from '@/api/index.js';
@ -65,14 +76,14 @@
},
data() {
return {
items: ['保险杠', '轮眉', '车门装饰板'],
tabs: [],
current: 0,
pageSize: this.modelConfig,
pageIndex: 1,
loadingType: "nomore",
dataList: [],
showList: [],
toLocationInfo: null
toLocationInfo: null,
tabIndex:0
};
},
filters: {
@ -83,23 +94,7 @@
onShow() {},
onLoad() {
uni.showLoading({
title:"加载中",
mask:true
})
getItemCategoryList().then(res => {
uni.hideLoading()
this.dataList = res;
this.dataList.forEach(res => {
res.checked = true;
})
this.onClickItem({
currentIndex: 0
})
}).catch(error => {
uni.hideLoading()
this.showMessage("获取分类信息失败"+error)
})
this.getCategoryListName();
},
onReachBottom() {},
onPullDownRefresh() {},
@ -120,6 +115,41 @@
}
},
methods: {
getCategoryListName(){
uni.showLoading({
title: "加载中",
mask: true
})
injectionIssuePlanRequestItemCategoryName().then(res => {
uni.hideLoading()
if(res.length==0){
this.showMessage("获取分类信息失败,请在字典中维护")
}else {
this.tabs = res;
this.getCategoryList(this.tabs[0])
}
this.tabIndex=0
}).catch(error => {
uni.hideLoading()
this.showMessage("获取分类信息失败" + error)
})
},
getCategoryList(categoryName){
injectionIssuePlanRequestItemCategory(categoryName).then(res => {
uni.hideLoading()
if(res.length==0){
this.showMessage("获取["+categoryName+"]信息失败,请在字典中维护")
}else {
this.showList = res;
}
}).catch(error => {
uni.hideLoading()
this.showMessage("获取["+categoryName+"]信息失败,"+error)
})
},
clearDefaultLocation() {
this.toLocationInfo = null
},
@ -151,18 +181,6 @@
item.checked = true;
this.$forceUpdate()
},
onClickItem(item) {
if (item.currentIndex == 0) {
this.showList = this.dataList.filter(res => res.category == "保险杠")
} else if (item.currentIndex == 1) {
this.showList = this.dataList.filter(res => res.category == "轮眉")
} else if (item.currentIndex == 2) {
this.showList = this.dataList.filter(res => res.category == "车门装饰板")
}
this.showList.forEach(res => {
res.checked = false;
})
},
//
showMessage(message) {
@ -172,22 +190,25 @@
this.$refs.comMessage.showCommitSuccess();
},
clearData() {
this.onClickItem({
currentIndex: 0
})
this.tabs=[]
this.current=0
this.showList= []
this.toLocationInfo = null,
this.tabIndex = 0
},
submit(item) {
var checked = this.showList.filter(r=>r.checked)
if (checked.length==0) {
var checked = this.showList.filter(r => r.checked)
if (checked.length == 0) {
this.showMessage("请选择零件")
return;
}
}
if (this.toLocationInfo == null) {
this.showMessage("请先扫描目标库位")
return;
}
uni.showLoading({
title: "提交中...",
@ -206,8 +227,8 @@
remark: "",
itemCode: checked[0].code,
itemName: checked[0].name,
itemDesc1: checked[0].desc1,
itemDesc2: checked[0].desc2,
itemDesc1: checked[0].desc1,
itemDesc2: checked[0].desc2,
uom: checked[0].basicUom,
qty: 1,
stdPackQty: checked[0].stdPackQty,
@ -222,13 +243,14 @@
}
params.details.push(item)
console.log("测试", JSON.stringify(params));
injectionIssuePlanRequest( params)
injectionIssuePlanRequest(params)
.then(res => {
uni.hideLoading();
if (res) {
this.showCommitSuccessMessage();
this.clearData();
}else {
this.getCategoryListName();
} else {
this.showMessage("提交失败");
}
})
@ -237,6 +259,58 @@
uni.hideLoading();
});
},
ontabtap(e){
let index = e.target.dataset.current || e.currentTarget.dataset.current;
if (this.tabIndex == index) {
return;
}
this.tabIndex = index;
this.getCategoryList(this.tabs[index])
}
}
};
</script>
</script>
<style>
.scrollview-box {
white-space: nowrap;
/* 滚动必须加的属性 */
width: 100%;
}
.item {
margin: 10rpx;
padding: 15rpx;
display: inline-flex;
/* item的外层定义成行内元素才可进行滚动 inline-block / inline-flex 均可 */
flex-direction: column;
align-items: center;
background-color: #fff;
color: #007AFF;
border: 1px solid #007AFF;
border-radius:8rpx;
}
.item_select {
margin: 10rpx;
padding: 15rpx;
display: inline-flex;
/* item的外层定义成行内元素才可进行滚动 inline-block / inline-flex 均可 */
flex-direction: column;
align-items: center;
background-color: #007AFF;
color: #fff;
border: 1px solid #007AFF;
border-radius: 8rpx;
}
.name {
font-size: 35rpx;
/* color: #fff; */
padding: 0;
/* width: 90%; */
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
</style>

7
fe/PDA/pages/request/kittingIssueRequestList.vue

@ -118,8 +118,11 @@
})
var isHaveNewJob = await iskittingHasNewJob(item.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
this.getList('refresh')
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
this.getList('refresh')
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

7
fe/PDA/pages/request/kittingIssueRequestListDetail.vue

@ -193,8 +193,11 @@
})
var isHaveNewJob = await iskittingHasNewJob(this.datacontent.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
navigateBack(1)
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
navigateBack(1)
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

7
fe/PDA/pages/request/sparePartIssueRequestList.vue

@ -118,8 +118,11 @@
})
var isHaveNewJob = await isSparePartHasNewJob(item.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
this.getList('refresh')
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
this.getList('refresh')
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

7
fe/PDA/pages/request/sparePartIssueRequestListDetail.vue

@ -193,8 +193,11 @@
})
var isHaveNewJob = await isSparePartHasNewJob(this.datacontent.number,isHaveNewJobList)
uni.hideLoading()
this.showMessage(isHaveNewJob)
navigateBack(1);
if(isHaveNewJob.includes("无任务")){
this.showMessage(isHaveNewJob)
}else {
navigateBack(1)
}
}catch(error){
uni.hideLoading()
this.showMessage(error)

37
fe/PDA/pages/task/assembleIssueJobDetail.vue

@ -372,26 +372,33 @@
});
},
setReceived(){
setReceived() {
//
//
if(this.datacontent.isClaims){
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if(this.datacontent.claimsUserId==localStorage.getItem('userId')) {
this.showBtn=true
}else {
this.showBtn=false
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
}else {
} else {
//
this.receive((callback => {
if(callback){
this.showBtn=true
}else {
this.showBtn=false
}
}));
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}
},

9
fe/PDA/pages/task/assembleIssueJobDetailByQty.vue

@ -350,20 +350,27 @@
//
//
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}

37
fe/PDA/pages/task/coatingIssuleJobDetail.vue

@ -375,26 +375,33 @@
});
},
setReceived(){
setReceived() {
//
//
if(this.datacontent.isClaims){
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if(this.datacontent.claimsUserId==localStorage.getItem('userId')) {
this.showBtn=true
}else {
this.showBtn=false
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
}else {
} else {
//
this.receive((callback => {
if(callback){
this.showBtn=true
}else {
this.showBtn=false
}
}));
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}
},

37
fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue

@ -359,26 +359,33 @@
});
},
setReceived(){
setReceived() {
//
//
if(this.datacontent.isClaims){
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if(this.datacontent.claimsUserId==localStorage.getItem('userId')) {
this.showBtn=true
}else {
this.showBtn=false
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
}else {
} else {
//
this.receive((callback => {
if(callback){
this.showBtn=true
}else {
this.showBtn=false
}
}));
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}
},
getScanResult(result) {

8
fe/PDA/pages/task/injectionIssueJobDetail.vue

@ -381,6 +381,7 @@
//
//
if (this.datacontent.isClaims) {
this.datacontent.jobStatus = 2
//
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
@ -392,9 +393,16 @@
//
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}

8
fe/PDA/pages/task/injectionIssueJobDetailByQty.vue

@ -346,6 +346,7 @@
//
//
if (this.datacontent.isClaims) {
this.datacontent.jobStatus = 2
//
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
@ -356,9 +357,16 @@
//
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}

9
fe/PDA/pages/task/kittingIssueJobDetail.vue

@ -375,20 +375,27 @@
//
//
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}

9
fe/PDA/pages/task/kittingIssueJobDetailByQty.vue

@ -348,20 +348,27 @@
//
//
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}

9
fe/PDA/pages/task/sparePartIssueJobDetail.vue

@ -375,20 +375,27 @@
//
//
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}

9
fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue

@ -346,20 +346,27 @@
//
//
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
//
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//
this.receive((callback => {
if (callback) {
this.datacontent.isClaims = true;
this.datacontent.jobStatus = 2
this.showBtn = true
this.datacontent.claimsUserName = localStorage.getItem('userName')
this.datacontent.claimsUserId = localStorage.getItem('userId')
} else {
this.showBtn = false
this.datacontent.isClaims = false;
this.datacontent.jobStatus = 1
this.datacontent.claimsUserId = ""
}
}));
}

Loading…
Cancel
Save