From 28328db7ef0b0270e9e94b6a11b32cb5f9bdac88 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 06 二月 2026 13:44:07 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue | 200 +
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue | 6
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue | 1954 +++++++++++-----------
pages/index/tab2.vue | 31
pages/index/vers.vue | 14
.hbuilderx/launch.json | 2
pages/ZLGL/QualityReportStep/QualityReportStepBill_tablet.vue | 1436 +++++++++++++++++
pages/shebeiguanli/deviceManage.vue | 6
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue | 10
pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue | 6
pages/index/login.vue | 4
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue | 31
pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue | 15
pages/index/index.vue | 24
pages/shebeidangan/Gy_EquipFileMainBill.vue | 6
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue | 116
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue | 19
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue | 10
pages.json | 17
pages/index/tab4.vue | 36
pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue | 6
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 52
pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue | 454 ++++
pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue | 7
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue | 20
pages/guzhangdengji/EqpConkBookBill.vue | 6
manifest.json | 4
pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue | 51
pages/weiwaigxOut/firstCheck.vue | 6
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | 19
pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue | 456 ++++
31 files changed, 3,722 insertions(+), 1,302 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index a41ed7d..6731a79 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -25,7 +25,7 @@
"localRepoPath" : "C:/Users/19858/Desktop/鏅轰簯杩堟��/APP/STUWMS/unpackage/debug",
"openVueDevtools" : true,
"packageName" : "com.iflytek.inputmethod",
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
}
]
diff --git a/manifest.json b/manifest.json
index 3633c9a..05904cd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.71",
- "versionCode" : 271,
+ "versionName" : "2.0.77",
+ "versionCode" : 277,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 8d42e77..13f4c7f 100644
--- a/pages.json
+++ b/pages.json
@@ -1554,7 +1554,6 @@
},
{
"path": "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
-
"style": {
"navigationBarTitleText": "璁惧缁翠慨娲惧伐鍗曠紦瀛�"
}
@@ -1731,7 +1730,7 @@
}
},
{
- "path" : "pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP",
+ "path" : "pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP",
"style" :
{
"navigationBarTitleText" : "閿�鍞嚭搴撳崟(楠岃瘉)"
@@ -1758,6 +1757,13 @@
"navigationBarTitleText" : "瀹㈣瘔鍗曠紪杈�"
}
},
+ {
+ "path" : "pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP",
+ "style" :
+ {
+ "navigationBarTitleText" : "鐩存帴璋冩嫧鍗�(楠岃瘉)"
+ }
+ },
{
"path" : "pages/chaixiang/chaixiang_xiaowei",
"style" :
@@ -1773,6 +1779,13 @@
}
},
{
+ "path" : "pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍒嗘寮忚皟鍑哄崟(楠岃瘉)"
+ }
+ },
+ {
"path": "pages/shengchantuiliaoCheck/MateOutBackCheckBill",
"style": {
"navigationBarTitleText": "鐢熶骇閫�鏂欐牎楠�"
diff --git a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
similarity index 78%
copy from pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
copy to pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
index 571373a..a39723d 100644
--- a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
+++ b/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
@@ -33,20 +33,24 @@
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">璋冨嚭浠撳簱:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
- @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
+ <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HSCWHName"
+ @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
- <!-- 鍥涚淮灏斿惎鐢ㄤ粨浣嶆壂鐮� 鍏朵粬瀹㈡埛鎸夐渶鍚敤鎺у埗 -->
+ <view class="title">璋冨嚭浠撲綅:</view>
+ <!-- TODO: 鍥涚淮灏旈渶瑕佹壂浠撲綅鐮� 甯﹀嚭浠撳簱浠撲綅淇℃伅锛屾牴鎹叕鍙稿垽鏂槸鍚﹂渶瑕佺鐢ㄤ粨浣� -->
<view class="right">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
- v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
- @confirm="HStockPlaceNameScan"></uni-combox>
+ <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
+ @confirm="HStockPlaceOutNameScan"></uni-combox>
</view>
+
+ <!-- <view class="righton" v-show="!HSCIsStockMgr">
+ <input v-model="hform.HOutStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+ </view> -->
</view>
</view>
<view class="tabs horizon_tabs" id="tabs">
@@ -86,8 +90,14 @@
</view>
<!-- 閫夋簮鍗曞姛鑳� -->
<view class="icon-wrapper">
- <uni-icons type="search" size="20" @click=""></uni-icons>
+ <uni-icons type="search" size="20" @click="openSourceBillSelector"></uni-icons>
</view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁瀛愮被鍨�:</view>
+ <zxz-uni-data-select class="right" :localdata="HBillSubType" dataKey="HName" dataValue="HNumber"
+ v-model="hform.HBillSubType">
+ </zxz-uni-data-select>
</view>
<view class="form-item">
<view class="title">鍏堣繘鍏堝嚭浠�:</view>
@@ -95,6 +105,24 @@
<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏ヤ粨搴�" v-model="hform.HFIFOWHName"
@input="HFIFOWHNameChange"></uni-combox>
</view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冩嫧绫诲瀷:</view>
+ <zxz-uni-data-select class="right" :localdata="[{value: '缁勭粐鍐呰皟鎷�'},{value: '璺ㄧ粍缁囪皟鎷�'}]" dataKey="value"
+ dataValue="value" v-model="hform.HStockStyle">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冩嫧鏂瑰悜:</view>
+ <zxz-uni-data-select class="right" :localdata="[]" dataKey="鐝鍚嶇О" dataValue="HItemID"
+ v-model="hform.HTransferDirect">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">鍑鸿揣绫诲瀷:</view>
+ <zxz-uni-data-select class="right" :localdata="[]" dataKey="鐝鍚嶇О" dataValue="HItemID"
+ v-model="hform.HShipType">
+ </zxz-uni-data-select>
</view>
<view class="form-item">
<view class="title">鏃ユ湡: </view>
@@ -130,6 +158,24 @@
overflow: 'auto'
}">
<view class="form-item">
+ <view class="title">璋冨叆浠撳簱:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨叆浠撲綅:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
+ @confirm="HStockPlaceNameInScan"></uni-combox>
+ </view>
+ <!-- <view class="righton" v-show="!HIsStockMgr">
+ <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+ </view> -->
+ </view>
+ <view class="form-item">
<view class="title">淇濈: </view>
<zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HItemID"
v-model="hform.HKeeperID">
@@ -154,9 +200,15 @@
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐: </view>
- <view class="right">
- <input type="text" v-model="hform.HStockOrgName" />
+ <view class="title">璋冨嚭缁勭粐: </view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HStockOrgName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨叆缁勭粐: </view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HStockOrgName" />
</view>
</view>
</view>
@@ -208,7 +260,8 @@
overflow: 'auto'
}">
<view class="list" v-for="(item,index) in HMaterList" :key="index">
- <uni-card :title="item.鍣ㄥ叿鍚嶇О" :extra="item.鍣ㄥ叿浠ｅ彿" style="margin: 10px;" @tap="delMould(item)">
+ <uni-card v-if="item.鍣ㄥ叿鏉＄爜" :title="item.鍣ㄥ叿鍚嶇О" :extra="item.鍣ㄥ叿浠ｅ彿" style="margin: 10px;"
+ @tap="delMould(item)">
<view class="card-detail">
<view class="detail">
<text>鍣ㄥ叿鏉＄爜锛�</text>{{item.鍣ㄥ叿鏉＄爜}}
@@ -275,15 +328,27 @@
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱: </view>
+ <view class="title">璋冨叆浠撳簱: </view>
<view class="righton">
<input type="text" disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅: </view>
+ <view class="title">璋冨叆浠撲綅: </view>
<view class="righton">
<input type="text" disabled v-model="hform.HSPName_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨嚭浠撳簱: </view>
+ <view class="righton">
+ <input type="text" disabled v-model="hform.HSCWHName_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨嚭浠撲綅: </view>
+ <view class="righton">
+ <input type="text" disabled v-model="hform.HSCSPName_B" />
</view>
</view>
</view>
@@ -320,7 +385,7 @@
} from "@/utils/mpaasScan.js"
import {
getUserInfo
- } from "../../../utils/auth";
+ } from "@/utils/auth";
import {
getUserStockRelation
} from '@/utils/userRelationManager';
@@ -328,7 +393,7 @@
import BillListPopupVue from "@/components/BillListPopup/BillListPopup.vue";
export default {
// 閿�鍞嚭搴撳崟(楠岃瘉)
- name: 'Kf_SellOutBill_CusBar_APP',
+ name: 'Kf_MoveStockBill_CusBar_APP',
components: {
FIFOListComponentVue,
BillListPopupVue
@@ -339,7 +404,7 @@
btnTop: 0,
tabsBottom: 0,
- HModName: "Sb_EqpMaintenanceBill",
+ HModName: "Kf_MoveStockBill_CusBar_APP",
operationType: 1,
uploadOptions: {},
enableEdit: true,
@@ -347,14 +412,19 @@
// 婧愬崟绫诲瀷鐩稿叧
HMainSourceBillType: "鍙戣揣閫氱煡鍗�", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
- arrayHMainSourceBillType: ['鍙戣揣閫氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
- arrayHMainSourceBillTypeID: ['1402', '1401', '-1'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+ arrayHMainSourceBillType: ["鍙戣揣閫氱煡鍗�", "璋冩嫧鐢宠鍗�", "鐢熶骇鐢ㄦ枡娓呭崟", "濮斿鐢ㄦ枡娓呭崟", "鐢熶骇鍙戞枡閫氱煡鍗�", "鐢熶骇澶囨枡鍗�", "鍑哄簱鐢宠鍗�", "鎵嬪伐褰曞叆"],
+ arrayHMainSourceBillTypeID: [1402, 1243, 3720, 1604, 1214, 3721, 1242, -1], // 瀵瑰簲鐨勫崟鎹被鍨婭D
showHMainSourceBillType: true,
arrayHWHName: [], //浠撳簱
HWHNameList: [],
arrayHStockPlaceName: [], //浠撲綅
HStockPlaceNameList: [],
+ arraySCHWName: [], // 璋冨嚭浠撳簱
+ arrayHWHInName: [], // 璋冨叆浠撳簱
+ HWHInNameList: [],
+ arrayHStockPlaceInName: [], //璋冨叆浠撲綅
+ HStockPlaceInNameList: [],
HDeptList: [],
HRepairCheckList: [],
@@ -365,7 +435,7 @@
materMeta: [],
HMaterList: [],
HMouldList: [],
-
+ HBillSubType: [], // 鍗曟嵁瀛愮被鍨�
hform: {
"HCP": "",
"HBarCode": "",
@@ -419,13 +489,25 @@
"cmdModify": "",
"cmdDelete": "",
"cmdCancel": "",
- "HBillType": "1205",
+ "HBillType": "1207",
"HBillerID": uni.getStorageSync("HBillerID"),
"HRedBlueFlag": false,
"HSourceBillListCtl": 0,
"cs": "",
"cs2": "",
- HSourceFlag: false,
+ "HSourceFlag": false,
+ "HSCWHName": "",
+ "HSCWHID": 0,
+ "HOutStockPlaceName": "",
+ "HOutStockPlaceID": 0,
+ "HBillSubType": "ZJDB01_SYS",
+ "HStockStyle": "缁勭粐鍐呰皟鎷�",
+ "HTransferDirect": "",
+ "HShipType": "",
+ "HStockOutOrgID": uni.getStorageSync("OrganizationID"),
+ "HStockInOrgID": uni.getStorageSync("OrganizationID"),
+ "HSCWHName_B": "",
+ "HSCSPName_B": ""
},
HDetailList: [{
"HRepairID": 0,
@@ -449,19 +531,231 @@
return this.btnTop - this.tabsBottom - 5
}
},
- HStockPlaceNameListComputed: {
+ arrayHStockPlaceNameComputed: {
get() {
- // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+ // 鍔ㄦ�佽绠楀搴旇皟鍑轰粨搴撶殑浠撲綅
return this.HStockPlaceNameList
+ .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HSCWHName)
+ .map(e => e['浠撲綅鍚嶇О'])
+ }
+ },
+ arrayHStockPlaceInNameComputed: {
+ get() {
+ // 鍔ㄦ�佽绠楀搴旇皟鍏ヤ粨搴撶殑浠撲綅
+ return this.HStockPlaceInNameList
.filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
.map(e => e['浠撲綅鍚嶇О'])
}
}
},
methods: {
+ // 鑾峰彇鍗曟嵁瀛愮被鍨�
+ async set_InitBillSubType(){
+ try{
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/GetBillSubType_Json",
+ data: {
+ "HBillType": this.hform.HBillType,
+ "HStockOrgID": this.hform.HStockOutOrgID
+ }
+ })
+
+ let {data, count, Message} = res.data
+ if(count == 1) {
+ this.HBillSubType = data
+ }else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍗曟嵁瀛愮被鍨嬪け璐�: ${Message}`
+ })
+ }
+ }catch(err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍗曟嵁瀛愮被鍨嬪け璐�: ${err}`
+ })
+ }
+ },
+ // 璋冨叆浠撲綅淇敼
+ HStockPlaceInNameChange(e) {
+ for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
+ if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
+ this.hform.HStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
+ this.hform.HStockPlaceID = this.HStockPlaceInNameList[i].HMainID
+ }
+ }
+ },
+ // 璋冨叆浠撳簱淇敼
+ HWHInNameChange(e) {
+ console.log('e: ', e);
+ this.hform.HStockPlaceName = ''
+ this.hform.HStockPlaceID = 0
+ for (var i = 0; i < this.HWHInNameList.length; i++) {
+ if (this.HWHInNameList[i].浠撳簱鍚嶇О == e) {
+ this.hform.HWHName = this.HWHInNameList[i].浠撳簱鍚嶇О
+ this.hform.HWHID = this.HWHInNameList[i].HItemID
+ this.HStockPlaceNameChange(null)
+ if (this.HWHInNameList[i]['鍚敤浠撲綅'] == 'Y') {
+ this.HIsStockMgr = true
+ this.getStockPlaceRemote(this.HWHInNameList[i]["HSPGroupID"], 1) // 淇敼璋冨叆浠撳簱
+ } else {
+ // this.hform.HStockPlaceName = ''
+ this.HIsStockMgr = false
+ }
+ }
+ }
+ },
+ // 璋冨嚭浠撳簱淇敼
+ HSCWHNameChange(e) {
+ // var name = e.split("(")
+ for (var i = 0; i < this.HWHNameList.length; i++) {
+ if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+ this.hform.HSCWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+ this.hform.HSCWHID = this.HWHNameList[i].HItemID
+ this.HOutStockPlaceNameChange(null)
+ if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+ this.HSCIsStockMgr = true
+ this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"], 2) // 淇敼璋冨嚭浠撳簱
+ // 鏌ヨ浠撲綅鏁版嵁
+ } else {
+
+ this.HSCIsStockMgr = false
+ }
+ }
+ }
+ },
+ // 閫夋嫨璋冨嚭浠撲綅
+ HOutStockPlaceNameChange(e) {
+ let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+ this.hform.HOutStockPlaceName = ''
+ this.hform.HOutStockPlaceID = 0
+ if (index != -1) {
+ this.hform.HOutStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+ this.hform.HOutStockPlaceID = this.HStockPlaceNameList[index].HMainID
+ }
+
+ // for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
+ // if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
+ // this.hform.HOutStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
+ // this.hform.HOutStockPlaceID = this.HStockPlaceInNameList[i].HMainID
+ // }
+ // }
+ },
+ async HWHNameOutScan(e) {
+ return
+ // 鎵弿浠撳簱鐮�
+ console.log('浠撳簱鐮�: ', e);
+ let index = this.HWHNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e)
+ if (index == -1) {
+ uni.showToast({
+ icon: 'none',
+ title: '鎵弿浠撳簱鏉＄爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+ })
+ } else {
+ this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+ }
+ },
+ async HStockPlaceOutNameScan(e) {
+ // 鎵弿浠撲綅鐮�
+ console.log('浠撲綅鐮�: ', e);
+ // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
+ this.hform.HOutStockPlaceID = 0
+ this.hform.HOutStockPlaceName = ''
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_StockPlace/list',
+ data: {
+ sWhere: ` and 鏉＄爜缂栧彿 = '${e}'`,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ })
+
+ if (res.data.count == 1) {
+ console.log('res.data: ',res.data);
+
+ // this.hform.HSCWHName = res.data.data[0].鎵�灞炰粨搴�
+ this.HSCWHNameChange(res.data.data[0].鎵�灞炰粨搴�)
+ this.hform.HOutStockPlaceID = res.data.data[0].HMainID
+ this.hform.HOutStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
+ this.hform.HSCWHID = res.data.data[0].HWHID
+
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+
+ } catch (err) {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ async HWHNameInScan(e) {
+ return;
+ // 鎵弿浠撳簱鐮�
+ console.log('浠撳簱鐮�: ', e);
+ let index = this.HWHInNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e)
+ if (index == -1) {
+ uni.showToast({
+ icon: 'none',
+ title: '鎵弿浠撳簱鏉＄爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+ })
+ } else {
+ this.HWHInNameChange(this.HWHInNameList[index]['浠撳簱鍚嶇О'])
+ }
+ },
+ async HStockPlaceNameInScan(e) {
+ // 鎵弿浠撲綅鐮�
+ console.log('浠撲綅鐮�: ', e);
+ // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
+ this.hform.HStockPlaceID = 0
+ this.hform.HStockPlaceName = ''
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_StockPlace/list',
+ data: {
+ sWhere: ` and 鏉＄爜缂栧彿 = '${e}'`,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ })
+
+ if (res.data.count == 1) {
+ this.HWHInNameChange(res.data.data[0].鎵�灞炰粨搴�)
+ this.hform.HStockPlaceID = res.data.data[0].HMainID
+ this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
+ this.hform.HWHID = res.data.data[0].HWHID
+ // this.hform.HWHName = res.data.data[0].鎵�灞炰粨搴�
+
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+
+ } catch (err) {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ // 鎵撳紑閫夋簮鍗曢〉闈�
+ openSourceBillSelector() {
+ this.$refs.billList.showPopup()
+ },
// 鎺ユ敹婧愬崟
- handleSourceBill(e){
-
+ handleSourceBill(e) {
+ console.log('e: ', e);
+
+ this.hform.HSourceBillNo = e.HBillNo
+ this.GetMessageByHSourceBillNo(e.HBillNo)
+ this.$refs.billList.exit()
},
// 鏉＄爜鍒犻櫎
async delMater(item) {
@@ -589,6 +883,37 @@
this.getHBaseList()
}
},
+ // 璋冨叆浠撳簱璧勬枡
+ getHWarehouseInList(Organizaiton) {
+ Organizaiton = Organizaiton || uni.getStorageSync("Organization")
+ CommonUtils.doRequest2({
+ url: '/Gy_Warehouse/list',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: Organizaiton
+ },
+ resFunction: (res) => {
+ console.log('璋冨叆浠撳簱 res: ', res.data.data);
+ if (res.data.count == 1) {
+ this.HWHInNameList = []
+ this.arrayHWHInName = []
+
+ this.HWHInNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+ }
+
+ this.HWHInNameChange(getUserInfo()["HSCWHName"])
+ } else {
+ uni.showToast({
+ title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ }
+ });
+ },
//鍩虹浠撳簱璧勬枡
async getHBaseList({
sWhere = ''
@@ -628,6 +953,7 @@
message: `鑾峰彇浠撳簱澶辫触: ${err}`
})
}
+
},
//閫夋嫨浠撳簱
HWHNameChange(e) {
@@ -654,7 +980,10 @@
}
}
},
- async getStockPlaceRemote(HSPGroupID) {
+ // 鑾峰彇浠撲綅
+ async getStockPlaceRemote(HSPGroupID, Mode) {
+ // Mode=1 -> 璋冨叆浠撲綅鏁版嵁鑾峰彇; Mode=2 -> 璋冨嚭浠撲綅鏁版嵁鑾峰彇
+ console.log('Mode: ',Mode);
try {
let res = await CommonUtils.doRequest2Async({
url: '/Gy_StockPlace/list',
@@ -664,19 +993,32 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
- this.HStockPlaceNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+ if (Mode == 1) {
+ this.HStockPlaceInNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHStockPlaceInName[i] = res.data.data[i].浠撲綅鍚嶇О
+ }
+
+ console.log('this.HStockPlaceInNameList: ',this.HStockPlaceInNameList);
+ return
}
+ if (Mode == 2) {
+ this.HStockPlaceNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+ }
+ return
+ }
+
} else {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -1040,13 +1382,13 @@
}
},
async getBarCodeJson(sBarCode, sBarCodePrefix) {
- if (!this.hform.HQty) {
- this.hform.HQty = 0
- }
+ // if (!this.hform.HQty) {
+ // this.hform.HQty = 0
+ // }
console.log('this.hform.HQty: ', this.hform.HQty);
try {
let res = await CommonUtils.doRequest2Sync({
- url: '/WEBSController/Get_BarCode_Json',
+ url: '/WEBSController/get_BarCode_MoveStock_New_Json',
data: {
sBarCode: sBarCode,
HInterID: this.hform.HInterID,
@@ -1055,12 +1397,15 @@
HMaker: this.hform.HMaker,
HWhID: this.hform.HWHID,
HSPID: this.hform.HStockPlaceID,
- HQty: this.hform.HQty,
+ HQty: this.hform.HQty || 0,
HRedBlueFlag: this.hform.HRedBlueFlag,
SourceFlag: this.hform.HSourceFlag,
HSourceBillNo: this.hform.HSourceBillNo,
HSourceBillType: this.hform.HMainSourceBillType,
- HStockOrgID: this.hform.HStockOrgID,
+ HStockInOrgID: this.hform.HStockInOrgID,
+ HStockOutOrgID: this.hform.HStockOutOrgID,
+ HSCWHID: this.hform.HSCWHID,
+ HSCSPID: this.hform.HOutStockPlaceID,
HScanStyle: "",
HCustom1: "1",
HCustom2: ""
@@ -1225,8 +1570,9 @@
this.hform.HDeptID = data.hDeptIDField
this.hform.HDeptName = data.hDeptNameField
}
-
+ // this.tabs = 2
this.hform.HSourceBillNo = data.hSourceBillNoField
+ this.DisBillEntryList()
} else {
CommonUtils.playSound(0)
CommonUtils.showTips({
@@ -1250,6 +1596,9 @@
}
if (this.hform.HSupName == '') {
this.hform.HSupID = "0"
+ }
+ if(this.hform.HOutStockPlaceName == '') {
+ this.hform.HOutStockPlaceID = "0"
}
console.log('HQty: ', this.hform.HQty);
@@ -1426,6 +1775,8 @@
this.hform.HTMQty_B = ''
this.hform.HWHName_B = ''
this.hform.HSPName_B = ''
+ this.hform.HSCWHName_B = ''
+ this.hform.HSCSPName_B = ''
} else {
this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
@@ -1436,6 +1787,8 @@
this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+ this.hform.HSCWHName_B = data.BarCodeDetailslist[0].HSCWHName
+ this.hform.HSCSPName_B = data.BarCodeDetailslist[0].HSCSPName
}
this.tabs = 2
@@ -1497,7 +1850,7 @@
let oMain = JSON.stringify(this.hform)
console.log('oMain: ', oMain);
let res = await CommonUtils.doRequest2Sync({
- url: "/WEBSController/set_SaveSellOutBill_Json",
+ url: "/WEBSController/set_SaveMoveStockBill_Json",
data: {
"oMain": oMain
},
@@ -1683,26 +2036,15 @@
this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
+ this.getHWarehouseInList()
this.getHDeptList()
this.getEmpList()
this.getRelationStore()
+ this.set_InitBillSubType()
this.loadCache()
-
- // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
- this.hform.HMainSourceInterID = e.HInterID
- this.hform.HSourceBillNo = e.HBillNo
- this.hform.HMainSourceEntryID = e.HEntryID
- this.hform.HEquipID = e.HEquipID
- this.hform.HBarName = e.HEquipName
- this.hform.HBarSpec = e.HEquipSpec
- this.hform.HBarModel = e.HEquipModel
- this.$refs.billList.exit()
- })
},
onUnload() {
- uni.$off('BillSelectComplete')
+ // uni.$off('BillSelectComplete')
},
onReady() {
const query = uni.createSelectorQuery().in(this)
@@ -1719,7 +2061,7 @@
</script>
<style lang="scss" scoped>
- @import "../style/MJBillStyle.scss";
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
.left {
width: 4em;
diff --git a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
similarity index 78%
copy from pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
copy to pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
index 571373a..5b3c657 100644
--- a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
+++ b/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
@@ -33,20 +33,24 @@
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">璋冨嚭浠撳簱:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
- @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
+ <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HSCWHName"
+ @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
- <!-- 鍥涚淮灏斿惎鐢ㄤ粨浣嶆壂鐮� 鍏朵粬瀹㈡埛鎸夐渶鍚敤鎺у埗 -->
+ <view class="title">璋冨嚭浠撲綅:</view>
+ <!-- TODO: 鍥涚淮灏旈渶瑕佹壂浠撲綅鐮� 甯﹀嚭浠撳簱浠撲綅淇℃伅锛屾牴鎹叕鍙稿垽鏂槸鍚﹂渶瑕佺鐢ㄤ粨浣� -->
<view class="right">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
- v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
- @confirm="HStockPlaceNameScan"></uni-combox>
+ <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
+ @confirm="HStockPlaceOutNameScan"></uni-combox>
</view>
+
+ <!-- <view class="righton" v-show="!HSCIsStockMgr">
+ <input v-model="hform.HOutStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+ </view> -->
</view>
</view>
<view class="tabs horizon_tabs" id="tabs">
@@ -86,9 +90,15 @@
</view>
<!-- 閫夋簮鍗曞姛鑳� -->
<view class="icon-wrapper">
- <uni-icons type="search" size="20" @click=""></uni-icons>
+ <uni-icons type="search" size="20" @click="openSourceBillSelector"></uni-icons>
</view>
</view>
+ <!-- <view class="form-item">
+ <view class="title">鍗曟嵁瀛愮被鍨�:</view>
+ <zxz-uni-data-select class="right" :localdata="HBillSubType" dataKey="HName" dataValue="HNumber"
+ v-model="hform.HBillSubType">
+ </zxz-uni-data-select>
+ </view> -->
<view class="form-item">
<view class="title">鍏堣繘鍏堝嚭浠�:</view>
<view class="right">
@@ -96,6 +106,24 @@
@input="HFIFOWHNameChange"></uni-combox>
</view>
</view>
+ <view class="form-item">
+ <view class="title">璋冩嫧绫诲瀷:</view>
+ <zxz-uni-data-select class="right" :localdata="[{value: '缁勭粐鍐呰皟鎷�'},{value: '璺ㄧ粍缁囪皟鎷�'}]" dataKey="value"
+ dataValue="value" v-model="hform.HStockStyle">
+ </zxz-uni-data-select>
+ </view>
+ <!-- <view class="form-item">
+ <view class="title">璋冩嫧鏂瑰悜:</view>
+ <zxz-uni-data-select class="right" :localdata="[]" dataKey="鐝鍚嶇О" dataValue="HItemID"
+ v-model="hform.HTransferDirect">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">鍑鸿揣绫诲瀷:</view>
+ <zxz-uni-data-select class="right" :localdata="[]" dataKey="鐝鍚嶇О" dataValue="HItemID"
+ v-model="hform.HShipType">
+ </zxz-uni-data-select>
+ </view> -->
<view class="form-item">
<view class="title">鏃ユ湡: </view>
<view class="right">
@@ -130,6 +158,24 @@
overflow: 'auto'
}">
<view class="form-item">
+ <view class="title">璋冨叆浠撳簱:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨叆浠撲綅:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
+ @confirm="HStockPlaceNameInScan"></uni-combox>
+ </view>
+ <!-- <view class="righton" v-show="!HIsStockMgr">
+ <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+ </view> -->
+ </view>
+ <!-- <view class="form-item">
<view class="title">淇濈: </view>
<zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HItemID"
v-model="hform.HKeeperID">
@@ -140,7 +186,7 @@
<zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HItemID"
v-model="hform.HSecManagerID">
</zxz-uni-data-select>
- </view>
+ </view> -->
<view class="form-item">
<view class="title">閮ㄩ棬: </view>
<zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
@@ -154,9 +200,15 @@
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐: </view>
- <view class="right">
- <input type="text" v-model="hform.HStockOrgName" />
+ <view class="title">璋冨嚭缁勭粐: </view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HStockOrgName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨叆缁勭粐: </view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HStockOrgName" />
</view>
</view>
</view>
@@ -208,7 +260,8 @@
overflow: 'auto'
}">
<view class="list" v-for="(item,index) in HMaterList" :key="index">
- <uni-card :title="item.鍣ㄥ叿鍚嶇О" :extra="item.鍣ㄥ叿浠ｅ彿" style="margin: 10px;" @tap="delMould(item)">
+ <uni-card v-if="item.鍣ㄥ叿鏉＄爜" :title="item.鍣ㄥ叿鍚嶇О" :extra="item.鍣ㄥ叿浠ｅ彿" style="margin: 10px;"
+ @tap="delMould(item)">
<view class="card-detail">
<view class="detail">
<text>鍣ㄥ叿鏉＄爜锛�</text>{{item.鍣ㄥ叿鏉＄爜}}
@@ -275,15 +328,27 @@
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱: </view>
+ <view class="title">璋冨叆浠撳簱: </view>
<view class="righton">
<input type="text" disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅: </view>
+ <view class="title">璋冨叆浠撲綅: </view>
<view class="righton">
<input type="text" disabled v-model="hform.HSPName_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨嚭浠撳簱: </view>
+ <view class="righton">
+ <input type="text" disabled v-model="hform.HSCWHName_B" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璋冨嚭浠撲綅: </view>
+ <view class="righton">
+ <input type="text" disabled v-model="hform.HSCSPName_B" />
</view>
</view>
</view>
@@ -320,7 +385,7 @@
} from "@/utils/mpaasScan.js"
import {
getUserInfo
- } from "../../../utils/auth";
+ } from "@/utils/auth";
import {
getUserStockRelation
} from '@/utils/userRelationManager';
@@ -328,7 +393,7 @@
import BillListPopupVue from "@/components/BillListPopup/BillListPopup.vue";
export default {
// 閿�鍞嚭搴撳崟(楠岃瘉)
- name: 'Kf_SellOutBill_CusBar_APP',
+ name: 'Kf_MoveStockBill_CusBar_APP',
components: {
FIFOListComponentVue,
BillListPopupVue
@@ -339,7 +404,7 @@
btnTop: 0,
tabsBottom: 0,
- HModName: "Sb_EqpMaintenanceBill",
+ HModName: "Kf_MoveStockBill_CusBar_APP",
operationType: 1,
uploadOptions: {},
enableEdit: true,
@@ -347,14 +412,19 @@
// 婧愬崟绫诲瀷鐩稿叧
HMainSourceBillType: "鍙戣揣閫氱煡鍗�", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
- arrayHMainSourceBillType: ['鍙戣揣閫氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
- arrayHMainSourceBillTypeID: ['1402', '1401', '-1'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+ arrayHMainSourceBillType: ["鍙戣揣閫氱煡鍗�", "璋冩嫧鐢宠鍗�", "鎵嬪伐褰曞叆"],
+ arrayHMainSourceBillTypeID: [1402, 1243, -1], // 瀵瑰簲鐨勫崟鎹被鍨婭D
showHMainSourceBillType: true,
arrayHWHName: [], //浠撳簱
HWHNameList: [],
arrayHStockPlaceName: [], //浠撲綅
HStockPlaceNameList: [],
+ arraySCHWName: [], // 璋冨嚭浠撳簱
+ arrayHWHInName: [], // 璋冨叆浠撳簱
+ HWHInNameList: [],
+ arrayHStockPlaceInName: [], //璋冨叆浠撲綅
+ HStockPlaceInNameList: [],
HDeptList: [],
HRepairCheckList: [],
@@ -365,7 +435,7 @@
materMeta: [],
HMaterList: [],
HMouldList: [],
-
+ HBillSubType: [], // 鍗曟嵁瀛愮被鍨�
hform: {
"HCP": "",
"HBarCode": "",
@@ -419,13 +489,25 @@
"cmdModify": "",
"cmdDelete": "",
"cmdCancel": "",
- "HBillType": "1205",
+ "HBillType": "1250",
"HBillerID": uni.getStorageSync("HBillerID"),
"HRedBlueFlag": false,
"HSourceBillListCtl": 0,
"cs": "",
"cs2": "",
- HSourceFlag: false,
+ "HSourceFlag": false,
+ "HSCWHName": "",
+ "HSCWHID": 0,
+ "HOutStockPlaceName": "",
+ "HOutStockPlaceID": 0,
+ "HBillSubType": "FBDC01_SYS",
+ "HStockStyle": "缁勭粐鍐呰皟鎷�",
+ "HTransferDirect": "",
+ "HShipType": "",
+ "HStockOutOrgID": uni.getStorageSync("OrganizationID"),
+ "HStockInOrgID": uni.getStorageSync("OrganizationID"),
+ "HSCWHName_B": "",
+ "HSCSPName_B": ""
},
HDetailList: [{
"HRepairID": 0,
@@ -449,19 +531,231 @@
return this.btnTop - this.tabsBottom - 5
}
},
- HStockPlaceNameListComputed: {
+ arrayHStockPlaceNameComputed: {
get() {
- // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+ // 鍔ㄦ�佽绠楀搴旇皟鍑轰粨搴撶殑浠撲綅
return this.HStockPlaceNameList
+ .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HSCWHName)
+ .map(e => e['浠撲綅鍚嶇О'])
+ }
+ },
+ arrayHStockPlaceInNameComputed: {
+ get() {
+ // 鍔ㄦ�佽绠楀搴旇皟鍏ヤ粨搴撶殑浠撲綅
+ return this.HStockPlaceInNameList
.filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
.map(e => e['浠撲綅鍚嶇О'])
}
}
},
methods: {
+ // 鑾峰彇鍗曟嵁瀛愮被鍨�
+ async set_InitBillSubType(){
+ try{
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/GetBillSubType_Json",
+ data: {
+ "HBillType": this.hform.HBillType,
+ "HStockOrgID": this.hform.HStockOutOrgID
+ }
+ })
+
+ let {data, count, Message} = res.data
+ if(count == 1) {
+ this.HBillSubType = data
+ }else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍗曟嵁瀛愮被鍨嬪け璐�: ${Message}`
+ })
+ }
+ }catch(err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍗曟嵁瀛愮被鍨嬪け璐�: ${err}`
+ })
+ }
+ },
+ // 璋冨叆浠撲綅淇敼
+ HStockPlaceInNameChange(e) {
+ for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
+ if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
+ this.hform.HStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
+ this.hform.HStockPlaceID = this.HStockPlaceInNameList[i].HMainID
+ }
+ }
+ },
+ // 璋冨叆浠撳簱淇敼
+ HWHInNameChange(e) {
+ console.log('e: ', e);
+ this.hform.HStockPlaceName = ''
+ this.hform.HStockPlaceID = 0
+ for (var i = 0; i < this.HWHInNameList.length; i++) {
+ if (this.HWHInNameList[i].浠撳簱鍚嶇О == e) {
+ this.hform.HWHName = this.HWHInNameList[i].浠撳簱鍚嶇О
+ this.hform.HWHID = this.HWHInNameList[i].HItemID
+ this.HStockPlaceNameChange(null)
+ if (this.HWHInNameList[i]['鍚敤浠撲綅'] == 'Y') {
+ this.HIsStockMgr = true
+ this.getStockPlaceRemote(this.HWHInNameList[i]["HSPGroupID"], 1) // 淇敼璋冨叆浠撳簱
+ } else {
+ // this.hform.HStockPlaceName = ''
+ this.HIsStockMgr = false
+ }
+ }
+ }
+ },
+ // 璋冨嚭浠撳簱淇敼
+ HSCWHNameChange(e) {
+ // var name = e.split("(")
+ for (var i = 0; i < this.HWHNameList.length; i++) {
+ if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+ this.hform.HSCWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+ this.hform.HSCWHID = this.HWHNameList[i].HItemID
+ this.HOutStockPlaceNameChange(null)
+ if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+ this.HSCIsStockMgr = true
+ this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"], 2) // 淇敼璋冨嚭浠撳簱
+ // 鏌ヨ浠撲綅鏁版嵁
+ } else {
+
+ this.HSCIsStockMgr = false
+ }
+ }
+ }
+ },
+ // 閫夋嫨璋冨嚭浠撲綅
+ HOutStockPlaceNameChange(e) {
+ let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+ this.hform.HOutStockPlaceName = ''
+ this.hform.HOutStockPlaceID = 0
+ if (index != -1) {
+ this.hform.HOutStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+ this.hform.HOutStockPlaceID = this.HStockPlaceNameList[index].HMainID
+ }
+
+ // for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
+ // if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
+ // this.hform.HOutStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
+ // this.hform.HOutStockPlaceID = this.HStockPlaceInNameList[i].HMainID
+ // }
+ // }
+ },
+ async HWHNameOutScan(e) {
+ return
+ // 鎵弿浠撳簱鐮�
+ console.log('浠撳簱鐮�: ', e);
+ let index = this.HWHNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e)
+ if (index == -1) {
+ uni.showToast({
+ icon: 'none',
+ title: '鎵弿浠撳簱鏉＄爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+ })
+ } else {
+ this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+ }
+ },
+ async HStockPlaceOutNameScan(e) {
+ // 鎵弿浠撲綅鐮�
+ console.log('浠撲綅鐮�: ', e);
+ // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
+ this.hform.HOutStockPlaceID = 0
+ this.hform.HOutStockPlaceName = ''
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_StockPlace/list',
+ data: {
+ sWhere: ` and 鏉＄爜缂栧彿 = '${e}'`,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ })
+
+ if (res.data.count == 1) {
+ console.log('res.data: ',res.data);
+
+ // this.hform.HSCWHName = res.data.data[0].鎵�灞炰粨搴�
+ this.HSCWHNameChange(res.data.data[0].鎵�灞炰粨搴�)
+ this.hform.HOutStockPlaceID = res.data.data[0].HMainID
+ this.hform.HOutStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
+ this.hform.HSCWHID = res.data.data[0].HWHID
+
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+
+ } catch (err) {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ async HWHNameInScan(e) {
+ return;
+ // 鎵弿浠撳簱鐮�
+ console.log('浠撳簱鐮�: ', e);
+ let index = this.HWHInNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e)
+ if (index == -1) {
+ uni.showToast({
+ icon: 'none',
+ title: '鎵弿浠撳簱鏉＄爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+ })
+ } else {
+ this.HWHInNameChange(this.HWHInNameList[index]['浠撳簱鍚嶇О'])
+ }
+ },
+ async HStockPlaceNameInScan(e) {
+ // 鎵弿浠撲綅鐮�
+ console.log('浠撲綅鐮�: ', e);
+ // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
+ this.hform.HStockPlaceID = 0
+ this.hform.HStockPlaceName = ''
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_StockPlace/list',
+ data: {
+ sWhere: ` and 鏉＄爜缂栧彿 = '${e}'`,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ })
+
+ if (res.data.count == 1) {
+ this.HWHInNameChange(res.data.data[0].鎵�灞炰粨搴�)
+ this.hform.HStockPlaceID = res.data.data[0].HMainID
+ this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
+ this.hform.HWHID = res.data.data[0].HWHID
+ // this.hform.HWHName = res.data.data[0].鎵�灞炰粨搴�
+
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+
+ } catch (err) {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ // 鎵撳紑閫夋簮鍗曢〉闈�
+ openSourceBillSelector() {
+ this.$refs.billList.showPopup()
+ },
// 鎺ユ敹婧愬崟
- handleSourceBill(e){
-
+ handleSourceBill(e) {
+ console.log('e: ', e);
+
+ this.hform.HSourceBillNo = e.HBillNo
+ this.GetMessageByHSourceBillNo(e.HBillNo)
+ this.$refs.billList.exit()
},
// 鏉＄爜鍒犻櫎
async delMater(item) {
@@ -589,6 +883,37 @@
this.getHBaseList()
}
},
+ // 璋冨叆浠撳簱璧勬枡
+ getHWarehouseInList(Organizaiton) {
+ Organizaiton = Organizaiton || uni.getStorageSync("Organization")
+ CommonUtils.doRequest2({
+ url: '/Gy_Warehouse/list',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: Organizaiton
+ },
+ resFunction: (res) => {
+ console.log('璋冨叆浠撳簱 res: ', res.data.data);
+ if (res.data.count == 1) {
+ this.HWHInNameList = []
+ this.arrayHWHInName = []
+
+ this.HWHInNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+ }
+
+ this.HWHInNameChange(getUserInfo()["HSCWHName"])
+ } else {
+ uni.showToast({
+ title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ }
+ });
+ },
//鍩虹浠撳簱璧勬枡
async getHBaseList({
sWhere = ''
@@ -628,6 +953,7 @@
message: `鑾峰彇浠撳簱澶辫触: ${err}`
})
}
+
},
//閫夋嫨浠撳簱
HWHNameChange(e) {
@@ -654,7 +980,10 @@
}
}
},
- async getStockPlaceRemote(HSPGroupID) {
+ // 鑾峰彇浠撲綅
+ async getStockPlaceRemote(HSPGroupID, Mode) {
+ // Mode=1 -> 璋冨叆浠撲綅鏁版嵁鑾峰彇; Mode=2 -> 璋冨嚭浠撲綅鏁版嵁鑾峰彇
+ console.log('Mode: ',Mode);
try {
let res = await CommonUtils.doRequest2Async({
url: '/Gy_StockPlace/list',
@@ -664,19 +993,32 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
- this.HStockPlaceNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+ if (Mode == 1) {
+ this.HStockPlaceInNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHStockPlaceInName[i] = res.data.data[i].浠撲綅鍚嶇О
+ }
+
+ console.log('this.HStockPlaceInNameList: ',this.HStockPlaceInNameList);
+ return
}
+ if (Mode == 2) {
+ this.HStockPlaceNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+ }
+ return
+ }
+
} else {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -1040,13 +1382,13 @@
}
},
async getBarCodeJson(sBarCode, sBarCodePrefix) {
- if (!this.hform.HQty) {
- this.hform.HQty = 0
- }
+ // if (!this.hform.HQty) {
+ // this.hform.HQty = 0
+ // }
console.log('this.hform.HQty: ', this.hform.HQty);
try {
let res = await CommonUtils.doRequest2Sync({
- url: '/WEBSController/Get_BarCode_Json',
+ url: '/WEBSController/get_BarCode_MoveStock_New_Json',
data: {
sBarCode: sBarCode,
HInterID: this.hform.HInterID,
@@ -1055,12 +1397,15 @@
HMaker: this.hform.HMaker,
HWhID: this.hform.HWHID,
HSPID: this.hform.HStockPlaceID,
- HQty: this.hform.HQty,
+ HQty: this.hform.HQty || 0,
HRedBlueFlag: this.hform.HRedBlueFlag,
SourceFlag: this.hform.HSourceFlag,
HSourceBillNo: this.hform.HSourceBillNo,
HSourceBillType: this.hform.HMainSourceBillType,
- HStockOrgID: this.hform.HStockOrgID,
+ HStockInOrgID: this.hform.HStockInOrgID,
+ HStockOutOrgID: this.hform.HStockOutOrgID,
+ HSCWHID: this.hform.HSCWHID,
+ HSCSPID: this.hform.HOutStockPlaceID,
HScanStyle: "",
HCustom1: "1",
HCustom2: ""
@@ -1225,8 +1570,9 @@
this.hform.HDeptID = data.hDeptIDField
this.hform.HDeptName = data.hDeptNameField
}
-
+ // this.tabs = 2
this.hform.HSourceBillNo = data.hSourceBillNoField
+ this.DisBillEntryList()
} else {
CommonUtils.playSound(0)
CommonUtils.showTips({
@@ -1250,6 +1596,9 @@
}
if (this.hform.HSupName == '') {
this.hform.HSupID = "0"
+ }
+ if(this.hform.HOutStockPlaceName == '') {
+ this.hform.HOutStockPlaceID = "0"
}
console.log('HQty: ', this.hform.HQty);
@@ -1426,6 +1775,8 @@
this.hform.HTMQty_B = ''
this.hform.HWHName_B = ''
this.hform.HSPName_B = ''
+ this.hform.HSCWHName_B = ''
+ this.hform.HSCSPName_B = ''
} else {
this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
@@ -1436,6 +1787,8 @@
this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+ this.hform.HSCWHName_B = data.BarCodeDetailslist[0].HSCWHName
+ this.hform.HSCSPName_B = data.BarCodeDetailslist[0].HSCSPName
}
this.tabs = 2
@@ -1497,7 +1850,7 @@
let oMain = JSON.stringify(this.hform)
console.log('oMain: ', oMain);
let res = await CommonUtils.doRequest2Sync({
- url: "/WEBSController/set_SaveSellOutBill_Json",
+ url: "/WEBSController/set_SaveMoveStockBill_Json",
data: {
"oMain": oMain
},
@@ -1683,26 +2036,15 @@
this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
+ this.getHWarehouseInList()
this.getHDeptList()
this.getEmpList()
this.getRelationStore()
+ this.set_InitBillSubType()
this.loadCache()
-
- // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
- this.hform.HMainSourceInterID = e.HInterID
- this.hform.HSourceBillNo = e.HBillNo
- this.hform.HMainSourceEntryID = e.HEntryID
- this.hform.HEquipID = e.HEquipID
- this.hform.HBarName = e.HEquipName
- this.hform.HBarSpec = e.HEquipSpec
- this.hform.HBarModel = e.HEquipModel
- this.$refs.billList.exit()
- })
},
onUnload() {
- uni.$off('BillSelectComplete')
+ // uni.$off('BillSelectComplete')
},
onReady() {
const query = uni.createSelectorQuery().in(this)
@@ -1719,7 +2061,7 @@
</script>
<style lang="scss" scoped>
- @import "../style/MJBillStyle.scss";
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
.left {
width: 4em;
diff --git a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
similarity index 97%
rename from pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
rename to pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
index 571373a..0b1e419 100644
--- a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
+++ b/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
@@ -86,7 +86,7 @@
</view>
<!-- 閫夋簮鍗曞姛鑳� -->
<view class="icon-wrapper">
- <uni-icons type="search" size="20" @click=""></uni-icons>
+ <uni-icons type="search" size="20" @click="openSourceBillSelector"></uni-icons>
</view>
</view>
<view class="form-item">
@@ -208,7 +208,7 @@
overflow: 'auto'
}">
<view class="list" v-for="(item,index) in HMaterList" :key="index">
- <uni-card :title="item.鍣ㄥ叿鍚嶇О" :extra="item.鍣ㄥ叿浠ｅ彿" style="margin: 10px;" @tap="delMould(item)">
+ <uni-card v-if="item.鍣ㄥ叿鏉＄爜" :title="item.鍣ㄥ叿鍚嶇О" :extra="item.鍣ㄥ叿浠ｅ彿" style="margin: 10px;" @tap="delMould(item)">
<view class="card-detail">
<view class="detail">
<text>鍣ㄥ叿鏉＄爜锛�</text>{{item.鍣ㄥ叿鏉＄爜}}
@@ -320,7 +320,7 @@
} from "@/utils/mpaasScan.js"
import {
getUserInfo
- } from "../../../utils/auth";
+ } from "@/utils/auth";
import {
getUserStockRelation
} from '@/utils/userRelationManager';
@@ -459,9 +459,17 @@
}
},
methods: {
+ // 鎵撳紑閫夋簮鍗曢〉闈�
+ openSourceBillSelector() {
+ this.$refs.billList.showPopup()
+ },
// 鎺ユ敹婧愬崟
handleSourceBill(e){
+ console.log('e: ',e);
+ this.hform.HSourceBillNo = e.HBillNo
+ this.GetMessageByHSourceBillNo(e.HBillNo)
+ this.$refs.billList.exit()
},
// 鏉＄爜鍒犻櫎
async delMater(item) {
@@ -1040,9 +1048,9 @@
}
},
async getBarCodeJson(sBarCode, sBarCodePrefix) {
- if (!this.hform.HQty) {
- this.hform.HQty = 0
- }
+ // if (!this.hform.HQty) {
+ // this.hform.HQty = 0
+ // }
console.log('this.hform.HQty: ', this.hform.HQty);
try {
let res = await CommonUtils.doRequest2Sync({
@@ -1055,7 +1063,7 @@
HMaker: this.hform.HMaker,
HWhID: this.hform.HWHID,
HSPID: this.hform.HStockPlaceID,
- HQty: this.hform.HQty,
+ HQty: this.hform.HQty || 0,
HRedBlueFlag: this.hform.HRedBlueFlag,
SourceFlag: this.hform.HSourceFlag,
HSourceBillNo: this.hform.HSourceBillNo,
@@ -1225,8 +1233,9 @@
this.hform.HDeptID = data.hDeptIDField
this.hform.HDeptName = data.hDeptNameField
}
-
+ // this.tabs = 2
this.hform.HSourceBillNo = data.hSourceBillNoField
+ this.DisBillEntryList()
} else {
CommonUtils.playSound(0)
CommonUtils.showTips({
@@ -1689,20 +1698,20 @@
this.loadCache()
// 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
- this.hform.HMainSourceInterID = e.HInterID
- this.hform.HSourceBillNo = e.HBillNo
- this.hform.HMainSourceEntryID = e.HEntryID
- this.hform.HEquipID = e.HEquipID
- this.hform.HBarName = e.HEquipName
- this.hform.HBarSpec = e.HEquipSpec
- this.hform.HBarModel = e.HEquipModel
- this.$refs.billList.exit()
- })
+ // uni.$on('BillSelectComplete', (e) => {
+ // console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ // this.hform.HMainSourceInterID = e.HInterID
+ // this.hform.HSourceBillNo = e.HBillNo
+ // this.hform.HMainSourceEntryID = e.HEntryID
+ // this.hform.HEquipID = e.HEquipID
+ // this.hform.HBarName = e.HEquipName
+ // this.hform.HBarSpec = e.HEquipSpec
+ // this.hform.HBarModel = e.HEquipModel
+ // this.$refs.billList.exit()
+ // })
},
onUnload() {
- uni.$off('BillSelectComplete')
+ // uni.$off('BillSelectComplete')
},
onReady() {
const query = uni.createSelectorQuery().in(this)
@@ -1719,7 +1728,7 @@
</script>
<style lang="scss" scoped>
- @import "../style/MJBillStyle.scss";
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
.left {
width: 4em;
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
index 5faca64..dc27a85 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -647,7 +647,24 @@
})
}
},
- async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ async getSendWorkBill(HRepairSendWorkID) {
+ let res2 = await CommonUtils.doRequest2Async({
+ url: "/Sc_MouldRepairSendWorkBill/Sc_MouldRepairSendWorkBill_Edit",
+ data: {
+ "linterid": HRepairSendWorkID,
+ "user": getUserInfo()["Czymc"]
+ }
+ })
+
+ let {data, count, Message} = res2.data
+ if(count == 1) {
+ this.hform.HRepairCheckMainID = this.HRepairCheckList.find(item => item["缁翠慨楠屾敹椤圭洰"] == data[0]["缁翠慨椤圭洰"])?.hitemid
+ this.hform.HRepairCheckMainContent = data[0]["缁翠慨鍐呭"]
+ } else {
+
+ }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo, HRepairSendWorkID) {
// 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
if(HSourceBillType == 3815) {
let res = await CommonUtils.doRequest2Async({
@@ -673,6 +690,8 @@
this.hform.HMouldName = data1.浜у搧妯″叿
this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+
+ this.getSendWorkBill(HRepairSendWorkID)
}
else {
CommonUtils.showTips({
@@ -705,14 +724,20 @@
let {
HSourceBillType,
HInterID,
- HBillNo
+ HBillNo,
+ HRepairBillNo,
+ HRepairID,
+ HRepairSendWorkID
} = e
// 涓嬫帹
// this.enableEdit = false;
// this.enableSourceBillEdit = false;
// this.showHMainSourceBillType = false;
+ this.hform.HMouldRepairWorkID = HRepairID
+ this.hform.HMouldRepairWorkName = HRepairBillNo
+
this.getMaxNum()
- this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo, HRepairSendWorkID)
}
this.getHDeptList()
diff --git a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
index aa6e9b4..9d8ab35 100644
--- a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -1,938 +1,981 @@
<template>
- <view>
- <view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
- </view>
- <!-- 鍩烘湰淇℃伅 -->
- <template v-if="tabs == 0">
- <view class="form" :style="{
+ <view>
+ <view class="tabs" id="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+ </view>
+ <!-- 鍩烘湰淇℃伅 -->
+ <template v-if="tabs == 0">
+ <view class="form" :style="{
height: containerHeight + 'px',
overflow: 'auto'
}">
- <view class="form-item">
- <view class="title">璁惧鏉＄爜:</view>
- <view :class="enableEdit?'right':'righton'">
- <input v-model="hform.HBarCode" :disabled="!enableEdit"
- @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨寮�濮�:</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanBeginDate">
- <input :value="hform.HRepairBeginDate" />
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨缁撴潫:</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanEndDate">
- <input :value="hform.HRepairEndDate" />
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨鍐呭:</view>
- <view class="right">
- <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input disabled v-model="hform.HDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
- <view class="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+ <view class="form-item">
+ <view class="title">璁惧鏉＄爜:</view>
+ <view :class="enableEdit?'right':'righton'">
+ <input v-model="hform.HBarCode" :disabled="!enableEdit"
+ @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨寮�濮�:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanBeginDate">
+ <input :value="hform.HRepairBeginDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨缁撴潫:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanEndDate">
+ <input :value="hform.HRepairEndDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨鍐呭:</view>
+ <view class="right">
+ <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
- <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- <view class="righton" v-show="!showHMainSourceBillType">
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- </view>
- </view>
- <view class="form-item">
- <view class="title required">婧愬崟鍗曞彿:</view>
- <view :class="enableSourceBillEdit?'right':'righton'">
- <input v-model="hform.HMainSourceBillNo" :disabled="enableSourceBillEdit?false:true"
- @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
- placeholder="璇疯緭鍏�(鎴栨壂鎻�)婧愬崟鍗曞彿" />
- </view>
- <view class="icon-wrapper" v-show="hform.HMainSourceBillType != '鎵嬪伐褰曞叆'"
- :disabled="hform.HMainSourceBillType == '鎵嬪伐褰曞叆'">
- <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨瑕佹眰:</view>
- <view class="right">
- <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏃堕棿鍗曚綅:</view>
- <zxz-uni-data-select class="right" :localdata="[
+ <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">婧愬崟鍗曞彿:</view>
+ <view :class="enableSourceBillEdit?'right':'righton'">
+ <input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
+ @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
+ placeholder="璇疯緭鍏�(鎴栨壂鎻�)婧愬崟鍗曞彿" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != '鎵嬪伐褰曞叆'">
+ <uni-icons :disabled="hform.HMainSourceBillType == '鎵嬪伐褰曞叆'" type="search" size="20"
+ @click="showBillList"></uni-icons>
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != '鎵嬪伐褰曞叆'">
+ <uni-icons :disabled="hform.HMainSourceBillType == '鎵嬪伐褰曞叆'" type="scan" size="20"
+ @click="toScanHMainSourceBillNo"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨瑕佹眰:</view>
+ <view class="right">
+ <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏃堕棿鍗曚綅:</view>
+ <zxz-uni-data-select class="right" :localdata="[
{key: '灏忔椂', value: '灏忔椂'},
{key: '澶�', value: '澶�'},
{key: '鏈�', value: '鏈�'},
]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨宸ユ椂:</view>
- <view class="right">
- <input type="number" v-model="hform.HTimes" />
- </view>
- </view>
- <view class="form-item">
- <view class="title required">閮ㄩ棬:</view>
- <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
- dataValue="HItemID" v-model="hform.HDeptID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title required">缁翠慨浜�:</view>
- <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
- dataValue="HItemID" v-model="hform.HEmpID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title required">缁翠慨椤圭洰:</view>
- <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title required">璐熻矗浜�:</view>
- <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
- dataValue="HItemID" v-model="hform.HManagerID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">璁惧鍚嶇О:</view>
- <view class="righton">
- <input v-model="hform.HBarName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧瑙勬牸:</view>
- <view class="righton">
- <input v-model="hform.HBarSpec" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧鍨嬪彿:</view>
- <view class="righton">
- <input v-model="hform.HBarModel" disabled />
- </view>
- </view>
- </view>
- </template>
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨宸ユ椂:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HTimes" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">閮ㄩ棬:</view>
+ <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+ dataValue="HItemID" v-model="hform.HDeptID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">缁翠慨浜�:</view>
+ <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+ dataValue="HItemID" v-model="hform.HEmpID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">缁翠慨椤圭洰:</view>
+ <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+ dataValue="hitemid" v-model="hform.HRepairID" filterable>
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">璐熻矗浜�:</view>
+ <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+ dataValue="HItemID" v-model="hform.HManagerID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HBarName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧瑙勬牸:</view>
+ <view class="righton">
+ <input v-model="hform.HBarSpec" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HBarModel" disabled />
+ </view>
+ </view>
+ </view>
+ </template>
- <!-- 鍏朵粬淇℃伅 -->
- <template v-if="tabs == 2">
- <view class="form" :style="{
+ <!-- 鍏朵粬淇℃伅 -->
+ <template v-if="tabs == 2">
+ <view class="form" :style="{
height: containerHeight + 'px',
overflow: 'auto'
}">
- <view class="form-item">
- <view class="title">鍒涘缓浜�:</view>
- <view class="righton">
- <input v-model="hform.HMaker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒涘缓鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HMakeDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼浜�:</view>
- <view class="righton">
- <input v-model="hform.HUpDater" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HUpDateDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
- <view class="righton">
- <input v-model="hform.HChecker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳鏃堕棿:</view>
- <view class="righton">
- <input v-model="hform.HCheckDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾浜�:</view>
- <view class="righton">
- <input v-model="hform.HDeleteMan" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HDeleteDate" />
- </view>
- </view>
- </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HMakeDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDateDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃堕棿:</view>
+ <view class="righton">
+ <input v-model="hform.HCheckDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteMan" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteDate" />
+ </view>
+ </view>
+ </view>
- </template>
- <!-- 鎿嶄綔鎸夐挳 -->
- <view class="buttons" id="buttons">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <view style="flex: 1;"></view>
- <button class="btn-a" v-if="operationType!=4" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
- <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
- <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
- :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
- </BillListPopupEquipConkBookBillVue>
- </view>
+ </template>
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="buttons" id="buttons">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <view style="flex: 1;"></view>
+ <button class="btn-a" v-if="operationType!=4" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+ <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupEquipConkBookBillVue>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- // 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
- import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ // 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
+ import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
- export default {
- // 璁惧缁翠慨璁板綍鍗�
- name: 'Sb_EqpMaintenanceBill',
- components: {
- BillListPopupEquipConkBookBillVue
- },
- data() {
- return {
- tabs: 0,
-
- btnTop: 0,
- tabsBottom: 0,
- HModName: "Sb_EqpMaintenanceBill",
- HBillType: '3910',
- operationType: 1,
- uploadOptions: {},
- enableEdit: true,
- enableSourceBillEdit: true,
+ export default {
+ // 璁惧缁翠慨璁板綍鍗�
+ name: 'Sb_EqpMaintenanceBill',
+ components: {
+ BillListPopupEquipConkBookBillVue
+ },
+ data() {
+ return {
+ tabs: 0,
- // 婧愬崟绫诲瀷鐩稿叧
- HMainSourceBillType: "璁惧缁翠慨鐧昏鍗�", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
- arrayHMainSourceBillType: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'],
- arrayHMainSourceBillTypeID: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
- showHMainSourceBillType: true,
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "Sb_EqpMaintenanceBill",
+ HBillType: '3910',
+ operationType: 1,
+ uploadOptions: {},
+ enableEdit: true,
+ enableSourceBillEdit: false,
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
- HRepairList: [],
+ // 婧愬崟绫诲瀷鐩稿叧
+ HMainSourceBillType: "鎵嬪伐褰曞叆", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
+ arrayHMainSourceBillType: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'],
+ arrayHMainSourceBillTypeID: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+ showHMainSourceBillType: true,
- hform: {
- HBillType: '3910',
- HStockOrgID: uni.getStorageSync("OrganizationID"),
- HBarCode: "",
- HBarCode: '',
- HRepairBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HRepairEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HRepairContent: '',
- HBillNo: '',
- HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HDeptName: getUserInfo().HDeptName,
- HDeptID: getUserInfo().HDeptID,
- HEmpName: getUserInfo().HEmpName,
- HEmpID: getUserInfo().HEmpID,
- HRepair: '',
- HRepairID: 0,
- HExplanation: '',
- HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
- HMainSourceBillNo: '',
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HManagerName: getUserInfo().HManagerName,
- HManagerID: getUserInfo().HManagerID,
- HTimes: 0,
- HCycleUnit: '灏忔椂',
- HBarName: '',
- HNumber: '',
- HEquipID: 0,
- HBarSpec: '',
- HBarModel: '',
- HMaker: getUserInfo()["Czymc"],
- HChecker: '',
- HCloseMan: '',
- HUpDater: '',
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HCheckDate: '',
- HCloseDate: '',
- HUpDateDate: '',
- HDeleteMan: '',
- HDeleteDate: ''
- },
- HDetailList: [{
- "HRepairID": 0,
- "HRepairCode": "",
- "HRepairName": "",
- "HManagerID": 0,
- "HManagerCode": "",
- "HManagerName": "",
- "HRepairExplanation": '',
- "HRemark": "",
- "HEmpID": '',
- "HSourceInterID": 0,
- "HSourceEntryID": 0,
- "HSourceBillNo": ''
- }]
- };
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- },
- },
- methods: {
- // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
- showBillList() {
- this.$refs.billList.showPopup()
- },
+ HDeptList: [],
+ HRepairCheckList: [],
+ HEmpList: [],
+ HRepairList: [],
- // 閫夋嫨婧愬崟绫诲瀷
- HMainSourceBillTypeChange(e) {
- if (e.detail.value == -1 || e.detail.value == NaN) {
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- this.hform.HMainSourceBillType = '鎵嬪伐褰曞叆'
- return
- }
-
- this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
-
- // 缂撳瓨褰撳墠椤甸潰閫夋嫨
- const pages = getCurrentPages()
- const currentPage = pages[pages.length - 1]
- uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
- HSourceBillTypeName: this.HMainSourceBillType,
- HSourceBillType: this.hform.HMainSourceBillType
- })
- },
-
- // 璇诲彇缂撳瓨
- loadCache() {
- const pages = getCurrentPages()
- const currentPage = pages[pages.length - 1]
- let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
- if (HBillTypeCache) {
- this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
- this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
- }
- },
-
- // 缁翠慨椤圭洰
- async getRepairList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_Repair/GetRepairList',
- data: {
- sWhere: '',
- user: getUserInfo()["Czymc"]
- }
- })
-
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HRepairList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${err}`
- })
- }
- },
- // 鍒犻櫎鏄庣粏
- delDetail(item) {
-
- },
- // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
- ValidCheck() {
- if (this.hform.HEquipID == 0) {
- return {
- Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
- state: false
- }
- }
- if (this.hform.HDeptID == 0) {
- return {
- Message: "閮ㄩ棬涓嶅緱涓虹┖!",
- state: false
- }
- }
- if (this.hform.HEmpID == 0) {
- return {
- Message: "楠屾敹浜轰笉寰椾负绌�!",
- state: false
- }
- }
- if (this.hform.HRepairCheckMainID == 0) {
- return {
- Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
- state: false
- }
- }
- if (this.hform.HManagerID == 0) {
- return {
- Message: "璐熻矗浜轰笉寰椾负绌�!",
- state: false
- }
- }
- if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
- if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
- CommonUtils.showTips({
- message: '婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�'
- })
- return
- }
- }
- return {
- Message: "",
- state: true
- }
- },
- addNew() {
- uni.redirectTo({
- url: './Sb_EqpMaintenanceBill?operationType=1'
- })
- },
- goBack() {
- uni.navigateBack()
- },
- checkBoxChangeHandler(index, e) {
- let cr = e.detail.value
- if (cr.length == 0) {
- this.HCheckFileList[index]["HDotCheckResult"] = false
- } else {
- this.HCheckFileList[index]["HDotCheckResult"] = true
- }
- },
- uploadFile(index) {
- console.log('filePath: ', this.attachmentInfo[index].filePath);
- // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
- uni.uploadFile({
- url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
- filePath: this.attachmentInfo[index].filePath,
- name: 'file',
- formData: {
- HBillNo: this.hform.HBillNo,
- HRemark: "",
- HUserName: getUserInfo()["Czymc"]
- },
- success: (uploadRes) => {
- CommonUtils.showTips({
- message: "涓婁紶鎴愬姛"
- })
- this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
- },
- fail: (err) => {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `涓婁紶澶辫触: ${err}`
- })
- }
- })
- },
- delFile(index) {
- console.log('attachmentInfo: ', this.attachmentInfo[index]);
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: (res) => {
- if (res.confirm) {
- this.attachmentInfo.splice(index, 1)
- }
- },
- })
-
- },
- handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
- console.log('file: ', res);
- let fileInfo = res.data[0]
- this.attachmentInfo.push({
- fileName: fileInfo.name,
- size: fileInfo.size,
- status: '绛夊緟涓婁紶',
- filePath: fileInfo.tempFilePath
- })
- },
- // 涓婁紶鏂囦欢
- fileUpload() {
- this.$refs.XeUpload.upload('file', {});
- },
- //鑾峰彇鐝鏁版嵁
- async getShiftList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetGy_ShiftsList_Json',
- data: {
- Shifts: "",
- }
- })
-
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HShiftsList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- async getHDeptList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_Department/list',
- data: {
- sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')} `,
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- }
- })
-
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HDeptList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- // 鑾峰彇鑱屽憳鏁版嵁
- async getEmpList() {
- let sWhere= " where 1=1"
- if(this.hform.HDeptName){
- // sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ hform: {
+ HBillType: '3910',
+ HStockOrgID: uni.getStorageSync("OrganizationID"),
+ HBarCode: "",
+ HBarCode: '',
+ HRepairBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HRepairEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HRepairContent: '',
+ HBillNo: '',
+ HInterID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HDeptName: getUserInfo().HDeptName,
+ HDeptID: getUserInfo().HDeptID,
+ HEmpName: getUserInfo().HEmpName,
+ HEmpID: getUserInfo().HEmpID,
+ HRepair: '',
+ HRepairID: 0,
+ HExplanation: '',
+ HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+ HMainSourceBillNo: '',
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HManagerName: getUserInfo().HManagerName,
+ HManagerID: getUserInfo().HManagerID,
+ HTimes: 0,
+ HCycleUnit: '灏忔椂',
+ HBarName: '',
+ HNumber: '',
+ HEquipID: 0,
+ HBarSpec: '',
+ HBarModel: '',
+ HMaker: getUserInfo()["Czymc"],
+ HChecker: '',
+ HCloseMan: '',
+ HUpDater: '',
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HCheckDate: '',
+ HCloseDate: '',
+ HUpDateDate: '',
+ HDeleteMan: '',
+ HDeleteDate: ''
+ },
+ HDetailList: [{
+ "HRepairID": 0,
+ "HRepairCode": "",
+ "HRepairName": "",
+ "HManagerID": 0,
+ "HManagerCode": "",
+ "HManagerName": "",
+ "HRepairExplanation": '',
+ "HRemark": "",
+ "HEmpID": '',
+ "HSourceInterID": 0,
+ "HSourceEntryID": 0,
+ "HSourceBillNo": ''
+ }]
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
}
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/PublicPageMethod/UserList',
- data: {
- sWhere: sWhere
- }
- })
+ },
+ },
+ methods: {
+ // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HEmpList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
- async getCheckProjList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_RepairCheck/GetRepairCheckList',
- data: {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- }
- })
+ // 閫夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ if (e.detail.value == -1 || e.detail.value == NaN) {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.enableSourceBillEdit = false
+ return
+ }
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HRepairCheckList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- toScanCode() {
- MpaasScan.scanCode(cb => {
- this.hform.HBarCode = cb
- this.GetMessageByBarCode(cb)
- })
- },
- toScanHMainSourceBillNo() {
- MpaasScan.scanCode(cb => {
- this.hfrom.HMainSourceBillNo = cb
- this.GetMessageByHMainSourceBillNo(cb)
- })
- },
- async GetMessageByHMainSourceBillNo(HSouceBillNo) {
- try {
+ if (e.detail.value == 1) {
+ this.enableSourceBillEdit = false
+ } else {
+ this.enableSourceBillEdit = true
+ }
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+
+ // 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ })
+ },
+
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
+
+ // 缁翠慨椤圭洰
+ async getRepairList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Repair/GetRepairList',
+ data: {
+ sWhere: '',
+ user: getUserInfo()["Czymc"]
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HRepairList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${err}`
+ })
+ }
+ },
+ // 鍒犻櫎鏄庣粏
+ delDetail(item) {
+
+ },
+ // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+ ValidCheck() {
+ if (this.hform.HEquipID == 0) {
+ return {
+ Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+ state: false
+ }
+ }
+ if (this.hform.HDeptID == 0) {
+ return {
+ Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
+ if (this.hform.HEmpID == 0) {
+ return {
+ Message: "楠屾敹浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ if (this.hform.HRepairCheckMainID == 0) {
+ return {
+ Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
+ if (this.hform.HManagerID == 0) {
+ return {
+ Message: "璐熻矗浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
+ if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+ CommonUtils.showTips({
+ message: '婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�'
+ })
+ return
+ }
+ }
+ return {
+ Message: "",
+ state: true
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: './Sb_EqpMaintenanceBill?operationType=1'
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HDotCheckResult"] = false
+ } else {
+ this.HCheckFileList[index]["HDotCheckResult"] = true
+ }
+ },
+ uploadFile(index) {
+ console.log('filePath: ', this.attachmentInfo[index].filePath);
+ // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+ uni.uploadFile({
+ url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+ filePath: this.attachmentInfo[index].filePath,
+ name: 'file',
+ formData: {
+ HBillNo: this.hform.HBillNo,
+ HRemark: "",
+ HUserName: getUserInfo()["Czymc"]
+ },
+ success: (uploadRes) => {
+ CommonUtils.showTips({
+ message: "涓婁紶鎴愬姛"
+ })
+ this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+ },
+ fail: (err) => {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓婁紶澶辫触: ${err}`
+ })
+ }
+ })
+ },
+ delFile(index) {
+ console.log('attachmentInfo: ', this.attachmentInfo[index]);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.attachmentInfo.splice(index, 1)
+ }
+ },
+ })
+
+ },
+ handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+ console.log('file: ', res);
+ let fileInfo = res.data[0]
+ this.attachmentInfo.push({
+ fileName: fileInfo.name,
+ size: fileInfo.size,
+ status: '绛夊緟涓婁紶',
+ filePath: fileInfo.tempFilePath
+ })
+ },
+ // 涓婁紶鏂囦欢
+ fileUpload() {
+ this.$refs.XeUpload.upload('file', {});
+ },
+ //鑾峰彇鐝鏁版嵁
+ async getShiftList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetGy_ShiftsList_Json',
+ data: {
+ Shifts: "",
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HShiftsList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ async getHDeptList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Department/list',
+ data: {
+ sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')} `,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HDeptList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ // 鑾峰彇鑱屽憳鏁版嵁
+ async getEmpList() {
+ let sWhere = " where 1=1 "
+ if (this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�') {
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/UserList',
+ data: {
+ sWhere: sWhere
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HEmpList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+ async getCheckProjList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_RepairCheck/GetRepairCheckList',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HRepairCheckList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ toScanCode() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HBarCode = cb
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ toScanHMainSourceBillNo() {
+ MpaasScan.scanCode(cb => {
+ this.hfrom.HMainSourceBillNo = cb
+ this.GetMessageByHMainSourceBillNo(cb)
+ })
+ },
+ async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+ try {
let url = ''
let dataField = ''
- // 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
- if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�')
- {
- url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
- dataField = {
- sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
- user: getUserInfo()["Czymc"],
- page: 1,
- size: 1,
- };
- } else if (this.hform.HMainSourceBillType === '璁惧缁翠慨娲惧伐鍗�') {
- url = "/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage";
- dataField = {
- sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
- user: getUserInfo()["Czymc"],
- page: 1,
- size: 1,
- };
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鏆備笉鏀寔璇ユ簮鍗曠被鍨嬶細${this.hform.HMainSourceBillType}`
- })
- return;
- }
+ // 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
+ if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+ url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
+ dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
+ } else if (this.hform.HMainSourceBillType === '璁惧缁翠慨娲惧伐鍗�') {
+ url = "/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage";
+ dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鏆備笉鏀寔璇ユ簮鍗曠被鍨嬶細${this.hform.HMainSourceBillType}`
+ })
+ return;
+ }
- let res = await CommonUtils.doRequest2Async({
- url: url,
- data: dataField
- })
+ let res = await CommonUtils.doRequest2Async({
+ url: url,
+ data: dataField
+ })
- let { count, Message, data } = res.data
- if (count == 1) {
- this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"]
- this.hform.HMainSourceInterID = data[0]["hmainid"]
- this.hform.HMainSourceEntryID = data[0]["hsubid"]
+ let {
+ count,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"]
+ this.hform.HMainSourceInterID = data[0]["hmainid"]
+ this.hform.HMainSourceEntryID = data[0]["hsubid"]
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
- })
- }
- },
- async GetMessageByBarCode(HBarCode) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
- data: {
- HBarCode: HBarCode,
- },
- })
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
+ })
+ }
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+ data: {
+ HBarCode: HBarCode,
+ },
+ })
- if (!res) {
- return
- }
+ if (!res) {
+ return
+ }
- let {
- data,
- count,
- Message
- } = res.data
+ let {
+ data,
+ count,
+ Message
+ } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.hform.HEquipID = data[0].hmainid
- this.hform.HBarName = data[0].璁惧鍚嶇О
- this.hform.HBarSpec = data[0].璁惧瑙勬牸
- this.hform.HBarModel = data[0].璁惧鍨嬪彿
- this.hform.HQty = 1
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HEquipID = data[0].hmainid
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HQty = 1
- this.enableEdit = false
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: Message
- })
- }
+ this.enableEdit = false
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ })
+ }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: err
- })
- }
- },
- radioChange({
- detail: {
- value
- }
- }) {
- this.hform.HCheckResult = value
- },
- async getMaxNum() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetMAXNum",
- data: {
- "HBillType": this.HBillType
- }
- })
- let {
- count,
- data,
- Message
- } = res.data
- this.hform.HInterID = 0
- this.hform.HBillNo = data[0]["HBillNo"]
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
- })
- }
- },
- async submit() {
- let valid = this.ValidCheck()
- if (!valid.state) {
- CommonUtils.showTips({
- message: valid.Message
- })
- return
- }
-
- try {
- let oMain = JSON.stringify(this.hform);
- this.HDetailList[0].HManagerID = this.hform.HManagerID
- this.HDetailList[0].HRepairID = this.hform.HRepairID
- this.HDetailList[0].HRepairExplanation = this.hform.HExplanation
- this.HDetailList[0].HEmpID = this.hform.HEmpID
- this.HDetailList[0].HSourceInterID = this.hform.HMainSourceInterID
- this.HDetailList[0].HSourceEntryID = this.hform.HMainSourceEntryID
- this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ })
+ }
+ },
+ radioChange({
+ detail: {
+ value
+ }
+ }) {
+ this.hform.HCheckResult = value
+ },
+ async getMaxNum() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetMAXNum",
+ data: {
+ "HBillType": this.HBillType
+ }
+ })
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ this.hform.HInterID = 0
+ this.hform.HBillNo = data[0]["HBillNo"]
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ })
+ }
+ },
+ async submit() {
+ let valid = this.ValidCheck()
+ if (!valid.state) {
+ CommonUtils.showTips({
+ message: valid.Message
+ })
+ return
+ }
- let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr;
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
+ try {
+ let oMain = JSON.stringify(this.hform);
+ this.HDetailList[0].HManagerID = this.hform.HManagerID
+ this.HDetailList[0].HRepairID = this.hform.HRepairID
+ this.HDetailList[0].HRepairExplanation = this.hform.HExplanation
+ this.HDetailList[0].HEmpID = this.hform.HEmpID
+ this.HDetailList[0].HSourceInterID = this.hform.HMainSourceInterID
+ this.HDetailList[0].HSourceEntryID = this.hform.HMainSourceEntryID
+ this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
- if (!res) {
- return
- }
+ let sSubStr = JSON.stringify(this.HDetailList);
+ let sMainSub = oMain + ';' + sSubStr;
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
- let {
- count,
- Message
- } = res.data
- if (count == 1) {
- if (this.operationType == 4) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傚嵆灏嗚繑鍥炰笂绾ч〉闈�',
- showCancel: false,
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- // uni.redirectTo({
- // url: './Sb_EquipRepairSendWorkBill?operationType=1'
- // })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- return
- }
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: './Sb_EqpMaintenanceBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + Message
- })
- }
+ if (!res) {
+ return
+ }
+
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ if (this.operationType == 4) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傚嵆灏嗚繑鍥炰笂绾ч〉闈�',
+ showCancel: false,
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ // uni.redirectTo({
+ // url: './Sb_EquipRepairSendWorkBill?operationType=1'
+ // })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ return
+ }
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: './Sb_EqpMaintenanceBill?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
- })
- }
- },
- async getEquipFileMain(HInterID) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
- data: {
- HEquipID: HInterID,
- },
- })
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ },
+ async getEquipFileMain(HInterID) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+ data: {
+ HEquipID: HInterID,
+ },
+ })
- if (!res) {
- return
- }
+ if (!res) {
+ return
+ }
- let {
- data,
- count,
- Message
- } = res.data
+ let {
+ data,
+ count,
+ Message
+ } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.hform.HEquipID = data[0].hmainid
- this.hform.HBarName = data[0].璁惧鍚嶇О
- this.hform.HBarSpec = data[0].璁惧瑙勬牸
- this.hform.HBarModel = data[0].璁惧鍨嬪彿
- this.hform.HQty = 1
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HEquipID = data[0].hmainid
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HQty = 1
- this.enableEdit = false
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: Message
- })
- }
+ this.enableEdit = false
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ })
+ }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: err
- })
- }
- },
- async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ })
+ }
+ },
+ async getSendWorkBill(HSendWorkID) {
+ try{
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillList",
+ data: {
+ sWhere: ` and hmainid ='${HSendWorkID}' `,
+ user: getUserInfo()["Czymc"]
+ }
+ })
+
+ let {data, count, Message} = res.data
+ if(count == 1) {
+ console.log('data: ',data);
+ this.hform.HRepairID = this.HRepairList.find(item => data[0]["琛ㄤ綋缁翠慨椤圭洰"] == item["缁翠慨椤圭洰"])?.hitemid
+ }else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇娲惧伐鍗曞け璐�: ${Message}`
+ })
+ }
+ }catch(err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇娲惧伐鍗曞け璐�: ${err}`
+ })
+ }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo, HSendWorkID) {
// 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
- if(HSourceBillType == 3907) {
+ if (HSourceBillType == 3907) {
let res = await CommonUtils.doRequest2Async({
url: "/Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai",
data: {
HID: HInterID
}
})
-
- let {data,code, count, Message} = res.data
-
- if(code == 1) {
- console.log('data: ',data.h_v_Sb_EquipConkBookBillList_Edit);
+
+ let {
+ data,
+ code,
+ count,
+ Message
+ } = res.data
+
+ if (code == 1) {
+ console.log('data: ', data.h_v_Sb_EquipConkBookBillList_Edit);
let data1 = data.h_v_Sb_EquipConkBookBillList_Edit[0]
this.hform.HMainSourceBillType = HSourceBillType
this.HMainSourceBillType = '璁惧鏁呴殰鐧昏鍗�'
@@ -942,11 +985,15 @@
this.hform.HEquipID = data1.HEquipID
this.hform.HManagerName = data1.璐熻矗浜�
this.hform.HManagerID = data1.HManagerID
+ this.hform.HEmpID = data1["HEmpID"] || getUserInfo()["HEmpID"]
this.hform.HBarName = data1.璁惧鍚嶇О
this.hform.HBarModel = data1.璁惧鍨嬪彿
this.hform.HBarSpec = data1.璁惧瑙勬牸
- }
- else {
+ this.hform.HExplanation = data1.鏁呴殰鍘熷洜鎻忚堪
+ this.hform.HRepairContent = data1.鏁呴殰鍘熷洜鎻忚堪
+
+ this.getSendWorkBill(HSendWorkID)
+ } else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇婧愬崟澶辫触: ${Message}`
@@ -954,79 +1001,84 @@
}
}
}
- },
- onLoad(e) {
- console.log('e: ', e);
- if (!e.operationType) {
- this.operationType = 1
- } else {
- this.operationType = e.operationType
- }
-
- if (this.operationType == 1) {
- // 鏂板
- this.getMaxNum()
- } else if (this.operationType == 2) {
- // 澶嶅埗
- } else if (this.operationType == 3) {
- // 缂栬緫
-
- } else if (this.operationType == 4) {
- // 鐢辨姤宸ュ钩鍙版墦寮�
- let HEquipID = e.HEquipID
- this.getMaxNum()
- this.getEquipFileMain(HEquipID)
- } else if(this.operationType == 5) {
- let {HSourceBillType, HInterID, HBillNo} = e
- // 涓嬫帹
- this.getMaxNum()
- this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ if (!e.operationType) {
+ this.operationType = 1
+ } else {
+ this.operationType = e.operationType
}
- this.getHDeptList()
- this.getEmpList()
- this.getRepairList()
- this.loadCache()
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
- // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
- this.hform.HMainSourceInterID = e.HInterID
- this.hform.HMainSourceBillNo = e.HBillNo
- this.hform.HMainSourceEntryID = e.HEntryID
- this.hform.HEquipID = e.HEquipID
- this.hform.HBarName = e.HEquipName
- this.hform.HBarSpec = e.HEquipSpec
- this.hform.HBarModel = e.HEquipModel
- this.$refs.billList.exit()
- })
- },
- onUnload() {
- uni.$off('BillSelectComplete')
- },
- onReady() {
- const query = uni.createSelectorQuery().in(this)
- query.select("#buttons")
- .boundingClientRect()
- .select("#tabs")
- .boundingClientRect()
- .exec(res => {
- this.btnTop = Math.floor(res[0].top)
- this.tabsBottom = Math.ceil(res[1].bottom)
- })
- }
- }
+ } else if (this.operationType == 4) {
+ // 鐢辨姤宸ュ钩鍙版墦寮�
+ let HEquipID = e.HEquipID
+ this.getMaxNum()
+ this.getEquipFileMain(HEquipID)
+ } else if (this.operationType == 5) {
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo,
+ HSendWorkID
+ } = e
+ // 涓嬫帹
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo,HSendWorkID)
+ }
+
+ this.getHDeptList()
+ this.getEmpList()
+ this.getRepairList()
+ this.loadCache()
+
+ // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HEquipID = e.HEquipID
+ this.hform.HBarName = e.HEquipName
+ this.hform.HBarSpec = e.HEquipSpec
+ this.hform.HBarModel = e.HEquipModel
+ this.$refs.billList.exit()
+ })
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ },
+ onReady() {
+ const query = uni.createSelectorQuery().in(this)
+ query.select("#buttons")
+ .boundingClientRect()
+ .select("#tabs")
+ .boundingClientRect()
+ .exec(res => {
+ this.btnTop = Math.floor(res[0].top)
+ this.tabsBottom = Math.ceil(res[1].bottom)
+ })
+ }
+ }
</script>
<style lang="scss" scoped>
- @import "@/pages/MJGL/style/MJBillStyle.scss";
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
- .picker-overlay {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 1;
- }
+ .picker-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index 1128ab7..514418d 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -78,7 +78,7 @@
<!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
- <view class="title required">璐熻矗浜�:</view>
+ <view class="title required">楠屾敹浜�:</view>
<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
dataValue="HItemID" v-model="hform.HManagerID">
@@ -207,7 +207,7 @@
hform: {
HBarCode: "",
- HConkBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HConkBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
HConkTypeName: "",
HConkTypeID: 0,
HConkReasonName: "",
@@ -215,7 +215,7 @@
HExplanation: "",
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HEmpName: getUserInfo().HEmpName,
@@ -230,7 +230,7 @@
HChecker: '',
HCloseMan: '',
HUpDater: '',
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
HCheckDate: '',
HCloseDate: '',
HUpDateDate: '',
@@ -500,10 +500,15 @@
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
try {
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
+
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
data: {
- sWhere: " where 1=1",
+ sWhere: sWhere,
}
})
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index edff4d1..908e4de 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -321,8 +321,8 @@
hform: {
HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
HQty: 0,
HErrNote: "",
HBigSafeNote: "",
@@ -331,7 +331,7 @@
HShiftsID: 0,
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HRemark: "",
@@ -685,10 +685,10 @@
"HDotCheckItemClassName": "",
"HDotCheckItemMethodID": 0,
"HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ "HDotCheckResult": item.榛樿鐐规缁撴灉 == 'OK' ? true : false
}
})
-
+ this.tabs = 1
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
index 8094176..0104e1b 100644
--- a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -295,8 +295,8 @@
hform: {
HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
HQty: 0,
HErrNote: "",
HBigSafeNote: "",
@@ -304,7 +304,7 @@
HShiftsID: 0,
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HRemark: "",
@@ -395,7 +395,7 @@
this.HCheckFileList = Array.from(data).map(item => {
return {
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ "HMaintainResult": item.榛樿淇濆吇缁撴灉 == 'OK' ? true : false,
"HMaintainItemID": item.HMaintainItemID,
"HMaintainNumber": item.淇濆吇椤圭洰浠ｇ爜,
"HMaintainItem": item.淇濆吇椤圭洰,
@@ -662,7 +662,7 @@
this.HCheckFileList = Array.from(data).map(item => {
return {
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ // "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
"HMaintainItemID": item.淇濆吇椤圭洰ID,
"HMaintainNumber": item.淇濆吇椤圭洰浠ｇ爜,
"HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index 99ea259..b153674 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -231,12 +231,12 @@
hform: {
"HBillType": '3911',
"HBarCode": "",
- "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HCheckResult": "OK",
"HRepairCheckContent": "",
"HBillNo": "",
"HInterID": 0,
- "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HDeptName": getUserInfo().HDeptName,
"HDeptID": getUserInfo().HDeptID,
"HEmpName": getUserInfo().HEmpName,
@@ -250,7 +250,7 @@
"HBarSpec": "",
"HBarModel": "",
"HMaker": getUserInfo()["Czymc"],
- "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HUpDater": "",
"HUpDateDate": "",
"HChecker": "",
@@ -567,10 +567,14 @@
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
try {
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
data: {
- sWhere: " where 1=1",
+ sWhere: sWhere,
}
})
@@ -705,7 +709,33 @@
})
}
},
- async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ async getSendWorkBill(HSendWorkID) {
+ try{
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillList",
+ data: {
+ sWhere: ` and hmainid ='${HSendWorkID}' `,
+ user: getUserInfo()["Czymc"]
+ }
+ })
+
+ let {data, count, Message} = res.data
+ if(count == 1) {
+ this.hform.HRepairCheckID = this.HRepairCheckList.find(item => data[0]["琛ㄤ綋缁翠慨椤圭洰"] == item["缁翠慨楠屾敹椤圭洰"])?.hitemid
+ }else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇娲惧伐鍗曞け璐�: ${Message}`
+ })
+ }
+ }catch(err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇娲惧伐鍗曞け璐�: ${err}`
+ })
+ }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo, HSendWorkID) {
// 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
if (HSourceBillType == 3907) {
let res = await CommonUtils.doRequest2Async({
@@ -730,12 +760,13 @@
this.hform.HBarName = data[0].璁惧鍚嶇О
this.hform.HBarModel = data[0].璁惧瑙勬牸
this.hform.HBarSpec = data[0].璁惧瑙勬牸
-
+ this.HDetailList[0].HRepairCheckContent = data[0].鏁呴殰鎻忚堪
this.hform.HMainSourceBillNo = data[0]["璁惧缁翠慨璁板綍鍗�"];
this.hform.HMainSourceInterID = data[0]["HEquipRepairCheckBillInterID"];
this.hform.HMainSourceEntryID = data[0]["HEquipRepairCheckBillEntryID"];
-
-
+ this.hform.HManagerID = data[0]["HManagerID"];
+ this.hform.HEmpID = data[0]["HEmpID"];
+ this.getSendWorkBill(HSendWorkID)
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -830,11 +861,12 @@
let {
HSourceBillType,
HInterID,
- HBillNo
+ HBillNo,
+ HSendWorkID
} = e
// 涓嬫帹
this.getMaxNum()
- this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo, HSendWorkID)
}
this.getHDeptList()
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
index e6f35c6..d38816b 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -36,7 +36,7 @@
<view class="form-item">
<view class="title">缁翠慨鍐呭:</view>
<view class="right">
- <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
+ <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
</view>
</view>
<!-- 婧愬崟绫诲瀷 -->
@@ -57,7 +57,7 @@
<!-- 婧愬崟鍗曞彿 -->
<view class="form-item">
- <view class="title required">婧愬崟鍗曞彿:</view>
+ <view class="title">婧愬崟鍗曞彿:</view>
<view :class="enableSourceBillEdit?'right':'righton'">
<input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
@confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
@@ -306,7 +306,7 @@
HDeleteMan: '',
HDeleteDate: '',
// 鏂板鐨勬簮鍗曠浉鍏冲瓧娈�
- HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+ HMainSourceBillType: '-1', // 榛樿涓鸿澶囩淮淇櫥璁板崟
HMainSourceBillNo: '',
HMainSourceInterID: 0,
HMainSourceEntryID: 0,
@@ -706,10 +706,14 @@
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
try {
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
data: {
- sWhere: " where 1=1",
+ sWhere: sWhere,
}
})
@@ -857,8 +861,12 @@
let oMain = JSON.stringify(this.hform);
this.HDetailList[0].HManagerID = this.hform.HManagerID
this.HDetailList[0].HRepairID = this.hform.HRepairID
+ let oprType = this.operationType
+ if(oprType == 4){
+ oprType = 1
+ }
let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
+ let sMainSub = oMain + ';' + sSubStr + `;-1;${oprType}` + ';' + getUserInfo()[
'Czymc'];
let res = await CommonUtils.doRequest2Sync({
url: "/Sb_EquipRepairSendWorkBill/AddEquipRepairSendWorkBill",
@@ -934,6 +942,8 @@
this.hform.HBarName = data1.璁惧鍚嶇О
this.hform.HBarModel = data1.璁惧鍨嬪彿
this.hform.HBarSpec = data1.璁惧瑙勬牸
+ this.hform.HRepairContent = data1.鏁呴殰鎻忚堪
+
}
else {
CommonUtils.showTips({
diff --git a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
index dc7e7ea..e4bd830 100644
--- a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
+++ b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
@@ -83,11 +83,12 @@
} else if (tab == 1) {
uni.navigateTo({
url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query
+ + `&HSendWorkID=${item.HSendWorkID}`
})
} else if (tab == 2) {
uni.navigateTo({
url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
- Query
+ Query + `&HSendWorkID=${item.HSendWorkID}`
})
}
},
@@ -110,7 +111,7 @@
let res = await CommonUtils.doRequest2Async({
url: '/Sb_EquipRepairCheckTaskReport/RepairCheckList2',
data: {
- user: getUserInfo()["Czymc"]
+ user: getUserInfo()["HEmpName"]
}
})
@@ -157,7 +158,7 @@
}
}
},
- onLoad() {
+ onShow() {
this.getRepairList()
}
}
diff --git a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
index 5a747c3..ed139b6 100644
--- a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
@@ -14,18 +14,18 @@
@confirm="getHBarCodeData(hform.HBarCode)" />
</view>
<uni-icons type="scan"
- style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
- size="20" @click="toScanCode"></uni-icons>
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
+ size="20" @click="toScanCode"></uni-icons>
</view>
- <view class="form-item" @click="searchModule">
- <view class="title">鍣ㄥ叿</view>
- <view class="righton" style="width: 350rpx;">
- <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
- </view>
- <uni-icons type="search"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" ></uni-icons>
- </view>
+ <view class="form-item" @click="searchModule">
+ <view class="title">鍣ㄥ叿</view>
+ <view class="righton" style="width: 350rpx;">
+ <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
+ </view>
+ <uni-icons type="search"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20"></uni-icons>
+ </view>
<view class="form-item">
<view class="title">鏁呴殰鍙戠敓鏃ユ湡</view>
@@ -84,9 +84,9 @@
</view>
</view>
<view class="form-item">
- <view class="title required">璐熻矗浜�</view>
+ <view class="title required">楠屾敹浜�</view>
<view class="right">
- <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HManagerName"
+ <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨楠屾敹浜�" v-model="hform.HManagerName"
@input="ManagerChange"></uni-combox>
</view>
</view>
@@ -180,7 +180,9 @@
CommonUtils
} from '../../../utils/common';
import dayjs from 'dayjs';
- import { MpaasScan } from '../../../utils/mpaasScan';
+ import {
+ MpaasScan
+ } from '../../../utils/mpaasScan';
export default {
data() {
return {
@@ -190,7 +192,7 @@
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
HModName: 'Kf_POStockInBackBill_PDA',
ModRightName: 'CE_POStockInBack',
- OperationType: 1,
+ operationType: 1,
HInterID_Temp: '',
showHStockPlaceName: false,
@@ -229,7 +231,7 @@
// 鎻愪氦鏁版嵁
hform: {
"HBarCode": "",
- "HConkBeginDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HConkBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HConkTypeName": "",
"HConkTypeID": "0",
"HConkReasonName": "",
@@ -237,7 +239,7 @@
"HExplanation": "",
"HBillNo": "",
"HInterID": "0",
- "HDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HDeptName": getUserInfo()["HDeptName"],
"HDeptID": getUserInfo()["HDeptID"],
"HEmpName": getUserInfo().HEmpName,
@@ -249,7 +251,7 @@
"HBarSpec": "",
"HBarModel": "",
"HMaker": getUserInfo()["Czymc"],
- "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HUpDater": "",
"HUpDateDate": "",
"HChecker": "",
@@ -269,8 +271,8 @@
},
async onLoad(e) {
console.log(e, this.userInfo)
- this.OperationType = e.OperationType || 1
- if(operationType == 1) {
+ this.operationType = e.operationType || 1
+ if (this.operationType == 1) {
if (e.HInterID) {
this.HInterID_Temp = e.HInterID
this.RoadBillMain(e.HInterID)
@@ -280,31 +282,35 @@
this.HSourceBillNoFocus = true
this.refreshBarCodeState()
}
-
- }else if(operationType == 5) {
+
+ } else if (this.operationType == 5) {
// 鍗曟嵁涓嬫帹
- let {HSourceBillType, HInterID, HBillNo} = e
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo,
+ } = e
this.getMaxNum()
this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
-
+
this.InitConkType()
this.InitConkReason()
this.InitDept()
this.InitEmp()
},
methods: {
- searchModule() {
- this.$refs['billListMould'].showPopup()
- },
- MouldBillHandler(mould) {
- if(!mould.enableMultiSourceBill){
- let val = mould.val[0]
- this.hform.HBarCode = val['鏉＄爜缂栧彿']
- this.getHBarCodeData(this.hform.HBarCode)
- }
- this.$refs['billListMould'].exit()
- },
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if (!mould.enableMultiSourceBill) {
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
// 鏁呴殰绫诲埆
async InitConkType() { // 鍒濆鍖栨晠闅滅被鍒�
try {
@@ -590,11 +596,11 @@
}
},
-
+
// 鏂板鍥炶皟
addNew() {
uni.redirectTo({
- url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?OperationType=1'
+ url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?operationType=1'
})
},
//鏂板
@@ -624,7 +630,7 @@
})
},
});
- },
+ },
checkBillValidate() {
let message = ''
@@ -636,7 +642,7 @@
message = '鏈～鍐欓儴闂�'
} else if (!this.hform.HEmpName) {
message = '鏈～鍐欏彂鐜颁汉'
- }
+ }
if (!message) {
return true
}
@@ -688,12 +694,12 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?OperationType=1'
+ url: '/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
setTimeout(() => {
- uni.navigateBack();
+ uni.navigateBack();
}, 50)
}
}
@@ -730,18 +736,23 @@
},
async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
// 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
- if(HSourceBillType == 3815) {
+ if (HSourceBillType == 3815) {
let res = await CommonUtils.doRequest2Async({
url: "/Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
data: {
HID: HInterID
}
})
-
- let {data,code, count, Message} = res.data
- console.log('data: ',data);
- if(code == 1) {
- console.log('data: ',data.h_v_Sc_MouldConkBookBillList_Edit);
+
+ let {
+ data,
+ code,
+ count,
+ Message
+ } = res.data
+ console.log('data: ', data);
+ if (code == 1) {
+ console.log('data: ', data.h_v_Sc_MouldConkBookBillList_Edit);
let data1 = data.h_v_Sc_MouldConkBookBillList_Edit[0]
this.hform.HMainSourceBillType = HSourceBillType
this.HMainSourceBillType = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
@@ -754,15 +765,20 @@
this.hform.HMouldName = data1.浜у搧妯″叿
this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
- }
- else {
+
+
+ } else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇婧愬崟澶辫触: ${Message}`
})
}
+
+
}
- }
+ },
+
+
}
}
</script>
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
index ca8997e..f669451 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -160,7 +160,7 @@
<view class="form-item">
<view class="title">渚涘簲鍟�:</view>
<view class="right">
- <input v-model="hform.HSupID" placeholder="" />
+ <input v-model="hform.HSupIDName" placeholder="" />
</view>
</view>
<view class="form-item">
@@ -583,10 +583,14 @@
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
try {
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
data: {
- sWhere: " where 1=1",
+ sWhere: sWhere,
}
})
@@ -793,7 +797,12 @@
this.HDetailList[0].HManagerID = this.hform.HManagerID
this.HDetailList[0].HRepairID = this.hform.HRepairID
let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr + `;${this.operationType}` + ';' + getUserInfo()[
+ let oprType = this.operationType
+ if(oprType == 4) {
+ // 涓嬫帹鐨勬搷浣滅被鍨嬩篃瑙嗕负鏂板
+ oprType = 1
+ }
+ let sMainSub = oMain + ';' + sSubStr + `;${oprType}` + ';' + getUserInfo()[
'Czymc'];
let res = await CommonUtils.doRequest2Sync({
url: "/Sc_MouldRepairSendWorkBill/AddBill",
@@ -869,6 +878,10 @@
this.hform.HMouldName = data1.浜у搧妯″叿
this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+ this.hform.HRepairContent = data1.鏁呴殰鍘熷洜
+
+ this.enableEdit = false
+ this.showHMainSourceBillType = false
}
else {
CommonUtils.showTips({
diff --git a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
index 9866e89..de29416 100644
--- a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
+++ b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
@@ -83,10 +83,12 @@
}else if(tab == 1) {
uni.navigateTo({
url: '/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill?operationType=5' + Query
+ + `&HRepairSendWorkID=${item.HRepairSendWorkID}`
})
}else if(tab == 2) {
uni.navigateTo({
url: '/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill?operationType=4' + Query
+ + `&HRepairBillNo=${item['鍣ㄥ叿缁翠慨璁板綍鍗�']}&HRepairID=${item['HRepairWorkID']}&HRepairSendWorkID=${item.HRepairSendWorkID}`
})
}
},
@@ -109,7 +111,7 @@
let res = await CommonUtils.doRequest2Async({
url: 'Sc_MouldRepairCheckTaskReport/RepairCheckList2',
data: {
- user: getUserInfo()["Czymc"]
+ user: getUserInfo()["HEmpName"]
}
})
@@ -156,7 +158,7 @@
}
}
},
- onLoad() {
+ onShow() {
this.getRepairList()
}
}
diff --git a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
index 6d8ca18..5304389 100644
--- a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
@@ -14,23 +14,22 @@
@confirm="getHBarCodeData(hform.HBarCode)" />
</view>
<uni-icons type="scan"
- style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
- size="20" @click="toScanCode"></uni-icons>
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
+ size="20" @click="toScanCode"></uni-icons>
</view>
- <view class="form-item" @click="searchModule">
- <view class="title">鍣ㄥ叿</view>
- <view class="righton" style="width: 350rpx;">
- <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
- </view>
- <uni-icons type="search"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" ></uni-icons>
- </view>
+ <view class="form-item" @click="searchModule">
+ <view class="title">鍣ㄥ叿</view>
+ <view class="righton" style="width: 350rpx;">
+ <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
+ </view>
+ <uni-icons type="search"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20"></uni-icons>
+ </view>
<view class="form-item">
<view class="title">婧愬崟绫诲瀷</view>
<view class="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType"
- @change="HMainSourceBillTypeChange">
+ <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
<input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
@@ -175,8 +174,7 @@
<view class="form-item">
<view class="title">鏂拌璁″鍛�</view>
<view class="right">
- <input v-model="hform.HNewDesignLife"
- placeholder="璇疯緭鍏ユ柊璁捐瀵垮懡..." />
+ <input v-model="hform.HNewDesignLife" placeholder="璇疯緭鍏ユ柊璁捐瀵垮懡..." />
</view>
</view>
<view class="form-item">
@@ -261,7 +259,7 @@
:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
</BillListPopupMouldConkBookBillVue>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
- <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
+ <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
</view>
</template>
<script>
@@ -277,13 +275,13 @@
} from '../../../utils/userRelationManager';
import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
import BarCodePopupVue from "../../../components/BarCodePopup/BarCodePopup.vue";
- import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
+ import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
import dayjs from 'dayjs';
export default {
components: {
BarCodePopupVue,
BillListPopupMouldConkBookBillVue,
- BillListPopupMouldVue,
+ BillListPopupMouldVue,
},
data() {
@@ -347,15 +345,15 @@
"HMainSourceInterID": "0",
"HMainSourceEntryID": "0",
"XDHList": "",
- "HRepairBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HRepairEndDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HRepairAccepDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HRepairBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HRepairEndDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HRepairAccepDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HRepairContent": "",
"HPlanTimes": "0",
"HTimes": "0",
"HBillNo": "",
"HInterID": "0",
- "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HDeptName": getUserInfo()["HDeptName"],
"HDeptID": getUserInfo()["HDeptID"],
"HEmpName": getUserInfo().HEmpName,
@@ -397,12 +395,25 @@
computed: {},
onLoad(e) {
console.log(e, this.userInfo)
- this.OperationType = e.OperationType
+ this.operationType = e.operationType || 1
if (e.HInterID) {
- this.HInterID_Temp = e.HInterID
- // this.btnType = 1
- this.RoadBillMain(e.HInterID)
- this.barCodeFocus = true
+ if (this.operationType == 5) {
+ // 涓嬫帹
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo,
+ HRepairSendWorkID
+ } = e
+ // 涓嬫帹
+ this.getNewData()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo, HRepairSendWorkID)
+ } else {
+ this.HInterID_Temp = e.HInterID
+ // this.btnType = 1
+ this.RoadBillMain(e.HInterID)
+ this.barCodeFocus = true
+ }
} else {
this.getNewData()
this.HSourceBillNoFocus = true
@@ -412,7 +423,7 @@
this.InitEmp()
this.InitSupplier()
this.InitRepairName()
- this.loadCache()
+ this.loadCache()
uni.$on('BillSelectComplete', (e) => {
console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
this.hform.HMainSourceInterID = e.HInterID
@@ -429,27 +440,86 @@
uni.$off('BillSelectComplete')
},
methods: {
- searchModule() {
- this.$refs['billListMould'].showPopup()
- },
- MouldBillHandler(mould) {
- if(!mould.enableMultiSourceBill){
- let val = mould.val[0]
- this.hform.HBarCode = val['鏉＄爜缂栧彿']
- this.getHBarCodeData(this.hform.HBarCode)
- }
- this.$refs['billListMould'].exit()
- },
+ async getSendWorkBill(HRepairSendWorkID) {
+ let res2 = await CommonUtils.doRequest2Async({
+ url: "/Sc_MouldRepairSendWorkBill/Sc_MouldRepairSendWorkBill_Edit",
+ data: {
+ "linterid": HRepairSendWorkID,
+ "user": getUserInfo()["Czymc"]
+ }
+ })
+
+ let {data, count, Message} = res2.data
+ if(count == 1) {
+ this.RepairNameChange(data[0]["缁翠慨椤圭洰"])
+ this.hform.HRepairContent = data[0]["缁翠慨鍐呭"]
+ } else {
+
+ }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo,HRepairSendWorkID) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓哄櫒鍏锋晠闅滅櫥璁板崟
+ if (HSourceBillType == 3815) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
+ data: {
+ HID: HInterID
+ }
+ })
+
+ let {
+ data,
+ code,
+ count,
+ Message
+ } = res.data
+
+ if (code == 1) {
+ console.log('data: ', data.h_v_Sc_MouldConkBookBillList_Edit);
+ let data1 = data.h_v_Sc_MouldConkBookBillList_Edit[0]
+ this.hform.HMainSourceBillType = HSourceBillType
+ this.HMainSourceBillType = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
+ this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data1.hmainid
+ this.hform.HMainSourceEntryID = data1.hsubid
+ this.hform.HMouldID = data1.HMouldID
+ this.hform.HManagerName = data1.璐熻矗浜�
+ this.hform.HManagerID = data1.HManagerID
+ this.hform.HEmpID = data1.HEmpID || getUserInfo()["HEmpID"]
+ this.hform.HBarName = data1.浜у搧妯″叿
+ this.hform.HBarModel = data1.妯″叿鍨嬪彿
+ this.hform.HBarSpec = data1.妯″叿瑙勬牸
+
+ this.getSendWorkBill(HRepairSendWorkID)
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
+ },
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if (!mould.enableMultiSourceBill) {
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
// 缁翠慨椤圭洰
async InitRepairName() { // 鍒濆鍖栫淮淇」鐩�
try {
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/Gy_RepairList_PDA',
data: {
- sWhere: ''
+ sWhere: ''
}
})
-
+
let {
count,
data,
@@ -474,13 +544,13 @@
},
RepairNameChange(elem) {
let index = this.RepairNameNameList.findIndex(e => e == elem)
-
+
if (index == -1) {
this.hform.HRepairName = ''
this.hform.HRepairID = 0
return
}
-
+
this.hform.HRepairName = this.RepairNameList[index]['HName']
this.hform.HRepairID = this.RepairNameList[index]['HItemID']
},
@@ -752,30 +822,30 @@
this.hform.HMainSourceBillType = -1
return
}
- console.log(e.detail.value)
- console.log(e)
+ console.log(e.detail.value)
+ console.log(e)
this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
- uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
- HSourceBillTypeName: this.HMainSourceBillType,
- HSourceBillType: this.hform.HMainSourceBillType
- })
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ })
},
- // 璇诲彇缂撳瓨
- loadCache() {
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
- if (HBillTypeCache) {
- this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
- this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
- }
- },
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
// 鎵弿妯″叿鏉＄爜
async getHBarCodeData(HBarCode) {
if (!HBarCode) {
@@ -1086,7 +1156,7 @@
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
setTimeout(() => {
- uni.navigateBack();
+ uni.navigateBack();
}, 50)
}
}
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
index a164ff2..7ca551e 100644
--- a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -15,8 +15,8 @@
<input v-model="hform.HBarCode" @confirm="GetMessageByBarCode(hform.HBarCode)"
placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉＄爜" />
</view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+ <view class="icon-wrapper" @click="toScanCode">
+ <uni-icons type="scan" size="20" ></uni-icons>
</view>
</view>
<view class="form-item">
@@ -120,8 +120,8 @@
<view class="right">
<input type="text" :value="hform.HMouldMaintainRuleInterNo" />
</view>
- <view class="icon-wrapper">
- <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+ <view class="icon-wrapper" @click="toCheckFile">
+ <uni-icons type="search" size="20" ></uni-icons>
</view>
</view>
</view>
@@ -173,6 +173,7 @@
</uni-card>
</view>
<view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+ <view style="height: 120rpx;"></view>
</template>
<!-- 鍏朵粬淇℃伅 -->
<template v-if="tabs == 2">
@@ -298,12 +299,12 @@
hform: {
HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
HQty: 1,
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
HMaintainLevName: "",
HMaintainLevID: 0,
HRemark: "",
@@ -510,7 +511,7 @@
this.HCheckFileList = Array.from(data).map(item => {
return {
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ // "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
"HMaintainItemID": item.淇濆吇椤圭洰ID,
"HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
"HMaintainPart": item.淇濆吇閮ㄤ綅, // 淇敼瀛楁鍚�
@@ -615,7 +616,7 @@
"HManagerID": item.璐熻矗浜篒D || 0,
"HManagerCode": item.璐熻矗浜轰唬鐮� || "",
"HManagerName": item.璐熻矗浜哄悕绉� || "",
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ "HMaintainResult": item.榛樿淇濆吇缁撴灉 == 'OK' ? true : false,
"HRemark": item.琛ㄤ綋澶囨敞 || "",
};
});
diff --git a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
index 678ab03..c181c65 100644
--- a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
+++ b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -335,8 +335,8 @@
hform: {
HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
HQty: 0,
HErrNote: "",
HBigSafeNote: "",
@@ -345,7 +345,7 @@
HShiftsID: 0,
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HRemark: "",
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill_tablet.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill_tablet.vue
new file mode 100644
index 0000000..2b82411
--- /dev/null
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill_tablet.vue
@@ -0,0 +1,1436 @@
+<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 :class="mainTabSelected == 4 ? 'selected' : ''" @tap="mainTabSelected = 4">鍏朵粬淇℃伅</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-select" 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> -->
+ <zxz-uni-data-select
+ v-model="hform.HSourceBillType"
+ dataKey="typeName"
+ dataValue="typeID"
+ :filterable="true"
+ :localdata="HSourceBillTypeList"
+ :clear="false"
+ :disabled="hasSourceBill"
+ @change="HSourceBillTypeNameChange"
+ ></zxz-uni-data-select>
+ </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"
+ :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons>
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons class="right-icon" type="search"
+ :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill" size="20" @click="toBillSelector"></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>
+ <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 disabled">
+ <input type="number" v-model="hform.HSourceBillQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">妫�楠屾暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HCheckQty" :disabled="hasCheckQty" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">妫�楠屽憳</view>
+ <view class="right-select">
+ <zxz-uni-data-select
+ v-model="hform.HEmpID"
+ dataKey="鑱屽憳鍚嶇О"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HCheckEmpList"
+ :clear="false"
+ ></zxz-uni-data-select>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HProcName" />
+ </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="list" v-for="(item,index) in HisReportList" :key="index">
+ <uni-card :title="item.HBadReasonName" style="margin: 10px;" @tap="delReason(item, $event)">
+ <view class="card-detail">
+ <view
+ class="detail"
+ v-for="(value, key,keyIndex) in item"
+ :key="key"
+ v-if="shouldShowField(key, value)"
+ >
+ <text>{{ formatFieldName(key) }}锛�</text>{{ value }}
+ </view>
+ </view>
+ </uni-card>
+ </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 class="bill-main-content" v-if="mainTabSelected == 4">
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝粍</view>
+ <view class="right-select">
+ <zxz-uni-data-select
+ v-model="hform.HGroupID"
+ dataKey="鐝粍鍚嶇О"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HGroupList"
+ :clear="false"
+ ></zxz-uni-data-select>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right-select">
+ <zxz-uni-data-select
+ v-model="hform.HSourceID"
+ dataKey="鐢熶骇璧勬簮鍚嶇О"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HSourceList"
+ :clear="false"
+ ></zxz-uni-data-select>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 瀛愯〃鍖哄煙 -->
+ <view class="bill-sub-area">
+ <!-- 瀛愯〃椤电 -->
+ <view class="bill-sub-tabs">
+ <view v-for="subTab in subTabs" :key="subTab.typeID" :class="subTab.typeID == subTabSelected ? 'selected' : ''"
+ @tap="subTabSelected = subTab.typeID">{{ subTab.typeName }}</view>
+ </view>
+ <!-- 瀛愯〃鍐呭 -->
+ <view class="reason-container-flex">
+ <!-- 妫�娴嬪�� 鍛堢幇 -->
+ <view v-for="item in HBadReasonList"
+ v-if="item.涓嶈壇绫诲瀷id==subTabSelected"
+ :key="item.HItemID"
+ class="reason-item-flex"
+ :class="{ 'double-clicked': item.isDoubleClicked }"
+ @click="reasonClick(item)"
+ >
+ <view >
+ <view>{{ item.涓嶈壇鍘熷洜浠ｇ爜 }}</view>
+ <view>{{ item.涓嶈壇鍘熷洜鍚嶇О }}</view>
+ <view>姹囨姤鎬绘暟:{{ item.num }}</view>
+ </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>
+
+ <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
+ :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "../../../utils/common";
+
+ import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import {
+ MpaasScan
+ } from "../../../utils/mpaasScan";
+ export default {
+ components: {
+
+ BillListPopupVue,
+ },
+ computed: {
+ },
+ data() {
+ return {
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ //涓婁竴娆＄偣鍑绘椂闂�
+ lastClickTime: 0,
+ operationType: 1,
+
+ mainTabSelected: 1,
+ subTabSelected: 0,
+
+ // 婧愬崟鐘舵�佹帶鍒�
+ hasSourceBill: false,
+ hasCheckQty:false,
+ // 瀛愯〃 椤电淇℃伅
+ subTabs: {
+ 0: {
+ typeID: "0",
+ typeName: "鍏跺畠绫诲瀷",
+ },
+ },
+ HBadReasonList:[],
+ //婧愬崟绫诲瀷
+ HSourceBillTypeList:[{typeID:"3772",typeName:"宸ュ簭娴佽浆鍗�"},{typeID:"0",typeName:"鍘嗗彶缂撳瓨"}],
+ //鐢熶骇璧勬簮
+ HSourceList:[],
+ //妫�楠屽憳
+ HCheckEmpList:[],
+ //鐝粍
+ HGroupList:[],
+ //鍘嗗彶鎵爜璁板綍
+ HisReportList:[],
+ // 涓昏〃灞炴��
+ hform: {
+ HBillType: '3717',
+ HBillNo: "",
+ HInterID: "0",
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HSourceID: getUserInfo().HSourceID,
+ HEmpID:getUserInfo().HEmpID,
+ HGroupID:getUserInfo().HGroupID,
+ HDeptID:0,
+ HMaterNumber: "",
+ HMaterID: "0",
+ HMaterName: "",
+ HProcID: "0",
+
+ HRemark: "",
+ HMaker: getUserInfo()["Czymc"] || "",
+ HChecker: "",
+ HCloseMan: "",
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+ HCheckDate: "",
+ HCloseDate: "",
+ HUpDater: "",
+ HDeleteMan: "",
+ HUpDateDate: "",
+ HDeleteDate: "",
+
+ HCheckQty: 0,
+ //婧愬崟淇℃伅
+ HSourceBillQty: 0,
+ HSourceBillNo:'',
+ HSourceBillType: "3772",
+ //娴佽浆鍗′俊鎭�
+ HICMOBillNo: "",
+ HICMOInterID: "0",
+ HICMOEntryID: "1",
+ HICMOQty: "0",
+ HProcExchBillNo: "",
+ HProcExchInterID: "0",
+ HProcExchEntryID: "0",
+ HProcExchQty: "0",
+ HMainSourceBillType: "",
+ HMainSourceInterID: "0",
+ HMainSourceEntryID: "1",
+ HMainSourceBillNo: "",
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ },
+ };
+ },
+ methods: {
+ // 鍒ゆ柇鍝簺瀛楁闇�瑕佹樉绀�
+ shouldShowField(key, value) {
+ // 鎺掗櫎涓嶉渶瑕佹樉绀虹殑瀛楁
+ const excludeKeys = ['鍗曟嵁鍙�', '鏃ユ湡']; // 杩欎簺瀛楁宸茬粡鍦ㄥ叾浠栧湴鏂规樉绀轰簡
+
+ // 鍒ゆ柇key鏄惁鍏ㄨ嫳鏂囷紙涓嶅寘鍚腑鏂囷級
+ const isAllEnglish = /^[a-zA-Z]+$/.test(key);
+
+ // 鍒ゆ柇key鏄惁鍖呭惈"ID"锛堜笉鍖哄垎澶у皬鍐欙級
+ const containsID = key.toUpperCase().includes('ID');
+
+ return !excludeKeys.includes(key) &&
+ //!isAllEnglish && // 鎺掗櫎鍏ㄨ嫳鏂囩殑key
+ !containsID && // 鎺掗櫎鍖呭惈ID鐨刱ey
+ value !== null &&
+ value !== undefined &&
+ value !== '';
+ },
+
+ // 鏍煎紡鍖栧瓧娈靛悕鏄剧ず
+ formatFieldName(key) {
+ // 浣犲彲浠ユ牴鎹渶姹傝嚜瀹氫箟鏄剧ず鍚嶇О
+ const nameMap = {
+ 'HBadReasonNumber': '涓嶈壇鍘熷洜浠ｇ爜',
+ 'HBadReasonHName': '涓嶈壇鍘熷洜鍚嶇О',
+ 'HCheckMan': '妫�楠屽憳',
+ 'HGroupName': '鐝粍',
+ 'HSourceName': '鐢熶骇璧勬簮',
+ // ... 鍏朵粬瀛楁鏄犲皠
+ };
+ return nameMap[key] || key;
+ },
+ //涓嶈壇鍘熷洜鍗曞嚮
+ reasonClick(item) {
+ const now = Date.now();
+ if (now - this.lastClickTime < 300) {
+ // 鍙屽嚮閫昏緫
+ this.handleDoubleClick(item);
+ this.lastClickTime = 0;
+ } else {
+ // 鍗曞嚮閫昏緫
+ this.handleSingleClick(item);
+ this.lastClickTime = now;
+ }
+ },
+ handleSingleClick(item) {
+ console.log('鍗曞嚮:', item.涓嶈壇鍘熷洜鍚嶇О);
+ },
+ handleDoubleClick(item) {
+
+
+ // 璁剧疆鍙屽嚮鐘舵��
+ this.$set(item, 'isDoubleClicked', true);
+
+ // 300ms鍚庣Щ闄ゅ姩鐢荤被锛堜笌鍔ㄧ敾鏃堕暱鍖归厤锛�
+ setTimeout(() => {
+ this.$set(item, 'isDoubleClicked', false);
+ }, 300);
+
+ // 瀹為檯涓氬姟閫昏緫
+ console.log('鍙屽嚮:', item.涓嶈壇鍘熷洜鍚嶇О);
+
+ this.submitBarCode(item);
+ uni.vibrateShort(); // 鍙�夛細闇囧姩鍙嶉
+ },
+ // 婧愬崟绫诲瀷閫夋嫨
+ HSourceBillTypeNameChange(e) {
+
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillType: this.hform.HSourceBillType
+ })
+ },
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
+ // 鏍规嵁婧愬崟绫诲瀷閫夋嫨鍗曟嵁
+ toBillSelector() {
+ this.$refs['billList'].showPopup()
+ },
+ toScanCode() {
+ MpaasScan.scanCode((res) => {
+ if (res) {
+ this.getSourceBillInfo(res);
+ }
+ });
+ },
+ async getGy_BadReasonList() {
+ let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(瀹℃牳浜�,'') != '' `
+ if (this.serverUrl == 'http://122.228.39.234:7177/API/') {
+ //娴疯瘹鏍规嵁鐗╂枡鍒嗙粍璁剧疆涓嶈壇鍘熷洜
+ sWhere += " and 涓嶈壇绫诲瀷 like '%鎴愬搧%' order by 涓嶈壇鍘熷洜浠ｇ爜"
+ }else{
+ sWhere += " order by 涓嶈壇鍘熷洜浠ｇ爜"
+ }
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_BadReason/list",
+ data: {
+ sWhere:sWhere,
+ user:getUserInfo()["Czymc"]
+ }
+ })
+
+ console.log(res)
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ data.forEach(item=>{
+ const typeID = item["涓嶈壇绫诲瀷id"]
+ const typeName = item["涓嶈壇绫诲瀷"]
+ if (!this.subTabs[typeID]) {
+ this.subTabs[typeID] = {
+ typeID: typeID,
+ typeName: typeName
+ }
+ }
+ })
+ this.HBadReasonList = data;
+
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ },
+ async getSourceBillInfo(HBarCode) {
+ console.log('HBarCode: ', HBarCode);
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+ data: {
+ HBillType: this.hform.HBillType,
+ HSourceBillType: this.hform.HSourceBillType,
+ HBarCode: HBarCode,
+ HInterID: 0,
+ HEntryID: 0,
+ Mode: 1 ,//鎵爜妯″紡
+ user:getUserInfo()["Czymc"]
+ }
+ })
+
+ console.log(res)
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ //婧愬崟淇℃伅
+ this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HSourceBillQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID= data[0].HICMOInterID
+ this.hform.HICMOEntryID= data[0].HICMOEntryID
+ this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
+ this.hform.HProcExchInterID= data[0].HInterID
+ this.hform.HProcExchEntryID= data[0].HEntryID
+ this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
+ this.hasSourceBill = true
+
+ this.hform.HSourceName= data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID= data[0].HSourceID
+ this.hform.HProcID= data[0].HProcID
+ this.hform.HProcName= data[0].褰撳墠宸ュ簭
+ this.hform.HDeptID= data[0].HWorkShopID
+
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ },
+ async HandleBillSelectComplete(e) {
+ if(this.hform.HSourceBillType=="0"){
+ this.hform.HSourceBillType = e.billInfo["HSourceBillType"];
+ this.hform.HBillNo = e.billInfo["缂撳瓨鍗曟嵁鍙�"];
+ this.hform.HInterID = e.billInfo["HInterID"];
+ this.hform.HCheckQty = e.billInfo["妫�楠屾暟閲�"];
+ await this.getHisReportList();
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+ data: {
+ HBillType: this.hform.HBillType,
+ HSourceBillType: this.hform.HSourceBillType,
+ HBarCode: "",
+ HInterID: e?.HInterID,
+ HEntryID: e?.HEntryID,
+ Mode: 2 ,//閫夊崟妯″紡
+ user:getUserInfo()["Czymc"]
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ //濡傛灉婧愬崟鏁伴噺瓒呭嚭鎻愮ず
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
+ console.log('鑾峰彇婧愬崟锛�', data)
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ //婧愬崟淇℃伅
+ this.hform.HMainSourceBillNo = data[0]['HBillNo']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HSourceBillQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID= data[0].HICMOInterID
+ this.hform.HICMOEntryID= data[0].HICMOEntryID
+ this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
+ this.hform.HProcExchInterID= data[0].HInterID
+ this.hform.HProcExchEntryID= data[0].HEntryID
+ this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
+
+ this.hasSourceBill = true
+
+ this.hform.HSourceName= data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID= data[0].HSourceID
+ this.hform.HProcID= data[0].HProcID
+ this.hform.HProcName= data[0].褰撳墠宸ュ簭
+ this.hform.HDeptID= data[0].HWorkShopID
+ this.$refs['billList'].exit()
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: "婧愬崟涓嬫帹閿欒: " + err
+ })
+ }
+
+ },
+ // 鍘嗗彶鎵爜璁板綍鑾峰彇鍒濆鍖�
+ async getHisReportList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sc_QualityReportBill/get_BarCodeDetail",
+ data: {
+ HInterID: this.hform.HInterID,
+
+ },
+ });
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+
+ if (count == 1) {
+ console.log("data: ", data);
+ this.HisReportList = data;
+
+ } else {
+ this.HisReportList = [];
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍘嗗彶鎵爜璁板綍澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍘嗗彶鎵爜璁板綍澶辫触: ${err}`,
+ });
+ }
+ },
+ //鍒犻櫎鍘嗗彶璁板綍
+ delReason(item) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� "' + item.HBadReasonHName + '" 鐨勬壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ uni.request({
+ url: this.serverUrl +
+ '/Sc_QualityReportBill/del_BarCodeDetail',
+ data: {
+ HItemID: item.HItemID,
+
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.getHisReportList()
+ uni.showToast({
+ title: "鍒犻櫎鎴愬姛",
+ icon: 'none'
+ })
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ });
+
+ }
+ }
+ });
+ },
+
+ // 妫�楠屽憳鍒濆鍖�
+ async InitHEmp() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Employee/list",
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 = '' `,
+ user: getUserInfo()["Czymc"],
+ Organization: uni.getStorageSync("Organization"),
+ },
+ });
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+
+ if (count == 1) {
+ console.log("data: ", data);
+ this.HCheckEmpList = data;
+
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+ });
+ }
+ },
+ // 鐢熶骇璧勬簮鍒濆鍖�
+ async InitHSource() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Source/list",
+ data: {
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+
+ if (count == 1) {
+ this.HSourceList = data;
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+ });
+ }
+ },
+ // 鐝粍鍒濆鍖�
+ async InitHGroup() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Group/list",
+ data: {
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+
+ if (count == 1) {
+ this.HGroupList = data;
+ } 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: "3717",
+ },
+ });
+
+ 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,
+ });
+ }
+ },
+ //鎻愪氦涓嶈壇鍘熷洜鎵爜璁板綍缂撳瓨
+ async submitBarCode(item){
+ if(!this.checkSubmitValidate()){
+ return
+ }
+ try {
+ let oMainObject = {
+ HInterID:this.hform.HInterID//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ ,HBillNo:this.hform.HBillNo
+ ,HBillType:this.hform.HBillType
+ ,HDate:new Date()
+ ,HICMOBillNo:this.hform.HICMOBillNo
+ ,HICMOInterID:this.hform.HICMOInterID
+ ,HICMOEntryID:this.hform.HICMOEntryID
+ ,HProcExchBillNo:this.hform.HProcExchBillNo
+ ,HProcExchInterID:this.hform.HProcExchInterID
+ ,HProcExchEntryID:this.hform.HProcExchEntryID
+ ,HProcID:this.hform.HProcID
+ ,HMaterID:this.hform.HMaterID
+ ,HSourceID:this.hform.HSourceID
+ ,HGroupID:this.hform.HGroupID
+ ,HDeptID:this.hform.HDeptID
+ ,HCheckManID:this.hform.HEmpID
+ ,HBadReasonID:item.HItemID
+ ,HBarCode:item.涓嶈壇鍘熷洜浠ｇ爜
+ ,HMaker:this.hform.HMaker
+ ,HMakeDate:this.hform.HMakeDate
+ ,HReportType:1
+ ,HSourceBillType:this.hform.HSourceBillType
+ ,HSourceBillNo:this.hform.HSourceBillNo
+ ,HSourceInterID:this.hform.HMainSourceInterID
+ ,HSourceEntryID:this.hform.HMainSourceEntryID
+ ,HBadReasonHQty:1
+ ,HQty:this.hform.HCheckQty
+ }
+ var sMainStr = JSON.stringify(oMainObject);
+ var oMain = sMainStr + ';' + this.operationType;
+
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_QualityReportBill/set_SaveBarCode",
+ data: {
+ oMain: oMain,
+ },
+ method: "POST",
+ });
+
+ if (!res) {
+ return;
+ }
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+ if (count == 1) {
+ CommonUtils.showTips({
+ title: "淇濆瓨鎴愬姛",
+ message: `淇濆瓨鎴愬姛`,
+ });
+ if(!item.num){
+ this.$set(item, 'num', 1);
+ }else{
+ this.$set(item, 'num', item.num+1);
+ }
+ console.log(item.num)
+ //this.$set(item, 'num', newValue);
+ this.getHisReportList();
+ this.hasCheckQty=true;
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `涓嶈壇鍘熷洜淇濆瓨閿欒: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `涓嶈壇鍘熷洜淇濆瓨閿欒: ${err}`,
+ });
+ }
+ },
+ checkSubmitValidate() {
+ // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+ // CommonUtils.showTips({
+ // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+ // });
+ // return false;
+ // }
+
+ if (this.hform.HCheckQty==0||this.hform.HCheckQty=="") {
+ CommonUtils.showTips({
+ message: "璇疯緭鍏ユ楠屾暟閲忥紒",
+ });
+ return false;
+ }
+ if (this.hform.HEmpID == 0) {
+ CommonUtils.showTips({
+ message: "妫�楠屽憳鏈�夋嫨锛�",
+ });
+ return false;
+ }
+ if (!this.hasSourceBill) {
+ CommonUtils.showTips({
+ message: "婧愬崟鏈�夋嫨锛�",
+ });
+ return false;
+ }
+
+ return true;
+ },
+ async submit() {
+ // if (!this.checkSubmitValidate()) {
+ // return;
+ // }
+ if(this.HisReportList.length<=0){
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `璇疯緭鍏ユ楠屼俊鎭痐,
+ });
+ return
+ }
+ try {
+ console.log('this.$refs: ', this.$refs);
+
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_QualityReportBill/set_SaveBill",
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HChecker: getUserInfo()["Czymc"],
+ HBillSubType: this.hform.HBillType
+ },
+ method: "Get",
+ });
+
+ 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/QualityReportStep/QualityReportStepBill?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/QualityReportStep/QualityReportStepBill",
+ });
+ },
+ goBack() {
+ uni.navigateBack();
+ },
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
+ }
+ },
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
+
+ },
+ async onLoad(e) {
+ this.setAuto();
+ this.operationType = e.operationType || 1;
+ this.hform.HInterID = e.linterid || 0;
+ if (this.operationType == 1) {
+ await this.getMaxBillNo();
+ } else if (this.operationType == 2) {
+
+ }
+ this.getGy_BadReasonList();
+ await this.InitHSource();
+ await this.InitHEmp();
+ await this.InitHGroup();
+ await this.loadCache();
+ },
+ onUnload(){
+ this.setPortrait();
+ }
+ };
+</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: 100%;
+ 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: row;
+ flex-wrap: wrap; /* 瓒呭嚭鑷姩鎹㈣ */
+ /* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
+ align-content: flex-start; /* 澶氳瀵归綈鏂瑰紡 */
+ .form-item {
+ width: 600rpx;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
+ margin-right: 20rpx;
+ .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;
+ }
+ }
+ .right-select {
+ //padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+
+ }
+ .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: 50%;
+
+ .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;
+ }
+ .editable-input {
+ border: 1px solid #acacac;
+ border-radius: 5rpx;
+ 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;
+ }
+ .enable-icon-button {
+ background-color: #3a78ff;
+ padding: 6rpx;
+ color: #fff;
+ border-radius: 100%;
+ }
+
+ .disable-icon-button {
+ background-color: lightgray;
+ padding: 6rpx;
+ color: #fff;
+ border-radius: 100%;
+ pointer-events: none;
+ }
+ /* 鍩虹鏍峰紡 */
+ .reason-container-flex {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+ align-items: flex-start;
+ gap: 10px; /* 鏂瑰潡闂磋窛 */
+ padding: 10px;
+ box-sizing: border-box;
+ }
+
+ .reason-item-flex {
+ /* 鏂瑰潡鍩虹鏍峰紡 */
+ background-color: #f5f5f5;
+ border-radius: 8px;
+ padding: 12px 16px;
+ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+ transition: all 0.3s ease;
+
+ /* 鏂囧瓧鏍峰紡 */
+ font-size: 14px;
+ color: #333;
+ text-align: center;
+
+ width: 300rpx;
+
+ /* 纭繚鍐呭涓嶆崲琛屾椂灞呬腑 */
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ /* 鍙屽嚮鍔ㄧ敾鏁堟灉 */
+ @keyframes doubleClickPulse {
+ 0% {
+ transform: scale(1);
+ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+ }
+ 50% {
+ transform: scale(0.95);
+ box-shadow: 0 0 0 3px rgba(24, 144, 255, 0.3);
+ }
+ 100% {
+ transform: scale(1);
+ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+ }
+ }
+ .reason-item-flex.double-clicked {
+ animation: doubleClickPulse 0.5s ease-out;
+ background-color: #e6f7ff;
+ border: 1px solid #91d5ff;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/guzhangdengji/EqpConkBookBill.vue b/pages/guzhangdengji/EqpConkBookBill.vue
index 4dd4ac3..8e4dc0f 100644
--- a/pages/guzhangdengji/EqpConkBookBill.vue
+++ b/pages/guzhangdengji/EqpConkBookBill.vue
@@ -261,9 +261,13 @@
},
//鑾峰彇鍙戠幇浜�/璐熻矗浜烘暟鎹�
getEmpList(){
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
uni.request({
url: this.serverUrl + '/PublicPageMethod/UserList',
- data: { sWhere: '' },
+ data: { sWhere: sWhere },
success: (res) => {
if(res.data.count == 1){
this.EmpNameList = res.data.data
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 185ea40..dfbe9a4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,8 @@
<template>
<view class="content">
- <view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
+
+ <view class="header">
+ 鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
<view class="switch-button">
<uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
</view>
@@ -344,7 +346,20 @@
"id": 25,
"hidden": false
},
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閿�鍞嚭搴撳崟楠岃瘉",
+ "url": "/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP",
+ "id": 26,
+ "hidden": false
+ },
{
+ "img": "../../static/icon/icon15.png",
+ "text": "鐩存帴璋冩嫧鍗曢獙璇�",
+ "url": "/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP",
+ "id": 28,
+ "hidden": false
+ },{
"img": "../../static/icon/icon21.png",
"text": "灏忓崼鎷嗙",
"url": "/pages/chaixiang/chaixiang_xiaowei",
@@ -364,6 +379,13 @@
id: 37,
hidden: false,
},
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "鍒嗘寮忚皟鍑哄崟楠岃瘉",
+ "url": "/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP",
+ "id": 28,
+ "hidden": false
+ }
],
}
},
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a2dc24f..3c5cc2d 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -110,7 +110,7 @@
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.102:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.20.35:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
// 灏忓崼鍐呭缃�
@@ -127,7 +127,7 @@
"瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
},
- serverUrlName: uni.getStorageSync('serverUrlName') || '閿﹂殕-鏅鸿兘瀹跺眳-澶栫綉',
+ serverUrlName: uni.getStorageSync('serverUrlName') || '娴欐睙鏅轰簯杩堟��',
arrayOrganization: [],
Organization: '',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 507cc34..0304c3d 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -524,7 +524,36 @@
url: '/pages/EmployeeRecords/EmployeeRecordsBillList',
id: 65,
hidden: false,
- },{
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閲囪喘璁㈠崟鍒楄〃",
+ "url": "/pages/caigoudingdan/caigoudingdanList",
+ "id": 66,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閿�鍞鍗曞垪琛�",
+ "url": "/pages/xiaoshoudingdan/xiaoshoudingdanBillList",
+ "id": 67,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "鐗规壒鍗曞垪琛�",
+ "url": "/pages/tepidan/TePiDanList",
+ "id": 68,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "瀹㈣瘔澶勭悊鍗曞垪琛�",
+ "url": "/pages/CustomerComplaintsBill/CustomerComplaintsBillList",
+ "id": 69,
+ "hidden": false
+ },
+ {
"img": "../../static/icon/icon17.png",
"text": "鐢熶骇閫�鏂欐牎楠屾殏瀛樺垪琛�",
"url": "/pages/shengchantuiliaoCheck/MateOutBackCheckBillList",
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 10fad41..9ace52d 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -182,41 +182,7 @@
"id": 19,
"hidden": false
},
- {
- "img": "../../static/icon/icon15.png",
- "text": "閲囪喘璁㈠崟鍒楄〃",
- "url": "/pages/caigoudingdan/caigoudingdanList",
- "id": 20,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "閿�鍞鍗曞垪琛�",
- "url": "/pages/xiaoshoudingdan/xiaoshoudingdanBillList",
- "id": 21,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "鐗规壒鍗曞垪琛�",
- "url": "/pages/tepidan/TePiDanList",
- "id": 22,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "閿�鍞嚭搴撳崟楠岃瘉",
- "url": "/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP",
- "id": 23,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "瀹㈣瘔澶勭悊鍗曞垪琛�",
- "url": "/pages/CustomerComplaintsBill/CustomerComplaintsBillList",
- "id": 23,
- "hidden": false
- },
+
]
}
},
diff --git a/pages/index/vers.vue b/pages/index/vers.vue
index 96ad6a6..779d7a7 100644
--- a/pages/index/vers.vue
+++ b/pages/index/vers.vue
@@ -60,6 +60,20 @@
// "Content": ""
if (result.data.count == 1) {
var datas = result.data.data[index]
+ // 灏濊瘯鍖归厤 涓� 鐧诲綍鐨剈rl http鍦板潃鐩稿悓鐨勪笅杞藉湴鍧�
+ for(let i =0;i<result.data.data.length;i++) {
+ console.log(`result.data.data[${i}].DowloadPath: `,result.data.data[i].DowloadPath);
+ // 鍘婚櫎鏈�鍚庝竴涓弽鏂滄潬
+ let tempUrl = _this.serverUrl.substring(0, _this.serverUrl.length - 1)
+ // 鑾峰彇API鍓嶇殑鍙嶆枩鏉犱綅缃�
+ let LastBackSlash = tempUrl.lastIndexOf("/")
+ tempUrl = tempUrl.substring(0, LastBackSlash)
+ if(result.data.data[i].DowloadPath.includes(tempUrl)) {
+ datas = result.data.data[i]
+ index = -1
+ }
+ }
+
let dataLength = result.data.data.length
uni.setStorageSync('remarkURL',datas.DowloadPath)
plus.runtime.getProperty(plus.runtime.appid, function(inf) {
diff --git a/pages/shebeidangan/Gy_EquipFileMainBill.vue b/pages/shebeidangan/Gy_EquipFileMainBill.vue
index ca12485..95e3f8d 100644
--- a/pages/shebeidangan/Gy_EquipFileMainBill.vue
+++ b/pages/shebeidangan/Gy_EquipFileMainBill.vue
@@ -750,9 +750,13 @@
},
//鑾峰彇浣跨敤/缁存姢璐熻矗浜烘暟鎹�
getEmpList(){
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
uni.request({
url: this.serverUrl + '/PublicPageMethod/UserList',
- data: { sWhere: '' },
+ data: { sWhere: sWhere },
success: (res) => {
if(res.data.count == 1){
this.EmpNameList = res.data.data
diff --git a/pages/shebeiguanli/deviceManage.vue b/pages/shebeiguanli/deviceManage.vue
index be263e9..7490ea4 100644
--- a/pages/shebeiguanli/deviceManage.vue
+++ b/pages/shebeiguanli/deviceManage.vue
@@ -753,9 +753,13 @@
},
//鑾峰彇浣跨敤/缁存姢璐熻矗浜烘暟鎹�
getEmpList(){
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
uni.request({
url: this.serverUrl + '/PublicPageMethod/UserList',
- data: { sWhere: '' },
+ data: { sWhere: sWhere },
success: (res) => {
if(res.data.count == 1){
this.EmpNameList = res.data.data
diff --git a/pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue b/pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue
index d412ac5..84f9c4c 100644
--- a/pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue
+++ b/pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue
@@ -300,9 +300,13 @@
},
//鑾峰彇缁翠慨浜�/璐熻矗浜烘暟鎹�
getEmpList(){
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
uni.request({
url: this.serverUrl + '/PublicPageMethod/UserList',
- data: { sWhere: '' },
+ data: { sWhere: sWhere },
success: (res) => {
if(res.data.count == 1){
this.EmpNameList = res.data.data
diff --git a/pages/weiwaigxOut/firstCheck.vue b/pages/weiwaigxOut/firstCheck.vue
index 38fcc57..9799ff2 100644
--- a/pages/weiwaigxOut/firstCheck.vue
+++ b/pages/weiwaigxOut/firstCheck.vue
@@ -749,9 +749,13 @@
},
//鑾峰彇浣跨敤/缁存姢璐熻矗浜烘暟鎹�
getEmpList(){
+ let sWhere= " where 1=1 "
+ if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
uni.request({
url: this.serverUrl + '/PublicPageMethod/UserList',
- data: { sWhere: '' },
+ data: { sWhere: sWhere },
success: (res) => {
if(res.data.count == 1){
this.EmpNameList = res.data.data
--
Gitblit v1.9.1