From de32eaefeb995ce67a638ca82bc6760075af2eb5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 20 十一月 2025 10:17: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 | 2292 +++++++++++++++++
pages/chaituosaoma-xiaowei/UnpackPallet.vue | 15
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/zhuangxiangdan/form.vue | 14
pages/MJGL/mujubaoyangjiludan/MouldMaintainBill.vue | 0
pages/index/tab1.vue | 46
pages/sanmaheyi/table.vue | 487 +++
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/login.vue | 1
pages/index/index01.vue | 12
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 208
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 | 179
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 | 388 +-
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/sanmaheyi/BarCodeCheck.vue | 872 ++++++
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 | 141
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 | 302 +-
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
/dev/null | 2290 -----------------
pages/MJGL/qijudiaobodan/table.vue | 2
pages/qijvguzhangdengji/mouldMistake.vue | 4
pages/shebeiguanli/deviceManageList.vue | 4
pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue | 2
manifest.json | 4
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
125 files changed, 4,612 insertions(+), 3,171 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/manifest.json b/manifest.json
index 44c6034..3883949 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.15",
- "versionCode" : 215,
+ "versionName" : "2.0.16",
+ "versionCode" : 216,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 2dc40c7..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": "鏉＄爜鐢熸垚"
}
},
{
@@ -920,35 +913,28 @@
"style": {
"navigationBarTitleText": "鏉＄爜绠＄悊"
}
- },
- {
- "path": "pages/tiaomaguanli/table_son",
- "style": {
- "navigationBarTitleText": "鏉＄爜绠＄悊_son"
- }
- },
- {
- "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": "鐩存帴璋冩嫧鍗�"
}
@@ -965,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": "杩樻牱鍗�"
}
},
{
@@ -1010,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": "棣栦欢妫�楠屽崟"
}
@@ -1066,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
@@ -1122,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": "棣栦欢妫�楠屽崟"
}
@@ -1148,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
@@ -1204,38 +1177,32 @@
}
},
{
- "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": "妯″叿鏁呴殰鐧昏鍗�"
}
},
{
- "path": "pages/zhuangxiangdan/form",
- "style": {
- "navigationBarTitleText": "瑁呯鍗�"
- }
- },
- {
"path": "pages/chaixiang/form",
"style": {
"navigationBarTitleText": "鎷嗙"
@@ -1260,29 +1227,42 @@
}
},
{
- "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": "鏈欢妫�楠屽崟"
}
- }
+ },
+ {
+ "path": "pages/chaituosaoma-xiaowei/UnpackPallet",
+ "style": {
+ "navigationBarTitleText": "鎷嗘墭鎵爜锛堝皬鍗級"
+ }
+ },
+ {
+ "path": "pages/sanmaheyi/BarCodeCheck",
+ "style": {
+ "navigationBarTitleText": "涓夌爜鍚堜竴"
+ }
+ }
+
],
"tabBar": {
"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
@@ -1322,5 +1302,15 @@
"backgroundColor": "#F8F8F8",
"pageOrientation": "default"
},
- "uniIdRouter": {}
+ "uniIdRouter": {},
+ "condition" : { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
+ "current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
+ "list": [
+ {
+ "name": "", //妯″紡鍚嶇О
+ "path": "", //鍚姩椤甸潰锛屽繀閫�
+ "query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
+ }
+ ]
+ }
}
\ No newline at end of file
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/form.vue
deleted file mode 100644
index 9c5bc4a..0000000
--- a/pages/ZLGL/mojianjianyan/form.vue
+++ /dev/null
@@ -1,2290 +0,0 @@
-<template>
- <view>
- <!-- 涓昏〃鍖哄煙 -->
- <view class="bill-main-area">
- <!-- 涓昏〃椤电 -->
- <view class="bill-main-tabs">
- <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
- <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍒跺崟淇℃伅</view>
- </view>
- <!-- 涓昏〃鍐呭 -->
- <view class="bill-main-contents">
- <!-- 鍩烘湰淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 1">
- <view class="form-item">
- <view class="left">鍗曟嵁鍙�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HBillNo" disabled />
- </view>
- </view>
-
- <view class="form-item">
- <view class="left">鏃ユ湡</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
- <view>{{ hform.HDate }}</view>
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item">
- <view class="left">婧愬崟绫诲瀷</view>
- <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
- <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
- @change="HSourceBillTypeNameChange">
- <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="left">婧愬崟鍗曞彿</view>
- <view class="right" :class="!hasSourceBill?'':'disabled'">
- <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�" v-model="hform.HSourceBillNo"
- @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
- </view>
- <view class="icon-wrapper-big">
- <uni-icons class="right-icon" type="scan" style="
- background-color: #3a78ff;
- padding: 6rpx;
- color: #fff;
- border-radius: 100%;
- " size="20" @click="toScanCode"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right">
- <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @update:modelValue="HSourceChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇鐝</view>
- <view class="right">
- <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
- </view>
- </view>
- <!-- <view class="form-item">
- <view class="left"></view>
- <view class="right">
- <input type="text"></view>
- </view> -->
- <view class="form-item">
- <view class="left">浠诲姟鍗曞彿</view>
- <view class="right disabled">
- <input type="text" :value="hform.HICMOBillNo" disabled />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 5)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">浠诲姟鍗曟暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HICMOQty" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">娴佽浆鍗″彿</view>
- <view class="right disabled">
- <input type="text" :value="hform.HProcExchBillNo" disabled />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 6)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">娴佽浆鍗℃暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HProcExchQty" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浜у搧浠ｇ爜</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HMaterNumber" />
- </view>
- <view class="icon-wrapper-big">
- <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="left">浜у搧鍚嶇О</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HMaterName" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">妫�楠屽憳</view>
- <view class="right">
- <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
- :v-model="hform.HFirstCheckEmpName"
- @update:modelValue="HFirstCheckEmpChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">妫�楠屾柟妗�</view>
- <view class="right disabled">
- <input type="text" disabled :value="this.hform.HQCSchemeName" />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 7)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">鎵瑰彿</view>
- <view class="right">
- <input type="text" value="" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍒ゆ柇缁撹</view>
- <view class="right none-border">
- <radio-group @changer="checkResultChange">
- <label>
- <radio value="0" :checked="hform.HLastResult" /><text></text>
- 鍚堟牸
- </label>
- <view style="width: 20rpx; display: inline-block"></view>
- <label>
- <radio value="1" :checked="!hform.HLastResult" /><text></text>
- 涓嶅悎鏍�
- </label>
- </radio-group>
- </view>
- </view>
- <view class="form-item">
- <view class="left">宸ュ簭</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HProcName" />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 8)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">澶囨敞</view>
- <view class="right">
- <input type="text" value="" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
- <view class="right">
- <input type="text" value="" />
- </view>
- </view>
- </view>
- <!-- 鍒跺崟淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 2">
- <view class="form-item">
- <view class="left">鍒跺崟浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HMaker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍒跺崟鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HMakeDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">瀹℃牳浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HChecker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">瀹℃牳鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCheckDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍏抽棴浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCloseMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍏抽棴鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCloseDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">淇敼浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HUpDater" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">淇敼鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HUpDateDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浣滃簾浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HDeleteMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浣滃簾鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HDeleteDate" disabled />
- </view>
- </view>
- </view>
- </view>
- </view>
- <!-- 瀛愯〃鍖哄煙 -->
- <view class="bill-sub-area">
- <!-- 瀛愯〃椤电 -->
- <view class="bill-sub-tabs">
- <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
- @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
- </view>
- <!-- 瀛愯〃鍐呭 -->
- <view class="bill-main-contents">
- <!-- 妫�楠岄」鐩� 鍛堢幇 -->
- <view v-if="subTabSelected == 1">
- <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
- <view class="buttons" @tap="addCheckItem()">
- <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
- </view>
- <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
- <view class="list" v-else>
- <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
- <view class="card-detail">
- <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
- <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
- <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <view><text>缁撹锛�</text></view>
- <view style="width: 4em">
- {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
- </view>
- <view>
- <switch style="width: 2em; transform: scale(0.7)"
- :checked="checkItem.HResult == 1"
- @change="HResultChange(checkItem.num, $event)" />
- </view>
- </view>
- <view class="detail editable" style="position: relative">
- <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
- <picker :range="arrayAnalysisMethod" range-key="name"
- @change="HAnalysisMethodChange(checkItem.num, $event)">
- <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
- placeholder="璇烽�夋嫨" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
- <view>
- <switch type="checkbox" style="transform: scale(0.7)"
- :checked="checkItem.HKeyInspect"
- @change="HKeyInspectChange(checkItem, $event)" />
- </view>
- </view>
- <view class="detail" v-if="checkItem.HQCStd">
- <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
- </view>
- <view class="detail" v-if="checkItem.HUnit">
- <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
- </view>
- <view class="detail" v-if="checkItem.HQCStd">
- <text>妫�楠屽�硷細</text>{{ checkItem.HQCStd }}
- </view>
- <view class="detail" v-if="checkItem.HQCNote">
- <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
- </view>
- <view class="detail" v-if="checkItem.HTargetVal">
- <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
- </view>
- <view class="detail" v-if="checkItem.HUpLimit">
- <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
- </view>
- <view class="detail" v-if="checkItem.HDownLimit">
- <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
- </view>
- <view class="detail" v-if="checkItem.HMax">
- <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
- </view>
- <view class="detail" v-if="checkItem.HMin">
- <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
- </view>
- <view class="detail" v-if="checkItem.HAvg">
- <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
- </view>
- </view>
- <view style="height: 20rpx"></view>
- <view class="more">
- <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
- <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
- size="18"></uni-icons>鍒犻櫎
- </view>
- </view>
- </uni-card>
- </view>
- </view>
- <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
- <view v-if="subTabSelected == 2">
- <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
- <view class="list" v-else>
- <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
- <view class="card-detail">
- <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
- <view class="detail editable">
- <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
- </view>
- <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
- <view class="detail editable" style="width: 100%">
- <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
- <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
- </view>
- <view class="detail editable">
- <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
- </view>
- <view class="detail editable">
- <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
- </view>
- <view class="detail editable">
- <text>AQL锛�</text>{{ SamplingItem.HAQL }}
- </view>
- <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
- <view class="detail editable">
- <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
- </view>
- <view class="detail editable">
- <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
- </view>
- <view class="detail editable">
- <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
- </view>
- <view class="detail editable">
- <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
- </view>
- <view class="detail editable">
- <text>鏍锋湰鐮村潖鏁帮細</text>
- <view class="sampleDestory">
- <input type="number" v-model="SamplingItem.HSampleDamageQty" />
- </view>
- </view>
- <view class="detail editable">
- <text>妫�楠岀粨鏋滐細</text>
- <view style="border-radius: 15%; padding: 0 10rpx" :class="
- SamplingItem.HInspectResultToSee == '鍚堟牸'
- ? 'pass-background'
- : SamplingItem.HInspectResultToSee == '涓嶅悎鏍�'
- ? 'unpass-background'
- : ''
- ">
- {{ SamplingItem.HInspectResultToSee }}
- </view>
- </view>
- </view>
- </uni-card>
- </view>
- </view>
- <!-- 妫�娴嬪�� 鍛堢幇 -->
- <view v-else v-for="item in InspectModules" :key="item.id">
- <view v-if="subTabSelected == item.id">
- <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
- @syncCheckData="InspectValueComplete" :bind-data="{
- data: checkItems[item.checkItemId],
- list: InspectValues[item.checkItemId],
- mode: 1 // 棣栨妫�娴嬪�兼ā鍧�
- }">
- </InspectValueTemplateVue>
- </view>
- </view>
- </view>
- </view>
- <view style="height: 120rpx"></view>
- <view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <view style="flex: 1"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
- @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
- </SampleSchemePopupVue>
- <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
- @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
- </CheckItemPopupVue>
- <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
- @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
- </InspectMentPopupVue>
- <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
- :bindKey="0">
- </MaterialPopupVue>
- <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
- :bindKey="0"></ICMOBillPopupVue>
- <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
- @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
- <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
- :bindKey="0"></ProcessPopupVue>
- <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
- @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
- </view>
-</template>
-
-<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "../../../utils/common";
- import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
- import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
- import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
- import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
- import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
- import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
- import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
- import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
- import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
- import {
- getUserInfo
- } from "../../../utils/auth";
- import {
- MpaasScan
- } from "../../../utils/mpaasScan";
- export default {
- components: {
- InspectValueTemplateVue,
- SampleSchemePopupVue,
- CheckItemPopupVue,
- InspectMentPopupVue,
- MaterialPopupVue,
- ICMOBillPopupVue,
- ProcExchBillPopupVue,
- ProcessPopupVue,
- CheckProjectPopupVue,
- },
- computed: {
- judgeConclusion: {
- get() {
- return true;
- },
- },
- },
- data() {
- return {
- operationType: 1,
-
- mainTabSelected: 1,
- subTabSelected: 1,
-
- // 婧愬崟鐘舵�佹帶鍒�
- hasSourceBill: false,
-
- // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
- enablePopupModule: "",
- PopupModuleNameList: [
- "",
- "SampleScheme",
- "CheckItem",
- "InspectMent",
- "Material",
- "ICMOBill",
- "ProcExchBill",
- "QCScheme",
- "Process",
- ],
- // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
- currentChechItemIDCache: -1,
-
- // uni-combox 閫夋嫨鍣ㄤ娇鐢�
- // 鐢熶骇璧勬簮
- GySourceList: [],
- GySourceNameList: [],
- // 鐝
- GyWorkShiftList: [],
- GyWorkShiftNameList: [],
- // 妫�楠屽憳
- GyFirstCheckEmpList: [],
- GyFirstCheckEmpNameList: [],
-
- // 妫�楠屾柟妗�
- arrayAnalysisMethod: [{
- value: 1,
- name: "瀹氭�у垎鏋�",
- },
- {
- value: 2,
- name: "瀹氶噺鍒嗘瀽",
- },
- {
- value: 3,
- name: "鍏朵粬鍒嗘瀽",
- },
- ],
- ArrayAnalysisMethodValue: [1, 2, 3],
- // 瀛愯〃 椤电淇℃伅
- subTabs: {
- 1: {
- id: "1",
- name: "妫�楠岄」鐩�",
- },
- 2: {
- id: "2",
- name: "鎶芥牱妫�楠�",
- },
- },
-
- // 婧愬崟绫诲瀷
- HSourceBillType: "宸ュ簭鍑虹珯姹囨姤鍗�",
- HSourceBillTypeValueList: ["3791", "3710", "3772"],
- HSourceBillTypeNameList: [
- "宸ュ簭鍑虹珯姹囨姤鍗�",
- "鐢熶骇璁㈠崟",
- "宸ュ簭娴佽浆鍗�",
- ],
- // 涓昏〃灞炴��
- hform: {
- HSourceBillType: "3791",
- HSourceBillNo: "",
- HBillNo: "",
- HInterID: "0",
- HDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HSourceName: "",
- HSourceID: "0",
- HShiftsName: "",
- HShiftsID: "0",
- HICMOBillNo: "",
- HICMOInterID: "0",
- HICMOEntryID: "1",
- HICMOQty: "0",
- HProcExchBillNo: "",
- HProcExchInterID: "0",
- HProcExchEntryID: "0",
- HProcExchQty: "0",
- HMaterNumber: "",
- HMaterID: "0",
- HMaterName: "",
- HFirstCheckEmpName: "",
- HFirstCheckEmp: 0,
- HQCSchemeName: "",
- HQCSchemeID: "0",
- HBatchNo: "",
- HLastResult: true, // 榛樿鍚堟牸
- HProcName: "",
- HProcID: "0",
- HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
- HTakeSampleCheckBillID: "0",
- HRemark: "",
- HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
- HMaker: getUserInfo()["Czymc"] || "",
- HChecker: "",
- HCloseMan: "",
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
- HCheckDate: "",
- HCloseDate: "",
- HUpDater: "",
- HDeleteMan: "",
- HUpDateDate: "",
- HDeleteDate: "",
- HResult: 1,
- HAnalysisMethod: "",
-
- HResDec: "",
- HStatus: 1,
-
- HMainSourceBillType: "",
- HMainSourceInterID: "0",
- HMainSourceEntryID: "1",
- HMainSourceBillNo: "",
- },
- // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
- checkItems: {},
- // 妫�娴嬪�兼ā鍧�
- InspectModules: {},
- // 妫�娴嬪��
- InspectValues: {},
- };
- },
- methods: {
- // 婧愬崟绫诲瀷閫夋嫨
- HSourceBillTypeNameChange(e) {
- this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
- this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
- },
- toScanCode() {
- MpaasScan.scanCode((res) => {
- if (res) {
- this.getSourceBillInfo(HBarCode);
- }
- });
- },
- async getSourceBillInfo(HBarCode) {
- console.log('HBarCode: ', HBarCode);
- // 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
- if (this.hform.HSourceBillType == 3791) {
- // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
- await this.LoadingInformation_StationInBill(HBarCode);
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
- return;
- }
- // if (this.hform.HSourceBillType == 3793) {
- // // 宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
- // await this.LoadingInformation_StationEntrustOutBill(HBarCode);
- // if (
- // (uni.getStorageSync("OrganizationID") == "7667152" &&
- // uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- // (uni.getStorageSync("OrganizationID") == "100199" &&
- // uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- // ) {
- // await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- // }
- // return;
- // }
- if (this.hform.HSourceBillType == 3710) {
- // 鐢熶骇璁㈠崟鍒楄〃棣栨
- await this.LoadingInformation_ICMO(HBarCode);
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
- return;
- }
- if (this.hform.HSourceBillType == 3772) {
- // 宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
- await this.LoadingInformation_ProcExchange(HBarCode);
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
- return;
- }
- },
- async GetCheckItemID() {
- if (!this.hform.HMaterName && !this.hform.HProcName) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetCheckItemID",
- data: {
- HName: this.hform.HMaterName,
- HProName: this.hform.HProcName,
- HSourceID: this.hform.HSourceID,
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
- });
- return;
- }
-
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].hmainid;
-
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
- });
- }
- }
- },
- async LoadingInformation_ProcExchange(HBarCode) {
- // 宸ュ簭娴佽浆鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty || 0;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID || 0;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hform.HBatchNo = data[0].鎵瑰彿;
-
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_ICMO(HBarCode) {
- // 鐢熶骇璁㈠崟
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_StationOutBill(HBarCode) {
- // 鍑虹珯姹囨姤鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_ProcessCheckBill/get_StationOutBill",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_StationEntrustOutBill(HBarCode) {
- // 宸ュ簭濮斿鎺ユ敹鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Cj_StationEntrustOutBill/list",
- data: {
- sWhere: ` and HBillNo = '${HBarCode}'`,
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
- });
- return;
- }
-
- HProcExchBillNo = data[0].娴佽浆鍗″彿;
- HProcExchInterID = data[0].HProcExchInterID;
- HProcExchEntryID = data[0].HProcExchEntryID;
- HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
- HICMOInterID = data[0].HICMOInterID;
- HICMOQty = data[0].HICMOQty;
- HSourceName = data[0].鐢熶骇璧勬簮;
- HSourceID = data[0].HSourceID;
- HMaterID = data[0].HMaterID;
- HMaterName = data[0].浜у搧鍚嶇О;
- HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- HMainSourceBillType = data[0].HBillType;
- HMainSourceInterID = data[0].HInterID;
- HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_StationInBill(HBarCode) {
- // 杩涚珯鎺ユ敹鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-
- for(let i =0; i<data.length;i++) {
- this.addCheckItem(data[i])
- }
-
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
- });
- }
- },
- // 妫�楠屽憳鍒濆鍖�
- async InitHEmp() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_Employee/list",
- data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
- "Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
- user: getUserInfo()["Czymc"],
- Organization: uni.getStorageSync("Organization"),
- },
- });
-
- let {
- data,
- Message,
- count
- } = res.data;
-
- if (count == 1) {
- console.log("data: ", data);
- this.GyFirstCheckEmpList = data;
- this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
- });
- }
- },
- async HFirstCheckEmpChange(e) {
- console.log("閫変腑妫�楠屽憳: ", e);
- let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HFirstCheckEmp = 0;
- this.hform.HFirstCheckEmpName = "";
- return;
- }
-
- this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
- this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
- },
- // 鐢熶骇鐝鍒濆鍖�
- async InitHWorkShift() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
- data: {
- sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
- "Organization"
- )}'`,
- HMaker: getUserInfo()["Czymc"],
- },
- });
-
- let {
- data,
- Message,
- count
- } = res.data;
-
- if (count == 1) {
- console.log("data: ", data);
- this.GyWorkShiftList = data;
- this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
- });
- }
- },
- async HWorkShiftChange(e) {
- console.log("閫変腑鐝: ", e);
- let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HWorkShiftID = 0;
- this.hform.HWorkShiftName = "";
- return;
- }
-
- this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
- this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
- },
- // 鐢熶骇璧勬簮鏇存柊
- // 鐢熶骇璧勬簮鍒濆鍖�
- async InitHSource() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_Source/list",
- data: {
- sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and HUSEORGID = '100038'`,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- data,
- Message,
- count
- } = res.data;
-
- if (count == 1) {
- this.GySourceList = data;
- this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
- });
- }
- },
- // 鐢熶骇璧勬簮鏇存柊
- async HSourceChange(e) {
- console.log("閫変腑鐢熶骇璧勬簮: ", e);
- let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HSourceID = 0;
- this.hform.HSourceName = "";
- return;
- }
-
- this.hform.HSourceID = this.GySourceList[index]["HItemID"];
- this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
-
- this.get_ICMOBillStatusList();
- this.get_QC_TakeSampleCheckBillList();
- this.GetCheckItemID();
- },
- // 鏄剧ず寮圭獥
- async showSelectorModule(item, index) {
- this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
- this.enablePopupModule = this.PopupModuleNameList[index];
- console.log("this.$refs: ", this.$refs);
- await this.$nextTick();
- if (index == 7) {
- // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
- this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
- }
-
- this.$refs.listPopup.showPopup();
- },
- getAnalysisMethodDisplay(val) {
- console.log("AnalysisMethodVal: ", val);
- if (val) {
- return this.arrayAnalysisMethod.find((e) => e.value == val).name;
- }
- return "";
- },
- checkResultChange(event) {
- console.log("event: ", event);
- },
- // 妫�楠岄」鐩柊澧炶
- addCheckItem(resource) {
- let ordinal = this.getObjLength(this.checkItems) + 1;
- let checkItem = {
- num: ordinal,
- HInterID: this.hform.HInterID,
- HQCCheckItemID: "",
- HQCCheckItemNumber: "",
- HQCCheckItemName: "",
- HInspectInstruMentID: "0",
- HInspectInstruMentNumber: "",
- HInspectInstruMentName: "",
- HQCStd: "",
- HUnit: "",
- HQCNote: "",
- HAnalysisMethod: "",
- HResult: 1,
- HMax: "",
- HMin: "",
- HAvg: "",
- HRemark: "",
- HKeyInspect: false,
- HStatus: 1,
- HSampleSchemeID: "",
- HUnitID: 0,
- HInspectVal: "",
- HTargetVal: "",
- HUpLimit: "",
- HDownLimit: "",
- HUpOffSet: "",
- HDownOffSet: "",
- HSampleDamageQty: 0,
- HSampleSchemeName: "",
- HSampleQty: 0,
- HAcceptQty: 0,
- HInspectionLevel: "",
- HRejectQty: 0,
- HStrictness: "",
- HSampleUnRightQty: 0,
- HAQL: "",
- HSamplingType: "",
- HInspectResultToSee: "",
- };
- if (resource) {
- // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
- Object.assign(checkItem, resource);
- }
- this.$set(this.checkItems, ordinal, checkItem);
- this.$nextTick(() => {
- // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
- this.setInspectValModule(this.checkItems[ordinal]);
- });
- },
- // 妫�楠岄」鐩垹闄よ
- removeCheckItem(item) {
- uni.showModal({
- title: "娓╅Θ鎻愮ず",
- content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
- success: (res) => {
- if (res.confirm) {
- this.$delete(this.checkItems, item.num);
- this.$delete(this.subTabs, `_${item.num}`);
- this.$forceUpdate();
- this.refreshCheckItemNum();
- }
- },
- });
- },
- async refreshCheckItemNum() {
- await this.$nextTick();
- // 閲嶆帓搴忓彿
- let num = 1;
- let checkItemsCache = {};
- for (let s in this.checkItems) {
- checkItemsCache[num] = this.checkItems[s];
- checkItemsCache[num].num = num;
- num++;
- }
- this.checkItems = checkItemsCache;
- },
- getObjLength(obj) {
- return Object.keys(obj).length;
- },
- // 缁撹淇敼
- HResultChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
-
- this.HCheckLastResult();
- },
- // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
- HCheckLastResult() {
- let unPassNum = 0;
- for (var key in this.checkItems) {
- if (!(this.checkItems[key]["HResult"] == 1)) {
- unPassNum++;
- }
- }
-
- if (unPassNum > 0) {
- this.hform.HLastResult = false;
- return;
- }
- this.hform.HLastResult = true;
- },
- // 妫�楠屾柟妗堜慨鏀�
- HAnalysisMethodChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
- "value"
- ];
-
- // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
- this.setInspectValModule(this.checkItems[id]);
- },
- // 閲嶇偣妫�鏌ヤ慨鏀�
- HKeyInspectChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HKeyInspect"] = e.detail.value;
- },
- // 妫�楠岄」鐩繑鍥�
- async CheckItemComplete(e) {
- console.log("CheckItemRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HQCCheckItemID: data["HItemID"],
- HQCCheckItemNumber: data["浠ｇ爜"],
- HQCCheckItemName: data["鍚嶇О"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屾柟妗堣繑鍥�
- async SampleSchemeComplete(e) {
- console.log("SampleSchemeRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HSampleSchemeID: data["hmainid"],
- HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
- HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
- HSampleQty: data["鏍锋湰閲�"] || 0,
- HAcceptQty: data["鍏佽鏁�"] || 0,
- HInspectionLevel: data["妫�楠屾按骞�"],
- HRejectQty: data["鎷掔粷鏁�"] || 0,
- HStrictness: data["涓ユ牸搴�"],
- HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
- HAQL: data["AQL"],
- HSamplingType: data["鎶芥牱绫诲瀷"],
- HInspectResultToSee: data["妫�楠岀粨鏋�"],
- HUpLimit: data["涓婇檺鍊�"] || 0,
- HDownLimit: data["涓嬮檺鍊�"] || 0,
- HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- this.setInspectValModule(this.checkItems[key]);
-
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屼华鍣ㄨ繑鍥�
- async InspectMentComplete(e) {
- console.log("InspectInstruMentRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HInspectInstruMentID: data["HItemID"],
- HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
- HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 浜у搧浠ｇ爜杩斿洖
- async MaterComplete(e) {
- console.log("MaterRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HMaterNumber: data["鐗╂枡浠ｇ爜"],
- HMaterName: data["鐗╂枡鍚嶇О"],
- HMaterID: data["HItemID"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- this.GetCheckItemID();
- }
- },
- // 浠诲姟鍗曡繑鍥�
- async ICMOBillComplete(e) {
- console.log("ICMOBillRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HICMOInterID: data.hmainid,
- HICMOEntryID: data.HEntryID || 1,
- HICMOBillNo: data.鍗曟嵁鍙�,
- HMaterNumber: data.浜у搧浠ｇ爜,
- HMaterName: data.浜у搧鍚嶇О,
- HMaterID: data.HMaterID,
- HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 娴佽浆鍗¤繑鍥�
- async ProcExchBillComplete(e) {
- console.log("ProcExchBillRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HProcExchInterID: data.hmainid,
- HProcExchEntryID: data.hsubid,
- HProcExchBillNo: data.鍗曟嵁鍙�,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屾柟妗�(涓昏〃)杩斿洖
- async HQCSchemeComplete(e) {
- console.log("HQCSchemeRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HQCSchemeID: data.hmainid,
- HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
- });
- await this.get_CheckItem();
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 宸ュ簭杩斿洖
- async HProcComplete(e) {
- console.log(" HProcRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HProcName: data["宸ュ簭鍚嶇О"],
- HProcID: data["HItemID"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- await this.GetCheckItemID();
- await this.get_ICMOBillStatusList();
- await this.get_QC_TakeSampleCheckBillList();
- }
- },
- async get_QC_TakeSampleCheckBillList() {
- // 鍙栨牱鍗曟煡璇�
- let HProcID = this.hform.HProcID;
- let HProcExchInterId = this.hform.HProcExchInterID;
- let sWhere = "";
-
- if (HProcID == "0" || HProcID == "") {
- CommonUtils.showTips({
- message: "璇烽�夋嫨宸ュ簭",
- });
- return;
- }
-
- sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
-
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
- data: {
- sWhere: sWhere,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- data,
- count,
- Message
- } = res.data;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
- });
- }
-
- this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
- this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
- });
- }
- },
- async get_ICMOBillStatusList() {
- let sWhere = "";
- let HProcID = this.hform.HProcID;
- let HSourceID = this.hform.HSourceID;
- let HProcExchInterId = this.hform.HProcExchInterID;
-
- if (HProcID != "0") {
- sWhere += " and HProcID=" + HProcID;
- }
- if (HSourceID != "0") {
- sWhere += " and HSourceID=" + HSourceID;
- }
-
- sWhere += " and HSourceInterID=" + HProcExchInterID;
-
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/CheckBill/GetICMOBillStatusList",
- data: {
- sWhere: sWhere,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- data,
- count,
- Message
- } = res.data;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
- });
- }
-
- this.hform.HProcID = data[0]["HProcID"];
- this.hform.HProcName = data[0]["宸ュ簭"];
- this.hform.HSourceID = data[0]["HSourceID"];
- this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
- });
- }
- },
- setInspectValModule(checkItem) {
- console.log("checkItem: ", checkItem);
- if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
- return;
- }
- // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
- this.$set(this.InspectModules, `_${checkItem.num}`, {
- id: `_${checkItem.num}`,
- checkItemId: checkItem.num,
- });
- console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
- let analysisMethodName = this.arrayAnalysisMethod.find(
- (e) => e.value == checkItem.HAnalysisMethod
- ).name;
- this.$set(this.subTabs, `_${checkItem.num}`, {
- id: `_${checkItem.num}`,
- name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
- });
- },
- InspectValueUpdate(e) {
- console.log("e: ", e);
- let {
- data,
- list
- } = e;
- this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
- this.$set(this.InspectValues, `${data.num}`, list);
- },
- // 甯﹀嚭妫�楠岄」鐩�
- async get_CheckItem() {
- // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
- this.checkItems = {}
- for (let key in this.subTabs) {
- if (key.substring(1) == "_") {
- this.$delete(this.subTabs, key)
- }
- }
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetCheckItemByCheckProjectID",
- data: {
- CheckProjectID: this.hform.HQCSchemeID || 0,
- HBatchQty: this.hform.HProcExchQty || 0,
- },
- });
-
- let {
- data,
- count,
- Message
- } = res.data;
-
- if (count == 1) {
- for (var i = 0; i < data.length; i++) {
- let checkItem = {
- HQCCheckItemID: data[i]["HQCCheckItemID"],
- HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
- HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
- HInspectInstruMentID: data[i]["HInspectInstruMentID"],
- HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
- HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
- HQCStd: data[i]["HQCStd"],
- HUnit: data[i]["鍗曚綅鍚嶇О"],
- HQCNote: "",
- HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
- HResult: data[i]["榛樿缁撹"],
- HMax: "",
- HMin: "",
- HAvg: "",
- HRemark: "",
- HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
- HStatus: 0,
- HSampleSchemeID: data[i]["HSampleSchemeID"],
- HUnitID: data[i]["HUnitID"],
- HInspectVal: "",
- HTargetVal: "",
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: "",
- HDownOffSet: "",
- HSampleDamageQty: "0",
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: data[i].妫�楠屾按骞�,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: data[i].涓ユ牸搴�,
- HSampleUnRightQty: 0,
- HAQL: data[i].AQL,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HCompareSymbol: data[i].姣旇緝绗�,
- HTargetVal: data[i].鐩爣鍊� || 0,
- };
-
- this.addCheckItem(checkItem);
- }
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
- });
- }
- },
- async getMaxBillNo() {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Web/GetMAXNum",
- data: {
- HBillType: "7505",
- },
- });
-
- if (!res) {
- return;
- }
-
- let {
- data,
- Message,
- count
- } = res.data;
- if (count == 1) {
- this.hform.HInterID = data[0].HInterID;
- this.hform.HBillNo = data[0].HBillNo;
- } else {
- throw Message;
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
- });
- }
- },
- // 妫�楠屽�艰繑鍥炲��
- InspectValueComplete(e) {
- console.log("e: ", e);
- let key = e.num;
- e.HStatus = e.HStatus ? 1 : 0
- if(e.HResult2 == ''){
- e.HResult2 = this.checkItems[key].HResult
- }
- Object.assign(this.checkItems[key], e);
- this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
- this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
-
- this.HCheckLastResult();
-
- },
- checkSubmitValidate() {
- if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
- CommonUtils.showTips({
- message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
- });
- return false;
- }
-
- if (this.hform.HFirstCheckEmp == 0) {
- CommonUtils.showTips({
- message: "妫�楠屽憳鏈�夋嫨锛�",
- });
- return false;
- }
-
- for (let key in this.checkItems) {
- if (!this.checkItems[key].HQCCheckItemID) {
- CommonUtils.showTips({
- message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
- });
- return false;
- }
-
- if (
- this.checkItems[key].HSampleSchemeID == "" ||
- this.checkItems[key].HSampleSchemeID == null
- ) {
- this.checkItems[key].HSampleSchemeID = 0;
- }
- if (
- this.checkItems[key].HSampleQty == "" ||
- this.checkItems[key].HSampleQty == null
- ) {
- this.checkItems[key].HSampleQty = 0;
- }
- if (
- this.checkItems[key].HSampleDamageQty == "" ||
- this.checkItems[key].HSampleDamageQty == null
- ) {
- this.checkItems[key].HSampleDamageQty = 0;
- }
- if (
- this.checkItems[key].HAcceptQty == "" ||
- this.checkItems[key].HAcceptQty == null
- ) {
- this.checkItems[key].HAcceptQty = 0;
- }
- if (
- this.checkItems[key].HRejectQty == "" ||
- this.checkItems[key].HRejectQty == null
- ) {
- this.checkItems[key].HRejectQty = 0;
- }
- if (
- this.checkItems[key].HSampleUnRightQty == "" ||
- this.checkItems[key].HSampleUnRightQty == 0
- ) {
- this.checkItems[key].HSampleUnRightQty = 0;
- }
- if (this.checkItems[key].HUnitID == "") {
- this.checkItems[key].HUnitID = 0;
- }
- }
-
- return true;
- },
- async submit() {
- if (!this.checkSubmitValidate()) {
- return;
- }
- try {
- console.log('this.$refs: ',this.$refs);
- // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length > 0) {
- // 鍔犺浇鏈夋楠屽�兼ā鍧�
- await this.$refs.InspectValueModules[0].set_SaveValue();
- this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
- await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
- }
- let InspectValuesTrans = [];
- let HInterID = this.hform.HInterID;
- for (let key in this.InspectValues) {
- let HEntryID = key;
-
- InspectValuesTrans.push(
- `${JSON.stringify(this.InspectValues[key])}`
- );
- }
- let checkItemsArray = [];
- for (var key in this.checkItems) {
- let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
- delete checkItem.data
- checkItemsArray.push(checkItem);
- }
- console.log('checkItemsArray: ',checkItemsArray);
- let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
- checkItemsArray
- )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
- console.log("this.checkItems: ", this.checkItems);
-
- let res = await CommonUtils.doRequest2Sync({
- url: "/QC_FirstPieceCheckBill/set_SaveBill",
- data: {
- sMainSub: sMainSub,
- },
- method: "POST",
- });
-
- if (!res) {
- return;
- }
-
- let {
- count,
- Message,
- data
- } = res.data;
- if (count == 1) {
- uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
- success: (res) => {
- if (res.confirm) {
- console.log("鐢ㄦ埛鐐瑰嚮纭畾");
- uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
- });
- } else if (res.cancel) {
- console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- // setTimeout(() => {
- // uni.navigateBack();
- // }, 50)
- }
- },
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鏈欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鏈欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
- });
- }
- },
- addNew() {
- uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
- });
- },
- goBack() {
- uni.navigateBack();
- },
- async RoadBillMain() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
- data: {
- sWhere: ` and hmainid=${this.hform.HInterID}`,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- data,
- count,
- Message
- } = res.data;
-
- if (count == 1) {
- console.log("RoadBillMain: : ", data);
- Object.assign(this.hform, {
- HInterID: data[0].hmainid,
- HBillNo: data[0].鍗曟嵁鍙�,
- HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
- HSourceID: data[0].HSourceID,
- HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
- HICMOBillNo: data[0].浠诲姟鍗曞彿,
- HICMOQty: data[0].浠诲姟鍗曟暟閲�,
- HICMOInterID: data[0].HICMOInterID,
- HICMOEntryID: data[0].HICMOEntryID || 1,
- HMaterID: data[0].HMaterID,
- HMaterName: data[0].鐗╂枡鍚嶇О,
- HMaterNumber: data[0].鐗╂枡浠ｇ爜,
- HProcID: data[0].HProcID,
- HProcName: data[0].HProcName,
- HProcExchQty: data[0].HProcExchQty || 0,
- HProcExchBillNo: data[0].HProcExchBillNo,
- HProcExchInterID: data[0].HProcExchInterID,
- HProcExchEntryID: data[0].HProcExchEntryID || 0,
- HFirstCheckEmp: data[0].HFirstCheckEmp,
- HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
- HQCSchemeID: data[0].妫�楠屾柟妗圛D,
- HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
- HRemark: data[0].琛ㄥご澶囨敞,
- HMaker: data[0].鍒跺崟浜�,
- HMakeDate: data[0].鍒跺崟鏃ユ湡,
- HChecker: data[0].瀹℃牳浜�,
- HCheckDate: data[0].瀹℃牳鏃ユ湡,
- HCloseMan: data[0].鍏抽棴浜�,
- HCloseDate: data[0].鍏抽棴鏃ユ湡,
- HUpDateDate: data[0].淇敼鏃ユ湡,
- HDeleteDate: data[0].浣滃簾鏃ユ湡,
- HSampleSchemeID: data[0].HSampleSchemeID,
- HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[0].鏍锋湰閲�,
- HSampleQty2: data[0].鏍锋湰閲�,
- HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
- HSamplingType: data[0].鎶芥牱绫诲瀷,
- HAcceptQty: data[0].鍏佽鏁�,
- HInspectionLevel: data[0].妫�楠屾按骞�,
- HRejectQty: data[0].鎷掔粷鏁�,
- HStrictness: data[0].涓ユ牸搴�,
- HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
- HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[0].AQL,
- HUnitID: data[0].HUnitID,
- HUnit: data[0].鍗曚綅,
- HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
- HInspectVal: data[0].妫�娴嬪��,
- HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
- HTargetVal: data[0].鐩爣鍊�,
- HUpLimit: data[0].涓婇檺鍊�,
- HDownLimit: data[0].涓嬮檺鍊�,
- HUpOffSet: data[0].涓婂亸宸�,
- HDownOffSet: data[0].涓嬪亸宸�,
- HEntryID: data[0].hsubid,
- HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
- HQCCheckItemID: data[0].HQCCheckItemID,
- HShiftsID: data[0].HShiftsID,
- HShiftsName: data[0].鐝鍚嶇О,
- HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
- HBatchNo: data[0].鎵瑰彿,
- HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
- HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
- HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function(){
- if(data[0].HAnalysisMethod == 1) {
- return '瀹氭�ф楠�'
- }else if(data[0].HAnalysisMethod == 2) {
- return '瀹氶噺妫�楠�'
- }else {
- return '鍏朵粬妫�楠�'
- }
- }(),
-
-
-
- });
-
- for (let i = 0; i < data.length; i++) {
- this.addCheckItem({
- HQCCheckItemID: data[i].HQCCheckItemID,
- HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
- HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
- HInspectInstruMentID: data[i].HInspectInstruMentID,
- HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
- HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
- HQCStd: data[i].妫�楠屾爣鍑�,
- HUnit: data[i].鍗曚綅鍚嶇О,
- HQCNote: data[i].妫�楠岃褰�,
- HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
- HMax: data[i].鏈�澶у��,
- HMin: data[i].鏈�灏忓��,
- HAvg: data[i].骞冲潎鍊�,
- HRemark: data[i].琛ㄤ綋澶囨敞,
- HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
- 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
- 2 : 3,
- HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
- HSampleSchemeID: data[i].HSampleSchemeID,
- HUnitID: data[i].HUnitID,
- HInspectVal: data[i].妫�娴嬪��,
- HTargetVal: data[i].鐩爣鍊�,
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: data[i].涓婂亸宸�,
- HDownOffSet: data[i].涓嬪亸宸�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: 0,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: 0,
- HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[i].AQL,
- HSamplingType: 0,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HStrictness: data[i].涓ユ牸搴�,
- HInspectResultToSee: data[i].妫�楠岀粨鏋�
- });
-
- }
-
-
- this.hasSourceBill = true
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
- });
- }
- },
- },
- async onLoad(e) {
- this.operationType = e.operationType || 1;
- this.hform.HInterID = e.linterid || 0;
- if (this.operationType == 1) {
- await this.getMaxBillNo();
- } else if (this.operationType == 2) {
-
- } else if (this.operationType == 3) {
- await this.RoadBillMain();
- }
-
- await this.InitHSource();
- await this.InitHWorkShift();
- await this.InitHEmp();
- },
- };
-</script>
-
-<style lang="scss" scoped>
- input {
- width: inherit;
- font-size: 26rpx;
- }
-
- .uni-input {
- padding: 0;
- }
-
- .bill-main-tabs,
- .bill-sub-tabs {
- box-sizing: border-box;
- width: 730rpx;
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- gap: 20rpx;
- flex-shrink: 0;
- overflow-x: auto;
- border-bottom: 1px solid #ddd;
- padding: 20rpx 10rpx;
- white-space: nowrap;
-
- view {
- width: auto;
- font-size: 26rpx;
- color: #555;
- text-align: center;
- padding: 16rpx 0;
- }
-
- .selected {
- color: #3a78ff;
- font-weight: bold;
- border-bottom: 3px solid #3a78ff;
- }
- }
-
- .bill-main-content,
- .bill-sub-content {
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
- display: flex;
- flex-direction: column;
-
- .form-item {
- width: 100%;
- display: flex;
- align-items: center;
- font-size: 26rpx;
- padding: 6rpx 0;
-
- .left {
- width: 208rpx;
-
- text {
- color: red;
- font-weight: bold;
- }
- }
-
- .right {
- // width: 450rpx;
- padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
-
- .uni-combox {
- padding: 0;
- height: auto;
-
- .uni-input-placeholder,
- .uni-input-input {
- font-size: 26rpx;
- }
- }
-
- .uni-combox::v-deep input {
- height: inherit;
- font-size: 26rpx;
- }
- }
-
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
-
- .none-border {
- border: none;
- }
- }
- }
-
- .bottom-btn {
- box-sizing: border-box;
- width: 100%;
- height: 120rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- background-color: #fff;
- box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
- padding: 30rpx 40rpx 40rpx 40rpx;
- display: flex;
- flex-direction: row;
- gap: 10rpx;
-
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
-
- .btn-a {
- background-color: #3a78ff;
- color: #fff;
- }
-
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
-
- .btn-c {
- background-color: #acacac;
- color: #fff;
- // position: absolute;
- // right: 120rpx;
- }
-
- .btn-d {
- background-color: #ff8901;
- color: #fff;
- }
- }
-
- .buttons {
- box-sizing: border-box;
- width: 100%;
- display: flex;
- justify-content: center;
- padding: 10rpx 0;
-
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 26rpx;
- }
-
- .btn-a {
- background-color: #acacac;
- color: #fff;
- }
-
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
-
- .btn-c {
- background-color: #3a78ff;
- color: #fff;
- }
- }
-
- .list {
- width: 100%;
-
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- align-items: center;
- line-height: 120%;
- gap: 10rpx 0;
-
- input {
- font-size: 26rpx;
- }
-
- .detail {
- // width: 50%;
- box-sizing: border-box;
- font-size: 26rpx;
- color: #555;
- padding-right: 20rpx;
-
- text {
- color: #999;
- font-size: 26rpx;
- }
- }
-
- .editable {
- width: 50%;
- display: inline-flex;
- flex-direction: row;
- align-items: center;
-
- text {
- flex-shrink: 0;
- }
-
- .sampleDestory {
- border: 1px solid #acacac;
- border-radius: 10%;
- padding: 0 12rpx;
- }
- }
- }
- }
-
- .icon-wrapper {
- background-color: #3a78ff;
- border-radius: 100%;
- width: 40rpx;
- height: 40rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-shrink: 0;
-
- .uni-icons {
- color: #fff !important;
- }
- }
-
- .icon-wrapper-big {
- background-color: #3a78ff;
- border-radius: 100%;
- width: 50rpx;
- height: 50rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-shrink: 0;
- margin-left: 20rpx;
-
- .uni-icons {
- color: #fff !important;
- }
- }
-
- .more {
- color: #888;
- font-size: 22rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 10rpx;
-
- .part {
- width: 100%;
- text-align: center;
- }
- }
-
- .pass-background {
- background-color: #cee3f2;
- border: none;
- }
-
- .unpass-background {
- background-color: #f0d6e3;
- border: none;
- }
-</style>
\ No newline at end of file
diff --git a/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue b/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
new file mode 100644
index 0000000..c80f0a6
--- /dev/null
+++ b/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
@@ -0,0 +1,2292 @@
+<template>
+ <view>
+ <!-- 涓昏〃鍖哄煙 -->
+ <view class="bill-main-area">
+ <!-- 涓昏〃椤电 -->
+ <view class="bill-main-tabs">
+ <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+ <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+ <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+ </view>
+ <!-- 涓昏〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 鍩烘湰淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 1">
+ <view class="form-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HBillNo" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
+ <view>{{ hform.HDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">婧愬崟鍗曞彿</view>
+ <view class="right" :class="!hasSourceBill?'':'disabled'">
+ <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons class="right-icon" type="scan" style="
+ background-color: #3a78ff;
+ padding: 6rpx;
+ color: #fff;
+ border-radius: 100%;
+ " size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">浠诲姟鍗曞彿</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HICMOBillNo" disabled />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 5)"></uni-icons></view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">娴佽浆鍗″彿</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HProcExchBillNo" disabled />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 6)"></uni-icons></view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">浜у搧浠ｇ爜</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterNumber" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧鍚嶇О</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">妫�楠屽憳</view>
+ <view class="right">
+ <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
+ :v-model="hform.HFirstCheckEmpName"
+ @update:modelValue="HFirstCheckEmpChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">妫�楠屾柟妗�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="this.hform.HQCSchemeName" />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 7)"></uni-icons></view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">鍒ゆ柇缁撹</view>
+ <view class="right none-border">
+ <radio-group @changer="checkResultChange">
+ <label>
+ <radio value="0" :checked="hform.HLastResult" /><text></text>
+ 鍚堟牸
+ </label>
+ <view style="width: 20rpx; display: inline-block"></view>
+ <label>
+ <radio value="1" :checked="!hform.HLastResult" /><text></text>
+ 涓嶅悎鏍�
+ </label>
+ </radio-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HProcName" />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 8)"></uni-icons></view>
+ </view>
+
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 2">
+ <view class="form-item">
+ <view class="left">婧愬崟绫诲瀷</view>
+ <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+ <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+ @change="HSourceBillTypeNameChange">
+ <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right">
+ <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @update:modelValue="HSourceChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
+ <view class="right">
+ <input type="text" v-model="hform.HErrTreatment" value="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浠诲姟鍗曟暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HICMOQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">娴佽浆鍗℃暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HProcExchQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鎵瑰彿</view>
+ <view class="right">
+ <input type="text" v-model="hform.HBatchNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">澶囨敞</view>
+ <view class="right">
+ <input type="text" v-model="hform.HRemark" value="" />
+ </view>
+ </view>
+ </view>
+ <!-- 鍒跺崟淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 3">
+ <view class="form-item">
+ <view class="left">鍒跺崟浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍒跺崟鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCheckDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCloseMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCloseDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 瀛愯〃鍖哄煙 -->
+ <view class="bill-sub-area">
+ <!-- 瀛愯〃椤电 -->
+ <view class="bill-sub-tabs">
+ <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
+ @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
+ </view>
+ <!-- 瀛愯〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 妫�楠岄」鐩� 鍛堢幇 -->
+ <view v-if="subTabSelected == 1">
+ <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
+ <view class="buttons" @tap="addCheckItem()">
+ <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+ </view>
+ <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+ <view class="list" v-else>
+ <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
+ <view class="card-detail">
+ <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
+ <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
+ <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <view><text>缁撹锛�</text></view>
+ <view style="width: 4em">
+ {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
+ </view>
+ <view>
+ <switch style="width: 2em; transform: scale(0.7)"
+ :checked="checkItem.HResult == 1"
+ @change="HResultChange(checkItem.num, $event)" />
+ </view>
+ </view>
+ <view class="detail editable" style="position: relative">
+ <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
+ <picker :range="arrayAnalysisMethod" range-key="name"
+ @change="HAnalysisMethodChange(checkItem.num, $event)">
+ <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
+ placeholder="璇烽�夋嫨" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
+ <view>
+ <switch type="checkbox" style="transform: scale(0.7)"
+ :checked="checkItem.HKeyInspect"
+ @change="HKeyInspectChange(checkItem, $event)" />
+ </view>
+ </view>
+ <view class="detail" v-if="checkItem.HQCStd">
+ <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
+ </view>
+ <view class="detail" v-if="checkItem.HUnit">
+ <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
+ </view>
+ <view class="detail" v-if="checkItem.HQCStd">
+ <text>妫�楠屽�硷細</text>{{ checkItem.HQCStd }}
+ </view>
+ <view class="detail" v-if="checkItem.HQCNote">
+ <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
+ </view>
+ <view class="detail" v-if="checkItem.HTargetVal">
+ <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
+ </view>
+ <view class="detail" v-if="checkItem.HUpLimit">
+ <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
+ </view>
+ <view class="detail" v-if="checkItem.HDownLimit">
+ <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
+ </view>
+ <view class="detail" v-if="checkItem.HMax">
+ <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
+ </view>
+ <view class="detail" v-if="checkItem.HMin">
+ <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
+ </view>
+ <view class="detail" v-if="checkItem.HAvg">
+ <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
+ </view>
+ </view>
+ <view style="height: 20rpx"></view>
+ <view class="more">
+ <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
+ <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
+ size="18"></uni-icons>鍒犻櫎
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
+ <view v-if="subTabSelected == 2">
+ <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+ <view class="list" v-else>
+ <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
+ <view class="card-detail">
+ <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
+ <view class="detail editable">
+ <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
+ </view>
+ <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+ <view class="detail editable" style="width: 100%">
+ <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
+ <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
+ </view>
+ <view class="detail editable">
+ <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
+ </view>
+ <view class="detail editable">
+ <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
+ </view>
+ <view class="detail editable">
+ <text>AQL锛�</text>{{ SamplingItem.HAQL }}
+ </view>
+ <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+ <view class="detail editable">
+ <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
+ </view>
+ <view class="detail editable">
+ <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
+ </view>
+ <view class="detail editable">
+ <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
+ </view>
+ <view class="detail editable">
+ <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
+ </view>
+ <view class="detail editable">
+ <text>鏍锋湰鐮村潖鏁帮細</text>
+ <view class="sampleDestory">
+ <input type="number" v-model="SamplingItem.HSampleDamageQty" />
+ </view>
+ </view>
+ <view class="detail editable">
+ <text>妫�楠岀粨鏋滐細</text>
+ <view style="border-radius: 15%; padding: 0 10rpx" :class="
+ SamplingItem.HInspectResultToSee == '鍚堟牸'
+ ? 'pass-background'
+ : SamplingItem.HInspectResultToSee == '涓嶅悎鏍�'
+ ? 'unpass-background'
+ : ''
+ ">
+ {{ SamplingItem.HInspectResultToSee }}
+ </view>
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ <!-- 妫�娴嬪�� 鍛堢幇 -->
+ <view v-else v-for="item in InspectModules" :key="item.id">
+ <view v-if="subTabSelected == item.id">
+ <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
+ @syncCheckData="InspectValueComplete" :bind-data="{
+ data: checkItems[item.checkItemId],
+ list: InspectValues[item.checkItemId],
+ mode: 1 // 棣栨妫�娴嬪�兼ā鍧�
+ }">
+ </InspectValueTemplateVue>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view style="height: 120rpx"></view>
+ <view class="bottom-btn">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <view style="flex: 1"></view>
+ <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
+ @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
+ </SampleSchemePopupVue>
+ <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+ @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+ </CheckItemPopupVue>
+ <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
+ @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
+ </InspectMentPopupVue>
+ <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
+ :bindKey="0">
+ </MaterialPopupVue>
+ <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
+ :bindKey="0"></ICMOBillPopupVue>
+ <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
+ @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
+ <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
+ :bindKey="0"></ProcessPopupVue>
+ <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
+ @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "../../../utils/common";
+ import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
+ import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
+ import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
+ import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
+ import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
+ import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
+ import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
+ import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
+ import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import {
+ MpaasScan
+ } from "../../../utils/mpaasScan";
+ export default {
+ components: {
+ InspectValueTemplateVue,
+ SampleSchemePopupVue,
+ CheckItemPopupVue,
+ InspectMentPopupVue,
+ MaterialPopupVue,
+ ICMOBillPopupVue,
+ ProcExchBillPopupVue,
+ ProcessPopupVue,
+ CheckProjectPopupVue,
+ },
+ computed: {
+ judgeConclusion: {
+ get() {
+ return true;
+ },
+ },
+ },
+ data() {
+ return {
+ operationType: 1,
+
+ mainTabSelected: 1,
+ subTabSelected: 1,
+
+ // 婧愬崟鐘舵�佹帶鍒�
+ hasSourceBill: false,
+
+ // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+ enablePopupModule: "",
+ PopupModuleNameList: [
+ "",
+ "SampleScheme",
+ "CheckItem",
+ "InspectMent",
+ "Material",
+ "ICMOBill",
+ "ProcExchBill",
+ "QCScheme",
+ "Process",
+ ],
+ // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
+ currentChechItemIDCache: -1,
+
+ // uni-combox 閫夋嫨鍣ㄤ娇鐢�
+ // 鐢熶骇璧勬簮
+ GySourceList: [],
+ GySourceNameList: [],
+ // 鐝
+ GyWorkShiftList: [],
+ GyWorkShiftNameList: [],
+ // 妫�楠屽憳
+ GyFirstCheckEmpList: [],
+ GyFirstCheckEmpNameList: [],
+
+ // 妫�楠屾柟妗�
+ arrayAnalysisMethod: [{
+ value: 1,
+ name: "瀹氭�у垎鏋�",
+ },
+ {
+ value: 2,
+ name: "瀹氶噺鍒嗘瀽",
+ },
+ {
+ value: 3,
+ name: "鍏朵粬鍒嗘瀽",
+ },
+ ],
+ ArrayAnalysisMethodValue: [1, 2, 3],
+ // 瀛愯〃 椤电淇℃伅
+ subTabs: {
+ 1: {
+ id: "1",
+ name: "妫�楠岄」鐩�",
+ },
+ 2: {
+ id: "2",
+ name: "鎶芥牱妫�楠�",
+ },
+ },
+
+ // 婧愬崟绫诲瀷
+ HSourceBillType: "宸ュ簭鍑虹珯姹囨姤鍗�",
+ HSourceBillTypeValueList: ["3791", "3710", "3772"],
+ HSourceBillTypeNameList: [
+ "宸ュ簭鍑虹珯姹囨姤鍗�",
+ "鐢熶骇璁㈠崟",
+ "宸ュ簭娴佽浆鍗�",
+ ],
+ // 涓昏〃灞炴��
+ hform: {
+ HSourceBillType: "3791",
+ HSourceBillNo: "",
+ HBillNo: "",
+ HInterID: "0",
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HSourceName: "",
+ HSourceID: "0",
+ HShiftsName: "",
+ HShiftsID: "0",
+ HICMOBillNo: "",
+ HICMOInterID: "0",
+ HICMOEntryID: "1",
+ HICMOQty: "0",
+ HProcExchBillNo: "",
+ HProcExchInterID: "0",
+ HProcExchEntryID: "0",
+ HProcExchQty: "0",
+ HMaterNumber: "",
+ HMaterID: "0",
+ HMaterName: "",
+ HFirstCheckEmpName: "",
+ HFirstCheckEmp: 0,
+ HQCSchemeName: "",
+ HQCSchemeID: "0",
+ HBatchNo: "",
+ HLastResult: true, // 榛樿鍚堟牸
+ HProcName: "",
+ HProcID: "0",
+ HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
+ HTakeSampleCheckBillID: "0",
+ HRemark: "",
+ HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
+ HMaker: getUserInfo()["Czymc"] || "",
+ HChecker: "",
+ HCloseMan: "",
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+ HCheckDate: "",
+ HCloseDate: "",
+ HUpDater: "",
+ HDeleteMan: "",
+ HUpDateDate: "",
+ HDeleteDate: "",
+ HResult: 1,
+ HAnalysisMethod: "",
+
+ HResDec: "",
+ HStatus: 1,
+
+ HMainSourceBillType: "",
+ HMainSourceInterID: "0",
+ HMainSourceEntryID: "1",
+ HMainSourceBillNo: "",
+ },
+ // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
+ checkItems: {},
+ // 妫�娴嬪�兼ā鍧�
+ InspectModules: {},
+ // 妫�娴嬪��
+ InspectValues: {},
+ };
+ },
+ methods: {
+ // 婧愬崟绫诲瀷閫夋嫨
+ HSourceBillTypeNameChange(e) {
+ this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
+ this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
+ },
+ toScanCode() {
+ MpaasScan.scanCode((res) => {
+ if (res) {
+ this.getSourceBillInfo(HBarCode);
+ }
+ });
+ },
+ async getSourceBillInfo(HBarCode) {
+ console.log('HBarCode: ', HBarCode);
+ // 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
+ if (this.hform.HSourceBillType == 3791) {
+ // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+ await this.LoadingInformation_StationInBill(HBarCode);
+ if (
+ (uni.getStorageSync("OrganizationID") == "7667152" &&
+ uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ (uni.getStorageSync("OrganizationID") == "100199" &&
+ uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ ) {
+ await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ }
+ return;
+ }
+ // if (this.hform.HSourceBillType == 3793) {
+ // // 宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
+ // await this.LoadingInformation_StationEntrustOutBill(HBarCode);
+ // if (
+ // (uni.getStorageSync("OrganizationID") == "7667152" &&
+ // uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ // (uni.getStorageSync("OrganizationID") == "100199" &&
+ // uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ // ) {
+ // await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ // }
+ // return;
+ // }
+ if (this.hform.HSourceBillType == 3710) {
+ // 鐢熶骇璁㈠崟鍒楄〃棣栨
+ await this.LoadingInformation_ICMO(HBarCode);
+ if (
+ (uni.getStorageSync("OrganizationID") == "7667152" &&
+ uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ (uni.getStorageSync("OrganizationID") == "100199" &&
+ uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ ) {
+ await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ }
+ return;
+ }
+ if (this.hform.HSourceBillType == 3772) {
+ // 宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
+ await this.LoadingInformation_ProcExchange(HBarCode);
+ if (
+ (uni.getStorageSync("OrganizationID") == "7667152" &&
+ uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ (uni.getStorageSync("OrganizationID") == "100199" &&
+ uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ ) {
+ await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ }
+ return;
+ }
+ },
+ async GetCheckItemID() {
+ if (!this.hform.HMaterName && !this.hform.HProcName) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetCheckItemID",
+ data: {
+ HName: this.hform.HMaterName,
+ HProName: this.hform.HProcName,
+ HSourceID: this.hform.HSourceID,
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].hmainid;
+
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
+ });
+ }
+ }
+ },
+ async LoadingInformation_ProcExchange(HBarCode) {
+ // 宸ュ簭娴佽浆鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty || 0;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID || 0;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hform.HBatchNo = data[0].鎵瑰彿;
+
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_ICMO(HBarCode) {
+ // 鐢熶骇璁㈠崟
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_ProcessCheckBill/get_ICMOBill_ByBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_StationOutBill(HBarCode) {
+ // 鍑虹珯姹囨姤鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_ProcessCheckBill/get_StationOutBill",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍑虹珯姹囨姤鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍑虹珯姹囨姤鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_StationEntrustOutBill(HBarCode) {
+ // 宸ュ簭濮斿鎺ユ敹鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Cj_StationEntrustOutBill/list",
+ data: {
+ sWhere: ` and HBillNo = '${HBarCode}'`,
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+
+ HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ HProcExchInterID = data[0].HProcExchInterID;
+ HProcExchEntryID = data[0].HProcExchEntryID;
+ HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
+ HICMOInterID = data[0].HICMOInterID;
+ HICMOQty = data[0].HICMOQty;
+ HSourceName = data[0].鐢熶骇璧勬簮;
+ HSourceID = data[0].HSourceID;
+ HMaterID = data[0].HMaterID;
+ HMaterName = data[0].浜у搧鍚嶇О;
+ HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ HMainSourceBillType = data[0].HBillType;
+ HMainSourceInterID = data[0].HInterID;
+ HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_StationInBill(HBarCode) {
+ // 杩涚珯鎺ユ敹鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_ProcessCheckBill/get_StationInBill_ByHBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+
+ for (let i = 0; i < data.length; i++) {
+ this.addCheckItem(data[i])
+ }
+
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ // 妫�楠屽憳鍒濆鍖�
+ async InitHEmp() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Employee/list",
+ data: {
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ user: getUserInfo()["Czymc"],
+ Organization: uni.getStorageSync("Organization"),
+ },
+ });
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+
+ if (count == 1) {
+ console.log("data: ", data);
+ this.GyFirstCheckEmpList = data;
+ this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+ });
+ }
+ },
+ async HFirstCheckEmpChange(e) {
+ console.log("閫変腑妫�楠屽憳: ", e);
+ let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HFirstCheckEmp = 0;
+ this.hform.HFirstCheckEmpName = "";
+ return;
+ }
+
+ this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
+ this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
+ },
+ // 鐢熶骇鐝鍒濆鍖�
+ async InitHWorkShift() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+ HMaker: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+
+ if (count == 1) {
+ console.log("data: ", data);
+ this.GyWorkShiftList = data;
+ this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
+ });
+ }
+ },
+ async HWorkShiftChange(e) {
+ console.log("閫変腑鐝: ", e);
+ let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HWorkShiftID = 0;
+ this.hform.HWorkShiftName = "";
+ return;
+ }
+
+ this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
+ this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
+ },
+ // 鐢熶骇璧勬簮鏇存柊
+ // 鐢熶骇璧勬簮鍒濆鍖�
+ async InitHSource() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Source/list",
+ data: {
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+
+ if (count == 1) {
+ this.GySourceList = data;
+ this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+ });
+ }
+ },
+ // 鐢熶骇璧勬簮鏇存柊
+ async HSourceChange(e) {
+ console.log("閫変腑鐢熶骇璧勬簮: ", e);
+ let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HSourceID = 0;
+ this.hform.HSourceName = "";
+ return;
+ }
+
+ this.hform.HSourceID = this.GySourceList[index]["HItemID"];
+ this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
+
+ this.get_ICMOBillStatusList();
+ this.get_QC_TakeSampleCheckBillList();
+ this.GetCheckItemID();
+ },
+ // 鏄剧ず寮圭獥
+ async showSelectorModule(item, index) {
+ this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
+ this.enablePopupModule = this.PopupModuleNameList[index];
+ console.log("this.$refs: ", this.$refs);
+ await this.$nextTick();
+ if (index == 7) {
+ // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
+ this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
+ }
+
+ this.$refs.listPopup.showPopup();
+ },
+ getAnalysisMethodDisplay(val) {
+ console.log("AnalysisMethodVal: ", val);
+ if (val) {
+ return this.arrayAnalysisMethod.find((e) => e.value == val).name;
+ }
+ return "";
+ },
+ checkResultChange(event) {
+ console.log("event: ", event);
+ },
+ // 妫�楠岄」鐩柊澧炶
+ addCheckItem(resource) {
+ let ordinal = this.getObjLength(this.checkItems) + 1;
+ let checkItem = {
+ num: ordinal,
+ HInterID: this.hform.HInterID,
+ HQCCheckItemID: "",
+ HQCCheckItemNumber: "",
+ HQCCheckItemName: "",
+ HInspectInstruMentID: "0",
+ HInspectInstruMentNumber: "",
+ HInspectInstruMentName: "",
+ HQCStd: "",
+ HUnit: "",
+ HQCNote: "",
+ HAnalysisMethod: "",
+ HResult: 1,
+ HMax: "",
+ HMin: "",
+ HAvg: "",
+ HRemark: "",
+ HKeyInspect: false,
+ HStatus: 1,
+ HSampleSchemeID: "",
+ HUnitID: 0,
+ HInspectVal: "",
+ HTargetVal: "",
+ HUpLimit: "",
+ HDownLimit: "",
+ HUpOffSet: "",
+ HDownOffSet: "",
+ HSampleDamageQty: 0,
+ HSampleSchemeName: "",
+ HSampleQty: 0,
+ HAcceptQty: 0,
+ HInspectionLevel: "",
+ HRejectQty: 0,
+ HStrictness: "",
+ HSampleUnRightQty: 0,
+ HAQL: "",
+ HSamplingType: "",
+ HInspectResultToSee: "",
+ };
+ if (resource) {
+ // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
+ Object.assign(checkItem, resource);
+ }
+ this.$set(this.checkItems, ordinal, checkItem);
+ this.$nextTick(() => {
+ // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+ this.setInspectValModule(this.checkItems[ordinal]);
+ });
+ },
+ // 妫�楠岄」鐩垹闄よ
+ removeCheckItem(item) {
+ uni.showModal({
+ title: "娓╅Θ鎻愮ず",
+ content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
+ success: (res) => {
+ if (res.confirm) {
+ this.$delete(this.checkItems, item.num);
+ this.$delete(this.subTabs, `_${item.num}`);
+ this.$forceUpdate();
+ this.refreshCheckItemNum();
+ }
+ },
+ });
+ },
+ async refreshCheckItemNum() {
+ await this.$nextTick();
+ // 閲嶆帓搴忓彿
+ let num = 1;
+ let checkItemsCache = {};
+ for (let s in this.checkItems) {
+ checkItemsCache[num] = this.checkItems[s];
+ checkItemsCache[num].num = num;
+ num++;
+ }
+ this.checkItems = checkItemsCache;
+ },
+ getObjLength(obj) {
+ return Object.keys(obj).length;
+ },
+ // 缁撹淇敼
+ HResultChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
+
+ this.HCheckLastResult();
+ },
+ // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
+ HCheckLastResult() {
+ let unPassNum = 0;
+ for (var key in this.checkItems) {
+ if (!(this.checkItems[key]["HResult"] == 1)) {
+ unPassNum++;
+ }
+ }
+
+ if (unPassNum > 0) {
+ this.hform.HLastResult = false;
+ return;
+ }
+ this.hform.HLastResult = true;
+ },
+ // 妫�楠屾柟妗堜慨鏀�
+ HAnalysisMethodChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
+ "value"
+ ];
+
+ // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+ this.setInspectValModule(this.checkItems[id]);
+ },
+ // 閲嶇偣妫�鏌ヤ慨鏀�
+ HKeyInspectChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HKeyInspect"] = e.detail.value;
+ },
+ // 妫�楠岄」鐩繑鍥�
+ async CheckItemComplete(e) {
+ console.log("CheckItemRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HQCCheckItemID: data["HItemID"],
+ HQCCheckItemNumber: data["浠ｇ爜"],
+ HQCCheckItemName: data["鍚嶇О"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屾柟妗堣繑鍥�
+ async SampleSchemeComplete(e) {
+ console.log("SampleSchemeRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HSampleSchemeID: data["hmainid"],
+ HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
+ HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
+ HSampleQty: data["鏍锋湰閲�"] || 0,
+ HAcceptQty: data["鍏佽鏁�"] || 0,
+ HInspectionLevel: data["妫�楠屾按骞�"],
+ HRejectQty: data["鎷掔粷鏁�"] || 0,
+ HStrictness: data["涓ユ牸搴�"],
+ HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
+ HAQL: data["AQL"],
+ HSamplingType: data["鎶芥牱绫诲瀷"],
+ HInspectResultToSee: data["妫�楠岀粨鏋�"],
+ HUpLimit: data["涓婇檺鍊�"] || 0,
+ HDownLimit: data["涓嬮檺鍊�"] || 0,
+ HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ this.setInspectValModule(this.checkItems[key]);
+
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屼华鍣ㄨ繑鍥�
+ async InspectMentComplete(e) {
+ console.log("InspectInstruMentRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HInspectInstruMentID: data["HItemID"],
+ HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
+ HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 浜у搧浠ｇ爜杩斿洖
+ async MaterComplete(e) {
+ console.log("MaterRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HMaterNumber: data["鐗╂枡浠ｇ爜"],
+ HMaterName: data["鐗╂枡鍚嶇О"],
+ HMaterID: data["HItemID"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ this.GetCheckItemID();
+ }
+ },
+ // 浠诲姟鍗曡繑鍥�
+ async ICMOBillComplete(e) {
+ console.log("ICMOBillRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HICMOInterID: data.hmainid,
+ HICMOEntryID: data.HEntryID || 1,
+ HICMOBillNo: data.鍗曟嵁鍙�,
+ HMaterNumber: data.浜у搧浠ｇ爜,
+ HMaterName: data.浜у搧鍚嶇О,
+ HMaterID: data.HMaterID,
+ HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 娴佽浆鍗¤繑鍥�
+ async ProcExchBillComplete(e) {
+ console.log("ProcExchBillRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HProcExchInterID: data.hmainid,
+ HProcExchEntryID: data.hsubid,
+ HProcExchBillNo: data.鍗曟嵁鍙�,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屾柟妗�(涓昏〃)杩斿洖
+ async HQCSchemeComplete(e) {
+ console.log("HQCSchemeRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HQCSchemeID: data.hmainid,
+ HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
+ });
+ await this.get_CheckItem();
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 宸ュ簭杩斿洖
+ async HProcComplete(e) {
+ console.log(" HProcRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HProcName: data["宸ュ簭鍚嶇О"],
+ HProcID: data["HItemID"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ await this.GetCheckItemID();
+ await this.get_ICMOBillStatusList();
+ await this.get_QC_TakeSampleCheckBillList();
+ }
+ },
+ async get_QC_TakeSampleCheckBillList() {
+ // 鍙栨牱鍗曟煡璇�
+ let HProcID = this.hform.HProcID;
+ let HProcExchInterId = this.hform.HProcExchInterID;
+ let sWhere = "";
+
+ if (HProcID == "0" || HProcID == "") {
+ CommonUtils.showTips({
+ message: "璇烽�夋嫨宸ュ簭",
+ });
+ return;
+ }
+
+ sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
+ });
+ }
+
+ this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
+ this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
+ });
+ }
+ },
+ async get_ICMOBillStatusList() {
+ let sWhere = "";
+ let HProcID = this.hform.HProcID;
+ let HSourceID = this.hform.HSourceID;
+ let HProcExchInterId = this.hform.HProcExchInterID;
+
+ if (HProcID != "0") {
+ sWhere += " and HProcID=" + HProcID;
+ }
+ if (HSourceID != "0") {
+ sWhere += " and HSourceID=" + HSourceID;
+ }
+
+ sWhere += " and HSourceInterID=" + HProcExchInterID;
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/CheckBill/GetICMOBillStatusList",
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
+ });
+ }
+
+ this.hform.HProcID = data[0]["HProcID"];
+ this.hform.HProcName = data[0]["宸ュ簭"];
+ this.hform.HSourceID = data[0]["HSourceID"];
+ this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
+ });
+ }
+ },
+ setInspectValModule(checkItem) {
+ console.log("checkItem: ", checkItem);
+ if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+ return;
+ }
+ // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
+ this.$set(this.InspectModules, `_${checkItem.num}`, {
+ id: `_${checkItem.num}`,
+ checkItemId: checkItem.num,
+ });
+ console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
+ let analysisMethodName = this.arrayAnalysisMethod.find(
+ (e) => e.value == checkItem.HAnalysisMethod
+ ).name;
+ this.$set(this.subTabs, `_${checkItem.num}`, {
+ id: `_${checkItem.num}`,
+ name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
+ });
+ },
+ InspectValueUpdate(e) {
+ console.log("e: ", e);
+ let {
+ data,
+ list
+ } = e;
+ this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
+ this.$set(this.InspectValues, `${data.num}`, list);
+ },
+ // 甯﹀嚭妫�楠岄」鐩�
+ async get_CheckItem() {
+ // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
+ this.checkItems = {}
+ for (let key in this.subTabs) {
+ if (key.substring(1) == "_") {
+ this.$delete(this.subTabs, key)
+ }
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetCheckItemByCheckProjectID",
+ data: {
+ CheckProjectID: this.hform.HQCSchemeID || 0,
+ HBatchQty: this.hform.HProcExchQty || 0,
+ },
+ });
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+
+ if (count == 1) {
+ for (var i = 0; i < data.length; i++) {
+ let checkItem = {
+ HQCCheckItemID: data[i]["HQCCheckItemID"],
+ HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
+ HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
+ HInspectInstruMentID: data[i]["HInspectInstruMentID"],
+ HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
+ HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
+ HQCStd: data[i]["HQCStd"],
+ HUnit: data[i]["鍗曚綅鍚嶇О"],
+ HQCNote: "",
+ HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
+ HResult: data[i]["榛樿缁撹"],
+ HMax: "",
+ HMin: "",
+ HAvg: "",
+ HRemark: "",
+ HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+ HStatus: 0,
+ HSampleSchemeID: data[i]["HSampleSchemeID"],
+ HUnitID: data[i]["HUnitID"],
+ HInspectVal: "",
+ HTargetVal: "",
+ HUpLimit: data[i].涓婇檺鍊�,
+ HDownLimit: data[i].涓嬮檺鍊�,
+ HUpOffSet: "",
+ HDownOffSet: "",
+ HSampleDamageQty: "0",
+ HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[i].鏍锋湰閲�,
+ HAcceptQty: data[i].鍏佽鏁�,
+ HInspectionLevel: data[i].妫�楠屾按骞�,
+ HRejectQty: data[i].鎷掔粷鏁�,
+ HStrictness: data[i].涓ユ牸搴�,
+ HSampleUnRightQty: 0,
+ HAQL: data[i].AQL,
+ HSamplingType: data[i].鎶芥牱绫诲瀷,
+ HCompareSymbol: data[i].姣旇緝绗�,
+ HTargetVal: data[i].鐩爣鍊� || 0,
+ };
+
+ this.addCheckItem(checkItem);
+ }
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
+ });
+ }
+ },
+ async getMaxBillNo() {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Web/GetMAXNum",
+ data: {
+ HBillType: "7507",
+ },
+ });
+
+ if (!res) {
+ return;
+ }
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID;
+ this.hform.HBillNo = data[0].HBillNo;
+ } else {
+ throw Message;
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
+ });
+ }
+ },
+ // 妫�楠屽�艰繑鍥炲��
+ InspectValueComplete(e) {
+ console.log("e: ", e);
+ let key = e.num;
+ e.HStatus = e.HStatus ? 1 : 0
+ if (e.HResult2 == '') {
+ e.HResult2 = this.checkItems[key].HResult
+ }
+ Object.assign(this.checkItems[key], e);
+ this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
+ this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
+
+ this.HCheckLastResult();
+
+ },
+ checkSubmitValidate() {
+ // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+ // CommonUtils.showTips({
+ // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+ // });
+ // return false;
+ // }
+
+ if (this.hform.HFirstCheckEmp == 0) {
+ CommonUtils.showTips({
+ message: "妫�楠屽憳鏈�夋嫨锛�",
+ });
+ return false;
+ }
+
+ for (let key in this.checkItems) {
+ if (!this.checkItems[key].HQCCheckItemID) {
+ CommonUtils.showTips({
+ message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
+ });
+ return false;
+ }
+
+ if (
+ this.checkItems[key].HSampleSchemeID == "" ||
+ this.checkItems[key].HSampleSchemeID == null
+ ) {
+ this.checkItems[key].HSampleSchemeID = 0;
+ }
+ if (
+ this.checkItems[key].HSampleQty == "" ||
+ this.checkItems[key].HSampleQty == null
+ ) {
+ this.checkItems[key].HSampleQty = 0;
+ }
+ if (
+ this.checkItems[key].HSampleDamageQty == "" ||
+ this.checkItems[key].HSampleDamageQty == null
+ ) {
+ this.checkItems[key].HSampleDamageQty = 0;
+ }
+ if (
+ this.checkItems[key].HAcceptQty == "" ||
+ this.checkItems[key].HAcceptQty == null
+ ) {
+ this.checkItems[key].HAcceptQty = 0;
+ }
+ if (
+ this.checkItems[key].HRejectQty == "" ||
+ this.checkItems[key].HRejectQty == null
+ ) {
+ this.checkItems[key].HRejectQty = 0;
+ }
+ if (
+ this.checkItems[key].HSampleUnRightQty == "" ||
+ this.checkItems[key].HSampleUnRightQty == 0
+ ) {
+ this.checkItems[key].HSampleUnRightQty = 0;
+ }
+ if (this.checkItems[key].HUnitID == "") {
+ this.checkItems[key].HUnitID = 0;
+ }
+ }
+
+ return true;
+ },
+ async submit() {
+ if (!this.checkSubmitValidate()) {
+ return;
+ }
+ try {
+ console.log('this.$refs: ', this.$refs);
+ // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length >
+ 0) {
+ // 鍔犺浇鏈夋楠屽�兼ā鍧�
+ await this.$refs.InspectValueModules[0].set_SaveValue();
+ this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+ await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+ }
+ let InspectValuesTrans = [];
+ let HInterID = this.hform.HInterID;
+ for (let key in this.InspectValues) {
+ let HEntryID = key;
+
+ InspectValuesTrans.push(
+ `${JSON.stringify(this.InspectValues[key])}`
+ );
+ }
+ let checkItemsArray = [];
+ for (var key in this.checkItems) {
+ let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+ delete checkItem.data
+ checkItemsArray.push(checkItem);
+ }
+ console.log('checkItemsArray: ', checkItemsArray);
+ let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
+ checkItemsArray
+ )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
+ console.log("this.checkItems: ", this.checkItems);
+
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/QC_ProcessCheckBill/set_SaveBill",
+ data: {
+ sMainSub: sMainSub,
+ },
+ method: "POST",
+ });
+
+ if (!res) {
+ return;
+ }
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+ if (count == 1) {
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/ZLGL/mojianjianyan/form?operationType=1",
+ });
+ } else if (res.cancel) {
+ console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+ // setTimeout(() => {
+ // uni.navigateBack();
+ // }, 50)
+ }
+ },
+ });
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鏈欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鏈欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
+ });
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList?operationType=1",
+ });
+ },
+ goBack() {
+ uni.navigateBack();
+ },
+ async RoadBillMain() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
+ data: {
+ sWhere: ` and hmainid=${this.hform.HInterID}`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+
+ if (count == 1) {
+ console.log("RoadBillMain: : ", data);
+ Object.assign(this.hform, {
+ HInterID: data[0].hmainid,
+ HBillNo: data[0].鍗曟嵁鍙�,
+ HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
+ HSourceID: data[0].HSourceID,
+ HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
+ HICMOBillNo: data[0].浠诲姟鍗曞彿,
+ HICMOQty: data[0].浠诲姟鍗曟暟閲�,
+ HICMOInterID: data[0].HICMOInterID,
+ HICMOEntryID: data[0].HICMOEntryID || 1,
+ HMaterID: data[0].HMaterID,
+ HMaterName: data[0].鐗╂枡鍚嶇О,
+ HMaterNumber: data[0].鐗╂枡浠ｇ爜,
+ HProcID: data[0].HProcID,
+ HProcName: data[0].HProcName,
+ HProcExchQty: data[0].HProcExchQty || 0,
+ HProcExchBillNo: data[0].HProcExchBillNo,
+ HProcExchInterID: data[0].HProcExchInterID,
+ HProcExchEntryID: data[0].HProcExchEntryID || 0,
+ HFirstCheckEmp: data[0].HFirstCheckEmp,
+ HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
+ HQCSchemeID: data[0].妫�楠屾柟妗圛D,
+ HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
+ HRemark: data[0].琛ㄥご澶囨敞,
+ HMaker: data[0].鍒跺崟浜�,
+ HMakeDate: data[0].鍒跺崟鏃ユ湡,
+ HChecker: data[0].瀹℃牳浜�,
+ HCheckDate: data[0].瀹℃牳鏃ユ湡,
+ HCloseMan: data[0].鍏抽棴浜�,
+ HCloseDate: data[0].鍏抽棴鏃ユ湡,
+ HUpDateDate: data[0].淇敼鏃ユ湡,
+ HDeleteDate: data[0].浣滃簾鏃ユ湡,
+ HSampleSchemeID: data[0].HSampleSchemeID,
+ HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[0].鏍锋湰閲�,
+ HSampleQty2: data[0].鏍锋湰閲�,
+ HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
+ HSamplingType: data[0].鎶芥牱绫诲瀷,
+ HAcceptQty: data[0].鍏佽鏁�,
+ HInspectionLevel: data[0].妫�楠屾按骞�,
+ HRejectQty: data[0].鎷掔粷鏁�,
+ HStrictness: data[0].涓ユ牸搴�,
+ HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
+ HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
+ HAQL: data[0].AQL,
+ HUnitID: data[0].HUnitID,
+ HUnit: data[0].鍗曚綅,
+ HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
+ HInspectVal: data[0].妫�娴嬪��,
+ HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
+ HTargetVal: data[0].鐩爣鍊�,
+ HUpLimit: data[0].涓婇檺鍊�,
+ HDownLimit: data[0].涓嬮檺鍊�,
+ HUpOffSet: data[0].涓婂亸宸�,
+ HDownOffSet: data[0].涓嬪亸宸�,
+ HEntryID: data[0].hsubid,
+ HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
+ HQCCheckItemID: data[0].HQCCheckItemID,
+ HShiftsID: data[0].HShiftsID,
+ HShiftsName: data[0].鐝鍚嶇О,
+ HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
+ HBatchNo: data[0].鎵瑰彿,
+ HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
+ HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
+ HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
+ HAnalysisMethod: function() {
+ if (data[0].HAnalysisMethod == 1) {
+ return '瀹氭�ф楠�'
+ } else if (data[0].HAnalysisMethod == 2) {
+ return '瀹氶噺妫�楠�'
+ } else {
+ return '鍏朵粬妫�楠�'
+ }
+ }(),
+
+
+
+ });
+
+ for (let i = 0; i < data.length; i++) {
+ this.addCheckItem({
+ HQCCheckItemID: data[i].HQCCheckItemID,
+ HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
+ HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
+ HInspectInstruMentID: data[i].HInspectInstruMentID,
+ HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
+ HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
+ HQCStd: data[i].妫�楠屾爣鍑�,
+ HUnit: data[i].鍗曚綅鍚嶇О,
+ HQCNote: data[i].妫�楠岃褰�,
+ HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
+ HMax: data[i].鏈�澶у��,
+ HMin: data[i].鏈�灏忓��,
+ HAvg: data[i].骞冲潎鍊�,
+ HRemark: data[i].琛ㄤ綋澶囨敞,
+ HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
+ 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
+ 2 : 3,
+ HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+ HSampleSchemeID: data[i].HSampleSchemeID,
+ HUnitID: data[i].HUnitID,
+ HInspectVal: data[i].妫�娴嬪��,
+ HTargetVal: data[i].鐩爣鍊�,
+ HUpLimit: data[i].涓婇檺鍊�,
+ HDownLimit: data[i].涓嬮檺鍊�,
+ HUpOffSet: data[i].涓婂亸宸�,
+ HDownOffSet: data[i].涓嬪亸宸�,
+ HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+ HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[i].鏍锋湰閲�,
+ HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+ HAcceptQty: data[i].鍏佽鏁�,
+ HInspectionLevel: 0,
+ HRejectQty: data[i].鎷掔粷鏁�,
+ HStrictness: 0,
+ HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
+ HAQL: data[i].AQL,
+ HSamplingType: 0,
+ HSamplingType: data[i].鎶芥牱绫诲瀷,
+ HStrictness: data[i].涓ユ牸搴�,
+ HInspectResultToSee: data[i].妫�楠岀粨鏋�
+ });
+
+ }
+
+
+ this.hasSourceBill = true
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
+ });
+ }
+ },
+ },
+ async onLoad(e) {
+ this.operationType = e.operationType || 1;
+ this.hform.HInterID = e.linterid || 0;
+ if (this.operationType == 1) {
+ await this.getMaxBillNo();
+ } else if (this.operationType == 2) {
+
+ } else if (this.operationType == 3) {
+ await this.RoadBillMain();
+ }
+
+ await this.InitHSource();
+ await this.InitHWorkShift();
+ await this.InitHEmp();
+ },
+ };
+</script>
+
+<style lang="scss" scoped>
+ input {
+ width: inherit;
+ font-size: 26rpx;
+ }
+
+ .uni-input {
+ padding: 0;
+ }
+
+ .bill-main-tabs,
+ .bill-sub-tabs {
+ box-sizing: border-box;
+ width: 730rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ gap: 20rpx;
+ flex-shrink: 0;
+ overflow-x: auto;
+ border-bottom: 1px solid #ddd;
+ padding: 20rpx 10rpx;
+ white-space: nowrap;
+
+ view {
+ width: auto;
+ font-size: 26rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .selected {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .bill-main-content,
+ .bill-sub-content {
+ box-sizing: border-box;
+ padding: 0 30rpx 0 30rpx;
+ display: flex;
+ flex-direction: column;
+
+ .form-item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
+
+ .left {
+ width: 208rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ // width: 450rpx;
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+
+ .uni-combox {
+ padding: 0;
+ height: auto;
+
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
+
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+ }
+
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ .none-border {
+ border: none;
+ }
+ }
+ }
+
+ .bottom-btn {
+ box-sizing: border-box;
+ width: 100%;
+ height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
+
+ .buttons {
+ box-sizing: border-box;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ padding: 10rpx 0;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 26rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .list {
+ width: 100%;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ align-items: center;
+ line-height: 120%;
+ gap: 10rpx 0;
+
+ input {
+ font-size: 26rpx;
+ }
+
+ .detail {
+ // width: 50%;
+ box-sizing: border-box;
+ font-size: 26rpx;
+ color: #555;
+ padding-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+
+ .editable {
+ width: 50%;
+ display: inline-flex;
+ flex-direction: row;
+ align-items: center;
+
+ text {
+ flex-shrink: 0;
+ }
+
+ .sampleDestory {
+ border: 1px solid #acacac;
+ border-radius: 10%;
+ padding: 0 12rpx;
+ }
+ }
+ }
+ }
+
+ .icon-wrapper {
+ background-color: #3a78ff;
+ border-radius: 100%;
+ width: 40rpx;
+ height: 40rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .icon-wrapper-big {
+ background-color: #3a78ff;
+ border-radius: 100%;
+ width: 50rpx;
+ height: 50rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+ margin-left: 20rpx;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 22rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 10rpx;
+
+ .part {
+ width: 100%;
+ text-align: center;
+ }
+ }
+
+ .pass-background {
+ background-color: #cee3f2;
+ border: none;
+ }
+
+ .unpass-background {
+ background-color: #f0d6e3;
+ border: none;
+ }
+</style>
\ No newline at end of file
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..73f289b 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?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: `/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=3&linterid=${item.hmainid}`
})
}
},
diff --git a/pages/ZLGL/shoujianjianyan/form.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
similarity index 96%
rename from pages/ZLGL/shoujianjianyan/form.vue
rename to pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index 3893f38..423f253 100644
--- a/pages/ZLGL/shoujianjianyan/form.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -5,7 +5,8 @@
<!-- 涓昏〃椤电 -->
<view class="bill-main-tabs">
<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
- <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍒跺崟淇℃伅</view>
+ <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+ <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
</view>
<!-- 涓昏〃鍐呭 -->
<view class="bill-main-contents">
@@ -26,21 +27,11 @@
</uni-datetime-picker>
</view>
</view>
- <view class="form-item">
- <view class="left">婧愬崟绫诲瀷</view>
- <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
- <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
- @change="HSourceBillTypeNameChange">
- <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- </view>
- <view class="form-item">
+<view class="form-item">
<view class="left">婧愬崟鍗曞彿</view>
<view class="right" :class="!hasSourceBill?'':'disabled'">
- <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�" v-model="hform.HSourceBillNo"
- @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+ <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
</view>
<view class="icon-wrapper-big">
<uni-icons class="right-icon" type="scan" style="
@@ -51,25 +42,7 @@
" size="20" @click="toScanCode"></uni-icons>
</view>
</view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right">
- <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @update:modelValue="HSourceChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇鐝</view>
- <view class="right">
- <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
- </view>
- </view>
- <!-- <view class="form-item">
- <view class="left"></view>
- <view class="right">
- <input type="text"></view>
- </view> -->
+
<view class="form-item">
<view class="left">浠诲姟鍗曞彿</view>
<view class="right disabled">
@@ -79,24 +52,12 @@
@click="showSelectorModule(hform, 5)"></uni-icons></view>
</view>
<view class="form-item">
- <view class="left">浠诲姟鍗曟暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HICMOQty" />
- </view>
- </view>
- <view class="form-item">
<view class="left">娴佽浆鍗″彿</view>
<view class="right disabled">
<input type="text" :value="hform.HProcExchBillNo" disabled />
</view>
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 6)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">娴佽浆鍗℃暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HProcExchQty" />
- </view>
</view>
<view class="form-item">
<view class="left">浜у搧浠ｇ爜</view>
@@ -129,12 +90,7 @@
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 7)"></uni-icons></view>
</view>
- <view class="form-item">
- <view class="left">鎵瑰彿</view>
- <view class="right">
- <input type="text" value="" />
- </view>
- </view>
+
<view class="form-item">
<view class="left">鍒ゆ柇缁撹</view>
<view class="right none-border">
@@ -159,21 +115,74 @@
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 8)"></uni-icons></view>
</view>
+
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 2">
<view class="form-item">
- <view class="left">澶囨敞</view>
- <view class="right">
- <input type="text" value="" />
+ <view class="left">婧愬崟绫诲瀷</view>
+ <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+ <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+ @change="HSourceBillTypeNameChange">
+ <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
+ <view class="picker-overlay"></view>
+ </picker>
</view>
</view>
<view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right">
+ <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @update:modelValue="HSourceChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view>
+ <!-- <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view> -->
+ <view class="form-item">
<view class="left">寮傚父涓存椂澶勭悊鏂规</view>
<view class="right">
- <input type="text" value="" />
+ <input type="text" v-model="hform.HErrTreatment" value="" />
+ </view>
+ </view>
+ <!-- <view class="form-item">
+ <view class="left">浠诲姟鍗曟暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HICMOQty" />
+ </view>
+ </view> -->
+ <view class="form-item">
+ <view class="left">娴佽浆鍗℃暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HProcExchQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鎵瑰彿</view>
+ <view class="right">
+ <input type="text" v-model="hform.HBatchNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">澶囨敞</view>
+ <view class="right">
+ <input type="text" v-model="hform.HRemark" value="" />
</view>
</view>
</view>
<!-- 鍒跺崟淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 2">
+ <view class="bill-main-content" v-if="mainTabSelected == 3">
<view class="form-item">
<view class="left">鍒跺崟浜�</view>
<view class="right disabled">
@@ -235,6 +244,7 @@
</view>
</view>
</view>
+
</view>
</view>
<!-- 瀛愯〃鍖哄煙 -->
@@ -303,8 +313,11 @@
<view class="detail" v-if="checkItem.HUnit">
<text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
</view>
- <view class="detail" v-if="checkItem.HQCStd">
- <text>妫�楠屽�硷細</text>{{ checkItem.HQCStd }}
+ <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
+ <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
+ <text>妫�楠屽�硷細</text>
+ <input type="text" class="editable-input" @blur="calcHResult(checkItem)" v-model="checkItem.HInspectValQ" />
+
</view>
<view class="detail" v-if="checkItem.HQCNote">
<text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
@@ -382,7 +395,7 @@
</view>
<view class="detail editable">
<text>鏍锋湰鐮村潖鏁帮細</text>
- <view class="sampleDestory">
+ <view class="editable-input">
<input type="number" v-model="SamplingItem.HSampleDamageQty" />
</view>
</view>
@@ -491,7 +504,7 @@
mainTabSelected: 1,
subTabSelected: 1,
-
+
// 婧愬崟鐘舵�佹帶鍒�
hasSourceBill: false,
@@ -622,6 +635,21 @@
};
},
methods: {
+ // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
+ calcHResult(item){
+ // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
+ console.log('item: ',item);
+ if(item.HSampleSchemeID) {
+ return
+ }
+
+ if(item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit){
+ this.checkItems[item.num].HResult = true
+ return
+ }
+
+ this.checkItems[item.num].HResult = false
+ },
// 婧愬崟绫诲瀷閫夋嫨
HSourceBillTypeNameChange(e) {
this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
@@ -771,7 +799,7 @@
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
this.hform.HBatchNo = data[0].鎵瑰彿;
-
+
this.hasSourceBill = true
this.get_CheckItem();
} catch (err) {
@@ -922,11 +950,11 @@
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-
- for(let i =0; i<data.length;i++) {
+
+ for (let i = 0; i < data.length; i++) {
this.addCheckItem(data[i])
}
-
+
this.hasSourceBill = true
this.get_CheckItem();
} catch (err) {
@@ -1098,7 +1126,7 @@
this.$refs.listPopup.showPopup();
},
getAnalysisMethodDisplay(val) {
- console.log("AnalysisMethodVal: ", val);
+ console.log("AnalysisMethod: ", val);
if (val) {
return this.arrayAnalysisMethod.find((e) => e.value == val).name;
}
@@ -1620,7 +1648,7 @@
console.log("e: ", e);
let key = e.num;
e.HStatus = e.HStatus ? 1 : 0
- if(e.HResult2 == ''){
+ if (e.HResult2 == '') {
e.HResult2 = this.checkItems[key].HResult
}
Object.assign(this.checkItems[key], e);
@@ -1631,12 +1659,12 @@
},
checkSubmitValidate() {
- if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
- CommonUtils.showTips({
- message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
- });
- return false;
- }
+ // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+ // CommonUtils.showTips({
+ // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+ // });
+ // return false;
+ // }
if (this.hform.HFirstCheckEmp == 0) {
CommonUtils.showTips({
@@ -1701,9 +1729,10 @@
return;
}
try {
- console.log('this.$refs: ',this.$refs);
+ console.log('this.$refs: ', this.$refs);
// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length > 0) {
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+ .length > 0) {
// 鍔犺浇鏈夋楠屽�兼ā鍧�
await this.$refs.InspectValueModules[0].set_SaveValue();
this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
@@ -1720,11 +1749,11 @@
}
let checkItemsArray = [];
for (var key in this.checkItems) {
- let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+ let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
delete checkItem.data
checkItemsArray.push(checkItem);
}
- console.log('checkItemsArray: ',checkItemsArray);
+ console.log('checkItemsArray: ', checkItemsArray);
let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
checkItemsArray
)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
@@ -1780,7 +1809,7 @@
},
addNew() {
uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
+ url: "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
});
},
goBack() {
@@ -1869,18 +1898,15 @@
HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function(){
- if(data[0].HAnalysisMethod == 1) {
+ HAnalysisMethod: function() {
+ if (data[0].HAnalysisMethod == 1) {
return '瀹氭�ф楠�'
- }else if(data[0].HAnalysisMethod == 2) {
+ } else if (data[0].HAnalysisMethod == 2) {
return '瀹氶噺妫�楠�'
- }else {
- return '鍏朵粬妫�楠�'
+ } else {
+ return '鍏朵粬妫�楠�'
}
}(),
-
-
-
});
for (let i = 0; i < data.length; i++) {
@@ -1926,10 +1952,8 @@
HStrictness: data[i].涓ユ牸搴�,
HInspectResultToSee: data[i].妫�楠岀粨鏋�
});
-
}
-
-
+
this.hasSourceBill = true
} else {
CommonUtils.showTips({
@@ -1950,9 +1974,7 @@
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
await this.getMaxBillNo();
- } else if (this.operationType == 2) {
-
- } else if (this.operationType == 3) {
+ } else if (this.operationType == 2) {} else if (this.operationType == 3) {
await this.RoadBillMain();
}
@@ -2175,9 +2197,9 @@
flex-shrink: 0;
}
- .sampleDestory {
+ .editable-input {
border: 1px solid #acacac;
- border-radius: 10%;
+ border-radius: 5rpx;
padding: 0 12rpx;
}
}
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 97%
rename from pages/ZLGL/xunjianjianyan/form.vue
rename to pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 02ca5ed..dcc3c95 100644
--- a/pages/ZLGL/xunjianjianyan/form.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -5,7 +5,8 @@
<!-- 涓昏〃椤电 -->
<view class="bill-main-tabs">
<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
- <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍒跺崟淇℃伅</view>
+ <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+ <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
</view>
<!-- 涓昏〃鍐呭 -->
<view class="bill-main-contents">
@@ -26,21 +27,12 @@
</uni-datetime-picker>
</view>
</view>
- <view class="form-item">
- <view class="left">婧愬崟绫诲瀷</view>
- <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
- <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
- @change="HSourceBillTypeNameChange">
- <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- </view>
+
<view class="form-item">
<view class="left">婧愬崟鍗曞彿</view>
<view class="right" :class="!hasSourceBill?'':'disabled'">
- <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�" v-model="hform.HSourceBillNo"
- @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+ <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
</view>
<view class="icon-wrapper-big">
<uni-icons class="right-icon" type="scan" style="
@@ -51,25 +43,7 @@
" size="20" @click="toScanCode"></uni-icons>
</view>
</view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right">
- <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @update:modelValue="HSourceChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇鐝</view>
- <view class="right">
- <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
- </view>
- </view>
- <!-- <view class="form-item">
- <view class="left"></view>
- <view class="right">
- <input type="text"></view>
- </view> -->
+
<view class="form-item">
<view class="left">浠诲姟鍗曞彿</view>
<view class="right disabled">
@@ -79,24 +53,12 @@
@click="showSelectorModule(hform, 5)"></uni-icons></view>
</view>
<view class="form-item">
- <view class="left">浠诲姟鍗曟暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HICMOQty" />
- </view>
- </view>
- <view class="form-item">
<view class="left">娴佽浆鍗″彿</view>
<view class="right disabled">
<input type="text" :value="hform.HProcExchBillNo" disabled />
</view>
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 6)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">娴佽浆鍗℃暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HProcExchQty" />
- </view>
</view>
<view class="form-item">
<view class="left">浜у搧浠ｇ爜</view>
@@ -129,12 +91,7 @@
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 7)"></uni-icons></view>
</view>
- <view class="form-item">
- <view class="left">鎵瑰彿</view>
- <view class="right">
- <input type="text" value="" />
- </view>
- </view>
+
<view class="form-item">
<view class="left">鍒ゆ柇缁撹</view>
<view class="right none-border">
@@ -159,21 +116,74 @@
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 8)"></uni-icons></view>
</view>
+
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 2">
<view class="form-item">
- <view class="left">澶囨敞</view>
+ <view class="left">婧愬崟绫诲瀷</view>
+ <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+ <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+ @change="HSourceBillTypeNameChange">
+ <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
<view class="right">
- <input type="text" value="" />
+ <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @update:modelValue="HSourceChange"></uni-combox>
+ </view>
+ </view>
+ <!-- <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view> -->
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
</view>
</view>
<view class="form-item">
<view class="left">寮傚父涓存椂澶勭悊鏂规</view>
<view class="right">
- <input type="text" value="" />
+ <input type="text" v-model="hform.HErrTreatment" value="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浠诲姟鍗曟暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HICMOQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">娴佽浆鍗℃暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HProcExchQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鎵瑰彿</view>
+ <view class="right">
+ <input type="text" v-model="hform.HBatchNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">澶囨敞</view>
+ <view class="right">
+ <input type="text" v-model="hform.HRemark" value="" />
</view>
</view>
</view>
<!-- 鍒跺崟淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 2">
+ <view class="bill-main-content" v-if="mainTabSelected == 3">
<view class="form-item">
<view class="left">鍒跺崟浜�</view>
<view class="right disabled">
@@ -491,7 +501,7 @@
mainTabSelected: 1,
subTabSelected: 1,
-
+
// 婧愬崟鐘舵�佹帶鍒�
hasSourceBill: false,
@@ -771,7 +781,7 @@
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
this.hform.HBatchNo = data[0].鎵瑰彿;
-
+
this.hasSourceBill = true
this.get_CheckItem();
} catch (err) {
@@ -922,11 +932,11 @@
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-
- for(let i =0; i<data.length;i++) {
+
+ for (let i = 0; i < data.length; i++) {
this.addCheckItem(data[i])
}
-
+
this.hasSourceBill = true
this.get_CheckItem();
} catch (err) {
@@ -1620,7 +1630,7 @@
console.log("e: ", e);
let key = e.num;
e.HStatus = e.HStatus ? 1 : 0
- if(e.HResult2 == ''){
+ if (e.HResult2 == '') {
e.HResult2 = this.checkItems[key].HResult
}
Object.assign(this.checkItems[key], e);
@@ -1631,12 +1641,12 @@
},
checkSubmitValidate() {
- if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
- CommonUtils.showTips({
- message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
- });
- return false;
- }
+ // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+ // CommonUtils.showTips({
+ // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+ // });
+ // return false;
+ // }
if (this.hform.HFirstCheckEmp == 0) {
CommonUtils.showTips({
@@ -1701,9 +1711,10 @@
return;
}
try {
- console.log('this.$refs: ',this.$refs);
+ console.log('this.$refs: ', this.$refs);
// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length > 0) {
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+ .length > 0) {
// 鍔犺浇鏈夋楠屽�兼ā鍧�
await this.$refs.InspectValueModules[0].set_SaveValue();
this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
@@ -1720,11 +1731,11 @@
}
let checkItemsArray = [];
for (var key in this.checkItems) {
- let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+ let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
delete checkItem.data
checkItemsArray.push(checkItem);
}
- console.log('checkItemsArray: ',checkItemsArray);
+ console.log('checkItemsArray: ', checkItemsArray);
let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
checkItemsArray
)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
@@ -1755,7 +1766,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("鐢ㄦ埛鐐瑰嚮鍙栨秷");
@@ -1780,7 +1791,7 @@
},
addNew() {
uni.redirectTo({
- url: "/pages/ZLGL/xunjianjianyan/form?operationType=1",
+ url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
});
},
goBack() {
@@ -1869,17 +1880,17 @@
HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function(){
- if(data[0].HAnalysisMethod == 1) {
+ HAnalysisMethod: function() {
+ if (data[0].HAnalysisMethod == 1) {
return '瀹氭�ф楠�'
- }else if(data[0].HAnalysisMethod == 2) {
+ } else if (data[0].HAnalysisMethod == 2) {
return '瀹氶噺妫�楠�'
- }else {
- return '鍏朵粬妫�楠�'
+ } else {
+ return '鍏朵粬妫�楠�'
}
}(),
-
-
+
+
});
@@ -1926,10 +1937,10 @@
HStrictness: data[i].涓ユ牸搴�,
HInspectResultToSee: data[i].妫�楠岀粨鏋�
});
-
+
}
-
-
+
+
this.hasSourceBill = true
} else {
CommonUtils.showTips({
@@ -1951,7 +1962,7 @@
if (this.operationType == 1) {
await this.getMaxBillNo();
} else if (this.operationType == 2) {
-
+
} else if (this.operationType == 3) {
await this.RoadBillMain();
}
@@ -2177,7 +2188,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/form.vue b/pages/chaituosaoma-xiaowei/UnpackPallet.vue
similarity index 96%
rename from pages/chaituosaoma/form.vue
rename to pages/chaituosaoma-xiaowei/UnpackPallet.vue
index 71e5cac..ec5205a 100644
--- a/pages/chaituosaoma/form.vue
+++ b/pages/chaituosaoma-xiaowei/UnpackPallet.vue
@@ -12,17 +12,6 @@
@click="toScanCode"></uni-icons>
</view>
</view>
- <!-- <view class="form-item">
- <view class="title">鏉＄爜</view>
- <view class="right">
- <input type="text" :focus="HBarCodeFocus" v-model="HBarCode" @confirm="GetMeesageByBarCode(HBarCode)" />
- </view>
- <view class="right-icon">
- <uni-icons type="scan"
- style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
- @click="toScanCode2"></uni-icons>
- </view>
- </view> -->
</view>
<view class="tabs">
<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">瑁呯淇℃伅</view>
@@ -219,7 +208,7 @@
title: Message
})
} else {
- CommonUtils.playSound(1)
+ CommonUtils.playSound(0)
this.HBarCodePackFocusRefresh()
uni.showToast({
icon: 'none',
@@ -483,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%
copy from pages/chaituosaoma/form.vue
copy 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 d114244..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||!item.id" 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" :hidden="!item.id" 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,//id涓�0寮哄埗涓嶆樉绀�
- 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',
@@ -287,13 +287,26 @@
id: 32,
hidden: false,
},{
- img: '../../static/icon/icon16.png',
+ img: '../../static/icon/icon8.png',
text: '瑁呯鍗�',
url: '/pages/zhuangxiangdan/form',
+ id: 33,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon8.png',
+ text: '鎷嗘墭鎵爜锛堝皬鍗級',
+ url: `/pages/chaituosaoma-xiaowei/UnpackPallet`,
id: 34,
hidden: false,
},
-
+ {
+ img: '../../static/icon/icon8.png',
+ text: '涓夌爜鍚堜竴',
+ url: `/pages/sanmaheyi/BarCodeCheck`,
+ id: 35,
+ hidden: false,
+ },
],
// itemData: [{
// img: '../../static/icon/icon1.png',
@@ -506,144 +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"]
- this.itemData[e["HIndex"]].id = e["HEntryID"]//鐢ㄤ簬鏁版嵁搴撹缃ā鍧楅殣钘�
- })
- },
- 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/login.vue b/pages/index/login.vue
index 4096323..f78bec0 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -92,6 +92,7 @@
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�": 'http://localhost:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
+ "浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
},
serverUrlName: '娴欐睙鏅轰簯杩堟��',
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 c3d9b3f..ed1b732 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,129 +308,130 @@
{
"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",
+ "text": "棣栦欢妫�楠屽崟鍒楄〃",
+ "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
},
{
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+ "id": 43,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
+ "id": 44,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+ "id": 45,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟",
+ "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1",
+ "id": 46,
+ "hidden": false
+ },
+ {
"img": "../../static/icon/icon5.png",
"text": "妯″叿鐐规璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujudianjianjiludan/table",
- "id": 43,
+ "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
+ "id": 47,
"hidden": false
},
{
"img": "../../static/icon/icon5.png",
"text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujubaoyangjiludan/table",
- "id": 44,
+ "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
+ "id": 48,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
"text": "妯″叿棰嗘枡鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/mujulingliaochukudan/table",
- "id": 45,
+ "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+ "id": 49,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
"text": "妯″叿棰嗘枡閫�搴撳崟鍒楄〃",
"url": "/pages/MJGL/mujulingliaotuikudan/table",
- "id": 46,
+ "id": 50,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
"text": "妯″叿璋冩嫧鍗曞垪琛�",
"url": "/pages/MJGL/qijudiaobodan/table",
- "id": 47,
+ "id": 51,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
"text": "瑁呯鍗曟殏瀛樺垪琛�",
"url": "/pages/zhuangxiangdan/table",
- "id": 48,
+ "id": 52,
"hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃鍗曟殏瀛樺垪琛�",
- "url": "/pages/ZLGL/xunjianjianyan/table",
- "id": 49,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃鍗�",
- "url": "/pages/ZLGL/xunjianjianyan/form?operationType=1",
- "id": 50,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/mojianjianyan/table",
- "id": 51,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟",
- "url": "/pages/ZLGL/mojianjianyan/form?operationType=1",
- "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/sanmaheyi/BarCodeCheck.vue b/pages/sanmaheyi/BarCodeCheck.vue
new file mode 100644
index 0000000..2c8b502
--- /dev/null
+++ b/pages/sanmaheyi/BarCodeCheck.vue
@@ -0,0 +1,872 @@
+<template>
+ <view class="form">
+ <view class="form-base-info">
+ <view class="form-item">
+ <view class="title">鏍堟澘鐮�</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCodePallet ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet"
+ @confirm="CheckBarcode(HBarCode_Pallet,1)" :disabled="disableBarCodePallet" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="disableBarCodePallet ? 'disabled':''" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCodePallet"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐩殑浠撶爜</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCodeDest ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination"
+ @confirm="CheckBarcode(HBarCode_Destination,2)" :disabled="disableBarCodeDest" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="disableBarCodeDest ? 'disabled':''" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCodeDest"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓鐮�</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCodeMiddle ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox "
+ @confirm="CheckBarcode(HBarCode_MiddleBox,3)" :disabled="disableBarCodeMiddle" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="disableBarCodeMiddle ? 'disabled':''" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCodeMiddle"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧鐮�</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCode ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodeFocus" v-model="HBarCode"
+ @confirm="GetMeesageByBarCode(HBarCode)" :disabled="disableBarCode" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="[disableBarCode ? 'disabled':'']" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCode"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view class="tabs">
+ <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" :show-header="true" :border="true" :row-key="row => row.index"
+ @toggleRowSelection="handleSelect" @toggleAllSelection="handleSelectAll"
+ @rowClick="onTableRowClickHandler" />
+ </view>
+ <!-- 鍗曟嵁淇℃伅 -->
+ <view v-if="tabs == 1">
+
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="date" v-model="hform.HDate">
+ <input type="text" v-model="hform.HDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ </view>
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaker" />
+ </view>
+ </view>
+ </view>
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HBillNo" />
+ </view>
+ </view>
+ </view>
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">鍗曟嵁ID</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HInterID" />
+ </view>
+ </view>
+ </view>
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">缁勭粐</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HStockOrgName" />
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="bottom-btn" id="bottom-btn">
+ <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>
+ </view>
+ </view>
+</template>
+<script>
+ import dayjs from 'dayjs'
+ import {
+ getUserInfo
+ } from "../../utils/auth";
+ import {
+ CommonUtils
+ } from "@/utils/common.js"
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+
+ export default {
+ data() {
+ return {
+ // ==================== 甯冨眬璁＄畻鐩稿叧 ====================
+ // 璁＄畻鍒楄〃楂樺害
+ bottomBtnTop: 0,
+ listTableTop: 0,
+
+ // ==================== 鐣岄潰鐘舵�佹帶鍒� ====================
+ EnableSubmit: true, // 鏄惁鍏佽鎻愪氦
+ disableBarCodePallet: false, // 鏍堟澘鐮佺鐢ㄧ姸鎬�
+ disableBarCodeDest: false, // 鐩殑浠撶爜绂佺敤鐘舵��
+ disableBarCodeMiddle: false, // 涓鐮佺鐢ㄧ姸鎬�
+ disableBarCode: true, // 浜у搧鐮佺鐢ㄧ姸鎬�
+ HBarCodePalletFocus: false, // 鏍堟澘鐮佽緭鍏ユ鑱氱劍鐘舵��
+ HBarCodeDestFocus: false, // 鐩殑浠撶爜杈撳叆妗嗚仛鐒︾姸鎬�
+ HBarCodeMiddleFocus: false, // 涓鐮佽緭鍏ユ鑱氱劍鐘舵��
+ HBarCodeFocus: false, // 浜у搧鐮佽緭鍏ユ鑱氱劍鐘舵��
+ tabs: 0, // 褰撳墠閫夐」鍗�(0:鍗曟嵁淇℃伅,1:瑁呯淇℃伅)
+
+
+ // ==================== 涓氬姟鏁版嵁 ====================
+ HBarCode_Pallet: '', // 鏍堟澘鐮�
+ HBarCode_Destination: '', //鐩殑浠撶爜
+ HBarCode_MiddleBox: '', //涓鐮�
+ HBarCode: '', // 浜у搧鐮�
+ HBillType: '1283', // 鍗曟嵁绫诲瀷
+ HBillSubType: '1', // 瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
+ OperationType: 1, // 鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ HMaterNumber_Pack: "", // 鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+ HBarCode_Pallet_Temp: "", // 浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏍堟澘鐮�
+ BarCodeType: 1, // 鏉＄爜绫诲瀷(1:瑁呯,2:缁勬墭)
+
+
+ // ==================== 鍒楄〃鏁版嵁 ====================
+ listOption: [], // 鍒楄〃閫夐」
+ listData: [], // 琛ㄦ牸鏁版嵁
+ selectedRows: [], // 琛ㄦ牸閫変腑鐨勬暟鎹�
+ columns: [ // 琛ㄦ牸鍒楅厤缃�
+ {
+ type: 'selection',
+ fixed: true,
+ width: 50
+ },
+ {
+ name: 'index',
+ label: '搴忓彿',
+ width: 60,
+ hidden: true
+ },
+ {
+ name: '鏍堟澘鐮�',
+ label: '鏍堟澘鐮�',
+ width: 200
+ },
+ {
+ name: '鐩殑浠撶爜',
+ label: '鐩殑浠撶爜',
+ width: 200
+ },
+ {
+ name: '涓鐮�',
+ label: '涓鐮�',
+ width: 200
+ },
+ {
+ name: 'SN鐮�',
+ label: 'SN鐮�',
+ width: 200
+ }
+ ],
+
+ // ==================== 涓昏〃鍗曟暟鎹� ====================
+ hform: {
+ HDate: dayjs(new Date()).format('YYYY-MM-DD'), // 鍗曟嵁鏃ユ湡
+ HMaker: getUserInfo()['Czymc'], // 鍒跺崟浜�
+ HBillNo: '', // 鍗曟嵁鍙�
+ HInterID: '', // 鍗曟嵁ID
+ HStockOrgName: uni.getStorageSync("Organization"), // 缁勭粐鍚嶇О
+ HStockOrgID: uni.getStorageSync("OrganizationID"), // 缁勭粐ID
+ },
+
+ // ==================== 绯荤粺閰嶇疆 ====================
+ HModName: "Sc_PackUnionBill_Packing_PDA", // 妯″潡鍚嶇О
+ ModRightName: "CE_PackUnionBill_Packing", // 妯″潡鏉冮檺鍙傛暟
+ titleData: [] // 涓嶉渶瑕佹樉绀虹殑瀛楁
+ }
+ },
+ components: {
+
+ },
+ // ==================== 璁＄畻灞炴�� ====================
+ computed: {
+ // 璁＄畻琛ㄦ牸楂樺害
+ listTableHeight: {
+ get() {
+ return this.bottomBtnTop - this.listTableTop - 10
+ }
+ }
+ },
+
+ // ==================== 鏂规硶 ====================
+ methods: {
+ // 澶嶉�夋鍙樺寲澶勭悊
+ checkboxGroupChangeHandler(e) {
+ let checkBoxValues = Array.from(e.detail.value)
+ this.hform.HQualityApproval = checkBoxValues.includes('qualityApproval')
+ },
+
+ // 琛ㄦ牸琛岀偣鍑诲鐞�
+ onTableRowClickHandler(row, index) {
+ if (!this.listData[index].checked) {
+ this.$set(this.listData[index], 'checked', true)
+ } else {
+ this.listData[index].checked = !this.listData[index].checked
+ }
+ },
+
+ // 鍒锋柊SN鐮佽緭鍏ユ鐒︾偣
+ async HBarCodeFocusRefresh() {
+ this.HBarCode = ''
+ this.HBarCodeFocus = false
+ await this.$nextTick()
+ this.HBarCodeFocus = true
+ },
+
+ // 鍒锋柊鏍堟澘鐮佽緭鍏ユ鐒︾偣
+ async HBarCodePalletFocusRefresh() {
+ this.HBarCode_Pallet = ''
+ this.HBarCodePalletFocus = false
+ await this.$nextTick()
+ this.HBarCodePalletFocus = true
+ },
+
+ // 鍒锋柊鐩殑浠撶爜杈撳叆妗嗙劍鐐�
+ async HBarCodeDestFocusRefresh() {
+ this.HBarCode_Destination = ''
+ this.HBarCodeDestFocus = false
+ await this.$nextTick()
+ this.HBarCodeDestFocus = true
+ },
+
+ // 鍒锋柊涓鐮佽緭鍏ユ鐒︾偣
+ async HBarCodeMiddleFocusRefresh() {
+ this.HBarCode_MiddleBox = ''
+ this.HBarCodeMiddleFocus = false
+ await this.$nextTick()
+ this.HBarCodeMiddleFocus = true
+ },
+
+ // 鎵弿鏍堟澘鐮�
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_Pallet = scanCode
+ this.CheckBarcode(this.HBarCode_Pallet, 1)
+ })
+ },
+
+ // 鎵弿鐩殑浠撶爜
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_Destination = scanCode
+ this.CheckBarcode(this.HBarCode_Destination, 2)
+ })
+ },
+
+ // 鎵弿涓鐮�
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_MiddleBox = scanCode
+ this.CheckBarcode(this.HBarCode_MiddleBox, 3)
+ })
+ },
+
+ // 鎵潯鐮佹牳瀵规牎楠屼俊鎭�
+ CheckBarcode(HBarCode, HBarCodeType) {
+ CommonUtils.doRequest2({
+ url: '/CheckBarcodeController/Get_BarCode_BarcodeCheck',
+ data: {
+ HBarCode_Pallet: this.HBarCode_Pallet,
+ HBarCode_Destination: this.HBarCode_Destination,
+ HBarCode_MiddleBox: this.HBarCode_MiddleBox,
+ HBarCode_SN: this.HBarCode_SN,
+ HBarCodeType: HBarCodeType,
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HMaker: this.hform.HMaker
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message,
+ list
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+
+ if(HBarCodeType == 1){
+ //澶勭悊鎴愬姛鍚庤仛鐒﹀埌鐩殑浠撶爜杈撳叆妗�
+ this.HBarCodeDestFocusRefresh()
+ }else if(HBarCodeType == 2){
+ //澶勭悊鎴愬姛鍚庤仛鐒﹀埌涓鐮佽緭鍏ユ
+ this.HBarCodeMiddleFocusRefresh()
+ }else if(HBarCodeType == 3){
+ //澶勭悊鎴愬姛鍚庤仛鐒﹀埌SN鐮佽緭鍏ユ
+ this.HBarCodeFocusRefresh()
+ }
+
+
+ //this.DisBillEntryList();
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ this.listData = [];
+ for (let i = 0; i < data.length; i++) {
+ this.listData.push(Object.assign(data[i], {
+ index: i
+ }))
+ }
+ } else {
+ CommonUtils.playSound(0)
+ this.HBarCodePalletFocusRefresh()
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+
+ // 鎵弿浜у搧鐮�
+ toScanCode2() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode = scanCode
+ this.GetMeesageByBarCode(scanCode)
+ })
+ },
+
+ // 鏍规嵁浜у搧鐮佽幏鍙栦俊鎭�
+ GetMeesageByBarCode(HBarCode) {
+ let HBarCode_Pallet = this.HBarCode_Pallet
+ let sOldBarCode = this.HBarCode
+ let HDeleteFlag = sOldBarCode.substring(0, 1)
+ let sBarCode = sOldBarCode.slice(1)
+
+ if (!HBarCode_Pallet) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏍堟澘鐮佷笉鑳戒负绌猴紝璇峰厛鎵弿鎵樻潯鐮侊紒'
+ })
+ }
+ if (HDeleteFlag == '*') {
+ // 鍒犻櫎鏉＄爜閫昏緫
+ if (!sBarCode) {
+ return uni.showToast({
+ icon: 'none',
+ title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�'
+ })
+ } else {
+ this.HBarCodeFocusRefresh()
+ }
+ CommonUtils.doRequest2({
+ url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+ data: {
+ "HInterID": this.hform.HInterID,
+ "HBarCode": sBarCode,
+ "HBillType": this.HBillType
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ this.tabs = 1
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.playSound(0)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ } else {
+ // 鏂板鏉＄爜閫昏緫
+ let sBarCode = this.HBarCode
+ if (!sBarCode) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�'
+ })
+ }
+ CommonUtils.doRequest2({
+ url: '/WEBSController/Get_BarCode_PackUnionBill_New_Json_Cus',
+ data: {
+ "HBarCode": sBarCode,
+ "HInterID": this.hform.HInterID,
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": this.HBillType,
+ "HBillSubType": this.HBillSubType,
+ "HBarCode_Pallet": this.HBarCode_Pallet,
+ "HMaterNumber_Pack": this.HMaterNumber_Pack,
+ "HMaker": this.hform.HMaker,
+ "HStockOrgID": this.hform.HStockOrgID
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ this.tabs = 1
+ this.HBarCodeFocusRefresh()
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.playSound(0)
+ this.HBarCodeFocusRefresh()
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ }
+ },
+ // 鏄剧ず鍗曟嵁鏄庣粏鍒楄〃
+ DisBillEntryList() {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+ data: {
+ "HInterID": this.hform.HInterID,
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": this.HBillType
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ this.listData = []
+ if (count == 1) {
+ for (let i = 0; i < data.length; i++) {
+ this.listData.push(Object.assign(data[i], {
+ index: i
+ }))
+ }
+
+
+ } else {
+
+ }
+ }
+ })
+ },
+
+ // 琛ㄦ牸閫夋嫨澶勭悊
+ handleSelect(selected, array) {
+ this.selectedRows = array
+ },
+
+ // 琛ㄦ牸鍏ㄩ�夊鐞�
+ handleSelectAll(selected, array) {
+ this.selectedRows = array
+ },
+ // 鎾斁鎻愮ず闊�
+ playSound(type) {
+ const innerAudioContext = uni.createInnerAudioContext();
+ innerAudioContext.src = type == 1 ? '/static/success.wav' : '/static/jingbao.wav';
+ innerAudioContext.play();
+ },
+
+
+ // 鑾峰彇鏈�澶у崟鎹彿
+ getMaxNo() {
+ CommonUtils.doRequest2({
+ url: "/WEBSController/GetMaxBillNoAndID_Json",
+ data: {
+ "HBillType": this.HBillType
+ },
+ resFunction: (d) => {
+ let {
+ count,
+ data,
+ Message
+ } = d.data
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID;
+ this.hform.HBillNo = data[0].HBillNo
+ } else {
+ uni.showModal({
+ title: "娓╅Θ鎻愮ず",
+ showCancel: false,
+ content: Message
+ })
+ }
+ }
+ })
+ },
+
+ // 鎻愪氦鍓嶆鏌�
+ submitPreCheck() {
+ if (CommonUtils.isEmpty(this.hform.HInterID)) {
+ uni.showToast({
+ icon: 'none',
+ title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
+ })
+ return false
+ }
+ if (CommonUtils.isEmpty(this.hform.HBillNo)) {
+ uni.showToast({
+ icon: 'none',
+ title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
+ })
+ return false
+ }
+ if (this.listData.length < 1) {
+ uni.showToast({
+ icon: 'none',
+ title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
+ })
+ return false
+ }
+ return true
+ },
+
+ // 鍒犻櫎閫変腑琛�
+ cmdDelete() {
+ if (this.selectedRows.length != 1) {
+ return uni.showToast({
+ icon: 'none',
+ title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
+ })
+ }
+ uni.showModal({
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+ success: ({
+ confirm
+ }) => {
+ if (confirm) {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillType: this.HBillType,
+ HBarCode: this.selectedRows[0].HBarCode
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.playSound(0)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ }
+ }
+ })
+ },
+
+ // 鎻愪氦鍗曟嵁
+ cmdSubmit() {
+ let checkRes = this.submitPreCheck()
+ if (!checkRes) return
+
+ this.EnableSubmit = false
+ CommonUtils.doRequest2({
+ url: '/CheckBarcodeController/Save_BarCode_BarcodeCheck',
+ data: {
+ "HInterID": this.hform.HInterID,
+ "HBillNo": this.hform.HBillNo
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: Message,
+ confirmText: "鏂板",
+ cancelText: '鍏抽棴',
+ success: ({
+ confirm,
+ cancel
+ }) => {
+ if (confirm) {
+ uni.redirectTo({
+ url: "/pages/sanmaheyi/BarCodeCheck"
+ })
+ }
+ if (cancel) {
+ uni.navigateBack()
+ }
+ }
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+
+ // 閫�鍑洪〉闈�
+ cmdExit() {
+ uni.navigateBack()
+ }
+ },
+
+ // ==================== 鐢熷懡鍛ㄦ湡 ====================
+ async onReady() {
+ // 璁＄畻琛ㄦ牸楂樺害
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#bottom-btn").boundingClientRect((data) => {
+ if (data) this.bottomBtnTop = data.top
+ }).exec();
+ query.select("#list-table").boundingClientRect((data) => {
+ if (data) this.listTableTop = data.top
+ }).exec();
+ // #endif
+ },
+
+ onLoad(e) {
+ // 鍒濆鍖栧弬鏁�
+ this.BarCodeType = e.BarCodeType || 1
+ this.OperationType = e.OperationType || 1
+ this.HBarCode_Pallet = e.HBarCode_Pallet_Temp || ""
+ this.hform.HSourceBillNo = e.HSourceBillNo || ""
+ this.HBarCode_Destination = e.HBarCode_Destination || ""
+ this.HBarCode_MiddleBox = e.HBarCode_MiddleBox || ""
+
+ // 鏍规嵁鎿嶄綔绫诲瀷鍒濆鍖栨暟鎹�
+ if (this.OperationType == 1) {
+ this.getMaxNo() // 鏂板妯″紡锛氳幏鍙栨柊鍗曟嵁鍙�
+ // 鍒濆鍖栨椂鑱氱劍鍒版簮鍗曞崟鍙�
+ this.HSourcebillNoFocus = true
+ } else if (this.OperationType == 2) {
+ this.disableBarCodePallet = false
+ this.disableBarCodeDest = false
+ this.disableBarCodeMiddle = false
+ this.disableBarCode = false
+ this.CheckBarcode(this.HBarCode_Pallet, 1) // 缂撳瓨妯″紡锛氬姞杞藉凡鏈夋暟鎹�
+ this.DisBillEntryList()
+ this.tabs = 0
+ }
+
+ // 榛樿鑱氱劍鍒版爤鏉跨爜杈撳叆妗�
+ this.HBarCodePalletFocusRefresh()
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ }
+ }
+</script>
+
+<style lang="scss">
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .form {
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+
+ .form-base-info {
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ box-sizing: border-box;
+ padding: 30rpx;
+ }
+
+ .bill-info {
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ box-sizing: border-box;
+ padding: 16rpx 30rpx;
+ }
+
+ .form-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+
+ .title {
+ width: 5rem;
+ flex-shrink: 0;
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ .right-icon {
+ flex-shrink: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .icon-wrapper {
+ background-color: #3A78FF;
+ border-radius: 100%;
+ width: 52rpx;
+ height: 52rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
+ }
+ }
+
+ .tabs {
+ width: 100%;
+ display: flex;
+ border-bottom: 1px solid #ddd;
+ margin: 20rpx 0;
+
+ view {
+ width: 25%;
+ font-size: 30rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .bottom-btn {
+ width: 100%;
+ box-sizing: border-box;
+ // height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
+
+ .right-icon.disabled {
+ background-color: #ccc !important;
+ color: #666 !important;
+ cursor: not-allowed;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/sanmaheyi/table.vue b/pages/sanmaheyi/table.vue
new file mode 100644
index 0000000..b08c7ea
--- /dev/null
+++ b/pages/sanmaheyi/table.vue
@@ -0,0 +1,487 @@
+<template>
+ <view class="content">
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="form" v-if="tabs == 0">
+ <view class="buttons" @tap="add">
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ </view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+ <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鎵樻潯鐮�">
+ <text>鎵樻潯鐮侊細</text>{{item.鎵樻潯鐮亇}
+ </view>
+ <view class="detail" v-if="item.HSourceBillNo">
+ <text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{ item.鍒跺崟鏃ユ湡.split('T')[0] }}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ </view>
+ </view>
+
+ <view class="more">
+ <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+ </view>
+ <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+ <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <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>
+ <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>
+
+ <view class="more">
+ <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ </view>
+ <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ </view>
+ </view>
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ export default {
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ tabs: 0,
+ urls: '/WEBSController/GetSc_PackUnionBill_TempList_Json',
+ MvarReportTitle: '瑁呯鍗曠紦瀛樺垪琛�',
+ hform: {
+ // HBillNo: '',
+ // HSourceBillNo: '',
+ HBillType: 3783,
+ HMaker: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ },
+ sWhere: '',
+ listData: [],
+ showList: [],
+ showDetail: -1,
+
+ page: 1,
+ }
+ },
+ components: {
+ BarCodePopupVue
+ },
+ onShow() {
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ this.CheckModRight()
+ this.changeTab(0)
+ console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ },
+ onReachBottom: function() {
+ this.page++
+ setTimeout(() => {
+ this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ }, 100)
+ },
+ onPullDownRefresh: function() {
+ this.clear()
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ methods: {
+ async qrCodeDisplay(item) {
+ this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+ await this.$nextTick()
+ this.$refs.barcodePopup.open()
+ },
+ CheckModRight() {
+ uni.request({
+ url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+ data: {
+ ModRightName: 'CE_PackUnion',
+ HUserName: uni.getStorageSync('HUserName')
+ },
+ success: (res) => {
+ if (res.data.count == 1) {} else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getPage(page, list) {
+ let sindex = (parseInt(page) - 1) * 20
+ let eindex = parseInt(page) * 20
+ let newList = list.slice(sindex, eindex)
+ return newList
+ },
+ changeTab(e) {
+ this.tabs = e
+ this.page = 1
+ this.showList = []
+
+ if (this.tabs == 0) {
+ this.urls = '/WEBSController/GetSc_PackUnionBill_TempList_Json'
+ }
+ // if(this.tabs == 1){
+ // this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+ // }
+ this.getList()
+ },
+ getList() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ })
+ uni.request({
+ url: this.serverUrl + this.urls,
+ data: this.hform,
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.listData = res.data.data
+ this.showList = this.getPage(this.page, this.listData)
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000)
+ } else {
+ uni.hideLoading()
+ this.listData = []
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ search() {
+ this.sWhere = ''
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ console.log(this.hform)
+ this.getList()
+ },
+ clear() {
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ this.sWhere = ''
+ this.hform = {
+ HBillNo: '',
+ HSourceBillNo: '',
+ HBillType: 3783,
+ HMaker: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ }
+ this.getList()
+ },
+ add() {
+ uni.navigateTo({
+ url: './form?OperationType=1'
+ })
+ },
+ //缂栬緫
+ edit(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: './form?OperationType=2&HBarCode_Pack_Temp=' + item["HBarCode_Pack"] + '&HSourceBillNo=' +item["HSourceBillNo"],
+ })
+ },
+ //鍒犻櫎
+ del(item) {
+ // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/DeleteTemp_PackUnionBill_Json',
+ data: {
+ HInterID: item.HInterID,
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ //鎾ら攢
+ revoke(item) {
+ // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '鏄惁纭鎾ら攢',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+ data: {
+ HInterID: item.HInterID,
+ HBillNo: item.鍗曟嵁鍙�,
+ HBillType: this.hform.HBillType,
+ HMaker: uni.getStorageSync('HUserName'),
+ MvarReportTitle: this.MvarReportTitle,
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ width: 640rpx;
+ margin: 20rpx auto;
+ margin-top: 90rpx;
+ }
+
+ .tabs {
+ width: 100%;
+ position: fixed;
+ left: 0;
+ z-index: 9;
+ display: flex;
+ background-color: #e5e5e5;
+
+ view {
+ width: 50%;
+ font-size: 30rpx;
+ color: #333;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .buttons {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ margin-top: 20rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 180rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+
+ .list {
+ width: 100%;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ }
+</style>
\ No newline at end of file
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 bc78b53..8571813 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/zhuangxiangdan/form.vue b/pages/zhuangxiangdan/form.vue
index 101667e..4f65fa3 100644
--- a/pages/zhuangxiangdan/form.vue
+++ b/pages/zhuangxiangdan/form.vue
@@ -145,7 +145,7 @@
<!-- 寮圭獥缁勪欢 -->
<BillListPopupVue ref="billList" :HBillType="HBillType" :HSourceBillType="hform.HMainSourceBillType || 3710"
:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
-
+
</view>
</template>
<script>
@@ -303,7 +303,9 @@
this.HBarCode_Pack = ''
this.HBarCodePackFocus = false
await this.$nextTick()
- this.HBarCodePackFocus = true
+ setTimeout(() => {
+ this.HBarCodePackFocus = true
+ }, 60)
},
// 鎵弿绠辨潯鐮�
@@ -340,7 +342,7 @@
this.HMaterNumber_Pack = data[0].HMaterNumber
this.hform.HMaterName = data[0].HMaterName
// 璁剧疆鎬绘暟锛屽綋鍓嶆壂鎻忔暟閲忛�氳繃DisBillEntryList鏇存柊
- const totalQty = data[0].HBarcodeQtys || 0
+ const totalQty = data[0].HQty || 0
this.hform.HQtySum = `0/${totalQty}`
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌浜у搧鐮佽緭鍏ユ
this.HBarCodeFocusRefresh()
@@ -810,7 +812,7 @@
}) => {
if (confirm) {
uni.redirectTo({
- url: "/pages/zhuangxiangdan/form"
+ url: `/pages/zhuangxiangdan/form?HSourceBillNo=${encodeURIComponent(this.hform.HSourceBillNo)}`
})
}
if (cancel) {
@@ -874,6 +876,7 @@
},
onLoad(e) {
+ console.log('onLoad params:', e)
// 鍒濆鍖栧弬鏁�
this.BarCodeType = e.BarCodeType || 1
this.OperationType = e.OperationType || 1
@@ -885,6 +888,9 @@
this.getMaxNo() // 鏂板妯″紡锛氳幏鍙栨柊鍗曟嵁鍙�
// 鍒濆鍖栨椂鑱氱劍鍒版簮鍗曞崟鍙�
this.HSourcebillNoFocus = true
+ if (this.hform.HSourceBillNo != "" && this.hform.HSourceBillNo != undefined) {
+ this.getSourceBarCodeData(this.hform.HSourceBillNo)
+ }
} else if (this.OperationType == 2) {
this.disableBarCodePack = false
this.disableBarCode = false
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