From c141b01c990146b4ef41c17a69ad3066d721a91c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 05 二月 2026 12:26:20 +0800
Subject: [PATCH] 调整 器具/设备 维修相关模块 页面
---
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/vers.vue | 7
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 | 13
pages/index/index.vue | 14
pages/shebeidangan/Gy_EquipFileMainBill.vue | 6
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue | 112
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue | 19
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue | 10
pages.json | 10
pages/index/tab4.vue | 7
pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList.vue | 6
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 52
/dev/null | 1741 ------------------------
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/weiwaigxOut/firstCheck.vue | 6
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | 19
26 files changed, 1,401 insertions(+), 2,875 deletions(-)
diff --git a/manifest.json b/manifest.json
index 3633c9a..c9f0b0a 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.74",
+ "versionCode" : 274,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 9f59f49..9de6831 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" : "閿�鍞嚭搴撳崟(楠岃瘉)"
@@ -1757,6 +1756,13 @@
{
"navigationBarTitleText" : "瀹㈣瘔鍗曠紪杈�"
}
+ },
+ {
+ "path" : "pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP",
+ "style" :
+ {
+ "navigationBarTitleText" : "鐩存帴璋冩嫧鍗�(楠岃瘉)"
+ }
}
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..0e664ec 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 = 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..33ce3d4 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -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..a22b9c8 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>
@@ -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..d5be3b7 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 = 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/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
deleted file mode 100644
index 571373a..0000000
--- a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
+++ /dev/null
@@ -1,1741 +0,0 @@
-<template>
- <view>
- <!-- 鍩烘湰淇℃伅 -->
- <view class="form">
- <view class="form-item">
- <view class="title">
- 浼犵エ:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HCP">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('HCP')"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">
- 鏉＄爜:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HBarCode" @confirm="GetMessageByBarCode">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('BarCode')"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">
- 鏁伴噺:
- </view>
- <view class="right">
- <input type="number" v-model="hform.HQty">
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撳簱:</view>
- <view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
- @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撲綅:</view>
- <!-- 鍥涚淮灏斿惎鐢ㄤ粨浣嶆壂鐮� 鍏朵粬瀹㈡埛鎸夐渶鍚敤鎺у埗 -->
- <view class="right">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
- v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
- @confirm="HStockPlaceNameScan"></uni-combox>
- </view>
- </view>
- </view>
- <view class="tabs horizon_tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鍣ㄥ叿淇℃伅</view>
- <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">鏉＄爜淇℃伅</view>
- <view :class="tabs == 5 ? 'on':''" @tap="tabs = 5">涓嬫灦淇℃伅</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="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
- @change="HMainSourceBillTypeChange">
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- <view class="righton" v-show="!showHMainSourceBillType">
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟鍗曞彿: </view>
- <view class="right">
- <input type="text" v-model="hform.HSourceBillNo"
- @confirm="GetMessageByHSourceBillNo(hform.HSourceBillNo)" />
- </view>
- <!-- 閫夋簮鍗曞姛鑳� -->
- <view class="icon-wrapper">
- <uni-icons type="search" size="20" @click=""></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍏堣繘鍏堝嚭浠�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏ヤ粨搴�" v-model="hform.HFIFOWHName"
- @input="HFIFOWHNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏃ユ湡: </view>
- <view class="right">
- <input type="text" v-model="hform.HDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟浜�: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HMaker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁ID: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HInterID" />
- </view>
- </view>
- </view>
- </template>
-
- <!-- 琛ㄥご淇℃伅 -->
- <template v-if="tabs == 1">
- <view class="form" :style="{
- height: containerHeight + 'px',
- overflow: 'auto'
- }">
- <view class="form-item">
- <view class="title">淇濈: </view>
- <zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HItemID"
- v-model="hform.HKeeperID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">鍙戣揣: </view>
- <zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HItemID"
- v-model="hform.HSecManagerID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">閮ㄩ棬: </view>
- <zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
- v-model="hform.HDeptID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">瀹㈡埛: </view>
- <view class="right">
- <input type="text" v-model="hform.HSupName" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁勭粐: </view>
- <view class="right">
- <input type="text" v-model="hform.HStockOrgName" />
- </view>
- </view>
- </view>
- </template>
-
- <!-- 鐗╂枡淇℃伅 -->
- <template v-if="tabs == 2">
- <view class="form" :style="{
- height: containerHeight + 'px',
- overflow: 'auto'
- }">
- <view class="list" v-for="(item,index) in HMaterList" :key="index">
- <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
- <view class="card-detail">
- <view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
- </view>
- <view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
- </view>
- <view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
- </view>
- <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
- </view>
- <!-- 鍏磋揪瀹㈡埛 鍔熻兘 -->
- <view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName
- )">
- <text>浠撳簱锛�</text>{{materMeta[0].HWHName}}
- </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="HMaterList.length == 0">鏆傛棤鏁版嵁</view>
- </view>
- </template>
-
- <!-- 鍣ㄥ叿淇℃伅 -->
- <template v-if="tabs == 3">
- <view class="form" :style="{
- height: containerHeight + 'px',
- 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)">
- <view class="card-detail">
- <view class="detail">
- <text>鍣ㄥ叿鏉＄爜锛�</text>{{item.鍣ㄥ叿鏉＄爜}}
- </view>
- <view class="detail">
- <text>鍣ㄥ叿鏉＄爜涓暟锛�</text>{{item.鍣ㄥ叿鏉＄爜涓暟}}
- </view>
- <view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="HMaterList.length == 0">鏆傛棤鏁版嵁</view>
- </view>
- </template>
-
- <!-- 鏉＄爜淇℃伅 -->
- <template v-if="tabs == 4">
- <view class="form" :style="{
- height: containerHeight + 'px',
- overflow: 'auto'
- }">
- <view class="form-item">
- <view class="title">鏉＄爜: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HBarCode_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐗╂枡: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HMaterName_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瑙勬牸: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HMaterModel_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎵规: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HBatchNo_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曚綅: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HUnitName_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏁伴噺: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HQty_B" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹归噺: </view>
- <view class="righton">
- <input type="text" disabled v-model="hform.HTMQty_B" />
- </view>
- </view>
- <view class="form-item">
- <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="righton">
- <input type="text" disabled v-model="hform.HSPName_B" />
- </view>
- </view>
- </view>
- </template>
-
- <!-- 涓嬫灦淇℃伅 -->
- <template v-if="tabs == 5">
- <view class="form" :style="{
- height: containerHeight + 'px',
- overflow: 'auto'
- }">
- <FIFOListComponentVue :FIFOList="HFIFOList"></FIFOListComponentVue>
- </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>
- <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
- :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="handleSourceBill"></BillListPopupVue>
- </view>
-</template>
-
-<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- import {
- getUserStockRelation
- } from '@/utils/userRelationManager';
- import FIFOListComponentVue from "@/components/FIFOListModule/FIFOListComponent.vue";
- import BillListPopupVue from "@/components/BillListPopup/BillListPopup.vue";
- export default {
- // 閿�鍞嚭搴撳崟(楠岃瘉)
- name: 'Kf_SellOutBill_CusBar_APP',
- components: {
- FIFOListComponentVue,
- BillListPopupVue
- },
- data() {
- return {
- tabs: 0,
-
- btnTop: 0,
- tabsBottom: 0,
- HModName: "Sb_EqpMaintenanceBill",
- operationType: 1,
- uploadOptions: {},
- enableEdit: true,
- enableSourceBillEdit: true,
-
- // 婧愬崟绫诲瀷鐩稿叧
- HMainSourceBillType: "鍙戣揣閫氱煡鍗�", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
- arrayHMainSourceBillType: ['鍙戣揣閫氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
- arrayHMainSourceBillTypeID: ['1402', '1401', '-1'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
- showHMainSourceBillType: true,
-
- arrayHWHName: [], //浠撳簱
- HWHNameList: [],
- arrayHStockPlaceName: [], //浠撲綅
- HStockPlaceNameList: [],
-
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
- HRepairList: [],
- HFIFOList: [],
-
- materMeta: [],
- HMaterList: [],
- HMouldList: [],
-
- hform: {
- "HCP": "",
- "HBarCode": "",
- "HQty": "",
- "HBarCode-BT": "",
- "HWHName": "",
- "HWHID": 0,
- "HWHID-BT": "",
- "HStockPlaceName": "",
- "HStockPlaceID": 0,
- "HSpID-BT": "",
- "HMainSourceBillType": "1402",
- "HSourceBillNo": "",
- "cmdHSourceBillNo": "",
- "HSourceBillNo-BT": "",
- "HFIFOWHName": "",
- "HFIFOWHID": 0,
- "HFIFOWHID-BT": "",
- "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
- "HMaker": getUserInfo()["Czymc"],
- "HBillNo": "",
- "HInterID": 0,
- "HKeeperName": getUserInfo()["HKeeperName"],
- "HKeeperID": getUserInfo()["HKeeperID"],
- "HKeeperID-BT": "",
- "HSecManagerName": getUserInfo()["HSecManagerName"],
- "HSecManagerID": getUserInfo()["HSecManagerID"],
- "HSecManagerID-BT": "",
- "HDeptName": getUserInfo()["HDeptName"],
- "HDeptID": getUserInfo()["HDeptID"],
- "HDeptID-BT": "",
- "HSupName": "",
- "HSupID": 0,
- "HSupID-BT": "",
- "HStockOrgName": uni.getStorageSync("Organization"),
- "HStockOrgID": uni.getStorageSync("OrganizationID"),
- "wl-table": "",
- "cmdMouldDel": "",
- "Mould-table": "",
- "HBarCode_B": "",
- "HMaterName_B": "",
- "HMaterModel_B": "",
- "HBatchNo_B": "",
- "HUnitName_B": "",
- "HQty_B": "",
- "HTMQty_B": "",
- "HWHName_B": "",
- "HSPName_B": "",
- "FIFOList-table": "",
- "cmdSaver": "",
- "cmdModify": "",
- "cmdDelete": "",
- "cmdCancel": "",
- "HBillType": "1205",
- "HBillerID": uni.getStorageSync("HBillerID"),
- "HRedBlueFlag": false,
- "HSourceBillListCtl": 0,
- "cs": "",
- "cs2": "",
- HSourceFlag: false,
- },
- 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
- }
- },
- HStockPlaceNameListComputed: {
- get() {
- // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
- return this.HStockPlaceNameList
- .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
- .map(e => e['浠撲綅鍚嶇О'])
- }
- }
- },
- methods: {
- // 鎺ユ敹婧愬崟
- handleSourceBill(e){
-
- },
- // 鏉＄爜鍒犻櫎
- async delMater(item) {
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: async (res) => {
- if (res.confirm) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
- data: {
- "HInterID": this.hform.HInterID,
- "HMaterID": item.HMaterID,
- "HAuxPropID": item.HAuxPropID,
- "HMTONo": item.HMTONo,
- "HSourceInterID": item.HSourceInterID,
- "HSourceEntryID": item.HSourceEntryID,
- "HBillType": this.hform.HBillType
- },
- })
-
- let {
- count,
- Message
- } = res.data
-
- if (count == 1) {
- this.DisBillEntryList()
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鍒犻櫎鏉＄爜閿欒: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鍒犻櫎鏉＄爜閿欒: ${err}`
- })
- }
- }
- }
- });
- },
- // 鍣ㄥ叿鍒犻櫎
- async delMould(item) {
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� " ' + item.鍣ㄥ叿鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: async (res) => {
- if (res.confirm) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/MouldController/set_DelMouldStockBillMain_Temp_Json",
- data: {
- "HInterID": this.hform.HInterID,
- "HBillType": this.hform.HBillType,
- "HBarCode": item.HMouldBarCode
- },
- })
-
- let {
- count,
- Message
- } = res.data
-
- if (count == 1) {
- this.DisBillEntryList()
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鍒犻櫎鏉＄爜閿欒: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鍒犻櫎鏉＄爜閿欒: ${err}`
- })
- }
- }
- }
- });
- },
- // 鎵弿鏉＄爜
- qrCodeDisplay(type) {
- MpaasScan.scanCode(res => {
- if (!res) {
- return
- }
- switch (type) {
- // 鎵弿浼犵エ
- case "HCP":
- this.hform.HCP = res;
- break;
- // 鎵弿浜岀淮鐮�
- case "BarCode":
- this.hform.HBarCode = res
- this.GetMessageByBarCode();
- break;
- }
- })
-
- },
- // 鑾峰彇浠撳簱淇℃伅
- async getRelationStore() {
- let {
- data,
- count
- } = await getUserStockRelation()
- if (count == 1) {
- let WHIDList = []
-
- Array.from(data).forEach(elem => {
- WHIDList.push(elem.HItemID)
- })
-
- let sWhere = ` and HItemID in (${WHIDList.join(",")})`
- this.getHBaseList({
- sWhere: sWhere
- })
-
- } else {
- this.getHBaseList()
- }
- },
- //鍩虹浠撳簱璧勬枡
- async getHBaseList({
- sWhere = ''
- } = {}) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_Warehouse/list",
- data: {
- sWhere: sWhere,
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- },
- })
-
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.HWHNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHWHName[i] = data[i].浠撳簱鍚嶇О
- }
- this.HWHNameChange(getUserInfo()["HWhName"])
- // this.HStockPlaceNameChange(res.data.data[0].浠撳簱鍚嶇О)
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇浠撳簱澶辫触: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇浠撳簱澶辫触: ${err}`
- })
- }
- },
- //閫夋嫨浠撳簱
- HWHNameChange(e) {
- // var name = e.split("(")
- for (var i = 0; i < this.HWHNameList.length; i++) {
- if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
- this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
- this.hform.HWHID = this.HWHNameList[i].HItemID
- this.HStockPlaceNameChange(null)
- this.showHStockPlaceName = false
- if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
- this.showHStockPlaceName = true
- this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
- }
- }
- }
- },
- HFIFOWHNameChange(e) {
- // var name = e.split("(")
- for (var i = 0; i < this.HWHNameList.length; i++) {
- if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
- this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
- this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
- }
- }
- },
- async getStockPlaceRemote(HSPGroupID) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_StockPlace/list',
- data: {
- sWhere: ` and HSPGroupID = ${HSPGroupID}`,
- user: uni.getStorageSync('HUserName'),
- 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].浠撲綅鍚嶇О
- }
- } else {
- uni.showToast({
- title: '浠撲綅鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
-
- } catch (err) {
- uni.showToast({
- title: '浠撲綅鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- //閫夋嫨浠撲綅
- HStockPlaceNameChange(e) {
- let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
- if (index != -1) {
- this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
- this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
- } else {
- this.hform.HStockPlaceName = ''
- this.hform.HStockPlaceID = 0
- }
- },
- // 鎵弿浠撲綅鐮�
- async HStockPlaceNameScan(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.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'
- })
- }
- },
- // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
- showBillList() {
- this.$refs.billList.showPopup()
- },
-
- // 閫夋嫨婧愬崟绫诲瀷
- 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.HSourceBillNo || this.hform.HSourceBillNo.trim() === '') {
- CommonUtils.showTips({
- message: '婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�'
- })
- return
- }
- }
- return {
- Message: "",
- state: true
- }
- },
- addNew() {
- uni.redirectTo({
- url: './Kf_SellOutBill_CusBar_APP?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() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/PublicPageMethod/UserList',
- data: {
- sWhere: " where 1=1",
- }
- })
-
- 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
- })
- }
- },
- async getBarCodeJson(sBarCode, sBarCodePrefix) {
- 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',
- data: {
- sBarCode: sBarCode,
- HInterID: this.hform.HInterID,
- HBillType: this.hform.HBillType,
- HBillNo: this.hform.HBillNo,
- HMaker: this.hform.HMaker,
- HWhID: this.hform.HWHID,
- HSPID: this.hform.HStockPlaceID,
- HQty: this.hform.HQty,
- HRedBlueFlag: this.hform.HRedBlueFlag,
- SourceFlag: this.hform.HSourceFlag,
- HSourceBillNo: this.hform.HSourceBillNo,
- HSourceBillType: this.hform.HMainSourceBillType,
- HStockOrgID: this.hform.HStockOrgID,
- HScanStyle: "",
- HCustom1: "1",
- HCustom2: ""
- },
- })
- if (!res) {
- return
- }
- console.log('鎵爜杩斿洖', res.data);
- this.hform.HBarCode = ''
- if (res.data.count == 1) {
- CommonUtils.playSound(1)
- var data = res.data.data
- if (data.hBarTypeField == '浠撳簱鏉＄爜') {
- this.hform.HWHName = data.hWhNameField
- this.hform.HWHID = data.hWhIDField
- this.hform.HStockPlaceName = ''
- this.hform.HStockPlaceID = 0
- if (data.hSPFlagField == 0) {
- this.showHStockPlaceName = false
- } else {
- this.showHStockPlaceName = true
- }
- } else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
- this.hform.HWHName = data.hWhNameField
- this.hform.HWHID = data.hWhIDField
- this.hform.HStockPlaceName = data.hSPNameField
- this.hform.HStockPlaceID = data.hSPIDField
- } else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
- this.hform.HDeptName = data.hDeptNameField
- this.hform.HDeptID = data.hDeptIDField
- this.tabs = 1
- } else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
- this.hform.HSupName = data.hSupNameField
- this.hform.HSupID = data.hSupIDField
- if (data.hDeptIDField != 0) {
- this.hform.HDeptID = data.hDeptIDField
- this.hform.HDeptName = data.hDeptNameField
- }
- this.hform.HSourceBillNo = data.hSourceBillNoField
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- this.hform.HMainSourceBillType = data.hSourceBillTypeField
- if (data.hSourceBillTypeField == "1402") {
- this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
- this.hform.HMainSourceBillType = 1402
- this.showHMainSourceBillType = false
- } else if (data.hSourceBillTypeField == "1401") {
- this.HMainSourceBillType = '閿�鍞鍗�'
- this.hform.HMainSourceBillType = 1401
- this.showHMainSourceBillType = false
- } else {
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- this.hform.HMainSourceBillType = -1
- this.showHMainSourceBillType = false
- }
- if (data.hMulSourceFlagField == 0) {
- this.showHSourceBillNo = false
- }
- //瀹㈡埛涓嶅彲缂栬緫
- this.showHSupName = false
- this.tabs = 2
- } else { //鐗╂枡鏉＄爜
- this.materMeta.push(data)
- this.tabs = 2
- if (!this.hform.HSourceBillNo) {
- this.hform.HSupName = data.hSupNameField
- this.hform.HSupID = data.hSupIDField
- this.hform.HSourceBillNo = data.hSourceBillNoField
- if (data.hDeptIDField != 0) {
- this.hform.HDeptID = data.hDeptIDField
- this.hform.HDeptName = data.hDeptNameField
- }
- console.log('鐗╂枡鏉＄爜', data)
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 鏃犳簮鍗曠被鍨嬭涓烘墜宸ュ綍鍏�
- this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
-
- let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
- .hSourceBillTypeField)
- if (index != -1) {
- this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
- this.hform.HMainSourceBillType = data.hSourceBillTypeField
- this.showHMainSourceBillType = false
- }
- // if (data.hSourceBillTypeField == "1103") {
- // this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
- // this.hform.HMainSourceBillType = 1103
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "1102") {
- // this.HMainSourceBillType = '閲囪喘璁㈠崟'
- // this.hform.HMainSourceBillType = 1102
- // this.showHMainSourceBillType = false
- // } else {
- // this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- // this.hform.HMainSourceBillType = -1
- // this.showHMainSourceBillType = false
- // }
- if (data.hMulSourceFlagField == 0) {
- this.showHSourceBillNo = false
- }
- //渚涘簲鍟嗕笉鍙紪杈�
- this.showHSupName = false
- }
- }
- //鏄剧ず琛ㄤ綋鏄庣粏
- this.DisBillEntryList(sBarCodePrefix)
- //娓呯┖鏁伴噺
- this.hform.HQty = ''
- } else {
- CommonUtils.playSound(0)
- // this.refreshBarCodeState()
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- } catch (err) {
- CommonUtils.playSound(0)
- // this.refreshBarCodeState()
- console.log(err);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触: ' + err,
- icon: 'none'
- })
- }
-
- },
- toScanHSourceBillNo() {
- MpaasScan.scanCode(cb => {
- this.hfrom.HSourceBillNo = cb
- this.GetMessageByHSourceBillNo(cb)
- })
- },
- async GetMessageByHSourceBillNo(HSouceBillNo) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/WEBSController/get_SourceBarCode_SellOut_Json",
- data: {
- "HInterID": this.hform.HInterID,
- "HBillNo": this.hform.HBillNo,
- "HBillType": this.hform.HBillType,
- "HSourceBillNo": this.hform.HSourceBillNo,
- "HSourceBillType": this.hform.HMainSourceBillType,
- "HMaker": this.hform.HMaker,
- "HFIFOWhID": this.hform.HFIFOWHID,
- "HOWNERID": this.hform.HStockOrgID
- },
-
- })
-
- let {
- count,
- Message,
- data
- } = res.data
- if (count == 1) {
- CommonUtils.playSound(1)
- this.hform.HSourceFlag = true
- this.hform.HSupName = data.hSupNameField
- this.hform.HSupID = data.hSupIDField
-
- if (data.hDeptIDField != 0) {
- this.hform.HDeptID = data.hDeptIDField
- this.hform.HDeptName = data.hDeptNameField
- }
-
- this.hform.HSourceBillNo = data.hSourceBillNoField
- } else {
- CommonUtils.playSound(0)
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
- })
- }
- },
- async GetMessageByBarCode(HBarCode) {
- if (this.hform.HWHName == '') {
- this.hform.HWHID = "0"
- }
- if (this.hform.HStockPlaceName == '') {
- this.hform.HStockPlaceID = "0"
- }
- if (this.hform.HSupName == '') {
- this.hform.HSupID = "0"
- }
-
- console.log('HQty: ', this.hform.HQty);
- let sOldBarCode = this.hform.HBarCode
- let HDeleteFlag = sOldBarCode.substring(0, 1);
- let sBarCode = sOldBarCode.slice(1);
- let sHWHID = this.hform.HWHID
- let sHSPID = this.hform.HStockPlaceID
- let sHQty = this.hform.HQty
- let sSourceBillNo = this.hform.HSourceBillNo
- let sSourceBillType = this.hform.HMainSourceBillType
- let sHCusID = this.hform.HSupID
- let sHCP = this.hform.HCP
- if (HDeleteFlag == "*") {
- if (sBarCode == "") {
- CommonUtils.playSound(0)
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: "璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�"
- })
- } else {
- this.hform.HBarCode = ""
- }
-
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
- data: {
- "HInterID": this.hform.HInterID,
- "HBillType": this.hform.HBillType,
- "HBarCode": sBarCode
- }
- })
-
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- CommonUtils.playSound(1)
- this.hform.HQty = ""
-
- } else {
- CommonUtils.playSound(0)
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `閿欒: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `閿欒: ${err}`
- })
- }
- } else {
- sBarCode = this.hform.HBarCode
- if (sBarCode == '') {
- CommonUtils.playSound(0)
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鏉＄爜涓虹┖, 璇锋壂鎻忔潯鐮�!`
- })
- return
- }
- let sBarCodePrefix = sBarCode.substr(0, 3)
- if (sBarCodePrefix != 'PAK') {
- if (sHCusID == 0) {
- CommonUtils.playSound(0)
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `缂哄皯瀹㈡埛淇℃伅锛岃鍏堟壂鎻忔簮鍗曟潯鐮�!`
- })
- this.tabs = 0
- return
- }
- if (sHCP == '') {
- CommonUtils.playSound(0)
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `浼犵エ鍙蜂笉鑳戒负绌猴紝璇峰厛鎵弿浼犵エ鍙�!`
- })
- return
- }
-
- //鏍规嵁瀹㈡埛銆佷紶绁ㄣ�佹潯鐮佽繘琛岄獙璇�
- this.getChechBarCodeAndCPJSON(sHCusID, sHCP, sBarCode, sBarCodePrefix)
- } else {
- this.getBarCodeJson(sBarCode, sBarCodePrefix)
- // this.DisBillEntryList(sBarCodePrefix)
- }
- }
- },
- // 鏍规嵁瀹㈡埛 浼犵エ 鏉＄爜杩涜楠岃瘉
- async getChechBarCodeAndCPJSON(sHCusID, sHCP, sBarCode, sBarCodePrefix) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/WEBSController/GetCheakBarCodeAndCP_Json',
- data: {
- "HCusID": sHCusID,
- "HCP": sHCP,
- "HBarCode": sBarCode
- }
- })
-
- let {
- count,
- Message
- } = res.data
- if (count == 1) {
- CommonUtils.playSound(1)
-
- // this.DisBillEntryList()
- this.getBarCodeJson(sBarCode, sBarCodePrefix)
- } else {
- CommonUtils.playSound(0)
- console.log(err);
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: '鎺ュ彛璇锋眰澶辫触: ' + Message
- })
- }
- } catch (err) {
- CommonUtils.playSound(0)
- console.log(err);
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: '鎺ュ彛璇锋眰澶辫触: ' + err
- })
- }
- },
- //鐗╂枡淇℃伅
- async DisBillEntryList(sBarCodePrefix) {
- try {
-
- let res = await CommonUtils.doRequest2Async({
- url: '/WEBSController/GetBillEntryTmpList_Json',
- data: {
- HInterID: this.hform.HInterID,
- HBillNo: this.hform.HBillNo,
- HBillType: this.hform.HBillType,
- HStockOrgID: this.hform.HStockOrgID
- }
- })
-
- console.log('鐗╂枡', res.data)
- if (res.data.count == 1) {
- var data = res.data.data
- this.materMeta = data.BarCodeDetailslist
- this.HMaterList = data.Materlist
- this.HMouldList = data.Mouldlist
-
- if (data.FIFOlist.length != 0) {
- if (data.FIFOlist[0].HMaterID != 0) {
- this.FIFOlist = data.FIFOlist
- }
- }
-
- // 鏍规嵁鏄惁鏄鏉＄爜閰嶇疆浠撲綅淇℃伅
- if (sBarCodePrefix == 'PAK') {
- this.hform.HStockPlaceName = ''
- this.hform.HStockPlaceID = 0
- } else {
- this.hform.HStockPlaceName = data.hSPNameField || ''
- this.hform.HStockPlaceID = data.hSPIDField || 0
- }
- if (!data.BarCodeDetailslist[0].HBarCode) {
- this.hform.HMaterName_B = ''
- this.hform.HMaterModel_B = ''
- this.hform.HBatchNo_B = ''
- this.hform.HUnitName_B = ''
- this.hform.HQty_B = ''
- this.hform.HTMQty_B = ''
- this.hform.HWHName_B = ''
- this.hform.HSPName_B = ''
- } else {
- this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
- this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
- this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
- this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
- this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
- this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
- 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.tabs = 2
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鎵弿鏉＄爜澶辫触: ${res.data.Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鎵弿鏉＄爜澶辫触: ${err}`
- })
- }
- },
- radioChange({
- detail: {
- value
- }
- }) {
- this.hform.HCheckResult = value
- },
- // 鑾峰彇鏈�澶у崟鎹彿
- async getMaxNum() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/WEBSController/GetMaxBillNoAndID_Json",
- data: {
- "HBillType": this.hform.HBillType
- }
- })
- let {
- count,
- data,
- Message
- } = res.data
- this.hform.HInterID = data[0]['HInterID']
- 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 {
- console.log('HStockPlaceID: ', this.hform.HStockPlaceID);
- let oMain = JSON.stringify(this.hform)
- console.log('oMain: ', oMain);
- let res = await CommonUtils.doRequest2Sync({
- url: "/WEBSController/set_SaveSellOutBill_Json",
- data: {
- "oMain": oMain
- },
- method: "POST"
- })
-
- 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: './Kf_SellOutBill_CusBar_APP?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,
- },
- })
-
-
- if (!res) {
- return
- }
-
- 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
-
- this.enableEdit = false
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: Message
- })
- }
-
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: err
- })
- }
- },
- async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
- // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
- 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 data1 = data.h_v_Sb_EquipConkBookBillList_Edit[0]
- this.hform.HMainSourceBillType = HSourceBillType
- this.HMainSourceBillType = '璁惧鏁呴殰鐧昏鍗�'
- this.hform.HSourceBillNo = data1.鍗曟嵁鍙�
- this.hform.HMainSourceInterID = data1.hmainid
- this.hform.HMainSourceEntryID = data1.hsubid
- this.hform.HEquipID = data1.HEquipID
- this.hform.HManagerName = data1.璐熻矗浜�
- this.hform.HManagerID = data1.HManagerID
- this.hform.HBarName = data1.璁惧鍚嶇О
- this.hform.HBarModel = data1.璁惧鍨嬪彿
- this.hform.HBarSpec = data1.璁惧瑙勬牸
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇婧愬崟澶辫触: ${Message}`
- })
- }
- }
- }
- },
- onLoad(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)
- }
-
- this.getHDeptList()
- this.getEmpList()
- this.getRelationStore()
- 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')
- },
- 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 "../style/MJBillStyle.scss";
-
- .left {
- width: 4em;
- }
-
- .picker-overlay {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 1;
- }
-
- .horizon_tabs {
- width: 100%;
- overflow-x: auto;
- }
-</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 74915e3..9b64db1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -344,6 +344,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
+ },
],
}
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a2dc24f..32922db 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -109,7 +109,7 @@
"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.102:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82: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/tab4.vue b/pages/index/tab4.vue
index 10fad41..bbd27cf 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -205,13 +205,6 @@
},
{
"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,
diff --git a/pages/index/vers.vue b/pages/index/vers.vue
index 96ad6a6..7add8c5 100644
--- a/pages/index/vers.vue
+++ b/pages/index/vers.vue
@@ -60,6 +60,13 @@
// "Content": ""
if (result.data.count == 1) {
var datas = result.data.data[index]
+ // 灏濊瘯鍖归厤 涓� 鐧诲綍鐨剈rl http鍦板潃鐩稿悓鐨勪笅杞藉湴鍧�
+ for(let i =0;i<result.data.data.length;i++) {
+ if(result.data.data[i].DowloadPath.includes(_this.serverUrl.substring(0, -5))) {
+ datas = result.data.data[i]
+ }
+ }
+
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