From 10b6d97e7402f8a47d5dfb097c6fc3f4753ac686 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 08 一月 2026 07:50:03 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/index/tab1.vue | 66 +------
static/tabBar/icon4.png | 0
pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue | 43 ++++
static/tabBar/icon4-default.png | 0
pages/index/tab3.vue | 84 +++-----
pages.json | 22 +-
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 9
pages/index/tab2.vue | 189 +++++++++++++++++----
pages/index/tab4.vue | 55 -----
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 4
pages/index/index.vue | 43 +++-
11 files changed, 292 insertions(+), 223 deletions(-)
diff --git a/pages.json b/pages.json
index d4ee014..7bfae43 100644
--- a/pages.json
+++ b/pages.json
@@ -1477,25 +1477,25 @@
"pagePath": "pages/index/tab1",
"iconPath": "static/tabBar/icon1.png",
"selectedIconPath": "static/tabBar/icon1-default.png",
- "text": "杞﹂棿宸ュ簭"
- },
- {
- "pagePath": "pages/index/tab2",
- "iconPath": "static/tabBar/icon2.png",
- "selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "鍗曟嵁鍒楄〃"
+ "text": "杞﹂棿绠＄悊"
},
{
"pagePath": "pages/index/tab3",
- "iconPath": "static/tabBar/icon2.png",
- "selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "鍣ㄥ叿绠＄悊"
+ "iconPath": "static/tabBar/icon4.png",
+ "selectedIconPath": "static/tabBar/icon4-default.png",
+ "text": "璁惧绠＄悊"
},
{
"pagePath": "pages/index/tab4",
+ "iconPath": "static/tabBar/icon3.png",
+ "selectedIconPath": "static/tabBar/icon3-default.png",
+ "text": "璐ㄩ噺绠＄悊"
+ },
+ {
+ "pagePath": "pages/index/tab2",
"iconPath": "static/tabBar/icon2.png",
"selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "璐ㄩ噺绠＄悊"
+ "text": "鍗曟嵁鍒楄〃"
},
{
"pagePath": "pages/index/mine",
diff --git a/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue b/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
index cee2d24..37289d2 100644
--- a/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
+++ b/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
@@ -72,7 +72,7 @@
</picker>
</view>
</view>
- <view class="form-item">
+ <!-- <view class="form-item">
<view class="title">婧愬崟绫诲瀷:</view>
<view class="right" :class="showHMainSourceBillType?'':'disabled'">
<zxz-uni-data-select
@@ -86,7 +86,22 @@
@change="HSourceBillTypeNameChange"
></zxz-uni-data-select>
</view>
- </view>
+ </view> -->
+ <view class="form-item">
+ <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType"
+ @change="HMainSourceBillTypeChange">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
<view class="form-item">
<view class="title">婧愬崟鍗曞彿:</view>
<view class="right" v-show="showHSourceBillNo">
@@ -200,12 +215,14 @@
showHStockPlaceName: true,
HMouldList:[],
isEdit: false,
-
+ arrayHMainSourceBillType: ['鍣ㄥ叿鎶ュ簾鐢宠鍗�', '鎵嬪伐褰曞叆'],
+ HMainSourceBillType: '鍣ㄥ叿鎶ュ簾鐢宠鍗�',
+ arrayHMainSourceBillValue: ['3823', '-1'],
showHMainSourceBillType: true,
showHSourceBillNo: true,
//婧愬崟绫诲瀷
- HSourceBillTypeList:[{typeID:"-1",typeName:"鎵嬪伐褰曞叆"}],
+ HSourceBillTypeList:[{typeID:"-1",typeName:"鎵嬪伐褰曞叆"},{typeID:"3823",typeName:"鍣ㄥ叿鎶ュ簾鐢宠鍗�"}],
hform: {
HBarCode: '',
HInterID: '',
@@ -221,7 +238,7 @@
HDeptName: getUserInfo().HDept,
HDeptID: getUserInfo().HDeptID,
//婧愬崟淇℃伅
- HMainSourceBillType: "-1",
+ HMainSourceBillType:uni.getStorageSync('billTypeName_3832') ? uni.getStorageSync('billTypeName_3832'):'鍣ㄥ叿鎶ュ簾鐢宠鍗�',
HSourceBillNo: '', //CGDD000200
HDate: getDateTime.dateTimeStr('y-m-d'),
HMaker: uni.getStorageSync('HUserName'),
@@ -783,6 +800,19 @@
showBillList() {
this.$refs.billList.showPopup()
},
+
+ HMainSourceBillTypeChange(e) {
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+
+ let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+ if (index != -1) {
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+ // this.getHYDList()
+ }
+ console.log(this.hform.HMainSourceBillType)
+ uni.setStorageSync("billType_3823",this.hform.HMainSourceBillType);
+ uni.setStorageSync("billTypeName_3823",this.HMainSourceBillType);
+ },
HSourceBillTypeNameChange(e) {
const pages = getCurrentPages()
@@ -795,8 +825,9 @@
},
//閫変腑婧愬崟
getHBarCodeData(HBarCode) {
+ console.log("HInterID",this.hform.HInterID,"HBillNo",this.hform.HBillNo,"HBillType",this.hform.HBillType)
uni.request({
- url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
+ url: this.serverUrl + '/MouldController/Get_SourceBarCode_ScrapRequest_Json',
data: {
HInterID: this.hform.HInterID,
HBillNo: this.hform.HBillNo,
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 1ea919b..191b607 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -461,7 +461,7 @@
toScanCode() {
MpaasScan.scanCode((res) => {
if (res) {
- this.getSourceBillInfo(HBarCode);
+ this.getSourceBillInfo(res);
}
});
},
@@ -945,6 +945,13 @@
// if (!this.checkSubmitValidate()) {
// return;
// }
+ if(this.HisReportList.length<=0){
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `璇疯緭鍏ユ楠屼俊鎭痐,
+ });
+ return
+ }
try {
console.log('this.$refs: ', this.$refs);
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index e61f1a9..6ef0cb2 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -50,7 +50,7 @@
<input type="number" v-model="hform.HSourceBillQty" />
</view>
</view>
- <view class="form-item">
+ <view class="form-item" v-show="false">
<view class="left">浠诲姟鍗曞彿</view>
<view class="right disabled">
<input type="text" :value="hform.HICMOBillNo" disabled />
@@ -60,7 +60,7 @@
:disabled="hasSourceBill" size="20" @click="showSelectorModule(hform, 5)"></uni-icons>
</view>
</view>
- <view class="form-item">
+ <view class="form-item" v-show="false">
<view class="left">娴佽浆鍗″彿</view>
<view class="right disabled">
<input type="text" :value="hform.HProcExchBillNo" disabled />
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 59b9ab9..3c6551a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -49,7 +49,15 @@
menuListName: 'index',
canEdit: false,
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- itemData: [{
+ itemData: [
+ {
+ "img": "../../static/icon/icon18.png",
+ "text": "ERP鍙婃椂搴撳瓨鏌ヨ",
+ "url": "/pages/jishikucunchaxun/table",
+ "id": 32,
+ "hidden": false
+ },
+ {
img: '../../static/icon/icon8.png',
text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
url: '/pages/tiaomaguanli/table?HBillType=1103',
@@ -253,13 +261,7 @@
id: 27,
hidden: false,
},
- {
- img: '../../static/icon/icon16.png',
- text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
- url: '/pages/fenbushidiaorudan/table',
- id: 28,
- hidden: false,
- },
+
{
img: '../../static/icon/icon16.png',
text: '鍒嗘寮忚皟鍑哄崟',
@@ -315,12 +317,27 @@
hidden: false,
},
{
- img: '../../static/icon/icon8.png',
- text: '涓婃ā鍗�',
- url: `/pages/MJGL/shangmudan/MouldUpperBill`,
- id: 37,
- hidden: false,
+ "img": "../../static/icon/icon21.png",
+ "text": "鏍囩鎵撳嵃",
+ "url": "/pages/labelPrinter/index",
+ "id": 24,
+ "hidden": false
},
+ {
+ "img": "../../static/icon/icon21.png",
+ "text": "鏉＄爜鎷嗙爜",
+ "url": "/pages/tiaomachaima/tiaomachaima",
+ "id": 25,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon21.png",
+ "text": "鏉＄爜鎷嗙爜2",
+ "url": "/pages/tiaomachaima/tiaomachaima2",
+ "id": 26,
+ "hidden": false
+ },
+
],
// itemData: [{
// img: '../../static/icon/icon1.png',
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index e368513..34012ab 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -42,84 +42,40 @@
url: '/pages/gongxuIn/Cj_StationInBill',
id: 1,
hidden: false,
- }, {
- img: '../../static/icon/icon9.png',
- text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuIn/Cj_StationInBillList',
- id: 2,
- hidden: false,
- }, {
+ },
+
+ {
img: '../../static/icon/icon10.png',
text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/gongxuOut/Cj_StationOutBill',
id: 3,
hidden: false,
- }, {
- img: '../../static/icon/icon10.png',
- text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuOut/Cj_StationOutBillList',
- id: 4,
- hidden: false,
- }, {
+ },
+
+ {
img: '../../static/icon/icon11.png',
text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/weiwaigxIn/Cj_StationEntrustInBill',
id: 5,
hidden: false,
- }, {
- img: '../../static/icon/icon11.png',
- text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
- id: 6,
- hidden: false,
- }, {
+ },
+
+ {
img: '../../static/icon/icon12.png',
text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/weiwaigxOut/Cj_StationEntrustOutBill',
id: 7,
hidden: false,
- }, {
- img: '../../static/icon/icon12.png',
- text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
- id: 8,
- hidden: false,
- }
- , {
- img: '../../static/icon/icon1.png',
- text: '璁惧妗ｆ鏌ヨ',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
- id: 9,
- hidden: true,
- }, {
- img: '../../static/icon/icon8.png',
- text: '璁惧灞ュ巻鏌ヨ',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeilvli/EquipFileBillResume',
- id: 10,
- hidden: true,
- }, {
+ },
+ {
img: '../../static/icon/icon14.png',
text: '鎴戠殑鎶ュ伐骞冲彴',
tip: '鐐瑰嚮杩涘叆',
url: '/pages/baogong/IpadIndex',
id: 11,
- hidden: true,
- },
- {
- img: '../../static/icon/icon32.png',
- text: '璁惧杩愯鐘舵��',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
- id: 14,
hidden: true,
},
{
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 6c895d6..a1c53df 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -216,48 +216,164 @@
"id": 23,
"hidden": false
},
-
+ {
+ img: '../../static/icon/icon16.png',
+ text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
+ url: '/pages/fenbushidiaorudan/table',
+ id: 28,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon9.png',
+ text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/gongxuIn/Cj_StationInBillList',
+ id: 2,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon10.png',
+ text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/gongxuOut/Cj_StationOutBillList',
+ id: 4,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon11.png',
+ text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
+ id: 6,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon12.png',
+ text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
+ id: 8,
+ hidden: false,
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
+ "id": 51,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿璋冩嫧鍗曞垪琛�",
+ "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+ "id": 51,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
+ "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+ "id": 50,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "妯″叿鐐规璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
+ "id": 47,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
+ "id": 48,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿棰嗙敤鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+ "id": 49,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿缁翠慨璁板綍鍒楄〃",
+ "url": "/pages/weixiujilu/mouldRepairRecordBillList",
+ "id": 39,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿鏁呴殰鐧昏鍒楄〃",
+ "url": "/pages/qijvguzhangdengji/mouldMistake",
+ "id": 37,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "棣栦欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
+ "id": 41,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+ "id": 43,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+ "id": 45,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠屽垪琛�",
+ "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
+ "id": 54,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍏ㄦ妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
+ "id": 55,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "杞﹂棿鑷鍗曞垪琛�",
+ "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
+ "id": 55,
+ "hidden": false
+ },
// 鏍囩鏉＄爜鐩稿叧
- {
- "img": "../../static/icon/icon21.png",
- "text": "鏍囩鎵撳嵃",
- "url": "/pages/labelPrinter/index",
- "id": 24,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon21.png",
- "text": "鏉＄爜鎷嗙爜",
- "url": "/pages/tiaomachaima/tiaomachaima",
- "id": 25,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon21.png",
- "text": "鏉＄爜鎷嗙爜2",
- "url": "/pages/tiaomachaima/tiaomachaima2",
- "id": 26,
- "hidden": false
- },
+
// 璁惧鐩稿叧
{
"img": "../../static/icon/icon3.png",
- "text": "璁惧淇濆吇璁板綍鍗�",
+ "text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
"url": "/pages/baoyangjilu/Sb_EquipMaintainRuleList",
"id": 27,
"hidden": false
},
{
"img": "../../static/icon/icon6.png",
- "text": "璁惧鏁呴殰鐧昏琛�",
+ "text": "璁惧鏁呴殰鐧昏琛ㄥ垪琛�",
"url": "/pages/guzhangdengji/EqpConkBookBillList",
"id": 28,
"hidden": false
},
{
"img": "../../static/icon/icon7.png",
- "text": "璁惧缁翠慨璁板綍鍗�",
+ "text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
"url": "/pages/shebeiweixiu/SbEqpMaintenanceBillList",
"id": 29,
"hidden": false
@@ -266,39 +382,33 @@
// 寮傚父鐩稿叧
{
"img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉鍗�",
+ "text": "寮傚父鍙嶉鍗曞垪琛�",
"url": "/pages/yichang/MESExecptFeedBackBillList",
"id": 30,
"hidden": false
},
{
"img": "../../static/icon/icon16.png",
- "text": "寮傚父鍙嶉澶勭悊鍗�",
+ "text": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
"url": "/pages/yichang/MESExecptFeedBackBillList",
"id": 31,
"hidden": false
},
// 搴撳瓨鏌ヨ鐩稿叧
- {
- "img": "../../static/icon/icon18.png",
- "text": "ERP鍙婃椂搴撳瓨鏌ヨ",
- "url": "/pages/jishikucunchaxun/table",
- "id": 32,
- "hidden": false
- },
+
// 鍙栨牱杩樻牱鐩稿叧
{
"img": "../../static/icon/icon8.png",
- "text": "鍙栨牱鍗�",
+ "text": "鍙栨牱鍗曞垪琛�",
"url": "/pages/quyangdan/TakeSampleCheckBillList",
"id": 33,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
- "text": "杩樻牱鍗�",
+ "text": "杩樻牱鍗曞垪琛�",
"url": "/pages/huanyangdan/BackSampleCheckBillList",
"id": 34,
"hidden": false
@@ -328,6 +438,13 @@
"hidden": false
},
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
+ "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+ "id": 57,
+ "hidden": false
+ }
]
}
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index cb5e5ff..95f9bfd 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -69,23 +69,9 @@
},
{
"img": "../../static/icon/icon13.png",
- "text": "妯″叿鏁呴殰鐧昏鍒楄〃",
- "url": "/pages/qijvguzhangdengji/mouldMistake",
- "id": 37,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
"text": "妯″叿鏁呴殰鐧昏鍗�",
"url": "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1",
"id": 38,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "妯″叿缁翠慨璁板綍鍒楄〃",
- "url": "/pages/weixiujilu/mouldRepairRecordBillList",
- "id": 39,
"hidden": false
},
{
@@ -96,34 +82,8 @@
"hidden": false
},
- {
- "img": "../../static/icon/icon5.png",
- "text": "妯″叿鐐规璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
- "id": 47,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon5.png",
- "text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
- "id": 48,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿棰嗙敤鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
- "id": 49,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
- "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
- "id": 50,
- "hidden": false
- },
+
+
{
"img": "../../static/icon/icon8.png",
"text": "妯″叿棰嗙敤鍑哄簱鍗�",
@@ -140,19 +100,43 @@
},
{
"img": "../../static/icon/icon8.png",
- "text": "妯″叿璋冩嫧鍗曞垪琛�",
- "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
- "id": 51,
+ "text": "妯″叿鎶ュ簾鍑哄簱鍗�",
+ "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
+ "id": 50,
"hidden": false
},
{
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
- "id": 51,
- "hidden": false
+ img: '../../static/icon/icon8.png',
+ text: '涓婃ā鍗�',
+ url: `/pages/MJGL/shangmudan/MouldUpperBill`,
+ id: 37,
+ hidden: false,
},
{
+ img: '../../static/icon/icon1.png',
+ text: '璁惧妗ｆ鏌ヨ',
+ tip: '鏌ョ湅璇︽儏',
+ url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
+ id: 9,
+ hidden: true,
+ },
+ {
+ img: '../../static/icon/icon8.png',
+ text: '璁惧灞ュ巻鏌ヨ',
+ tip: '鏌ョ湅璇︽儏',
+ url: '/pages/shebeilvli/EquipFileBillResume',
+ id: 10,
+ hidden: true,
+ },
+ {
+ img: '../../static/icon/icon32.png',
+ text: '璁惧杩愯鐘舵��',
+ tip: '鏌ョ湅璇︽儏',
+ url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
+ id: 14,
+ hidden: true,
+ },
+ {
"img": "../../static/icon/icon8.png",
"text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
"url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 198bc50..c74e390 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -44,13 +44,7 @@
canEdit: false,
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
itemData: [
- {
- "img": "../../static/icon/icon13.png",
- "text": "棣栦欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
- "id": 41,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon13.png",
"text": "棣栦欢妫�楠屽崟",
@@ -58,13 +52,7 @@
"id": 42,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
- "id": 43,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "宸℃妫�楠屽崟",
@@ -72,13 +60,7 @@
"id": 44,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
- "id": 45,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "鏈欢妫�楠屽崟",
@@ -93,13 +75,7 @@
"id": 53,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠屽垪琛�",
- "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
- "id": 54,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "鐢熶骇鍏ュ簱妫�楠屽崟",
@@ -128,13 +104,7 @@
"id": 55,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍏ㄦ妫�楠屽崟鏌ヨ",
- "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
- "id": 55,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "杞﹂棿鑷鍗�",
@@ -142,24 +112,11 @@
"id": 55,
"hidden": false
},
+
{
- "img": "../../static/icon/icon8.png",
- "text": "杞﹂棿鑷鍗曟煡璇�",
- "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
- "id": 55,
- "hidden": false
- },
-{
"img": "../../static/icon/icon8.png",
"text": "鍦ㄥ簱妫�楠屽崟",
"url": "/pages/ZLGL/zaikujianyandan/InStockCheckBill",
- "id": 57,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
- "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
"id": 57,
"hidden": false
}
diff --git a/static/tabBar/icon4-default.png b/static/tabBar/icon4-default.png
new file mode 100644
index 0000000..78836ae
--- /dev/null
+++ b/static/tabBar/icon4-default.png
Binary files differ
diff --git a/static/tabBar/icon4.png b/static/tabBar/icon4.png
new file mode 100644
index 0000000..7508e08
--- /dev/null
+++ b/static/tabBar/icon4.png
Binary files differ
--
Gitblit v1.9.1