zhangsiyu
/
erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ddd

master
huangli865118801 4 years ago
parent
faacd865f6
commit
2e6a0a4d4a
14 changed files with 176 additions and 178 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. 26
      pages/assembleInfo/assembleInfo.vue
  2. 2
      pages/assembleList/assembleList.vue
  3. 26
      pages/hardwareInfo/hardwareInfo.vue
  4. 74
      pages/index/index.vue
  5. 33
      pages/sprayInfo/sprayInfo.vue
  6. 31
      pages/stampingInspectionInfo/stampingInspectionInfo.vue
  7. 30
      pages/tcqInfo/tcqInfo.vue
  8. 64
      unpackage/cache/wgt/__UNI__E896C30/app-service.js
  9. 2
      unpackage/cache/wgt/__UNI__E896C30/app-view.js
  10. 64
      unpackage/dist/build/app-plus/app-service.js
  11. 2
      unpackage/dist/build/app-plus/app-view.js
  12. BIN
      unpackage/release/apk/__UNI__E896C30__20210915104413.apk
  13. BIN
      unpackage/release/apk/__UNI__E896C30__20210915141051.apk
  14. BIN
      unpackage/release/apk/__UNI__E896C30__20210918112237.apk

26
pages/assembleInfo/assembleInfo.vue
Unescape View File

@ -125,8 +125,8 @@
<view class="cyxj-content" style="margin-top: 24upx;">
<view class="bzqk-card"><textarea v-model="froms.remake" placeholder="备注情况说明" /></view>
<view class="submit-btn">
<button v-if="type==1" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3" @tap="applys()" type="primary">审核</button>
<button v-if="type==1&&isMenu(35)" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3&&isMenu(34)" @tap="applys()" type="primary">审核</button>
</view>
</view>
</view>
@ -195,7 +195,8 @@
this.froms.model = this.CyInfo.product_size;
this.power = this.userInfo.power
//this.getArr();
this.getArr()
this.isMenu()
if (this.type != 1) {
this.getInfo();
}
@ -211,20 +212,19 @@
this.froms.result = index
},
getArr() {
let newArr = this.power.map(item => {
if (item.children) {
if (this.power.length > 0) {
let newArr = this.power.map(item => {
this.jurisdiction.push(item.id)
item.children.map(items => {
this.jurisdiction.push(items.title)
return items
})
}
})
})
}
console.log("xinshuzu", this.jurisdiction)
},
isMenu(title) {
return this.jurisdiction.includes(title);
isMenu(id) {
console.log("id", id)
return this.jurisdiction.includes(id);
},
inputListener(e, index, idx) {
let item = this.configSet[index].product_tcq_conf[idx];

2
pages/assembleList/assembleList.vue
Unescape View File

@ -100,7 +100,7 @@
this.isMenu();
},
methods: {
getArr() {
getArr() {
if (this.power.length > 0) {
let newArr = this.power.map(item => {
this.jurisdiction.push(item.id)

26
pages/hardwareInfo/hardwareInfo.vue
Unescape View File

@ -145,8 +145,8 @@
<view class="cyxj-content" style="margin-top: 24upx;">
<view class="bzqk-card"><textarea v-model="froms.remake" placeholder="备注情况说明" /></view>
<view class="submit-btn">
<button v-if="type==1" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3" @tap="applys()" type="primary">审核</button>
<button v-if="type==1&&isMenu(37)" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3&&isMenu(38)" @tap="applys()" type="primary">审核</button>
</view>
</view>
</view>
@ -217,7 +217,8 @@
this.froms.model = this.CyInfo.product_size;
this.power = this.userInfo.power
//this.getArr();
this.getArr()
this.isMenu();
if (this.type != 1) {
this.getInfo();
}
@ -236,20 +237,19 @@
this.froms.result = index
},
getArr() {
let newArr = this.power.map(item => {
if (item.children) {
if (this.power.length > 0) {
let newArr = this.power.map(item => {
this.jurisdiction.push(item.id)
item.children.map(items => {
this.jurisdiction.push(items.title)
return items
})
}
})
})
}
console.log("xinshuzu", this.jurisdiction)
},
isMenu(title) {
return this.jurisdiction.includes(title);
isMenu(id) {
console.log("id", id)
return this.jurisdiction.includes(id);
},
inputListener(e, index, idx) {
let item = this.configSet[index].check_conf_msg[idx];

74
pages/index/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<view class="content">
<view class="card">
<view class="card" v-if="isMenu(14)||isMenu(16)||isMenu(17)||isMenu(18)||isMenu(19)||isMenu(20)">
<view class="card-title">检验</view>
<view class="card-content">
<view v-if="isMenu(14)" class="card-list" @tap="rawMaterial()">
@ -11,14 +11,7 @@
来料检验
</view>
</view>
<!-- <view v-if="isMenu('首检记录')" class="card-list" @tap="firstInspection()">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/sjjl.png"></image>
</view>
<view class="menu-text">
首检记录
</view>
</view> -->
<view v-if="isMenu(16)" class="card-list" @tap="stampingInspection()">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/cyxj.png"></image>
@ -51,7 +44,7 @@
五金巡检
</view>
</view>
<view v-if="isMenu('制程质量')" class="card-list gery">
<!-- <view v-if="isMenu('制程质量')" class="card-list gery">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/zczl.png"></image>
</view>
@ -66,7 +59,7 @@
<view class="menu-text">
成品巡检
</view>
</view>
</view> -->
<view v-if="isMenu(20)" class="card-list" @tap="TCQ()">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/cto.png"></image>
@ -77,10 +70,10 @@
</view>
</view>
</view>
<view class="card" style="margin-top: 24upx;">
<view class="card" style="margin-top: 24upx;" v-if="isMenu(21)||isMenu(22)">
<view class="card-title">生产作业</view>
<view class="card-content">
<view class="card-list " @tap="stampingRecordList()">
<view class="card-list " @tap="stampingRecordList()" v-if="isMenu(21)">
<view class="card-list-img">
<image class="icon-cyjl" src="../../static/cybb.png"></image>
</view>
@ -88,7 +81,7 @@
冲压记录
</view>
</view>
<view class="card-list gery" @tap="kfz()">
<view class="card-list gery" @tap="kfz()" v-if="isMenu(22)">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/ptjl.png"></image>
</view>
@ -98,10 +91,10 @@
</view>
</view>
</view>
<view class="card" style="margin-top: 24upx;">
<view class="card" style="margin-top: 24upx;" v-if="isMenu(23)||isMenu(24)||isMenu(25)||isMenu(26)">
<view class="card-title">报表</view>
<view class="card-content">
<view class="card-list gery" @tap="kfz()" >
<view class="card-list gery" @tap="kfz()" v-if="isMenu(23)">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/cyrb.png"></image>
</view>
@ -109,7 +102,7 @@
冲压日报
</view>
</view>
<view class="card-list gery" @tap="kfz()">
<view class="card-list gery" @tap="kfz()" v-if="isMenu(24)">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/cyzb.png"></image>
</view>
@ -117,7 +110,7 @@
冲压周报
</view>
</view>
<view class="card-list gery">
<view class="card-list gery" v-if="isMenu(25)">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/ptrb.png"></image>
</view>
@ -125,7 +118,7 @@
喷涂日报
</view>
</view>
<view class="card-list gery" @tap="kfz()">
<view class="card-list gery" @tap="kfz()" v-if="isMenu(26)">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/ptzb.png"></image>
</view>
@ -151,10 +144,10 @@
</view>
</view>
</view>
<view class="card" style="margin-top: 24upx;">
<view class="card" style="margin-top: 24upx;" v-if="isMenu(49)||isMenu(50)">
<view class="card-title">保养</view>
<view class="card-content">
<view class="card-list" @tap="modeMaintainList()" >
<view class="card-list" @tap="modeMaintainList()" v-if="isMenu(49)">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/cyrb.png"></image>
</view>
@ -162,14 +155,14 @@
模具保养
</view>
</view>
<view class="card-list" @tap="LineList()">
<view class="card-list" @tap="LineList()" v-if="isMenu(50)">
<view class="card-list-img">
<image class="icon-yclj" src="../../static/cyzb.png"></image>
</view>
<view class="menu-text">
设备保养
</view>
</view>
</view>
</view>
</view>
</view>
@ -197,31 +190,34 @@
},
computed: {
...mapGetters(['userInfo', 'roleType'])
},
onLoad() {
this.power = this.userInfo.power
power({}).then(res => {
res.map(item => {
this.menuNameList.push(item.id);
})
})
this.getArr()
this.isMenu();
},
methods: {
getArr() {
let newArr = this.power.map(item => {
if (item.children) {
item.children.map(items => {
this.jurisdiction.push(items.id)
return items
})
}
})
if (this.power.length > 0) {
let newArr = this.power.map(item => {
this.jurisdiction.push(item.id)
})
}
console.log("xinshuzu", this.jurisdiction)
},
isMenu(id) {
console.log("id", id)
return this.jurisdiction.includes(id);
},
rawMaterial() {
@ -262,23 +258,23 @@
url: '../stampingRecordList/stampingRecordList'
});
},
TCQ(){
TCQ() {
uni.navigateTo({
url: '../TCQ/TCQ'
});
},
modeMaintainList(){
modeMaintainList() {
uni.navigateTo({
url: '../modeMaintainList/modeMaintainList'
});
},
LineList(){
LineList() {
uni.navigateTo({
url: '../lineList/lineList'
});
},
kfz(){
this.$functions.error("功能开发中");
kfz() {
this.$functions.error("功能开发中");
}
}
}

33
pages/sprayInfo/sprayInfo.vue
Unescape View File

@ -126,8 +126,8 @@
<view class="cyxj-content" style="margin-top: 24upx;">
<view class="bzqk-card"><textarea v-model="froms.remake" placeholder="备注情况说明" /></view>
<view class="submit-btn">
<button v-if="type==1" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3" @tap="applys()" type="primary">审核</button>
<button v-if="type==1&&isMenu(33)" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3&&isMenu(34)" @tap="applys()" type="primary">审核</button>
</view>
</view>
</view>
@ -195,6 +195,8 @@
this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
this.froms.model = this.CyInfo.product_size;
this.power = this.userInfo.power
this.getArr()
this.isMenu()
//this.getArr();
if (this.type != 1) {
@ -212,21 +214,20 @@
this.froms.result = index
},
getArr() {
let newArr = this.power.map(item => {
if (item.children) {
if (this.power.length > 0) {
let newArr = this.power.map(item => {
this.jurisdiction.push(item.id)
item.children.map(items => {
this.jurisdiction.push(items.title)
return items
})
}
})
console.log("xinshuzu", this.jurisdiction)
},
isMenu(title) {
return this.jurisdiction.includes(title);
},
})
}
console.log("xinshuzu", this.jurisdiction)
},
isMenu(id) {
console.log("id",id)
return this.jurisdiction.includes(id);
},
inputListener(e, index, idx) {
let item = this.configSet[index].check_conf_msg[idx];
if (!item.input) {

31
pages/stampingInspectionInfo/stampingInspectionInfo.vue
Unescape View File

@ -107,8 +107,8 @@
<view class="cyxj-content" style="margin-top: 24upx;">
<view class="bzqk-card"><textarea v-model="froms.remake" placeholder="备注情况说明" /></view>
<view class="submit-btn">
<button v-if="type==1&&isMenu('冲压提交')" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3" @tap="applys()" type="primary">审核</button>
<button v-if="type==1&&isMenu(31)" type="primary" :disabled="buttonState==false?true:false" @tap="submits">提交并发起审核</button>
<button v-if="type==3&&isMenu(36)" @tap="applys()" type="primary">审核</button>
</view>
</view>
</view>
@ -186,26 +186,27 @@
}
});
this.getConfig();
this.getArr();
this.isMenu();
},
methods: {
ifQualifiedChange(index) {
this.froms.result = index
},
getArr() {
let newArr = this.power.map(item => {
if (item.children) {
item.children.map(items => {
this.jurisdiction.push(items.title)
return items
})
}
})
console.log("xinshuzu", this.jurisdiction)
if (this.power.length > 0) {
let newArr = this.power.map(item => {
this.jurisdiction.push(item.id)
})
}
console.log("xinshuzu", this.jurisdiction)
},
isMenu(title) {
return this.jurisdiction.includes(title);
isMenu(id) {
console.log("id",id)
return this.jurisdiction.includes(id);
},
inputListener(e, index, idx) {
let item = this.configSet[index].check_conf_msg[idx];

30
pages/tcqInfo/tcqInfo.vue
Unescape View File

@ -194,7 +194,8 @@
this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
//this.froms.model = this.CyInfo.product_size;
this.power = this.userInfo.power
this.getArr();
this.getArr()
this.isMenu();
if (this.type != 1) {
this.getInfo();
@ -212,22 +213,21 @@
ifQualifiedChange(index) {
this.froms.result = index
},
getArr() {
let newArr = this.power.map(item => {
if (item.children) {
item.children.map(items => {
this.jurisdiction.push(items.title)
return items
getArr() {
if (this.power.length > 0) {
let newArr = this.power.map(item => {
this.jurisdiction.push(item.id)
})
}
})
console.log("xinshuzu", this.jurisdiction)
},
isMenu(title) {
return this.jurisdiction.includes(title);
},
console.log("xinshuzu", this.jurisdiction)
},
isMenu(id) {
console.log("id",id)
return this.jurisdiction.includes(id);
},
inputListener(e, index, idx) {
let item = this.configSet[index].check_conf_msg[idx];
if (!item.input) {

64
unpackage/cache/wgt/__UNI__E896C30/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/cache/wgt/__UNI__E896C30/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

64
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
unpackage/release/apk/__UNI__E896C30__20210915104413.apk
View File

Binary file not shown.

BIN
unpackage/release/apk/__UNI__E896C30__20210915141051.apk
View File

Binary file not shown.

BIN
unpackage/release/apk/__UNI__E896C30__20210918112237.apk
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save