From 3b59a3d1eac35d705c9b0195bce8a1af55abacf5 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 14 十一月 2025 10:07:46 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/qitaruku_v2/OtherInBillList.vue | 0
pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue | 0
pages/chaituosaoma-xiaowei/UnpackPallet.vue | 2
pages/shebeilvli/deviceStatueAnalysis.vue | 0
pages/qitachukujiaoyan/qitachukudanjiaoyan.vue | 6
pages/weiwailingliaojiaoyan/EntrustOutCheckBill.vue | 6
pages/weiwaigxIn/Cj_StationEntrustOutBill.vue | 6
pages/shengchanlingliao/PPickingCheckBillList.vue | 0
pages/MJGL/mujubaoyangjiludan/MouldMaintainBill.vue | 0
pages/index/tab1.vue | 46 +-
pages/caigouruku/POStockInBill.vue | 8
pages/qitaruku/qitarukudan.vue | 0
pages/weixiujilu/mouldRepairRecordBill.vue | 4
pages/baoyangjilu/Sb_EquipMaintainRuleList_son.vue | 0
pages/shebeiweixiu/SbEqpMaintenanceBillList.vue | 4
pages/baogong/ProductReportStepBillList.vue | 0
pages/index/index01.vue | 12
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 16
pages/shebeilvli/EquipFileBillResume_son.vue | 0
pages/shebeidangan/Gy_EquipFileMainBillList.vue | 4
pages/huanyangdan/BackSampleCheckBillList.vue | 0
pages/gongxuIn/Cj_StationInBillList.vue | 4
pages/shengchandiaobo/MoveStockBill.vue | 8
pages/guzhangdengji/EqpConkBookBill.vue | 0
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 6
pages/zutuosaoma/PackUnionBill.vue | 69 +-
pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue | 4
pages/tiaomaguanli/table.vue | 1
pages/guzhangdengji/EqpConkBookBillList.vue | 4
pages/MJGL/mujulingliaotuikudan/table.vue | 6
pages/shoujishouming/form.vue | 2
pages/baogong/DayPlanBillList.vue | 0
pages/MJGL/xiamodan/MouldLowerBill.vue | 2
pages/shouliaotongzhi/table.vue | 4
pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList.vue | 2
pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son.vue | 0
pages/shengchanbuliao/MateReplenishOutBill.vue | 6
pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue | 4
pages/shoujishouming/table.vue | 2
pages/baoyangjihua/Sb_EquipMaintainPlanList.vue | 6
pages/shebeiguanli/deviceManage.vue | 0
pages/zutuosaoma/PackUnionBillList.vue | 0
pages/MJGL/shangmudan/MouldUpperBillList.vue | 4
pages/qitachuku_v2/OtherOutBillList.vue | 0
pages/weixiujilu/mouldRepairRecordBillList.vue | 4
pages/gongxuIn/Cj_StationInBill.vue | 4
pages/fenbushidiaochudan/form_out.vue | 6
pages/index/index.vue | 370 ++++++++--------
pages/shebeidangan/Gy_EquipFileMainBill.vue | 0
pages/yichang/MESExecptFeedBackBillList.vue | 0
pages/shengchantuiliao/MateOutBackBill.vue | 6
pages/yichang/ErrMsgBackHandleBillList.vue | 0
pages/zhijiediaobo/MoveStockBillList.vue | 0
pages/weiwairuku/EntrustInBillList.vue | 0
pages/xiaoshouchukujiaoyan/SellOutCheckBill.vue | 6
pages/shengchanruku/ProductInCheckBillList.vue | 0
pages/chaituosaoma/UnPackUnionBill.vue | 84 ++-
pages/index/_index.vue | 24
pages/qitachuku_v2/OtherOutBill.vue | 8
pages/MJGL/xiamodan/MouldLowerBillList.vue | 4
pages/ZLGL/shoujianjianyan/firstCheckBillList.vue | 4
pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue | 0
pages/index/tab2.vue | 70 +-
pages/MJGL/shangmudan/MouldUpperBill.vue | 2
pages/zhuangxiang/form_mix.vue | 2
pages/gongxuOut/Cj_StationOutBillList.vue | 4
pages/qitachuku/qitachukudan.vue | 2
pages/shengchanruku/ProductInCheckBill.vue | 8
pages/gongxuOut/Cj_StationOutBill.vue | 12
pages/xiaoshoutuihuo/ICStockBillMain.vue | 8
pages/shebeiguanli/ticketList.vue | 0
pages/caigouruku/POStockInBillList.vue | 0
pages/index/mine01.vue | 12
pages/shengchanbuliao/MateReplenishOutBillList.vue | 0
pages.json | 261 +++++------
pages/xiaoshouchuku/SellOutBill.vue | 8
pages/qitaruku_v2/OtherInBill.vue | 6
pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue | 0
pages/MJGL/mujulingliaochukudan/MouldProdOutBillList.vue | 6
pages/baoyangjilu/Sb_EquipMaintainRuleEdit.vue | 0
pages/caigoutuiliao/POStockInBackBillList.vue | 0
pages/shengchantuiliao/MateOutBackBillList.vue | 0
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 4
pages/index/_tab1.vue | 24
pages/quyangdan/form.vue | 2
pages/zhijiediaobo/MoveStockBill.vue | 6
pages/shengchanlingliao/PPickingCheckBill.vue | 8
pages/yichang/MESExecptFeedBackBill.vue | 0
pages/qijvguzhangdengji/mouldMistakeBill.vue | 4
pages/xiaoshoutuihuo/ICStockBillMainList.vue | 0
pages/gongxuOutSendWork/gongxuOutSendWorkBill.vue | 0
pages/shengchandiaobo/MoveStockBillList.vue | 0
pages/weiwaigxOut/Cj_StationEntrustInBillList.vue | 4
pages/chaixiang/form.vue | 6
pages/huanyangdan/form.vue | 2
pages/weiwairuku/EntrustInBill.vue | 6
pages/quyangdan/TakeSampleCheckBillList.vue | 2
pages/caigourukujiaoyan/POStockInCheckBillList.vue | 0
pages/baogong/IpadIndex.vue | 4
pages/baoyangjihua/Sb_EquipMaintainPlanEdit.vue | 0
pages/caigoutuiliao/POStockInBackBill.vue | 8
pages/xiaoshouchuku/SellOutBillList.vue | 0
pages/baoyangjihua/Sb_EquipMaintainPlanList_son.vue | 0
pages/MJGL/mujulingliaotuikudan/form.vue | 4
pages/weiwaigxOut/Cj_StationEntrustInBill.vue | 6
pages/shebeilvli/EquipFileBillResume.vue | 2
pages/weiwailingliaojiaoyan/EntrustOutCheckBillList.vue | 0
pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son.vue | 0
pages/fenbushidiaorudan/form.vue | 4
pages/baoyangjilu/Sb_EquipMaintainRuleList.vue | 6
pages/MJGL/qijudiaobodan/table.vue | 2
pages/qijvguzhangdengji/mouldMistake.vue | 4
pages/shebeiguanli/deviceManageList.vue | 4
pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue | 2
pages/caigourukujiaoyan/POStockInCheckBill.vue | 6
pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue | 6
components/StationOutBillPopup/StationOutBillPopup.vue | 12
pages/MJGL/qijudiaobodan/form.vue | 4
pages/weiwaigxIn/Cj_StationEntrustOutBillList.vue | 4
119 files changed, 672 insertions(+), 643 deletions(-)
diff --git a/components/StationOutBillPopup/StationOutBillPopup.vue b/components/StationOutBillPopup/StationOutBillPopup.vue
index b8a561b..8e8a697 100644
--- a/components/StationOutBillPopup/StationOutBillPopup.vue
+++ b/components/StationOutBillPopup/StationOutBillPopup.vue
@@ -1616,7 +1616,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
})
},
submit() {
@@ -1692,7 +1692,7 @@
})
setTimeout(() => {
uni.redirectTo({
- url: '/pages/gongxuOut/table'
+ url: '/pages/gongxuOut/Cj_StationOutBillList'
})
}, 1000)
} else {
@@ -1708,7 +1708,7 @@
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// this.getNextProc()
// // uni.redirectTo({
- // // url: '/pages/gongxuOut/form?OperationType=1'
+ // // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
// // })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1716,7 +1716,7 @@
// // uni.navigateBack();
// // }, 50)
// uni.redirectTo({
- // url: '/pages/gongxuOut/form?OperationType=1'
+ // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
// })
// }
// }
@@ -1878,13 +1878,13 @@
icon: 'none'
})
uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
})
}else{
this.hform.HProcNo=nextProcess["宸ュ簭鍙�"];
const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1&HBarCode='+HNextBarCode
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode='+HNextBarCode
})
}
}else{
diff --git a/pages.json b/pages.json
index ecf7bc0..f7b4029 100644
--- a/pages.json
+++ b/pages.json
@@ -36,122 +36,122 @@
}
},
{
- "path": "pages/shebeilvli/form",
+ "path": "pages/shebeilvli/deviceStatueAnalysis",
"style": {
"navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
}
},
{
- "path": "pages/shebeilvli/table",
+ "path": "pages/shebeilvli/EquipFileBillResume",
"style": {
"navigationBarTitleText": "璁惧灞ュ巻",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shebeilvli/table_son",
+ "path": "pages/shebeilvli/EquipFileBillResume_son",
"style": {
"navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
}
},
{
- "path": "pages/baoyangjihua/form",
+ "path": "pages/baoyangjihua/Sb_EquipMaintainPlanEdit",
"style": {
"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
}
},
{
- "path": "pages/baoyangjihua/table",
+ "path": "pages/baoyangjihua/Sb_EquipMaintainPlanList",
"style": {
"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/baoyangjihua/table_son",
+ "path": "pages/baoyangjihua/Sb_EquipMaintainPlanList_son",
"style": {
"navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
}
},
{
- "path": "pages/baoyangjilu/form",
+ "path": "pages/baoyangjilu/Sb_EquipMaintainRuleEdit",
"style": {
"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
}
},
{
- "path": "pages/baoyangjilu/table",
+ "path": "pages/baoyangjilu/Sb_EquipMaintainRuleList",
"style": {
"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/baoyangjilu/table_son",
+ "path": "pages/baoyangjilu/Sb_EquipMaintainRuleList_son",
"style": {
"navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
}
},
{
- "path": "pages/guzhangdengji/form",
+ "path": "pages/guzhangdengji/EqpConkBookBill",
"style": {
"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
}
},
{
- "path": "pages/guzhangdengji/table",
+ "path": "pages/guzhangdengji/EqpConkBookBillList",
"style": {
"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shebeidangan/form",
+ "path": "pages/shebeidangan/Gy_EquipFileMainBill",
"style": {
"navigationBarTitleText": "璁惧妗ｆ"
}
},
{
- "path": "pages/shebeidangan/table",
+ "path": "pages/shebeidangan/Gy_EquipFileMainBillList",
"style": {
"navigationBarTitleText": "璁惧妗ｆ",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shebeiweixiu/form",
+ "path": "pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList",
"style": {
"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
}
},
{
- "path": "pages/shebeiweixiu/table",
+ "path": "pages/shebeiweixiu/SbEqpMaintenanceBillList",
"style": {
"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/weiwaigxIn/form",
+ "path": "pages/weiwaigxOut/Cj_StationEntrustInBill",
"style": {
"navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�"
}
},
{
- "path": "pages/weiwaigxIn/table",
+ "path": "pages/weiwaigxOut/Cj_StationEntrustInBillList",
"style": {
"navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/weiwaigxOut/form",
+ "path": "pages/weiwaigxIn/Cj_StationEntrustOutBill",
"style": {
"navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�"
}
},
{
- "path": "pages/weiwaigxOut/table",
+ "path": "pages/weiwaigxIn/Cj_StationEntrustOutBillList",
"style": {
"navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�",
"enablePullDownRefresh": true
@@ -164,32 +164,32 @@
"enablePullDownRefresh": true
}
}, {
- "path": "pages/gongxuIn/form",
+ "path": "pages/gongxuIn/Cj_StationInBill",
"style": {
"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
}
},
{
- "path": "pages/gongxuIn/table",
+ "path": "pages/gongxuIn/Cj_StationInBillList",
"style": {
"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
"enablePullDownRefresh": true
}
}, {
- "path": "pages/gongxuOut/form",
+ "path": "pages/gongxuOut/Cj_StationOutBill",
"style": {
"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
}
},
{
- "path": "pages/gongxuOut/table",
+ "path": "pages/gongxuOut/Cj_StationOutBillList",
"style": {
"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/gongxuOutSendWork/table",
+ "path": "pages/gongxuOutSendWork/gongxuOutSendWorkBill",
"style": {
"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
"enablePullDownRefresh": true
@@ -203,42 +203,42 @@
}
},
{
- "path": "pages/shebeiguanli/form",
+ "path": "pages/shebeiguanli/deviceManage",
"style": {
"navigationBarTitleText": "璁惧绠＄悊",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shebeiguanli/table",
+ "path": "pages/shebeiguanli/deviceManageList",
"style": {
"navigationBarTitleText": "璁惧绠＄悊",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shebeiguanli/list",
+ "path": "pages/shebeiguanli/ticketList",
"style": {
"navigationBarTitleText": "宸ュ崟鍒楄〃",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/baogong/form",
+ "path": "pages/baogong/ProductReportStepBillList",
"style": {
"navigationBarTitleText": "浜ч噺姹囨姤鍗�",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/baogong/table",
+ "path": "pages/baogong/IpadIndex",
"style": {
"navigationBarTitleText": "鎶ュ伐骞冲彴",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/baogong/list",
+ "path": "pages/baogong/DayPlanBillList",
"style": {
"navigationBarTitleText": "宸ュ崟鍒楄〃",
"enablePullDownRefresh": true
@@ -252,77 +252,77 @@
}
},
{
- "path": "pages/yichang/table",
+ "path": "pages/yichang/MESExecptFeedBackBillList",
"style": {
"navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/yichang/form",
+ "path": "pages/yichang/MESExecptFeedBackBill",
"style": {
"navigationBarTitleText": "寮傚父鍙嶉鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/yichang/list",
+ "path": "pages/yichang/ErrMsgBackHandleBillList",
"style": {
"navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/caigouruku/table",
+ "path": "pages/caigouruku/POStockInBillList",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/caigouruku/form",
+ "path": "pages/caigouruku/POStockInBill",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/caigoutuiliao/table",
+ "path": "pages/caigoutuiliao/POStockInBackBillList",
"style": {
"navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/caigoutuiliao/form",
+ "path": "pages/caigoutuiliao/POStockInBackBill",
"style": {
"navigationBarTitleText": "閲囪喘閫�鏂欏崟",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/xiaoshouchuku/table",
+ "path": "pages/xiaoshouchuku/SellOutBillList",
"style": {
"navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/xiaoshouchuku/form",
+ "path": "pages/xiaoshouchuku/SellOutBill",
"style": {
"navigationBarTitleText": "閿�鍞嚭搴撳崟",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/xiaoshoutuihuo/table",
+ "path": "pages/xiaoshoutuihuo/ICStockBillMainList",
"style": {
"navigationBarTitleText": "閿�鍞��璐у垪琛�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/xiaoshoutuihuo/form",
+ "path": "pages/xiaoshoutuihuo/ICStockBillMain",
"style": {
"navigationBarTitleText": "閿�鍞��璐у崟",
"enablePullDownRefresh": false
@@ -343,42 +343,42 @@
}
},
{
- "path": "pages/shengchanlingliao/table",
+ "path": "pages/shengchanlingliao/PPickingCheckBillList",
"style": {
"navigationBarTitleText": "鐢熶骇棰嗘枡鏍￠獙鍒楄〃",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shengchanlingliao/form",
+ "path": "pages/shengchanlingliao/PPickingCheckBill",
"style": {
"navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/shengchanruku/table",
+ "path": "pages/shengchanruku/ProductInCheckBillList",
"style": {
"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍￠獙鍒楄〃",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shengchanruku/form",
+ "path": "pages/shengchanruku/ProductInCheckBill",
"style": {
"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/shengchandiaobo/table",
+ "path": "pages/shengchandiaobo/MoveStockBillList",
"style": {
"navigationBarTitleText": "鐢熶骇璋冩嫧鏍￠獙鍒楄〃",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shengchandiaobo/form",
+ "path": "pages/shengchandiaobo/MoveStockBill",
"style": {
"navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
"enablePullDownRefresh": false
@@ -441,53 +441,53 @@
}
},
{
- "path": "pages/caigouruku/table",
+ "path": "pages/caigouruku/POStockInBillList",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/caigouruku/form",
+ "path": "pages/caigouruku/POStockInBill",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
}
},
{
- "path": "pages/caigoutuiliao/table",
+ "path": "pages/caigoutuiliao/POStockInBackBillList",
"style": {
"navigationBarTitleText": "閲囪喘閫�鏂�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/caigoutuiliao/form",
+ "path": "pages/caigoutuiliao/POStockInBackBill",
"style": {
"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
}
},
{
- "path": "pages/xiaoshouchuku/table",
+ "path": "pages/xiaoshouchuku/SellOutBillList",
"style": {
"navigationBarTitleText": "閿�鍞嚭搴�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/xiaoshouchuku/form",
+ "path": "pages/xiaoshouchuku/SellOutBill",
"style": {
"navigationBarTitleText": "閿�鍞嚭搴撳崟"
}
},
{
- "path": "pages/xiaoshoutuihuo/table",
+ "path": "pages/xiaoshoutuihuo/ICStockBillMainList",
"style": {
"navigationBarTitleText": "閿�鍞��璐�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/xiaoshoutuihuo/form",
+ "path": "pages/xiaoshoutuihuo/ICStockBillMain",
"style": {
"navigationBarTitleText": "閿�鍞��璐у崟"
}
@@ -500,7 +500,7 @@
}
},
{
- "path": "pages/qitachuku/form",
+ "path": "pages/qitachuku/qitachukudan",
"style": {
"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
}
@@ -513,7 +513,7 @@
}
},
{
- "path": "pages/qitaruku/form",
+ "path": "pages/qitaruku/qitarukudan",
"style": {
"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
}
@@ -537,33 +537,33 @@
}
},
{
- "path": "pages/MJGL/shangmudan/table",
+ "path": "pages/MJGL/shangmudan/MouldUpperBillList",
"style": {
"navigationBarTitleText": "涓婃ā鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/MJGL/shangmudan/form",
+ "path": "pages/MJGL/shangmudan/MouldUpperBill",
"style": {
"navigationBarTitleText": "涓婃ā鍗�"
}
},
{
- "path": "pages/MJGL/xiamodan/table",
+ "path": "pages/MJGL/xiamodan/MouldLowerBillList",
"style": {
"navigationBarTitleText": "涓嬫ā鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/MJGL/xiamodan/form",
+ "path": "pages/MJGL/xiamodan/MouldLowerBill",
"style": {
"navigationBarTitleText": "涓嬫ā鍗�"
}
},
{
- "path": "pages/MJGL/mujudianjianjiludan/table",
+ "path": "pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
"style": {
"navigationBarTitleText": "妯″叿鐐规璁板綍鍗�",
"enablePullDownRefresh": true
@@ -583,29 +583,29 @@
}
},
{
- "path": "pages/MJGL/mujudianjianjiludan/table_son",
+ "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son",
"style": {
"navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
}
},
{
- "path": "pages/MJGL/mujubaoyangjiludan/table",
+ "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
"style": {
"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�",
"enablePullDownRefresh": true
}
}, {
- "path": "pages/shengchanbuliaojiaoyan/form",
+ "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
}
}, {
- "path": "pages/MJGL/mujubaoyangjiludan/form",
+ "path": "pages/MJGL/mujubaoyangjiludan/MouldMaintainBill",
"style": {
"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
}
}, {
- "path": "pages/MJGL/mujubaoyangjiludan/table_son",
+ "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son",
"style": {
"navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
}
@@ -617,7 +617,7 @@
}
},
{
- "path": "pages/qitachukujiaoyan/detail",
+ "path": "pages/qitachukujiaoyan/qitachukudanjiaoyan",
"style": {
"navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
}
@@ -630,46 +630,46 @@
}
},
{
- "path": "pages/shengchanbuliaojiaoyan/form",
+ "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
}
},
{
- "path": "pages/xiaoshouchukujiaoyan/table",
+ "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
"style": {
"navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/xiaoshouchukujiaoyan/form",
+ "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
"style": {
"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍￠獙"
}
},
{
- "path": "pages/weiwailingliaojiaoyan/table",
+ "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
"style": {
"navigationBarTitleText": "濮斿棰嗘枡鏍￠獙",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/weiwailingliaojiaoyan/form",
+ "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
"style": {
"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
}
},
{
- "path": "pages/caigourukujiaoyan/table",
+ "path": "pages/caigourukujiaoyan/POStockInCheckBillList",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱鏍￠獙",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/caigourukujiaoyan/form",
+ "path": "pages/caigourukujiaoyan/POStockInCheckBill",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
"enablePullDownRefresh": false
@@ -741,33 +741,33 @@
}
},
{
- "path": "pages/xiaoshouchukujiaoyan/form",
+ "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
"style": {
"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍￠獙"
}
},
{
- "path": "pages/weiwailingliaojiaoyan/table",
+ "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
"style": {
"navigationBarTitleText": "濮斿棰嗘枡鏍￠獙",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/weiwailingliaojiaoyan/form",
+ "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
"style": {
"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
}
},
{
- "path": "pages/caigourukujiaoyan/table",
+ "path": "pages/caigourukujiaoyan/POStockInCheckBillList",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱鏍￠獙",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/caigourukujiaoyan/form",
+ "path": "pages/caigourukujiaoyan/POStockInCheckBill",
"style": {
"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
"enablePullDownRefresh": false
@@ -839,80 +839,73 @@
}
},
{
- "path": "pages/shengchanbuliao/table",
+ "path": "pages/shengchanbuliao/MateReplenishOutBillList",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shengchanbuliao/form",
+ "path": "pages/shengchanbuliao/MateReplenishOutBill",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
}
},
{
- "path": "pages/qitaruku_v2/table",
+ "path": "pages/qitaruku_v2/OtherInBillList",
"style": {
"navigationBarTitleText": "鍏朵粬鍏ュ簱",
"enablePullDownRefresh": true
}
}, {
- "path": "pages/qitaruku_v2/form",
+ "path": "pages/qitaruku_v2/OtherInBill",
"style": {
"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
}
},
{
- "path": "pages/qitachuku_v2/table",
+ "path": "pages/qitachuku_v2/OtherOutBillList",
"style": {
"navigationBarTitleText": "鍏朵粬鍑哄簱",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/qitachuku_v2/form",
+ "path": "pages/qitachuku_v2/OtherOutBill",
"style": {
"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
}
},
{
- "path": "pages/shengchanbuliao/table",
+ "path": "pages/shengchanbuliao/MateReplenishOutBill",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/shengchanbuliao/form",
+ "path": "pages/shengchanbuliao/MateReplenishOutBill",
"style": {
"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
}
},
{
- "path": "pages/qitaruku_v2/table",
+ "path": "pages/qitaruku_v2/OtherInBillList",
"style": {
"navigationBarTitleText": "鍏朵粬鍏ュ簱",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/qitaruku_v2/form",
+ "path": "pages/qitaruku_v2/OtherInBill",
"style": {
"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
}
},
{
- "path": "pages/qitachuku_v2/table",
+ "path": "pages/tiaomaguanli/table_son",
"style": {
- "navigationBarTitleText": "鍏朵粬鍑哄簱",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/qitachuku_v2/form",
- "style": {
- "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+ "navigationBarTitleText": "鏉＄爜鐢熸垚"
}
},
{
@@ -921,27 +914,27 @@
"navigationBarTitleText": "鏉＄爜绠＄悊"
}
}, {
- "path": "pages/weiwairuku/table",
+ "path": "pages/weiwairuku/EntrustInBillList",
"style": {
"navigationBarTitleText": "濮斿鍏ュ簱",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/weiwairuku/form",
+ "path": "pages/weiwairuku/EntrustInBill",
"style": {
"navigationBarTitleText": "濮斿鍏ュ簱鍗�"
}
},
{
- "path": "pages/zhijiediaobo/table",
+ "path": "pages/zhijiediaobo/MoveStockBillList",
"style": {
"navigationBarTitleText": "鐩存帴璋冩嫧",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/zhijiediaobo/form",
+ "path": "pages/zhijiediaobo/MoveStockBill",
"style": {
"navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
}
@@ -958,36 +951,23 @@
"navigationBarTitleText": "鏉＄爜绠＄悊"
}
}, {
- "path": "pages/weiwairuku/table",
+ "path": "pages/weiwairuku/EntrustInBillList",
"style": {
"navigationBarTitleText": "濮斿鍏ュ簱",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/quyangdan/table",
- "style": {
- "navigationBarTitleText": "鍙栨牱鍗�",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/quyangdan/form",
+ "path": "pages/quyangdan/TakeSampleCheckBillList",
"style": {
"navigationBarTitleText": "鍙栨牱鍗�"
}
},
{
- "path": "pages/huanyangdan/table",
+ "path": "pages/huanyangdan/BackSampleCheckBillList",
"style": {
"navigationBarTitleText": "杩樻牱鍗�",
"enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/huanyangdan/form",
- "style": {
- "navigationBarTitleText": "杩樻牱鍗�"
}
},
{
@@ -1003,43 +983,43 @@
}
},
{
- "path": "pages/zutuosaoma/form",
+ "path": "pages/zutuosaoma/PackUnionBill",
"style": {
"navigationBarTitleText": "缁勬墭鎵爜"
}
},
{
- "path": "pages/zutuosaoma/table",
+ "path": "pages/zutuosaoma/PackUnionBillList",
"style": {
"navigationBarTitleText": "缁勬墭鎵爜缂撳瓨"
}
},
{
- "path": "pages/chaituosaoma/form",
+ "path": "pages/chaituosaoma/UnPackUnionBill",
"style": {
"navigationBarTitleText": "鎷嗘墭鎵爜"
}
},
{
- "path": "pages/shengchantuiliao/table",
+ "path": "pages/shengchantuiliao/MateOutBackBillList",
"style": {
"navigationBarTitleText": "鐢熶骇閫�鏂�"
}
},
{
- "path": "pages/shengchantuiliao/form",
+ "path": "pages/shengchantuiliao/MateOutBackBill",
"style": {
"navigationBarTitleText": "鐢熶骇閫�鏂欏崟"
}
},
{
- "path": "pages/ZLGL/shoujianjianyan/table",
+ "path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
"style": {
"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
}
},
{
- "path": "pages/ZLGL/shoujianjianyan/form",
+ "path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
"style": {
"navigationBarTitleText": "棣栦欢妫�楠屽崟"
}
@@ -1059,14 +1039,14 @@
}
},
{
- "path": "pages/MJGL/mujulingliaochukudan/form",
+ "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
"style": {
"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/MJGL/mujulingliaochukudan/table",
+ "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
"style": {
"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
"enablePullDownRefresh": true
@@ -1115,13 +1095,13 @@
}
},
{
- "path": "pages/ZLGL/shoujianjianyan/table",
+ "path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
"style": {
"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
}
},
{
- "path": "pages/ZLGL/shoujianjianyan/form",
+ "path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
"style": {
"navigationBarTitleText": "棣栦欢妫�楠屽崟"
}
@@ -1141,14 +1121,14 @@
}
},
{
- "path": "pages/MJGL/mujulingliaochukudan/form",
+ "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
"style": {
"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/MJGL/mujulingliaochukudan/table",
+ "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
"style": {
"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
"enablePullDownRefresh": true
@@ -1197,27 +1177,27 @@
}
},
{
- "path": "pages/weixiujilu/table",
+ "path": "pages/weixiujilu/mouldRepairRecordBillList",
"style": {
"navigationBarTitleText": "妯″叿缁翠慨璁板綍",
"enablePullDownRefresh": true
}
},
{
- "path": "pages/weixiujilu/form",
+ "path": "pages/weixiujilu/mouldRepairRecordBill",
"style": {
"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
}
},
{
- "path": "pages/qijvguzhangdengji/table",
+ "path": "pages/qijvguzhangdengji/mouldMistake",
"style": {
"navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
}
},
{
- "path": "pages/qijvguzhangdengji/form",
+ "path": "pages/qijvguzhangdengji/mouldMistakeBill",
"style": {
"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
}
@@ -1247,25 +1227,25 @@
}
},
{
- "path": "pages/ZLGL/xunjianjianyan/table",
+ "path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
"style": {
"navigationBarTitleText": "宸℃鍗曠紦瀛�"
}
},
{
- "path": "pages/ZLGL/xunjianjianyan/form",
+ "path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBill",
"style": {
"navigationBarTitleText": "宸℃鍗�"
}
},
{
- "path": "pages/ZLGL/mojianjianyan/table",
+ "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
"style": {
"navigationBarTitleText": "鏈欢妫�楠屽崟缁存姢"
}
},
{
- "path": "pages/ZLGL/mojianjianyan/form",
+ "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBill",
"style": {
"navigationBarTitleText": "鏈欢妫�楠屽崟"
}
@@ -1282,6 +1262,7 @@
"navigationBarTitleText": "涓夌爜鍚堜竴"
}
}
+
],
"tabBar": {
"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
diff --git a/pages/MJGL/mujubaoyangjiludan/form.vue b/pages/MJGL/mujubaoyangjiludan/MouldMaintainBill.vue
similarity index 100%
rename from pages/MJGL/mujubaoyangjiludan/form.vue
rename to pages/MJGL/mujubaoyangjiludan/MouldMaintainBill.vue
diff --git a/pages/MJGL/mujubaoyangjiludan/table.vue b/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
similarity index 98%
rename from pages/MJGL/mujubaoyangjiludan/table.vue
rename to pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
index 0223ca7..19b1b9a 100644
--- a/pages/MJGL/mujubaoyangjiludan/table.vue
+++ b/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
@@ -377,7 +377,7 @@
//瀛愯〃鏌ョ湅
toSon(item) {
uni.navigateTo({
- url: '/pages/MJGL/mujubaoyangjiludan/table_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
+ url: '/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
.浜у搧妯″叿 + '&浜у搧妯″叿浠ｇ爜=' + item.浜у搧妯″叿浠ｇ爜,
});
}
diff --git a/pages/MJGL/mujubaoyangjiludan/table_son.vue b/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son.vue
similarity index 100%
rename from pages/MJGL/mujubaoyangjiludan/table_son.vue
rename to pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son.vue
diff --git a/pages/MJGL/mujudianjianjiludan/table.vue b/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList.vue
similarity index 98%
rename from pages/MJGL/mujudianjianjiludan/table.vue
rename to pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList.vue
index fd275e7..ab17144 100644
--- a/pages/MJGL/mujudianjianjiludan/table.vue
+++ b/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList.vue
@@ -377,7 +377,7 @@
//瀛愯〃鏌ョ湅
toSon(item) {
uni.navigateTo({
- url: '/pages/MJGL/mujudianjianjiludan/table_son?HInterID=' + item.hmainid + '&浜у搧妯″叿浠ｇ爜=' + item
+ url: '/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿浠ｇ爜=' + item
.浜у搧妯″叿浠ｇ爜 + '&浜у搧妯″叿=' + item.浜у搧妯″叿,
});
}
diff --git a/pages/MJGL/mujudianjianjiludan/table_son.vue b/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son.vue
similarity index 100%
rename from pages/MJGL/mujudianjianjiludan/table_son.vue
rename to pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son.vue
diff --git a/pages/MJGL/mujulingliaochukudan/form.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
similarity index 99%
rename from pages/MJGL/mujulingliaochukudan/form.vue
rename to pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index a73f09e..c349a5c 100644
--- a/pages/MJGL/mujulingliaochukudan/form.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -621,7 +621,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/MJGL/mujulingliaochukudan/table'
+ url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -783,7 +783,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigouruku/form?OperationType=1'
+ url: '/pages/caigouruku/POStockInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/MJGL/mujulingliaochukudan/table.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList.vue
similarity index 97%
rename from pages/MJGL/mujulingliaochukudan/table.vue
rename to pages/MJGL/mujulingliaochukudan/MouldProdOutBillList.vue
index 2d2de72..cf78ba1 100644
--- a/pages/MJGL/mujulingliaochukudan/table.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList.vue
@@ -283,7 +283,7 @@
},
creat(){
uni.navigateTo({
- url:'/pages/MJGL/mujulingliaochukudan/form'
+ url:'/pages/MJGL/mujulingliaochukudan/MouldProdOutBill'
})
},
clear(){
@@ -305,7 +305,7 @@
//TODO 瀛愯〃鍒楄〃
// toSon(item){
// uni.navigateTo({
- // url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid
+ // url:'/pages/baoyangjilu/Sb_EquipMaintainRuleList_son?HInterID=' + item.hmainid
// + '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
// + '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
// })
@@ -315,7 +315,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/MJGL/mujulingliaochukudan/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/MJGL/mujulingliaochukudan/MouldProdOutBill?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/MJGL/mujulingliaotuikudan/form.vue b/pages/MJGL/mujulingliaotuikudan/form.vue
index 37cc36d..0430926 100644
--- a/pages/MJGL/mujulingliaotuikudan/form.vue
+++ b/pages/MJGL/mujulingliaotuikudan/form.vue
@@ -616,7 +616,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/MJGL/mujulingliaochukudan/table'
+ url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -692,7 +692,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigouruku/form?OperationType=1'
+ url: '/pages/caigouruku/POStockInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/MJGL/mujulingliaotuikudan/table.vue b/pages/MJGL/mujulingliaotuikudan/table.vue
index 86e54a8..c806b09 100644
--- a/pages/MJGL/mujulingliaotuikudan/table.vue
+++ b/pages/MJGL/mujulingliaotuikudan/table.vue
@@ -282,7 +282,7 @@
},
creat(){
uni.navigateTo({
- url:'/pages/MJGL/mujulingliaochukudan/form'
+ url:'/pages/MJGL/mujulingliaochukudan/MouldProdOutBill'
})
},
clear(){
@@ -304,7 +304,7 @@
//TODO 瀛愯〃鍒楄〃
// toSon(item){
// uni.navigateTo({
- // url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid
+ // url:'/pages/baoyangjilu/Sb_EquipMaintainRuleList_son?HInterID=' + item.hmainid
// + '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
// + '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
// })
@@ -314,7 +314,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/baoyangjilu/form?hmainid=' + item.hmainid
+ url:'/pages/baoyangjilu/Sb_EquipMaintainRuleEdit?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/MJGL/qijudiaobodan/form.vue b/pages/MJGL/qijudiaobodan/form.vue
index f651461..8aeaff3 100644
--- a/pages/MJGL/qijudiaobodan/form.vue
+++ b/pages/MJGL/qijudiaobodan/form.vue
@@ -826,7 +826,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/MJGL/mujulingliaochukudan/table'
+ url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -989,7 +989,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigouruku/form?OperationType=1'
+ url: '/pages/caigouruku/POStockInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/MJGL/qijudiaobodan/table.vue b/pages/MJGL/qijudiaobodan/table.vue
index f38a578..f07c200 100644
--- a/pages/MJGL/qijudiaobodan/table.vue
+++ b/pages/MJGL/qijudiaobodan/table.vue
@@ -417,7 +417,7 @@
edit(item) {
console.log(item)
uni.navigateTo({
- url: '/pages/MJGL/shangmudan/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ url: '/pages/MJGL/shangmudan/MouldUpperBill?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/MJGL/shangmudan/form.vue b/pages/MJGL/shangmudan/MouldUpperBill.vue
similarity index 99%
rename from pages/MJGL/shangmudan/form.vue
rename to pages/MJGL/shangmudan/MouldUpperBill.vue
index 3e7610c..70a01c7 100644
--- a/pages/MJGL/shangmudan/form.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -625,7 +625,7 @@
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
- url:'/pages/weiwaigxIn/form?linterid=' + this.linterid + '&HBillNo=' + this.linterid
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?linterid=' + this.linterid + '&HBillNo=' + this.linterid
})
},1000)
}else{
diff --git a/pages/MJGL/shangmudan/table.vue b/pages/MJGL/shangmudan/MouldUpperBillList.vue
similarity index 98%
rename from pages/MJGL/shangmudan/table.vue
rename to pages/MJGL/shangmudan/MouldUpperBillList.vue
index d90c952..2dd6266 100644
--- a/pages/MJGL/shangmudan/table.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBillList.vue
@@ -368,7 +368,7 @@
//鏂板
creat() {
uni.navigateTo({
- url: '/pages/MJGL/shangmudan/form'
+ url: '/pages/MJGL/shangmudan/MouldUpperBill'
})
},
//閲嶇疆
@@ -396,7 +396,7 @@
edit(item) {
console.log(item)
uni.navigateTo({
- url: '/pages/MJGL/shangmudan/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ url: '/pages/MJGL/shangmudan/MouldUpperBill?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/MJGL/xiamodan/form.vue b/pages/MJGL/xiamodan/MouldLowerBill.vue
similarity index 99%
rename from pages/MJGL/xiamodan/form.vue
rename to pages/MJGL/xiamodan/MouldLowerBill.vue
index c1a89ff..c76c99e 100644
--- a/pages/MJGL/xiamodan/form.vue
+++ b/pages/MJGL/xiamodan/MouldLowerBill.vue
@@ -565,7 +565,7 @@
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
- url:'/pages/MJGL/xiamodan/form'
+ url:'/pages/MJGL/xiamodan/MouldLowerBill'
})
},1000)
}else{
diff --git a/pages/MJGL/xiamodan/table.vue b/pages/MJGL/xiamodan/MouldLowerBillList.vue
similarity index 98%
rename from pages/MJGL/xiamodan/table.vue
rename to pages/MJGL/xiamodan/MouldLowerBillList.vue
index 1d17ddb..c4b33ab 100644
--- a/pages/MJGL/xiamodan/table.vue
+++ b/pages/MJGL/xiamodan/MouldLowerBillList.vue
@@ -298,7 +298,7 @@
//鏂板
creat() {
uni.navigateTo({
- url: '/pages/MJGL/xiamodan/form'
+ url: '/pages/MJGL/xiamodan/MouldLowerBill'
})
},
//閲嶇疆
@@ -326,7 +326,7 @@
edit(item) {
console.log(item)
uni.navigateTo({
- url: '/pages/MJGL/xiamodan/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ url: '/pages/MJGL/xiamodan/MouldLowerBill?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/ZLGL/mojianjianyan/form.vue b/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
similarity index 100%
rename from pages/ZLGL/mojianjianyan/form.vue
rename to pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
diff --git a/pages/ZLGL/mojianjianyan/table.vue b/pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
similarity index 98%
rename from pages/ZLGL/mojianjianyan/table.vue
rename to pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
index 2f94f49..575107b 100644
--- a/pages/ZLGL/mojianjianyan/table.vue
+++ b/pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
@@ -193,7 +193,7 @@
},
cmdAdd() {
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/form?operationType=1"
+ url: "pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue?operationType=1"
})
},
async cmdSearch() {
@@ -344,7 +344,7 @@
edit(item) {
console.log("editItem:", item)
uni.navigateTo({
- url: `/pages/ZLGL/mojianjianyan/form?operationType=3&linterid=${item.hmainid}`
+ url: `/?operationType=3&linterid=${item.hmainid}`
})
}
},
diff --git a/pages/ZLGL/shoujianjianyan/form.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
similarity index 99%
rename from pages/ZLGL/shoujianjianyan/form.vue
rename to pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index 1a2ffdc..770713a 100644
--- a/pages/ZLGL/shoujianjianyan/form.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -2182,14 +2182,14 @@
flex-shrink: 0;
}
- .sampleDestory {
- border: 1px solid #acacac;
- border-radius: 10%;
- padding: 0 12rpx;
- }
- }
- }
- }
+ .sampleDestory {
+ border: 1px solid #acacac;
+ border-radius: 5rpx;
+ padding: 0 12rpx;
+ }
+ }
+ }
+ }
.icon-wrapper {
background-color: #3a78ff;
diff --git a/pages/ZLGL/shoujianjianyan/table.vue b/pages/ZLGL/shoujianjianyan/firstCheckBillList.vue
similarity index 98%
rename from pages/ZLGL/shoujianjianyan/table.vue
rename to pages/ZLGL/shoujianjianyan/firstCheckBillList.vue
index d77de6d..da76898 100644
--- a/pages/ZLGL/shoujianjianyan/table.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBillList.vue
@@ -193,7 +193,7 @@
},
cmdAdd() {
uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/form?operationType=1"
+ url: "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1"
})
},
async cmdSearch() {
@@ -344,7 +344,7 @@
edit(item) {
console.log("editItem:", item)
uni.navigateTo({
- url: `/pages/ZLGL/shoujianjianyan/form?operationType=3&linterid=${item.hmainid}`
+ url: `/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=3&linterid=${item.hmainid}`
})
}
},
diff --git a/pages/ZLGL/xunjianjianyan/form.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
similarity index 99%
rename from pages/ZLGL/xunjianjianyan/form.vue
rename to pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 6297c5a..262eaf8 100644
--- a/pages/ZLGL/xunjianjianyan/form.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1761,7 +1761,7 @@
if (res.confirm) {
console.log("鐢ㄦ埛鐐瑰嚮纭畾");
uni.redirectTo({
- url: "/pages/ZLGL/xunjianjianyan/form?operationType=1",
+ url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
@@ -1786,7 +1786,7 @@
},
addNew() {
uni.redirectTo({
- url: "/pages/ZLGL/xunjianjianyan/form?operationType=1",
+ url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
});
},
goBack() {
@@ -2183,7 +2183,7 @@
.sampleDestory {
border: 1px solid #acacac;
- border-radius: 10%;
+ border-radius: 5rpx;
padding: 0 12rpx;
}
}
diff --git a/pages/ZLGL/xunjianjianyan/table.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue
similarity index 98%
rename from pages/ZLGL/xunjianjianyan/table.vue
rename to pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue
index 9c218e8..ec7a3ea 100644
--- a/pages/ZLGL/xunjianjianyan/table.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue
@@ -194,7 +194,7 @@
},
cmdAdd() {
uni.navigateTo({
- url: "/pages/ZLGL/xunjianjianyan/form?operationType=1"
+ url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1"
})
},
async cmdSearch() {
@@ -345,7 +345,7 @@
edit(item) {
console.log("editItem:", item)
uni.navigateTo({
- url: `/pages/ZLGL/xunjianjianyan/form?operationType=3&linterid=${item.hmainid}`
+ url: `/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=3&linterid=${item.hmainid}`
})
}
},
diff --git a/pages/baogong/list.vue b/pages/baogong/DayPlanBillList.vue
similarity index 100%
rename from pages/baogong/list.vue
rename to pages/baogong/DayPlanBillList.vue
diff --git a/pages/baogong/table.vue b/pages/baogong/IpadIndex.vue
similarity index 98%
rename from pages/baogong/table.vue
rename to pages/baogong/IpadIndex.vue
index fa7c049..2c75642 100644
--- a/pages/baogong/table.vue
+++ b/pages/baogong/IpadIndex.vue
@@ -254,7 +254,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/shebeidangan/form'
+ url:'/pages/shebeidangan/Gy_EquipFileMainBill'
})
},
//閲嶇疆
@@ -314,7 +314,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/shebeidangan/form?hmainid=' + item.hmainid
+ url:'/pages/shebeidangan/Gy_EquipFileMainBill?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/baogong/form.vue b/pages/baogong/ProductReportStepBillList.vue
similarity index 100%
rename from pages/baogong/form.vue
rename to pages/baogong/ProductReportStepBillList.vue
diff --git a/pages/baoyangjihua/form.vue b/pages/baoyangjihua/Sb_EquipMaintainPlanEdit.vue
similarity index 100%
rename from pages/baoyangjihua/form.vue
rename to pages/baoyangjihua/Sb_EquipMaintainPlanEdit.vue
diff --git a/pages/baoyangjihua/table.vue b/pages/baoyangjihua/Sb_EquipMaintainPlanList.vue
similarity index 97%
rename from pages/baoyangjihua/table.vue
rename to pages/baoyangjihua/Sb_EquipMaintainPlanList.vue
index bb83e5c..4ab8a94 100644
--- a/pages/baoyangjihua/table.vue
+++ b/pages/baoyangjihua/Sb_EquipMaintainPlanList.vue
@@ -255,7 +255,7 @@
},
creat(){
uni.navigateTo({
- url:'/pages/baoyangjihua/form'
+ url:'/pages/baoyangjihua/Sb_EquipMaintainPlanEdit'
})
},
clear(){
@@ -276,7 +276,7 @@
},
toSon(item){
uni.navigateTo({
- url:'/pages/baoyangjihua/table_son?hmainid=' + item.hmainid
+ url:'/pages/baoyangjihua/Sb_EquipMaintainPlanList_son?hmainid=' + item.hmainid
+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
})
@@ -286,7 +286,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/baoyangjihua/form?hmainid=' + item.hmainid
+ url:'/pages/baoyangjihua/Sb_EquipMaintainPlanEdit?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/baoyangjihua/table_son.vue b/pages/baoyangjihua/Sb_EquipMaintainPlanList_son.vue
similarity index 100%
rename from pages/baoyangjihua/table_son.vue
rename to pages/baoyangjihua/Sb_EquipMaintainPlanList_son.vue
diff --git a/pages/baoyangjilu/form.vue b/pages/baoyangjilu/Sb_EquipMaintainRuleEdit.vue
similarity index 100%
rename from pages/baoyangjilu/form.vue
rename to pages/baoyangjilu/Sb_EquipMaintainRuleEdit.vue
diff --git a/pages/baoyangjilu/table.vue b/pages/baoyangjilu/Sb_EquipMaintainRuleList.vue
similarity index 97%
rename from pages/baoyangjilu/table.vue
rename to pages/baoyangjilu/Sb_EquipMaintainRuleList.vue
index f22a823..eb80bc2 100644
--- a/pages/baoyangjilu/table.vue
+++ b/pages/baoyangjilu/Sb_EquipMaintainRuleList.vue
@@ -282,7 +282,7 @@
},
creat(){
uni.navigateTo({
- url:'/pages/baoyangjilu/form'
+ url:'/pages/baoyangjilu/Sb_EquipMaintainRuleEdit'
})
},
clear(){
@@ -303,7 +303,7 @@
},
toSon(item){
uni.navigateTo({
- url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid
+ url:'/pages/baoyangjilu/Sb_EquipMaintainRuleList_son?HInterID=' + item.hmainid
+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
})
@@ -313,7 +313,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/baoyangjilu/form?hmainid=' + item.hmainid
+ url:'/pages/baoyangjilu/Sb_EquipMaintainRuleEdit?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/baoyangjilu/table_son.vue b/pages/baoyangjilu/Sb_EquipMaintainRuleList_son.vue
similarity index 100%
rename from pages/baoyangjilu/table_son.vue
rename to pages/baoyangjilu/Sb_EquipMaintainRuleList_son.vue
diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/POStockInBill.vue
similarity index 99%
rename from pages/caigouruku/form.vue
rename to pages/caigouruku/POStockInBill.vue
index ef7516a..444b4e7 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -1626,7 +1626,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/caigouruku/form?OperationType=1'
+ url: '/pages/caigouruku/POStockInBill?OperationType=1'
})
},
async submit() {
@@ -1708,7 +1708,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigouruku/form?OperationType=1'
+ url: '/pages/caigouruku/POStockInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1754,7 +1754,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/caigouruku/form?OperationType=1'
+ // url: '/pages/caigouruku/POStockInBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1817,7 +1817,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigouruku/table'
+ url: '/pages/caigouruku/POStockInBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/caigouruku/table.vue b/pages/caigouruku/POStockInBillList.vue
similarity index 100%
rename from pages/caigouruku/table.vue
rename to pages/caigouruku/POStockInBillList.vue
diff --git a/pages/caigourukujiaoyan/form.vue b/pages/caigourukujiaoyan/POStockInCheckBill.vue
similarity index 99%
rename from pages/caigourukujiaoyan/form.vue
rename to pages/caigourukujiaoyan/POStockInCheckBill.vue
index 4e6e826..a7c1501 100644
--- a/pages/caigourukujiaoyan/form.vue
+++ b/pages/caigourukujiaoyan/POStockInCheckBill.vue
@@ -1031,7 +1031,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigourukujiaoyan/form?OperationType=1'
+ url: '/pages/caigourukujiaoyan/POStockInCheckBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1113,7 +1113,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/caigourukujiaoyan/form?OperationType=1'
+ // url: '/pages/caigourukujiaoyan/POStockInCheckBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1156,7 +1156,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.navigateBack({
- url: '/pages/caigourukujiaoyan/table'
+ url: '/pages/caigourukujiaoyan/POStockInCheckBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/caigourukujiaoyan/table.vue b/pages/caigourukujiaoyan/POStockInCheckBillList.vue
similarity index 100%
rename from pages/caigourukujiaoyan/table.vue
rename to pages/caigourukujiaoyan/POStockInCheckBillList.vue
diff --git a/pages/caigoutuiliao/form.vue b/pages/caigoutuiliao/POStockInBackBill.vue
similarity index 99%
rename from pages/caigoutuiliao/form.vue
rename to pages/caigoutuiliao/POStockInBackBill.vue
index c45556b..922f76f 100644
--- a/pages/caigoutuiliao/form.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -1479,7 +1479,7 @@
// 鏂板鍥炶皟
addNew() {
uni.redirectTo({
- url: '/pages/caigoutuiliao/form?OperationType=1'
+ url: '/pages/caigoutuiliao/POStockInBackBill?OperationType=1'
})
},
//鏂板
@@ -1650,7 +1650,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigoutuiliao/form?OperationType=1'
+ url: '/pages/caigoutuiliao/POStockInBackBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1692,7 +1692,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/caigoutuiliao/form?OperationType=1'
+ // url: '/pages/caigoutuiliao/POStockInBackBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1729,7 +1729,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigoutuiliao/table'
+ url: '/pages/caigoutuiliao/POStockInBackBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/caigoutuiliao/table.vue b/pages/caigoutuiliao/POStockInBackBillList.vue
similarity index 100%
rename from pages/caigoutuiliao/table.vue
rename to pages/caigoutuiliao/POStockInBackBillList.vue
diff --git a/pages/chaituosaoma-xiaowei/UnpackPallet.vue b/pages/chaituosaoma-xiaowei/UnpackPallet.vue
index 98bd6fb..ec5205a 100644
--- a/pages/chaituosaoma-xiaowei/UnpackPallet.vue
+++ b/pages/chaituosaoma-xiaowei/UnpackPallet.vue
@@ -472,7 +472,7 @@
success: ({confirm,cancel}) => {
if(confirm) {
uni.redirectTo({
- url: "/pages/zutuosaoma/form"
+ url: "/pages/zutuosaoma/PackUnionBill"
})
}
diff --git a/pages/chaituosaoma/form.vue b/pages/chaituosaoma/UnPackUnionBill.vue
similarity index 89%
rename from pages/chaituosaoma/form.vue
rename to pages/chaituosaoma/UnPackUnionBill.vue
index 71e5cac..8ce6446 100644
--- a/pages/chaituosaoma/form.vue
+++ b/pages/chaituosaoma/UnPackUnionBill.vue
@@ -4,7 +4,8 @@
<view class="form-item">
<view class="title">鎵樻潯鐮�</view>
<view class="right">
- <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack" @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
+ <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack"
+ @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
</view>
<view class="right-icon">
<uni-icons class="right-icon" type="scan"
@@ -30,9 +31,32 @@
</view>
<!-- 鎷嗙淇℃伅 -->
<view v-if="tabs == 0">
- <zb-table id="list-table" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+ <!-- <zb-table id="list-table" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
:show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
- @toggleAllSelection="handleSelectAll" />
+ @toggleAllSelection="handleSelectAll" /> -->
+
+ <view class="item-wrapper">
+ <view v-for="(item, index) in listData" :key="index">
+ <uni-card :title="item['鐗╂枡鍚嶇О']" :extra="`鏉＄爜鏁伴噺: ${item['鏉＄爜涓暟']}`">
+ <view class="detail" v-if="item['鏉＄爜缂栧彿']">
+ <text>鏉＄爜缂栧彿锛�</text>{{item['鏉＄爜缂栧彿']}}
+ </view>
+ <view class="detail" v-if="item['鏁伴噺']">
+ <text>鏁伴噺锛�</text>{{item['鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['鐗╂枡浠ｇ爜']">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item['鐗╂枡浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
+ </view>
+ <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
</view>
<!-- 鍗曟嵁淇℃伅 -->
<view v-if="tabs == 1">
@@ -80,7 +104,8 @@
</view>
</view>
<view class="bottom-btn" id="bottom-btn">
- <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">鎷嗘墭</button>
+ <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini"
+ @tap="cmdSubmit">鎷嗘墭</button>
<view style="flex: 1;"></view>
<!-- <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button> -->
<button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
@@ -118,8 +143,7 @@
HMaterNumber_Pack: "", //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
listOption: [],
listData: [],
- columns: [
- {
+ columns: [{
name: 'index',
label: '搴忓彿',
width: 60,
@@ -174,17 +198,17 @@
}
},
methods: {
- async HBarCodeFocusRefresh(){
- this.HBarCode = ''
- this.HBarCodeFocus = false
- await this.$nextTick()
- this.HBarCodeFocus = true
+ async HBarCodeFocusRefresh() {
+ this.HBarCode = ''
+ this.HBarCodeFocus = false
+ await this.$nextTick()
+ this.HBarCodeFocus = true
},
- async HBarCodePackFocusRefresh(){
- this.HBarCode_Pack = ''
- this.HBarCodePackFocus = false
- await this.$nextTick()
- this.HBarCodePackFocus = true
+ async HBarCodePackFocusRefresh() {
+ this.HBarCode_Pack = ''
+ this.HBarCodePackFocus = false
+ await this.$nextTick()
+ this.HBarCodePackFocus = true
},
toScanCode() {
MpaasScan.scanCode((scanCode) => {
@@ -473,28 +497,35 @@
"HMaker": this.hform.HMaker,
},
resFunction: (res) => {
- let {data, count, Message} = res.data
- if(count == 1){
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
uni.showModal({
title: '娓╅Θ鎻愮ず',
content: Message,
confirmText: "鏂板",
cancelText: '鍏抽棴',
- success: ({confirm,cancel}) => {
- if(confirm) {
+ success: ({
+ confirm,
+ cancel
+ }) => {
+ if (confirm) {
uni.redirectTo({
- url: "/pages/zutuosaoma/form"
+ url: "/pages/zutuosaoma/PackUnionBill"
})
}
-
- if(cancel) {
+
+ if (cancel) {
uni.navigateBack()
}
}
})
- }else {
+ } else {
uni.showToast({
- icon:'none',
+ icon: 'none',
title: Message
})
}
@@ -544,7 +575,7 @@
} else if (this.OperationType == 2) {
}
-
+
this.HBarCodePackFocusRefresh()
}
}
@@ -674,5 +705,4 @@
color: #fff;
}
}
-
</style>
\ No newline at end of file
diff --git a/pages/chaixiang/form.vue b/pages/chaixiang/form.vue
index 43265ce..0c37e10 100644
--- a/pages/chaixiang/form.vue
+++ b/pages/chaixiang/form.vue
@@ -14,14 +14,14 @@
</view>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">瑁呯淇℃伅</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鎷嗙淇℃伅</view>
<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍗曟嵁淇℃伅</view>
</view>
<!-- 鎷嗙淇℃伅 -->
<view v-if="tabs == 0">
- <zb-table id="list-table" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+ <!-- <zb-table id="list-table" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
:show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
- @toggleAllSelection="handleSelectAll" />
+ @toggleAllSelection="handleSelectAll" /> -->
</view>
<!-- 鍗曟嵁淇℃伅 -->
<view v-if="tabs == 1">
diff --git a/pages/fenbushidiaochudan/form_out.vue b/pages/fenbushidiaochudan/form_out.vue
index 4fec4bc..217f637 100644
--- a/pages/fenbushidiaochudan/form_out.vue
+++ b/pages/fenbushidiaochudan/form_out.vue
@@ -2208,7 +2208,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/zhijiediaobo/form?OperationType=1'
+ url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
})
},
async submit() {
@@ -2289,7 +2289,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/zhijiediaobo/form?OperationType=1'
+ url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -2331,7 +2331,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/zhijiediaobo/form?OperationType=1'
+ // url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/fenbushidiaorudan/form.vue b/pages/fenbushidiaorudan/form.vue
index 5340676..415f044 100644
--- a/pages/fenbushidiaorudan/form.vue
+++ b/pages/fenbushidiaorudan/form.vue
@@ -2123,7 +2123,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/zhijiediaobo/form?OperationType=1'
+ url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
})
},
async submit() {
@@ -2204,7 +2204,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/zhijiediaobo/form?OperationType=1'
+ url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/gongxuIn/form.vue b/pages/gongxuIn/Cj_StationInBill.vue
similarity index 99%
rename from pages/gongxuIn/form.vue
rename to pages/gongxuIn/Cj_StationInBill.vue
index 05ff13b..b2c34b6 100644
--- a/pages/gongxuIn/form.vue
+++ b/pages/gongxuIn/Cj_StationInBill.vue
@@ -931,7 +931,7 @@
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
- url:'/pages/gongxuIn/form?linterid=' + this.linterid + '&HBillNo=' + this.linterid
+ url:'/pages/gongxuIn/Cj_StationInBill?linterid=' + this.linterid + '&HBillNo=' + this.linterid
})
},1000)
}else{
@@ -942,7 +942,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url:'/pages/gongxuIn/form?OperationType=1'
+ url:'/pages/gongxuIn/Cj_StationInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/gongxuIn/table.vue b/pages/gongxuIn/Cj_StationInBillList.vue
similarity index 98%
rename from pages/gongxuIn/table.vue
rename to pages/gongxuIn/Cj_StationInBillList.vue
index 962f3be..29d5c8b 100644
--- a/pages/gongxuIn/table.vue
+++ b/pages/gongxuIn/Cj_StationInBillList.vue
@@ -392,7 +392,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/gongxuIn/form'
+ url:'/pages/gongxuIn/Cj_StationInBill'
})
},
//閲嶇疆
@@ -432,7 +432,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/gongxuIn/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/gongxuIn/Cj_StationInBill?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/Cj_StationOutBill.vue
similarity index 99%
rename from pages/gongxuOut/form.vue
rename to pages/gongxuOut/Cj_StationOutBill.vue
index d9cc718..01b78d0 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/Cj_StationOutBill.vue
@@ -1711,7 +1711,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
})
},
submit() {
@@ -1787,7 +1787,7 @@
})
setTimeout(() => {
uni.redirectTo({
- url: '/pages/gongxuOut/table'
+ url: '/pages/gongxuOut/Cj_StationOutBillList'
})
}, 1000)
} else {
@@ -1799,7 +1799,7 @@
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
this.getNextProc()
// uni.redirectTo({
- // url: '/pages/gongxuOut/form?OperationType=1'
+ // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
// })
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1807,7 +1807,7 @@
// uni.navigateBack();
// }, 50)
uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
})
}
}
@@ -1973,13 +1973,13 @@
icon: 'none'
})
uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
})
}else{
this.hform.HProcNo=nextProcess["宸ュ簭鍙�"];
const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1&HBarCode='+HNextBarCode
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode='+HNextBarCode
})
}
}else{
diff --git a/pages/gongxuOut/table.vue b/pages/gongxuOut/Cj_StationOutBillList.vue
similarity index 98%
rename from pages/gongxuOut/table.vue
rename to pages/gongxuOut/Cj_StationOutBillList.vue
index 1eed4d0..b607a32 100644
--- a/pages/gongxuOut/table.vue
+++ b/pages/gongxuOut/Cj_StationOutBillList.vue
@@ -425,7 +425,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/gongxuOut/form'
+ url:'/pages/gongxuOut/Cj_StationOutBill'
})
},
//閲嶇疆
@@ -470,7 +470,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/gongxuOut/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/gongxuOut/Cj_StationOutBill?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/gongxuOutSendWork/table.vue b/pages/gongxuOutSendWork/gongxuOutSendWorkBill.vue
similarity index 100%
rename from pages/gongxuOutSendWork/table.vue
rename to pages/gongxuOutSendWork/gongxuOutSendWorkBill.vue
diff --git a/pages/guzhangdengji/form.vue b/pages/guzhangdengji/EqpConkBookBill.vue
similarity index 100%
rename from pages/guzhangdengji/form.vue
rename to pages/guzhangdengji/EqpConkBookBill.vue
diff --git a/pages/guzhangdengji/table.vue b/pages/guzhangdengji/EqpConkBookBillList.vue
similarity index 98%
rename from pages/guzhangdengji/table.vue
rename to pages/guzhangdengji/EqpConkBookBillList.vue
index 9b560ff..8fa436f 100644
--- a/pages/guzhangdengji/table.vue
+++ b/pages/guzhangdengji/EqpConkBookBillList.vue
@@ -343,7 +343,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/guzhangdengji/form'
+ url:'/pages/guzhangdengji/EqpConkBookBill'
})
},
//閲嶇疆
@@ -371,7 +371,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/guzhangdengji/form?hmainid=' + item.hmainid
+ url:'/pages/guzhangdengji/EqpConkBookBill?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/huanyangdan/table.vue b/pages/huanyangdan/BackSampleCheckBillList.vue
similarity index 100%
rename from pages/huanyangdan/table.vue
rename to pages/huanyangdan/BackSampleCheckBillList.vue
diff --git a/pages/huanyangdan/form.vue b/pages/huanyangdan/form.vue
index eb21f42..21f870a 100644
--- a/pages/huanyangdan/form.vue
+++ b/pages/huanyangdan/form.vue
@@ -707,7 +707,7 @@
},
onAddNewHandler() {
uni.redirectTo({
- url: "/pages/quyangdan/form?operationType=0"
+ url: "/pages/quyangdan/TakeSampleCheckBillList?operationType=0"
})
},
goBack() {
diff --git a/pages/index/_index.vue b/pages/index/_index.vue
index 530edaf..acfa703 100644
--- a/pages/index/_index.vue
+++ b/pages/index/_index.vue
@@ -20,22 +20,22 @@
itemData: [{
img: '../../static/icon/icon1.png',
text: '璁惧妗ｆ',
- url: '/pages/shebeidangan/table',
+ url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
id: 1
}, {
img: '../../static/icon/icon8.png',
text: '璁惧灞ュ巻',
- url: '/pages/shebeilvli/table',
+ url: '/pages/shebeilvli/EquipFileBillResume',
id: 0,
}, {
img: '../../static/icon/icon2.png',
text: '璁惧淇濆吇璁″垝鍗�',
- url: '/pages/baoyangjihua/table',
+ url: '/pages/baoyangjihua/Sb_EquipMaintainPlanList',
id: 2
}, {
img: '../../static/icon/icon3.png',
text: '璁惧淇濆吇璁板綍鍗�',
- url: '/pages/baoyangjilu/table',
+ url: '/pages/baoyangjilu/Sb_EquipMaintainRuleList',
id: 3
}, {
img: '../../static/icon/icon4.png',
@@ -50,37 +50,37 @@
}, {
img: '../../static/icon/icon6.png',
text: '璁惧鏁呴殰鐧昏琛�',
- url: '/pages/guzhangdengji/table',
+ url: '/pages/guzhangdengji/EqpConkBookBillList',
id: 6
}, {
img: '../../static/icon/icon7.png',
text: '璁惧缁翠慨璁板綍鍗�',
- url: '/pages/shebeiweixiu/table',
+ url: '/pages/shebeiweixiu/SbEqpMaintenanceBillList',
id: 7,
// },{
// img:'../../static/icon/icon8.png',
// text:'璁惧灞ュ巻',
- // url:'/pages/shebeilvli/table',
+ // url:'/pages/shebeilvli/EquipFileBillResume',
// id:8,
}, {
img: '../../static/icon/icon9.png',
text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
- url: '/pages/gongxuIn/table',
+ url: '/pages/gongxuIn/Cj_StationInBillList',
id: 9,
}, {
img: '../../static/icon/icon10.png',
text: '宸ュ簭鍑虹珯姹囨姤鍗�',
- url: '/pages/gongxuOut/table',
+ url: '/pages/gongxuOut/Cj_StationOutBillList',
id: 10,
}, {
img: '../../static/icon/icon11.png',
text: '宸ュ簭濮斿鍙戝嚭鍗�',
- url: '/pages/weiwaigxIn/table',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
id: 11,
}, {
img: '../../static/icon/icon12.png',
text: '宸ュ簭濮斿鎺ユ敹鍗�',
- url: '/pages/weiwaigxOut/table',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustOutBillList',
id: 12,
// }, {
// img: '../../static/icon/icon13.png',
@@ -95,7 +95,7 @@
}, {
img: '../../static/icon/icon15.png',
text: '寮傚父鍙嶉鍗�',
- url: '/pages/yichang/table',
+ url: '/pages/yichang/MESExecptFeedBackBillList',
id: 15,
}, {
img: '../../static/icon/icon16.png',
diff --git a/pages/index/_tab1.vue b/pages/index/_tab1.vue
index cb8ff13..b764d3d 100644
--- a/pages/index/_tab1.vue
+++ b/pages/index/_tab1.vue
@@ -21,22 +21,22 @@
itemData: [{
// img:'../../static/icon0.png',
// text:'鎶ヨ〃涓績',
- // url:'/pages/shebeilvli/table',
+ // url:'/pages/shebeilvli/EquipFileBillResume',
// id:0
// },{
img: '../../static/icon/icon_a1.png',
text: '璁惧妗ｆ',
- url: '/pages/shebeidangan/table',
+ url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
id: 1
}, {
img: '../../static/icon/icon_a2.png',
text: '璁惧淇濆吇璁″垝鍗�',
- url: '/pages/baoyangjihua/table',
+ url: '/pages/baoyangjihua/Sb_EquipMaintainPlanList',
id: 2
}, {
img: '../../static/icon/icon_a3.png',
text: '璁惧淇濆吇璁板綍鍗�',
- url: '/pages/baoyangjilu/table',
+ url: '/pages/baoyangjilu/Sb_EquipMaintainRuleList',
id: 3
// },{
// img:'../../static/icon/icon_a4.png',
@@ -51,37 +51,37 @@
}, {
img: '../../static/icon/icon_a6.png',
text: '璁惧鏁呴殰鐧昏琛�',
- url: '/pages/guzhangdengji/table',
+ url: '/pages/guzhangdengji/EqpConkBookBillList',
id: 6
}, {
img: '../../static/icon/icon_a7.png',
text: '璁惧缁翠慨璁板綍鍗�',
- url: '/pages/shebeiweixiu/table',
+ url: '/pages/shebeiweixiu/SbEqpMaintenanceBillList',
id: 7,
}, {
img: '../../static/icon/icon_a8.png',
text: '璁惧灞ュ巻',
- url: '/pages/shebeilvli/table',
+ url: '/pages/shebeilvli/EquipFileBillResume',
id: 8,
}, {
img: '../../static/icon/icon_a9.png',
text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
- url: '/pages/gongxuIn/table',
+ url: '/pages/gongxuIn/Cj_StationInBillList',
id: 9,
}, {
img: '../../static/icon/icon_a10.png',
text: '宸ュ簭鍑虹珯姹囨姤鍗�',
- url: '/pages/gongxuOut/table',
+ url: '/pages/gongxuOut/Cj_StationOutBillList',
id: 10,
}, {
img: '../../static/icon/icon_a11.png',
text: '宸ュ簭濮斿鍙戝嚭鍗�',
- url: '/pages/weiwaigxIn/table',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
id: 11,
}, {
img: '../../static/icon/icon_a12.png',
text: '宸ュ簭濮斿鎺ユ敹鍗�',
- url: '/pages/weiwaigxOut/table',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustOutBillList',
id: 12,
// }, {
// img: '../../static/icon/icon_a13.png',
@@ -96,7 +96,7 @@
}, {
img: '../../static/icon/icon_a15.png',
text: '寮傚父鍙嶉鍗�',
- url: '/pages/yichang/table',
+ url: '/pages/yichang/MESExecptFeedBackBillList',
id: 15,
}, {
img: '../../static/icon/icon_a16.png',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dbbee29..20f6965 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,68 +1,68 @@
<template>
- <view class="content">
- <view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
- <view class="switch-button">
- <uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
- </view>
- </view>
- <view class="mains">
- <view v-if="!canEdit" :hidden="item.hidden" class="box" v-for="(item,index) in itemData" :key="index"
- @tap="toUrl(item)">
- <image :src="item.img" mode=""></image>
- <view class="texts">
- {{item.text}}
- </view>
- </view>
- <view :enable-hidden="item.hidden" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
- :key="index" @tap="switchHidden(index)">
- <uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
- <image :src="item.img" mode=""></image>
- <view class="texts">
- {{item.text}}
- </view>
- </view>
- </view>
+ <view class="content">
+ <view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
+ <view class="switch-button">
+ <uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
+ </view>
+ </view>
+ <view class="mains">
+ <view v-if="!canEdit" :hidden="item.hidden" class="box" v-for="(item,index) in itemData" :key="index"
+ @tap="toUrl(item)">
+ <image :src="item.img" mode=""></image>
+ <view class="texts">
+ {{item.text}}
+ </view>
+ </view>
+ <view :enable-hidden="item.hidden" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
+ :key="index" @tap="switchHidden(index)">
+ <uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
+ <image :src="item.img" mode=""></image>
+ <view class="texts">
+ {{item.text}}
+ </view>
+ </view>
+ </view>
- <vers></vers>
- </view>
+ <vers></vers>
+ </view>
</template>
<script>
- import vers from './vers.vue';
- import {
- setMenuList,
- getMenuList
- } from '../../utils/menuListApp';
- import {
- CommonUtils
- } from '../../utils/common';
- import {
- getUserInfo
- } from '../../utils/auth';
- export default {
- components: {
- vers,
- },
- data() {
- return {
- updateCount: 0,
- menuListName: 'index',
- canEdit: false,
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- itemData: [{
- img: '../../static/icon/icon8.png',
- text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
- url: '/pages/tiaomaguanli/table?HBillType=1103',
- id: 1,
- hidden: false,
- },
- {
- img: '../../static/icon/icon8.png',
- text: '閲囪喘璁㈠崟鏉＄爜鎵撳嵃',
- url: '/pages/tiaomaguanli/table?HBillType=1102',
- id: 2,
- hidden: false,
- },
+ import vers from './vers.vue';
+ import {
+ setMenuList,
+ getMenuList
+ } from '../../utils/menuListApp';
+ import {
+ CommonUtils
+ } from '../../utils/common';
+ import {
+ getUserInfo
+ } from '../../utils/auth';
+ export default {
+ components: {
+ vers,
+ },
+ data() {
+ return {
+ updateCount: 0,
+ menuListName: 'index',
+ canEdit: false,
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ itemData: [{
+ img: '../../static/icon/icon8.png',
+ text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
+ url: '/pages/tiaomaguanli/table?HBillType=1103',
+ id: 1,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon8.png',
+ text: '閲囪喘璁㈠崟鏉＄爜鎵撳嵃',
+ url: '/pages/tiaomaguanli/table?HBillType=1102',
+ id: 2,
+ hidden: false,
+ },
// {
// img: '../../static/icon/icon8.png',
@@ -519,143 +519,143 @@
// id: 35,
// },
- // {
- // img: '../../static/icon/icon16.png',
- // text: '濮斿琛ユ枡鏍￠獙',
- // url: '/pages/weiwaibuliaojiaoyan/table',
- // id: 37,
- // },
- // {
- // img: '../../static/icon/icon17.png',
- // text: '鐢熶骇棰嗘枡',
- // url: '/pages/shengchanlingliaoshengdan/table',
- // id: 38,
- // },
- // ]
- }
- },
- onLoad() {
- this.getHiddenItem()
- },
- methods: {
- checkCardShow(item) {
- if (item.HMaker && item.HMaker != getUserInfo()['Czymc'] && item.hidden == true) {
- return false
- }
- return true
- },
- async getHiddenItem() {
- // let itemCache = uni.getStorageSync('HIndexItemData') || ''
- // console.log('itemCache: ',itemCache);
- // if(itemCache !== '') {
- // this.itemData = itemCache
- // }
+ // {
+ // img: '../../static/icon/icon16.png',
+ // text: '濮斿琛ユ枡鏍￠獙',
+ // url: '/pages/weiwaibuliaojiaoyan/table',
+ // id: 37,
+ // },
+ // {
+ // img: '../../static/icon/icon17.png',
+ // text: '鐢熶骇棰嗘枡',
+ // url: '/pages/shengchanlingliaoshengdan/table',
+ // id: 38,
+ // },
+ // ]
+ }
+ },
+ onLoad() {
+ this.getHiddenItem()
+ },
+ methods: {
+ checkCardShow(item) {
+ if (item.HMaker && item.HMaker != getUserInfo()['Czymc'] && item.hidden == true) {
+ return false
+ }
+ return true
+ },
+ async getHiddenItem() {
+ // let itemCache = uni.getStorageSync('HIndexItemData') || ''
+ // console.log('itemCache: ',itemCache);
+ // if(itemCache !== '') {
+ // this.itemData = itemCache
+ // }
- let data = await getMenuList({
- menuName: this.menuListName
- })
- Array.from(data).forEach(e => {
- this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
- this.itemData[e["HIndex"]].HMaker = e["HMaker"]
- })
- },
- switchHidden(index) {
- this.updateCount++;
- this.itemData[index].hidden = !this.itemData[index].hidden
- },
- switchIconsModeHandler() {
- this.canEdit = !this.canEdit
- if (this.canEdit == false && this.updateCount > 0) {
- this.$nextTick(() => {
- // uni.setStorageSync("HIndexItemData", this.itemData)
- setMenuList({
- menuName: this.menuListName,
- payload: this.itemData
- })
+ let data = await getMenuList({
+ menuName: this.menuListName
+ })
+ Array.from(data).forEach(e => {
+ this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
+ this.itemData[e["HIndex"]].HMaker = e["HMaker"]
+ })
+ },
+ switchHidden(index) {
+ this.updateCount++;
+ this.itemData[index].hidden = !this.itemData[index].hidden
+ },
+ switchIconsModeHandler() {
+ this.canEdit = !this.canEdit
+ if (this.canEdit == false && this.updateCount > 0) {
+ this.$nextTick(() => {
+ // uni.setStorageSync("HIndexItemData", this.itemData)
+ setMenuList({
+ menuName: this.menuListName,
+ payload: this.itemData
+ })
- this.updateCount = 0
- })
- }
- this.$forceUpdate()
- },
- toUrl(item) {
- if (item.url) {
- uni.navigateTo({
- url: item.url
- })
- } else {
- uni.showToast({
- title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
- icon: 'none'
- })
- }
- }
- }
- }
+ this.updateCount = 0
+ })
+ }
+ this.$forceUpdate()
+ },
+ toUrl(item) {
+ if (item.url) {
+ uni.navigateTo({
+ url: item.url
+ })
+ } else {
+ uni.showToast({
+ title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
+ icon: 'none'
+ })
+ }
+ }
+ }
+ }
</script>
<style lang="scss" scoped>
- .header {
- width: 750rpx;
- background: linear-gradient(0deg, #71AFFC 0%, #3A78FF 100%);
- font-size: 47rpx;
- font-weight: bold;
- color: #FFFFFF;
- text-align: center;
- padding: 9vh 0 6vh 0;
- position: relative;
- }
+ .header {
+ width: 750rpx;
+ background: linear-gradient(0deg, #71AFFC 0%, #3A78FF 100%);
+ font-size: 47rpx;
+ font-weight: bold;
+ color: #FFFFFF;
+ text-align: center;
+ padding: 9vh 0 6vh 0;
+ position: relative;
+ }
- .switch-button {
- position: absolute;
- right: 10rpx;
- bottom: 0;
- }
+ .switch-button {
+ position: absolute;
+ right: 10rpx;
+ bottom: 0;
+ }
- .mains {
- width: 720rpx;
- margin: 0 auto;
- display: flex;
- flex-wrap: wrap;
- margin-top: 3vh;
- padding-bottom: 5vh;
+ .mains {
+ width: 720rpx;
+ margin: 0 auto;
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 3vh;
+ padding-bottom: 5vh;
- .box {
- width: 25%;
- margin-top: 2.5vh;
- text-align: center;
+ .box {
+ width: 25%;
+ margin-top: 2.5vh;
+ text-align: center;
- image {
- width: 18vw;
- height: 18vw;
- }
+ image {
+ width: 18vw;
+ height: 18vw;
+ }
- .texts {
- width: 120rpx;
- margin: 0 auto;
- font-size: 29rpx;
- font-weight: normal;
- color: #333333;
- margin-top: .2vh;
- }
- }
+ .texts {
+ width: 120rpx;
+ margin: 0 auto;
+ font-size: 29rpx;
+ font-weight: normal;
+ color: #333333;
+ margin-top: .2vh;
+ }
+ }
- .edit {
- position: relative;
- }
+ .edit {
+ position: relative;
+ }
- .edit-mark {
- position: absolute;
- top: 0;
- right: 0;
- }
+ .edit-mark {
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
- view[enable-hidden] {
- opacity: .4 !important;
- }
+ view[enable-hidden] {
+ opacity: .4 !important;
+ }
- view[hidden] {
- display: none;
- }
- }
+ view[hidden] {
+ display: none;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/index/index01.vue b/pages/index/index01.vue
index 49454a8..b2ecc7d 100644
--- a/pages/index/index01.vue
+++ b/pages/index/index01.vue
@@ -20,32 +20,32 @@
itemData:[{
img:'../../static/icon0.png',
text:'鎶ヨ〃涓績',
- url:'/pages/shebeilvli/table',
+ url:'/pages/shebeilvli/EquipFileBillResume',
id:0
},{
img:'../../static/icon1.png',
text:'璁惧妗ｆ',
- url:'/pages/shebeidangan/table',
+ url:'/pages/shebeidangan/Gy_EquipFileMainBillList',
id:1
},{
img:'../../static/icon2.png',
text:'璁惧淇濆吇璁″垝鍗�',
- url:'/pages/baoyangjihua/table',
+ url:'/pages/baoyangjihua/Sb_EquipMaintainPlanList',
id:2
},{
img:'../../static/icon3.png',
text:'璁惧淇濆吇璁板綍鍗�',
- url:'/pages/baoyangjilu/table',
+ url:'/pages/baoyangjilu/Sb_EquipMaintainRuleList',
id:3
},{
img:'../../static/icon4.png',
text:'璁惧鏁呴殰鐧昏琛�',
- url:'/pages/guzhangdengji/table',
+ url:'/pages/guzhangdengji/EqpConkBookBillList',
id:4
},{
img:'../../static/icon5.png',
text:'璁惧缁翠慨璁板綍鍗�',
- url:'/pages/shebeiweixiu/table',
+ url:'/pages/shebeiweixiu/SbEqpMaintenanceBillList',
id:5
}]
}
diff --git a/pages/index/mine01.vue b/pages/index/mine01.vue
index 280148c..4a82285 100644
--- a/pages/index/mine01.vue
+++ b/pages/index/mine01.vue
@@ -35,32 +35,32 @@
itemData:[{
img:'../../static/icon00.png',
text:'鎶ヨ〃涓績',
- url:'/pages/shebeilvli/table',
+ url:'/pages/shebeilvli/EquipFileBillResume',
id:0
},{
img:'../../static/icon01.png',
text:'璁惧妗ｆ',
- url:'/pages/shebeidangan/table',
+ url:'/pages/shebeidangan/Gy_EquipFileMainBillList',
id:1
},{
img:'../../static/icon06.png',
text:'濮斿宸ュ簭鍙戝嚭鍗�',
- url:'/pages/weiwaigxIn/table',
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBillList',
id:2
},{
img:'../../static/icon07.png',
text:'濮斿宸ュ簭鎺ユ敹鍗�',
- url:'/pages/weiwaigxOut/table',
+ url:'/pages/weiwaigxIn/Cj_StationEntrustOutBillList',
id:3
},{
img:'../../static/icon09.png',
text:'宸ュ簭杩涚珯鎺ユ敹鍗�',
- url:'/pages/gongxuIn/table',
+ url:'/pages/gongxuIn/Cj_StationInBillList',
id:4
},{
img:'../../static/icon08.png',
text:'宸ュ簭鍑虹珯姹囨姤鍗�',
- url:'/pages/gongxuOut/table',
+ url:'/pages/gongxuOut/Cj_StationOutBillList',
id:5
}]
}
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 847248e..5ad2b88 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -39,56 +39,56 @@
img: '../../static/icon/icon9.png',
text: '宸ュ簭杩涚珯鎺ユ敹鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
- url: '/pages/gongxuIn/form',
+ url: '/pages/gongxuIn/Cj_StationInBill',
id: 1,
hidden: false,
}, {
img: '../../static/icon/icon9.png',
text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuIn/table',
+ url: '/pages/gongxuIn/Cj_StationInBillList',
id: 2,
hidden: false,
}, {
img: '../../static/icon/icon10.png',
text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
- url: '/pages/gongxuOut/form',
+ url: '/pages/gongxuOut/Cj_StationOutBill',
id: 3,
hidden: false,
}, {
img: '../../static/icon/icon10.png',
text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuOut/table',
+ url: '/pages/gongxuOut/Cj_StationOutBillList',
id: 4,
hidden: false,
}, {
img: '../../static/icon/icon11.png',
text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
- url: '/pages/weiwaigxIn/form',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBill',
id: 5,
hidden: false,
}, {
img: '../../static/icon/icon11.png',
text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxIn/table',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
id: 6,
hidden: false,
}, {
img: '../../static/icon/icon12.png',
text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
- url: '/pages/weiwaigxOut/form',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustOutBill',
id: 7,
hidden: false,
}, {
img: '../../static/icon/icon12.png',
text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxOut/table',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustOutBillList',
id: 8,
hidden: false,
}
@@ -96,14 +96,14 @@
img: '../../static/icon/icon1.png',
text: '璁惧妗ｆ鏌ヨ',
tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeidangan/table',
+ url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
id: 9,
hidden: true,
}, {
img: '../../static/icon/icon8.png',
text: '璁惧灞ュ巻鏌ヨ',
tip: '鏌ョ湅璇︽儏',
- url: '/pages/shebeilvli/table',
+ url: '/pages/shebeilvli/EquipFileBillResume',
id: 10,
hidden: true,
}, {
@@ -132,7 +132,7 @@
img: '../../static/icon/icon10.png',
text: '鎴戠殑浠诲姟',
tip: '绔嬪嵆鏂板',
- url: '/pages/gongxuOutSendWork/table',
+ url: '/pages/gongxuOutSendWork/gongxuOutSendWorkBill',
id: 16,
hidden: false,
},
@@ -148,22 +148,22 @@
// itemData: [{
// // img:'../../static/icon0.png',
// // text:'鎶ヨ〃涓績',
- // // url:'/pages/shebeilvli/table',
+ // // url:'/pages/shebeilvli/EquipFileBillResume',
// // id:0
// // },{
// img: '../../static/icon/icon_a1.png',
// text: '璁惧妗ｆ',
- // url: '/pages/shebeidangan/table',
+ // url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
// id: 1
// }, {
// img: '../../static/icon/icon_a2.png',
// text: '璁惧淇濆吇璁″垝鍗�',
- // url: '/pages/baoyangjihua/table',
+ // url: '/pages/baoyangjihua/Sb_EquipMaintainPlanList',
// id: 2
// }, {
// img: '../../static/icon/icon_a3.png',
// text: '璁惧淇濆吇璁板綍鍗�',
- // url: '/pages/baoyangjilu/table',
+ // url: '/pages/baoyangjilu/Sb_EquipMaintainRuleList',
// id: 3
// // },{
// // img:'../../static/icon/icon_a4.png',
@@ -178,37 +178,37 @@
// }, {
// img: '../../static/icon/icon_a6.png',
// text: '璁惧鏁呴殰鐧昏琛�',
- // url: '/pages/guzhangdengji/table',
+ // url: '/pages/guzhangdengji/EqpConkBookBillList',
// id: 6
// }, {
// img: '../../static/icon/icon_a7.png',
// text: '璁惧缁翠慨璁板綍鍗�',
- // url: '/pages/shebeiweixiu/table',
+ // url: '/pages/shebeiweixiu/SbEqpMaintenanceBillList',
// id: 7,
// }, {
// img: '../../static/icon/icon_a8.png',
// text: '璁惧灞ュ巻',
- // url: '/pages/shebeilvli/table',
+ // url: '/pages/shebeilvli/EquipFileBillResume',
// id: 8,
// }, {
// img: '../../static/icon/icon_a9.png',
// text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
- // url: '/pages/gongxuIn/table',
+ // url: '/pages/gongxuIn/Cj_StationInBillList',
// id: 9,
// }, {
// img: '../../static/icon/icon_a10.png',
// text: '宸ュ簭鍑虹珯姹囨姤鍗�',
- // url: '/pages/gongxuOut/table',
+ // url: '/pages/gongxuOut/Cj_StationOutBillList',
// id: 10,
// }, {
// img: '../../static/icon/icon_a11.png',
// text: '宸ュ簭濮斿鍙戝嚭鍗�',
- // url: '/pages/weiwaigxIn/table',
+ // url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
// id: 11,
// }, {
// img: '../../static/icon/icon_a12.png',
// text: '宸ュ簭濮斿鎺ユ敹鍗�',
- // url: '/pages/weiwaigxOut/table',
+ // url: '/pages/weiwaigxIn/Cj_StationEntrustOutBillList',
// id: 12,
// // }, {
// // img: '../../static/icon/icon_a13.png',
@@ -223,7 +223,7 @@
// }, {
// img: '../../static/icon/icon_a15.png',
// text: '寮傚父鍙嶉鍗�',
- // url: '/pages/yichang/table',
+ // url: '/pages/yichang/MESExecptFeedBackBillList',
// id: 15,
// }, {
// img: '../../static/icon/icon_a16.png',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 8215844..bc19919 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -48,42 +48,42 @@
{
"img": "../../static/icon/icon17.png",
"text": "閲囪喘鍏ュ簱鏆傚瓨鍒楄〃",
- "url": "/pages/caigouruku/table",
+ "url": "/pages/caigouruku/POStockInBillList",
"id": 1,
"hidden": false
},
{
"img": "../../static/icon/icon18.png",
"text": "閲囪喘閫�鏂欐殏瀛樺垪琛�",
- "url": "/pages/caigoutuiliao/table",
+ "url": "/pages/caigoutuiliao/POStockInBackBillList",
"id": 2,
"hidden": false
},
{
"img": "../../static/icon/icon30.png",
"text": "閲囪喘鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/caigourukujiaoyan/table",
+ "url": "/pages/caigourukujiaoyan/POStockInCheckBillList",
"id": 3,
"hidden": false
},
{
"img": "../../static/icon/icon18.png",
"text": "閿�鍞嚭搴撴殏瀛樺垪琛�",
- "url": "/pages/xiaoshouchuku/table",
+ "url": "/pages/xiaoshouchuku/SellOutBillList",
"id": 4,
"hidden": false
},
{
"img": "../../static/icon/icon20.png",
"text": "閿�鍞��璐ф殏瀛樺垪琛�",
- "url": "/pages/xiaoshoutuihuo/table",
+ "url": "/pages/xiaoshoutuihuo/ICStockBillMainList",
"id": 5,
"hidden": false
},
{
"img": "../../static/icon/icon18.png",
"text": "閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�",
- "url": "/pages/xiaoshouchukujiaoyan/table",
+ "url": "/pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
"id": 6,
"hidden": false
},
@@ -99,7 +99,7 @@
{
"img": "../../static/icon/icon31.png",
"text": "鐢熶骇琛ユ枡鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanbuliao/table",
+ "url": "/pages/shengchanbuliao/MateReplenishOutBillList",
"id": 8,
"hidden": false
},
@@ -113,14 +113,14 @@
{
"img": "../../static/icon/icon8.png",
"text": "鐢熶骇閫�鏂欏崟鏆傚瓨鍒楄〃",
- "url": "/pages/shengchantuiliao/table",
+ "url": "/pages/shengchantuiliao/MateOutBackBillList",
"id": 10,
"hidden": false
},
{
"img": "../../static/icon/icon30.png",
"text": "鐢熶骇棰嗘枡鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanlingliao/table",
+ "url": "/pages/xiaoshoutuihuo/PPickingBillList",
"id": 11,
"hidden": false
},
@@ -134,14 +134,14 @@
{
"img": "../../static/icon/icon17.png",
"text": "鐢熶骇鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanruku/table",
+ "url": "/pages/shengchanruku/ProductInCheckBillList",
"id": 13,
"hidden": false
},
{
"img": "../../static/icon/icon32.png",
"text": "鐢熶骇璋冩嫧鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/shengchandiaobo/table",
+ "url": "/pages/shengchandiaobo/MoveStockBillList",
"id": 14,
"hidden": false
},
@@ -157,21 +157,21 @@
{
"img": "../../static/icon/icon20.png",
"text": "濮斿鍏ュ簱鏆傚瓨鍒楄〃",
- "url": "/pages/weiwairuku/table",
+ "url": "/pages/weiwairuku/EntrustInBillList",
"id": 16,
"hidden": false
},
{
"img": "../../static/icon/icon30.png",
"text": "濮斿棰嗘枡鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/weiwailingliaojiaoyan/table",
+ "url": "/pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
"id": 17,
"hidden": false
},
{
"img": "../../static/icon/icon30.png",
"text": "閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�",
- "url": "/pages/xiaoshouchukujiaoyan/table",
+ "url": "/pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
"id": 18,
"hidden": false
},
@@ -180,14 +180,14 @@
{
"img": "../../static/icon/icon17.png",
"text": "鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃",
- "url": "/pages/qitaruku_v2/table",
+ "url": "/pages/qitaruku_v2/OtherInBillList",
"id": 19,
"hidden": false
},
{
"img": "../../static/icon/icon18.png",
"text": "鍏朵粬鍑哄簱鏆傚瓨鍒楄〃",
- "url": "/pages/qitachuku_v2/table",
+ "url": "/pages/qitachuku_v2/OtherOutBillList",
"id": 20,
"hidden": false
},
@@ -203,7 +203,7 @@
{
"img": "../../static/icon/icon32.png",
"text": "鐩存帴璋冩嫧鏆傚瓨鍒楄〃",
- "url": "/pages/zhijiediaobo/table",
+ "url": "/pages/zhijiediaobo/MoveStockBillList",
"id": 22,
"hidden": false
},
@@ -212,7 +212,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "缁勬墭鍗曟殏瀛樺垪琛�",
- "url": "/pages/zutuosaoma/table",
+ "url": "/pages/zutuosaoma/PackUnionBillList",
"id": 23,
"hidden": false
},
@@ -244,21 +244,21 @@
{
"img": "../../static/icon/icon3.png",
"text": "璁惧淇濆吇璁板綍鍗�",
- "url": "/pages/baoyangjilu/table",
+ "url": "/pages/baoyangjilu/Sb_EquipMaintainRuleList",
"id": 27,
"hidden": false
},
{
"img": "../../static/icon/icon6.png",
"text": "璁惧鏁呴殰鐧昏琛�",
- "url": "/pages/guzhangdengji/table",
+ "url": "/pages/guzhangdengji/EqpConkBookBillList",
"id": 28,
"hidden": false
},
{
"img": "../../static/icon/icon7.png",
"text": "璁惧缁翠慨璁板綍鍗�",
- "url": "/pages/shebeiweixiu/table",
+ "url": "/pages/shebeiweixiu/SbEqpMaintenanceBillList",
"id": 29,
"hidden": false
},
@@ -267,7 +267,7 @@
{
"img": "../../static/icon/icon15.png",
"text": "寮傚父鍙嶉鍗�",
- "url": "/pages/yichang/table",
+ "url": "/pages/yichang/MESExecptFeedBackBillList",
"id": 30,
"hidden": false
},
@@ -299,7 +299,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "杩樻牱鍗�",
- "url": "/pages/huanyangdan/table",
+ "url": "/pages/huanyangdan/BackSampleCheckBillList",
"id": 34,
"hidden": false
},
@@ -308,56 +308,56 @@
{
"img": "../../static/icon/icon13.png",
"text": "涓婃ā鍗曞垪琛�",
- "url": "/pages/MJGL/shangmudan/table",
+ "url": "/pages/MJGL/shangmudan/MouldUpperBillList",
"id": 35,
"hidden": false
},
{
"img": "../../static/icon/icon13.png",
"text": "涓嬫ā鍗曞垪琛�",
- "url": "/pages/MJGL/xiamodan/table",
+ "url": "/pages/MJGL/xiamodan/MouldLowerBillList",
"id": 36,
"hidden": false
},
{
"img": "../../static/icon/icon13.png",
"text": "妯″叿鏁呴殰鐧昏鍒楄〃",
- "url": "/pages/qijvguzhangdengji/table",
+ "url": "/pages/qijvguzhangdengji/mouldMistake",
"id": 37,
"hidden": false
},
{
"img": "../../static/icon/icon13.png",
"text": "妯″叿鏁呴殰鐧昏鍗�",
- "url": "/pages/qijvguzhangdengji/form?operationType=1",
+ "url": "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1",
"id": 38,
"hidden": false
},
{
"img": "../../static/icon/icon13.png",
"text": "妯″叿缁翠慨璁板綍鍒楄〃",
- "url": "/pages/weixiujilu/table",
+ "url": "/pages/weixiujilu/mouldRepairRecordBillList",
"id": 39,
"hidden": false
},
{
"img": "../../static/icon/icon13.png",
"text": "妯″叿缁翠慨璁板綍鍗�",
- "url": "/pages/weixiujilu/form",
+ "url": "/pages/weixiujilu/mouldRepairRecordBill",
"id": 40,
"hidden": false
},
{
"img": "../../static/icon/icon13.png",
"text": "棣栦欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/shoujianjianyan/table",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
"id": 41,
"hidden": false
},
{
"img": "../../static/icon/icon13.png",
"text": "棣栦欢妫�楠屽崟",
- "url": "/pages/ZLGL/shoujianjianyan/form?operationType=1",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
"id": 42,
"hidden": false
},
@@ -385,21 +385,21 @@
{
"img": "../../static/icon/icon5.png",
"text": "妯″叿鐐规璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujudianjianjiludan/table",
+ "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
"id": 46,
"hidden": false
},
{
"img": "../../static/icon/icon5.png",
"text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujubaoyangjiludan/table",
+ "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
"id": 47,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
"text": "妯″叿棰嗘枡鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/mujulingliaochukudan/table",
+ "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
"id": 48,
"hidden": false
},
@@ -427,7 +427,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "宸℃鍗曞垪琛�",
- "url": "/pages/ZLGL/xunjianjianyan/table",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
"id": 52,
"hidden": false
}
diff --git a/pages/qijvguzhangdengji/table.vue b/pages/qijvguzhangdengji/mouldMistake.vue
similarity index 98%
rename from pages/qijvguzhangdengji/table.vue
rename to pages/qijvguzhangdengji/mouldMistake.vue
index 6aec0d7..b3ac1ed 100644
--- a/pages/qijvguzhangdengji/table.vue
+++ b/pages/qijvguzhangdengji/mouldMistake.vue
@@ -256,7 +256,7 @@
},
cmdAdd() {
uni.navigateTo({
- url: "/pages/qijvguzhangdengji/form?operationType=1"
+ url: "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1"
})
},
async cmdSearch() {
@@ -372,7 +372,7 @@
edit(item) {
console.log("editItem:", item)
uni.navigateTo({
- url: `/pages/qijvguzhangdengji/form?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
+ url: `/pages/qijvguzhangdengji/mouldMistakeBill?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
})
}
},
diff --git a/pages/qijvguzhangdengji/form.vue b/pages/qijvguzhangdengji/mouldMistakeBill.vue
similarity index 99%
rename from pages/qijvguzhangdengji/form.vue
rename to pages/qijvguzhangdengji/mouldMistakeBill.vue
index 74c11f2..80cc9b2 100644
--- a/pages/qijvguzhangdengji/form.vue
+++ b/pages/qijvguzhangdengji/mouldMistakeBill.vue
@@ -678,7 +678,7 @@
// 鏂板鍥炶皟
addNew() {
uni.redirectTo({
- url: '/pages/qijvguzhangdengji/form?OperationType=1'
+ url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
})
},
//鏂板
@@ -835,7 +835,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/qijvguzhangdengji/form?OperationType=1'
+ url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/qitachuku/form.vue b/pages/qitachuku/qitachukudan.vue
similarity index 99%
rename from pages/qitachuku/form.vue
rename to pages/qitachuku/qitachukudan.vue
index ceaac06..d4c09e5 100644
--- a/pages/qitachuku/form.vue
+++ b/pages/qitachuku/qitachukudan.vue
@@ -1101,7 +1101,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/caigouruku/form?OperationType=1'
+ url: '/pages/caigouruku/POStockInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/qitachuku_v2/form.vue b/pages/qitachuku_v2/OtherOutBill.vue
similarity index 99%
rename from pages/qitachuku_v2/form.vue
rename to pages/qitachuku_v2/OtherOutBill.vue
index 1c1ee7a..b7bba30 100644
--- a/pages/qitachuku_v2/form.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -1675,7 +1675,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/qitachuku_v2/form?OperationType=1'
+ url: '/pages/qitachuku_v2/OtherOutBill?OperationType=1'
})
},
async submit() {
@@ -1756,7 +1756,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/qitachuku_v2/form?OperationType=1'
+ url: '/pages/qitachuku_v2/OtherOutBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1797,7 +1797,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/qitachuku_v2/form?OperationType=1'
+ // url: '/pages/qitachuku_v2/OtherOutBillList?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1834,7 +1834,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.navigateBack({
- url: '/pages/qitachuku_v2/table'
+ url: '/pages/qitachuku_v2/OtherOutBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/qitachuku_v2/table.vue b/pages/qitachuku_v2/OtherOutBillList.vue
similarity index 100%
rename from pages/qitachuku_v2/table.vue
rename to pages/qitachuku_v2/OtherOutBillList.vue
diff --git a/pages/qitachukujiaoyan/detail.vue b/pages/qitachukujiaoyan/qitachukudanjiaoyan.vue
similarity index 99%
rename from pages/qitachukujiaoyan/detail.vue
rename to pages/qitachukujiaoyan/qitachukudanjiaoyan.vue
index 363ff84..82d9c18 100644
--- a/pages/qitachukujiaoyan/detail.vue
+++ b/pages/qitachukujiaoyan/qitachukudanjiaoyan.vue
@@ -953,7 +953,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/qitachukujiaoyan/detail?OperationType=1'
+ url: '/pages/qitachukujiaoyan/qitachukudanjiaoyan?OperationType=1'
})
},
async submit() {
@@ -1011,7 +1011,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/qitachukujiaoyan/detail?OperationType=1'
+ url: '/pages/qitachukujiaoyan/qitachukudanjiaoyan?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1054,7 +1054,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/qitachukujiaoyan/detail?OperationType=1'
+ // url: '/pages/qitachukujiaoyan/qitachukudanjiaoyan?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/qitaruku/form.vue b/pages/qitaruku/qitarukudan.vue
similarity index 100%
rename from pages/qitaruku/form.vue
rename to pages/qitaruku/qitarukudan.vue
diff --git a/pages/qitaruku_v2/form.vue b/pages/qitaruku_v2/OtherInBill.vue
similarity index 99%
rename from pages/qitaruku_v2/form.vue
rename to pages/qitaruku_v2/OtherInBill.vue
index a46a8ac..49e501d 100644
--- a/pages/qitaruku_v2/form.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -1674,7 +1674,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/qitaruku_v2/form?OperationType=1'
+ url: '/pages/qitaruku_v2/OtherInBill?OperationType=1'
})
},
async submit() {
@@ -1754,7 +1754,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/qitaruku_v2/form?OperationType=1'
+ url: '/pages/qitaruku_v2/OtherInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1796,7 +1796,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/qitaruku_v2/form?OperationType=1'
+ // url: '/pages/qitaruku_v2/OtherInBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/qitaruku_v2/table.vue b/pages/qitaruku_v2/OtherInBillList.vue
similarity index 100%
rename from pages/qitaruku_v2/table.vue
rename to pages/qitaruku_v2/OtherInBillList.vue
diff --git a/pages/quyangdan/table.vue b/pages/quyangdan/TakeSampleCheckBillList.vue
similarity index 99%
rename from pages/quyangdan/table.vue
rename to pages/quyangdan/TakeSampleCheckBillList.vue
index ed247e7..875b09f 100644
--- a/pages/quyangdan/table.vue
+++ b/pages/quyangdan/TakeSampleCheckBillList.vue
@@ -272,7 +272,7 @@
// 鏂板鍙栨牱鍗�
onAddClickHandler() {
uni.navigateTo({
- url: "/pages/quyangdan/form?operationType=0"
+ url: "/pages/quyangdan/TakeSampleCheckBillList?operationType=0"
})
},
del(item) {
diff --git a/pages/quyangdan/form.vue b/pages/quyangdan/form.vue
index d1494b5..d483fd1 100644
--- a/pages/quyangdan/form.vue
+++ b/pages/quyangdan/form.vue
@@ -720,7 +720,7 @@
},
onAddNewHandler() {
uni.redirectTo({
- url: "/pages/quyangdan/form?operationType=0"
+ url: "/pages/quyangdan/TakeSampleCheckBillList?operationType=0"
})
},
goBack() {
diff --git a/pages/shebeidangan/form.vue b/pages/shebeidangan/Gy_EquipFileMainBill.vue
similarity index 100%
rename from pages/shebeidangan/form.vue
rename to pages/shebeidangan/Gy_EquipFileMainBill.vue
diff --git a/pages/shebeidangan/table.vue b/pages/shebeidangan/Gy_EquipFileMainBillList.vue
similarity index 98%
rename from pages/shebeidangan/table.vue
rename to pages/shebeidangan/Gy_EquipFileMainBillList.vue
index 854d7e9..69e18c1 100644
--- a/pages/shebeidangan/table.vue
+++ b/pages/shebeidangan/Gy_EquipFileMainBillList.vue
@@ -302,7 +302,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/shebeidangan/form'
+ url:'/pages/shebeidangan/Gy_EquipFileMainBill'
})
},
//閲嶇疆
@@ -325,7 +325,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/shebeidangan/form?hmainid=' + item.hmainid
+ url:'/pages/shebeidangan/Gy_EquipFileMainBill?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/shebeiguanli/form.vue b/pages/shebeiguanli/deviceManage.vue
similarity index 100%
rename from pages/shebeiguanli/form.vue
rename to pages/shebeiguanli/deviceManage.vue
diff --git a/pages/shebeiguanli/table.vue b/pages/shebeiguanli/deviceManageList.vue
similarity index 98%
rename from pages/shebeiguanli/table.vue
rename to pages/shebeiguanli/deviceManageList.vue
index 2e620aa..0ec932a 100644
--- a/pages/shebeiguanli/table.vue
+++ b/pages/shebeiguanli/deviceManageList.vue
@@ -307,7 +307,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/shebeidangan/form'
+ url:'/pages/shebeidangan/Gy_EquipFileMainBill'
})
},
//閲嶇疆
@@ -343,7 +343,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/shebeidangan/form?hmainid=' + item.hmainid
+ url:'/pages/shebeidangan/Gy_EquipFileMainBill?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/shebeiguanli/list.vue b/pages/shebeiguanli/ticketList.vue
similarity index 100%
rename from pages/shebeiguanli/list.vue
rename to pages/shebeiguanli/ticketList.vue
diff --git a/pages/shebeilvli/table.vue b/pages/shebeilvli/EquipFileBillResume.vue
similarity index 99%
rename from pages/shebeilvli/table.vue
rename to pages/shebeilvli/EquipFileBillResume.vue
index f4c34dc..7d4d291 100644
--- a/pages/shebeilvli/table.vue
+++ b/pages/shebeilvli/EquipFileBillResume.vue
@@ -338,7 +338,7 @@
},
toSon(item){
uni.navigateTo({
- url:'/pages/shebeilvli/table_son?HInterID=' + item.hmainid
+ url:'/pages/shebeilvli/EquipFileBillResume_son?HInterID=' + item.hmainid
+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜
+ '&璁惧鍑哄巶鏃ユ湡=' + item.璁惧鍑哄巶鏃ユ湡
diff --git a/pages/shebeilvli/table_son.vue b/pages/shebeilvli/EquipFileBillResume_son.vue
similarity index 100%
rename from pages/shebeilvli/table_son.vue
rename to pages/shebeilvli/EquipFileBillResume_son.vue
diff --git a/pages/shebeilvli/form.vue b/pages/shebeilvli/deviceStatueAnalysis.vue
similarity index 100%
rename from pages/shebeilvli/form.vue
rename to pages/shebeilvli/deviceStatueAnalysis.vue
diff --git a/pages/shebeiweixiu/table.vue b/pages/shebeiweixiu/SbEqpMaintenanceBillList.vue
similarity index 98%
rename from pages/shebeiweixiu/table.vue
rename to pages/shebeiweixiu/SbEqpMaintenanceBillList.vue
index b2af521..ffe86f5 100644
--- a/pages/shebeiweixiu/table.vue
+++ b/pages/shebeiweixiu/SbEqpMaintenanceBillList.vue
@@ -361,7 +361,7 @@
},
creat(){
uni.navigateTo({
- url:'/pages/shebeiweixiu/form'
+ url:'/pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList'
})
},
clear(){
@@ -387,7 +387,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/shebeiweixiu/form?hmainid=' + item.hmainid
+ url:'/pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList?hmainid=' + item.hmainid
})
},
//鍒犻櫎
diff --git a/pages/shebeiweixiu/form.vue b/pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue
similarity index 100%
rename from pages/shebeiweixiu/form.vue
rename to pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue
diff --git a/pages/shengchanbuliao/form.vue b/pages/shengchanbuliao/MateReplenishOutBill.vue
similarity index 99%
rename from pages/shengchanbuliao/form.vue
rename to pages/shengchanbuliao/MateReplenishOutBill.vue
index b66fafa..ec11f14 100644
--- a/pages/shengchanbuliao/form.vue
+++ b/pages/shengchanbuliao/MateReplenishOutBill.vue
@@ -1541,7 +1541,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/shengchanbuliao/form?OperationType=1'
+ url: '/pages/shengchanbuliao/MateReplenishOutBill?OperationType=1'
})
},
async submit() {
@@ -1622,7 +1622,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchanbuliao/form?OperationType=1'
+ url: '/pages/shengchanbuliao/MateReplenishOutBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1664,7 +1664,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/shengchanbuliao/form?OperationType=1'
+ // url: '/pages/shengchanbuliao/MateReplenishOutBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/shengchanbuliao/table.vue b/pages/shengchanbuliao/MateReplenishOutBillList.vue
similarity index 100%
rename from pages/shengchanbuliao/table.vue
rename to pages/shengchanbuliao/MateReplenishOutBillList.vue
diff --git a/pages/shengchanbuliaojiaoyan/form.vue b/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
similarity index 99%
rename from pages/shengchanbuliaojiaoyan/form.vue
rename to pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
index 1710758..1299003 100644
--- a/pages/shengchanbuliaojiaoyan/form.vue
+++ b/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
@@ -953,7 +953,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1'
+ url: '/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill?OperationType=1'
})
},
async submit() {
@@ -1012,7 +1012,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1'
+ url: '/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1056,7 +1056,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1'
+ // url: '/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/shengchandiaobo/form.vue b/pages/shengchandiaobo/MoveStockBill.vue
similarity index 99%
rename from pages/shengchandiaobo/form.vue
rename to pages/shengchandiaobo/MoveStockBill.vue
index 4e94a4f..5d6a8d6 100644
--- a/pages/shengchandiaobo/form.vue
+++ b/pages/shengchandiaobo/MoveStockBill.vue
@@ -974,7 +974,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/shengchandiaobo/form?OperationType=1'
+ url: '/pages/shengchandiaobo/MoveStockBill?OperationType=1'
})
},
async submit() {
@@ -1033,7 +1033,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchandiaobo/form?OperationType=1'
+ url: '/pages/shengchandiaobo/MoveStockBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1077,7 +1077,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/shengchandiaobo/form?OperationType=1'
+ // url: '/pages/shengchandiaobo/MoveStockBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1114,7 +1114,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchandiaobo/table'
+ url: '/pages/shengchandiaobo/MoveStockBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/shengchandiaobo/table.vue b/pages/shengchandiaobo/MoveStockBillList.vue
similarity index 100%
rename from pages/shengchandiaobo/table.vue
rename to pages/shengchandiaobo/MoveStockBillList.vue
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
similarity index 99%
rename from pages/shengchanlingliao/form.vue
rename to pages/shengchanlingliao/PPickingCheckBill.vue
index 3c4ae63..a4a3dc5 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -1061,7 +1061,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/shengchanlingliao/form?OperationType=1'
+ url: '/pages/xiaoshoutuihuo/PPickingBill?OperationType=1'
})
},
async submit() {
@@ -1121,7 +1121,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchanlingliao/form?OperationType=1'
+ url: '/pages/xiaoshoutuihuo/PPickingBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1166,7 +1166,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/shengchanlingliao/form?OperationType=1'
+ // url: '/pages/xiaoshoutuihuo/PPickingBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1203,7 +1203,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchanlingliao/table'
+ url: '/pages/xiaoshoutuihuo/PPickingBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/shengchanlingliao/table.vue b/pages/shengchanlingliao/PPickingCheckBillList.vue
similarity index 100%
rename from pages/shengchanlingliao/table.vue
rename to pages/shengchanlingliao/PPickingCheckBillList.vue
diff --git a/pages/shengchanruku/form.vue b/pages/shengchanruku/ProductInCheckBill.vue
similarity index 99%
rename from pages/shengchanruku/form.vue
rename to pages/shengchanruku/ProductInCheckBill.vue
index 9628208..1f4661c 100644
--- a/pages/shengchanruku/form.vue
+++ b/pages/shengchanruku/ProductInCheckBill.vue
@@ -948,7 +948,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/shengchanruku/form?OperationType=1'
+ url: '/pages/shengchanruku/ProductCheckInBill?OperationType=1'
})
},
async submit() {
@@ -1008,7 +1008,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchanruku/form?OperationType=1'
+ url: '/pages/shengchanruku/ProductCheckInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1052,7 +1052,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/shengchanruku/form?OperationType=1'
+ // url: '/pages/shengchanruku/ProductCheckInBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1089,7 +1089,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchanruku/table'
+ url: '/pages/shengchanruku/ProductInCheckBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/shengchanruku/table.vue b/pages/shengchanruku/ProductInCheckBillList.vue
similarity index 100%
rename from pages/shengchanruku/table.vue
rename to pages/shengchanruku/ProductInCheckBillList.vue
diff --git a/pages/shengchantuiliao/form.vue b/pages/shengchantuiliao/MateOutBackBill.vue
similarity index 99%
rename from pages/shengchantuiliao/form.vue
rename to pages/shengchantuiliao/MateOutBackBill.vue
index a429e22..99185ef 100644
--- a/pages/shengchantuiliao/form.vue
+++ b/pages/shengchantuiliao/MateOutBackBill.vue
@@ -1647,7 +1647,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/shengchantuiliao/form?OperationType=1'
+ url: '/pages/shengchantuiliao/MateOutBackBill?OperationType=1'
})
},
async submit() {
@@ -1727,7 +1727,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/shengchantuiliao/form?OperationType=1'
+ url: '/pages/shengchantuiliao/MateOutBackBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1769,7 +1769,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/shengchantuiliao/form?OperationType=1'
+ // url: '/pages/shengchantuiliao/MateOutBackBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/shengchantuiliao/table.vue b/pages/shengchantuiliao/MateOutBackBillList.vue
similarity index 100%
rename from pages/shengchantuiliao/table.vue
rename to pages/shengchantuiliao/MateOutBackBillList.vue
diff --git a/pages/shoujishouming/form.vue b/pages/shoujishouming/form.vue
index 3cebf53..463c353 100644
--- a/pages/shoujishouming/form.vue
+++ b/pages/shoujishouming/form.vue
@@ -601,7 +601,7 @@
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
- url:'/pages/weiwaigxIn/form?linterid=' + this.linterid + '&HBillNo=' + this.linterid
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?linterid=' + this.linterid + '&HBillNo=' + this.linterid
})
},1000)
}else{
diff --git a/pages/shoujishouming/table.vue b/pages/shoujishouming/table.vue
index 60318fa..0432db7 100644
--- a/pages/shoujishouming/table.vue
+++ b/pages/shoujishouming/table.vue
@@ -303,7 +303,7 @@
},
toSon(item){
uni.navigateTo({
- url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid
+ url:'/pages/baoyangjilu/Sb_EquipMaintainRuleList_son?HInterID=' + item.hmainid
+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
})
diff --git a/pages/shouliaotongzhi/table.vue b/pages/shouliaotongzhi/table.vue
index 2cd19e2..88d092f 100644
--- a/pages/shouliaotongzhi/table.vue
+++ b/pages/shouliaotongzhi/table.vue
@@ -225,12 +225,12 @@
}
},
toSon(item) {
+ console.log(item)
// 鏍规嵁鏉′欢鍒ゆ柇鏄惁鍘诲瓙椤甸潰锛屽鏋滄槸澶氭潯鐮佹墦鍗版ā寮忥紝鍒欏瓨鍏ョ紦瀛�
if (!this.MultiCodePrint) {
uni.navigateTo({
url: './table_son?OperationType=1&closeType=1&linterid=' + item.hmainid + '&hsubid=' +
- item
- .hsubid
+ item.hsubid
})
} else {
this.setPrintableWaitInfo(item)
diff --git a/pages/tiaomaguanli/table.vue b/pages/tiaomaguanli/table.vue
index bc6d403..424b1c5 100644
--- a/pages/tiaomaguanli/table.vue
+++ b/pages/tiaomaguanli/table.vue
@@ -185,6 +185,7 @@
}
},
toSon(item) {
+ console.log(item)
uni.navigateTo({
url: './table_son?OperationType=1&closeType=1&linterid=' + item.hmainid + '&hsubid=' + item
.hsubid + '&HBillType=' + this.baseInfo.HBillType
diff --git a/pages/weiwaigxIn/form.vue b/pages/weiwaigxIn/Cj_StationEntrustOutBill.vue
similarity index 98%
rename from pages/weiwaigxIn/form.vue
rename to pages/weiwaigxIn/Cj_StationEntrustOutBill.vue
index 1d3b50f..9314202 100644
--- a/pages/weiwaigxIn/form.vue
+++ b/pages/weiwaigxIn/Cj_StationEntrustOutBill.vue
@@ -1001,7 +1001,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/weiwaigxIn/form?OperationType=1'
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBill?OperationType=1'
})
},
submit() {
@@ -1055,7 +1055,7 @@
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
- url:'/pages/weiwaigxIn/form?linterid=' + this.linterid + '&HBillNo=' + this.linterid
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?linterid=' + this.linterid + '&HBillNo=' + this.linterid
})
},1000)
}else{
@@ -1066,7 +1066,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url:'/pages/weiwaigxIn/form?OperationType=1'
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/weiwaigxIn/table.vue b/pages/weiwaigxIn/Cj_StationEntrustOutBillList.vue
similarity index 98%
rename from pages/weiwaigxIn/table.vue
rename to pages/weiwaigxIn/Cj_StationEntrustOutBillList.vue
index 0f8f436..a33830c 100644
--- a/pages/weiwaigxIn/table.vue
+++ b/pages/weiwaigxIn/Cj_StationEntrustOutBillList.vue
@@ -335,7 +335,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/weiwaigxIn/form'
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBill'
})
},
//閲嶇疆
@@ -365,7 +365,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/weiwaigxIn/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/weiwaigxOut/form.vue b/pages/weiwaigxOut/Cj_StationEntrustInBill.vue
similarity index 99%
rename from pages/weiwaigxOut/form.vue
rename to pages/weiwaigxOut/Cj_StationEntrustInBill.vue
index a0afd35..4b91e0f 100644
--- a/pages/weiwaigxOut/form.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustInBill.vue
@@ -1200,7 +1200,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/weiwaigxOut/form?OperationType=1'
+ url: '/pages/weiwaigxIn/Cj_StationEntrustOutBill?OperationType=1'
})
},
submit() {
@@ -1262,7 +1262,7 @@
})
setTimeout(() => {
uni.redirectTo({
- url: '/pages/weiwaigxOut/table'
+ url: '/pages/weiwaigxIn/Cj_StationEntrustOutBillList'
})
}, 1000)
} else {
@@ -1273,7 +1273,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/weiwaigxOut/form?OperationType=1'
+ url: '/pages/weiwaigxIn/Cj_StationEntrustOutBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/weiwaigxOut/table.vue b/pages/weiwaigxOut/Cj_StationEntrustInBillList.vue
similarity index 98%
rename from pages/weiwaigxOut/table.vue
rename to pages/weiwaigxOut/Cj_StationEntrustInBillList.vue
index eb8f27e..515d14d 100644
--- a/pages/weiwaigxOut/table.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustInBillList.vue
@@ -376,7 +376,7 @@
//鏂板
creat(){
uni.navigateTo({
- url:'/pages/weiwaigxOut/form'
+ url:'/pages/weiwaigxIn/Cj_StationEntrustOutBill'
})
},
//閲嶇疆
@@ -417,7 +417,7 @@
edit(item){
console.log(item)
uni.navigateTo({
- url:'/pages/weiwaigxOut/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/weiwaigxIn/Cj_StationEntrustOutBill?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
diff --git a/pages/weiwailingliaojiaoyan/form.vue b/pages/weiwailingliaojiaoyan/EntrustOutCheckBill.vue
similarity index 99%
rename from pages/weiwailingliaojiaoyan/form.vue
rename to pages/weiwailingliaojiaoyan/EntrustOutCheckBill.vue
index 9707142..9660e1b 100644
--- a/pages/weiwailingliaojiaoyan/form.vue
+++ b/pages/weiwailingliaojiaoyan/EntrustOutCheckBill.vue
@@ -737,7 +737,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/weiwailingliaojiaoyan/form?OperationType=1'
+ url: '/pages/weiwailingliaojiaoyan/EntrustOutCheckBill?OperationType=1'
})
},
submit() {
@@ -791,7 +791,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/weiwailingliaojiaoyan/form?OperationType=1'
+ url: '/pages/weiwailingliaojiaoyan/EntrustOutCheckBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -834,7 +834,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/weiwailingliaojiaoyan/table'
+ url: '/pages/weiwailingliaojiaoyan/EntrustOutCheckBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/weiwailingliaojiaoyan/table.vue b/pages/weiwailingliaojiaoyan/EntrustOutCheckBillList.vue
similarity index 100%
rename from pages/weiwailingliaojiaoyan/table.vue
rename to pages/weiwailingliaojiaoyan/EntrustOutCheckBillList.vue
diff --git a/pages/weiwairuku/form.vue b/pages/weiwairuku/EntrustInBill.vue
similarity index 99%
rename from pages/weiwairuku/form.vue
rename to pages/weiwairuku/EntrustInBill.vue
index 8be46e7..a25819b 100644
--- a/pages/weiwairuku/form.vue
+++ b/pages/weiwairuku/EntrustInBill.vue
@@ -1570,7 +1570,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/weiwairuku/form?OperationType=1'
+ url: '/pages/weiwairuku/EntrustInBill?OperationType=1'
})
},
async submit() {
@@ -1650,7 +1650,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/weiwairuku/form?OperationType=1'
+ url: '/pages/weiwairuku/EntrustInBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1692,7 +1692,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/weiwairuku/form?OperationType=1'
+ // url: '/pages/weiwairuku/EntrustInBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/weiwairuku/table.vue b/pages/weiwairuku/EntrustInBillList.vue
similarity index 100%
rename from pages/weiwairuku/table.vue
rename to pages/weiwairuku/EntrustInBillList.vue
diff --git a/pages/weixiujilu/form.vue b/pages/weixiujilu/mouldRepairRecordBill.vue
similarity index 99%
rename from pages/weixiujilu/form.vue
rename to pages/weixiujilu/mouldRepairRecordBill.vue
index 8287c88..2aa7078 100644
--- a/pages/weixiujilu/form.vue
+++ b/pages/weixiujilu/mouldRepairRecordBill.vue
@@ -880,7 +880,7 @@
// 鏂板鍥炶皟
addNew() {
uni.redirectTo({
- url: '/pages/weixiujilu/form?OperationType=1'
+ url: '/pages/weixiujilu/mouldRepairRecordBill?OperationType=1'
})
},
//鏂板
@@ -1041,7 +1041,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/weixiujilu/form?OperationType=1'
+ url: '/pages/weixiujilu/mouldRepairRecordBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/weixiujilu/table.vue b/pages/weixiujilu/mouldRepairRecordBillList.vue
similarity index 98%
rename from pages/weixiujilu/table.vue
rename to pages/weixiujilu/mouldRepairRecordBillList.vue
index cf12e77..694bd21 100644
--- a/pages/weixiujilu/table.vue
+++ b/pages/weixiujilu/mouldRepairRecordBillList.vue
@@ -247,7 +247,7 @@
},
cmdAdd() {
uni.navigateTo({
- url: "/pages/weixiujilu/form?operationType=1"
+ url: "/pages/weixiujilu/mouldRepairRecordBill?operationType=1"
})
},
async cmdSearch() {
@@ -364,7 +364,7 @@
edit(item) {
console.log("editItem:", item)
uni.navigateTo({
- url: `/pages/weixiujilu/form?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
+ url: `/pages/weixiujilu/mouldRepairRecordBill?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
})
}
},
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/SellOutBill.vue
similarity index 99%
rename from pages/xiaoshouchuku/form.vue
rename to pages/xiaoshouchuku/SellOutBill.vue
index 17c5d0f..002920d 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -1614,7 +1614,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/xiaoshouchuku/form?OperationType=1'
+ url: '/pages/xiaoshouchuku/SellOutBill?OperationType=1'
})
},
async submit() {
@@ -1698,7 +1698,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/xiaoshouchuku/form?OperationType=1'
+ url: '/pages/xiaoshouchuku/SellOutBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1756,7 +1756,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/xiaoshouchuku/form?OperationType=1'
+ // url: '/pages/xiaoshouchuku/SellOutBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1825,7 +1825,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/xiaoshouchuku/table'
+ url: '/pages/xiaoshouchuku/SellOutBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/xiaoshouchuku/table.vue b/pages/xiaoshouchuku/SellOutBillList.vue
similarity index 100%
rename from pages/xiaoshouchuku/table.vue
rename to pages/xiaoshouchuku/SellOutBillList.vue
diff --git a/pages/xiaoshouchukujiaoyan/form.vue b/pages/xiaoshouchukujiaoyan/SellOutCheckBill.vue
similarity index 99%
rename from pages/xiaoshouchukujiaoyan/form.vue
rename to pages/xiaoshouchukujiaoyan/SellOutCheckBill.vue
index 05c7b63..ea4a7fa 100644
--- a/pages/xiaoshouchukujiaoyan/form.vue
+++ b/pages/xiaoshouchukujiaoyan/SellOutCheckBill.vue
@@ -736,7 +736,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/xiaoshouchukujiaoyan/form?OperationType=1'
+ url: '/pages/xiaoshouchukujiaoyan/SellOutCheckBill?OperationType=1'
})
},
submit() {
@@ -790,7 +790,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/xiaoshouchukujiaoyan/form?OperationType=1'
+ url: '/pages/xiaoshouchukujiaoyan/SellOutCheckBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -833,7 +833,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.navigateBack({
- url: '/pages/xiaoshouchukujiaoyan/table'
+ url: '/pages/xiaoshouchukujiaoyan/SellOutCheckBillList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/xiaoshouchukujiaoyan/table.vue b/pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue
similarity index 100%
rename from pages/xiaoshouchukujiaoyan/table.vue
rename to pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue
diff --git a/pages/xiaoshoutuihuo/form.vue b/pages/xiaoshoutuihuo/ICStockBillMain.vue
similarity index 99%
rename from pages/xiaoshoutuihuo/form.vue
rename to pages/xiaoshoutuihuo/ICStockBillMain.vue
index f28557f..4d7a0dd 100644
--- a/pages/xiaoshoutuihuo/form.vue
+++ b/pages/xiaoshoutuihuo/ICStockBillMain.vue
@@ -1419,7 +1419,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/xiaoshoutuihuo/form?OperationType=1'
+ url: '/pages/xiaoshoutuihuo/ICStockBillMain?OperationType=1'
})
},
async submit() {
@@ -1499,7 +1499,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/xiaoshoutuihuo/form?OperationType=1'
+ url: '/pages/xiaoshoutuihuo/ICStockBillMain?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1541,7 +1541,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/xiaoshoutuihuo/form?OperationType=1'
+ // url: '/pages/xiaoshoutuihuo/ICStockBillMain?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1578,7 +1578,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/xiaoshoutuihuo/table'
+ url: '/pages/xiaoshoutuihuo/ICStockBillMainList'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/xiaoshoutuihuo/table.vue b/pages/xiaoshoutuihuo/ICStockBillMainList.vue
similarity index 100%
rename from pages/xiaoshoutuihuo/table.vue
rename to pages/xiaoshoutuihuo/ICStockBillMainList.vue
diff --git a/pages/yichang/list.vue b/pages/yichang/ErrMsgBackHandleBillList.vue
similarity index 100%
rename from pages/yichang/list.vue
rename to pages/yichang/ErrMsgBackHandleBillList.vue
diff --git a/pages/yichang/form.vue b/pages/yichang/MESExecptFeedBackBill.vue
similarity index 100%
rename from pages/yichang/form.vue
rename to pages/yichang/MESExecptFeedBackBill.vue
diff --git a/pages/yichang/table.vue b/pages/yichang/MESExecptFeedBackBillList.vue
similarity index 100%
rename from pages/yichang/table.vue
rename to pages/yichang/MESExecptFeedBackBillList.vue
diff --git a/pages/zhijiediaobo/form.vue b/pages/zhijiediaobo/MoveStockBill.vue
similarity index 99%
rename from pages/zhijiediaobo/form.vue
rename to pages/zhijiediaobo/MoveStockBill.vue
index eb4e571..0944018 100644
--- a/pages/zhijiediaobo/form.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -2264,7 +2264,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/zhijiediaobo/form?OperationType=1'
+ url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
})
},
async submit() {
@@ -2345,7 +2345,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/zhijiediaobo/form?OperationType=1'
+ url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -2387,7 +2387,7 @@
// if (res.confirm) {
// console.log('鐢ㄦ埛鐐瑰嚮纭畾');
// uni.redirectTo({
- // url: '/pages/zhijiediaobo/form?OperationType=1'
+ // url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
// })
// } else if (res.cancel) {
// console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/zhijiediaobo/table.vue b/pages/zhijiediaobo/MoveStockBillList.vue
similarity index 100%
rename from pages/zhijiediaobo/table.vue
rename to pages/zhijiediaobo/MoveStockBillList.vue
diff --git a/pages/zhuangxiang/form_mix.vue b/pages/zhuangxiang/form_mix.vue
index ed803ca..b41d1af 100644
--- a/pages/zhuangxiang/form_mix.vue
+++ b/pages/zhuangxiang/form_mix.vue
@@ -529,7 +529,7 @@
}) => {
if (confirm) {
uni.redirectTo({
- url: "/pages/zutuosaoma/form"
+ url: "/pages/zutuosaoma/PackUnionBill"
})
}
diff --git a/pages/zutuosaoma/form.vue b/pages/zutuosaoma/PackUnionBill.vue
similarity index 91%
rename from pages/zutuosaoma/form.vue
rename to pages/zutuosaoma/PackUnionBill.vue
index be0f767..e72330b 100644
--- a/pages/zutuosaoma/form.vue
+++ b/pages/zutuosaoma/PackUnionBill.vue
@@ -8,7 +8,7 @@
@confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
</view>
<view class="right-icon">
- <uni-icons class="right-icon" :class="[EnableScanBarCodePack?'disabled':'']" type="scan"
+ <uni-icons class="right-icon" :class="[EnableScanBarCodePack?'disabled':'']" type="scan"
style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
@click="toScanCode"></uni-icons>
</view>
@@ -27,14 +27,37 @@
</view>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">瑁呯淇℃伅</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">缁勬墭淇℃伅</view>
<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍗曟嵁淇℃伅</view>
</view>
<!-- 瑁呯淇℃伅 -->
<view v-if="tabs == 0">
- <zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+ <!-- <zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
:show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
- @toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" />
+ @toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" /> -->
+
+ <view class="item-wrapper">
+ <view v-for="(item, index) in listData" :key="index">
+ <uni-card :title="item['鐗╂枡鍚嶇О']" :extra="`鏉＄爜鏁伴噺: ${item['鏉＄爜涓暟']}`" @tap="cmdDelete(item)">
+ <view class="detail" v-if="item['鏉＄爜缂栧彿']">
+ <text>鏉＄爜缂栧彿锛�</text>{{item['鏉＄爜缂栧彿']}}
+ </view>
+ <view class="detail" v-if="item['鏁伴噺']">
+ <text>鏁伴噺锛�</text>{{item['鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['鐗╂枡浠ｇ爜']">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item['鐗╂枡浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
+ </view>
+ <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
</view>
<!-- 鍗曟嵁淇℃伅 -->
<view v-if="tabs == 1">
@@ -82,17 +105,18 @@
</view>
<view class="bill-info">
<checkbox-group @change="checkboxGroupChangeHandler">
- <view class="form-item" style="justify-content: right;">
- <view class="title">璐ㄩ噺瀹℃壒</view>
- <checkbox value="qualityApproval"></checkbox>
- </view>
+ <view class="form-item" style="justify-content: right;">
+ <view class="title">璐ㄩ噺瀹℃壒</view>
+ <checkbox value="qualityApproval"></checkbox>
+ </view>
</checkbox-group>
</view>
</view>
<view class="bottom-btn" id="bottom-btn">
- <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">鎻愪氦</button>
+ <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini"
+ @tap="cmdSubmit">鎻愪氦</button>
<view style="flex: 1;"></view>
- <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button>
+ <!-- <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button> -->
<button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
</view>
</view>
@@ -181,7 +205,7 @@
HInterID: '',
HStockOrgName: uni.getStorageSync("Organization"),
HStockOrgID: uni.getStorageSync("OrganizationID"),
-
+
HQualityApproval: false,
},
// 鍒嗛〉妯″潡鍏冩暟鎹�
@@ -193,17 +217,17 @@
methods: {
checkboxGroupChangeHandler(e) {
let checkBoxValues = Array.from(e.detail.value)
- if(checkBoxValues.findIndex(elem => elem == 'qualityApproval') != -1) {
+ if (checkBoxValues.findIndex(elem => elem == 'qualityApproval') != -1) {
this.hform.HQualityApproval = true
- }else {
+ } else {
this.hform.HQualityApproval = false
}
},
onTableRowClickHandler(row, index) {
- console.log('row: ',row);
- if(!this.listData[index].checked){
+ console.log('row: ', row);
+ if (!this.listData[index].checked) {
this.$set(this.listData[index], 'checked', true)
- }else {
+ } else {
this.listData[index].checked = !this.listData[index].checked
}
},
@@ -446,14 +470,7 @@
}
return true
},
- cmdDelete() {
- console.log('this.selectedRows: ', this.selectedRows);
- if (this.selectedRows.length != 1) {
- return uni.showToast({
- icon: 'none',
- title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
- })
- }
+ cmdDelete(item) {
uni.showModal({
title: '鍒犻櫎纭',
content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
@@ -464,7 +481,7 @@
data: {
HInterID: this.hform.HInterID,
HBillType: this.HBillType,
- HBarCode: this.selectedRows[0].HBarCode
+ HBarCode: item.HBarCode
},
resFunction: (res) => {
let {
@@ -526,7 +543,7 @@
}) => {
if (confirm) {
uni.redirectTo({
- url: "/pages/zutuosaoma/form"
+ url: "/pages/zutuosaoma/PackUnionBill"
})
}
diff --git a/pages/zutuosaoma/table.vue b/pages/zutuosaoma/PackUnionBillList.vue
similarity index 100%
rename from pages/zutuosaoma/table.vue
rename to pages/zutuosaoma/PackUnionBillList.vue
--
Gitblit v1.9.1