From 6761e4f06daef8e5cb71fb8f3fde9ca9a353bb2c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 22 七月 2025 16:46:51 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/shebeidangan/form.vue | 47 +-
pages/weiwaigxOut/form.vue | 73 ++++
pages/index/vers.vue | 103 +-----
pages/gongxuOut/table.vue | 5
pages/baoyangjilu/form.vue | 4
pages/shebeiweixiu/form.vue | 10
pages/weiwaigxIn/table.vue | 2
pages/weiwaigxOut/table.vue | 2
README.md | 2
pages/gongxuIn/form.vue | 510 +++++++++++++++++------------------
pages/baogong/list.vue | 2
pages/shebeiweixiu/form1.vue | 1
manifest.json | 7
pages/baoyangjihua/form.vue | 4
pages/gongxuIn/table.vue | 3
pages/weiwaigxIn/form.vue | 6
pages/gongxuOut/form.vue | 23 +
pages/index/index.vue | 8
pages/index/mine.vue | 12
19 files changed, 413 insertions(+), 411 deletions(-)
diff --git a/README.md b/README.md
index 5ad36ef..4ce2f9f 100644
--- a/README.md
+++ b/README.md
@@ -26,4 +26,4 @@
娣诲姞鍔熻兘妯″潡:
娴嬭瘯鏁版嵁锛氱敓浜ч鏂欙紙MATO00048891锛�,
-
\ No newline at end of file
+
diff --git a/manifest.json b/manifest.json
index 059f94f..09c0a4e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.15",
- "versionCode" : 115,
+ "versionName" : "1.0.17",
+ "versionCode" : 117,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -45,7 +45,8 @@
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ]
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
/* ios鎵撳寘閰嶇疆 */
"ios" : {
diff --git a/pages/baogong/list.vue b/pages/baogong/list.vue
index aaeedfe..389a726 100644
--- a/pages/baogong/list.vue
+++ b/pages/baogong/list.vue
@@ -120,6 +120,7 @@
})
},
edit(item){
+ console.log(item)
var lists = ['寮�宸�', '姹囨姤', '瀹屽伐', '鍋滃伐', '寮傚父鍙嶉']
this.chooseIt = item
var upData = {
@@ -218,6 +219,7 @@
uni.showLoading({
title:'璇风◢鍚�...'
})
+ console.log(upData)
uni.request({
url: this.serverUrl + urls,
data:upData,
diff --git a/pages/baoyangjihua/form.vue b/pages/baoyangjihua/form.vue
index db925bc..21971cc 100644
--- a/pages/baoyangjihua/form.vue
+++ b/pages/baoyangjihua/form.vue
@@ -348,9 +348,9 @@
url: this.serverUrl + '/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListCheckDetai',
data: { HID: hmainid },
success: (res) => {
- console.log(res.data.data.h_v_Sb_EquipMaintainPlanBillList[0]);
+ console.log(res.data.data.h_v_Sb_EquipMaintainPlanBill_Edit);
if(res.data.code == 1){
- var data = res.data.data.h_v_Sb_EquipMaintainPlanBillList[0]
+ var data = res.data.data.h_v_Sb_EquipMaintainPlanBill_Edit[0]
this.hform = {
HInterID:hmainid,
HBillNo:data.鍗曟嵁鍙�,
diff --git a/pages/baoyangjilu/form.vue b/pages/baoyangjilu/form.vue
index 9e2c7da..4cf6882 100644
--- a/pages/baoyangjilu/form.vue
+++ b/pages/baoyangjilu/form.vue
@@ -337,9 +337,9 @@
url: this.serverUrl + '/Sb_EquipMaintainBill/Sb_EquipMaintainBillListCheckDetai',
data: { HID: hmainid },
success: (res) => {
- console.log(1,res.data.data.h_v_Sb_EquipMaintainBillList[0]);
+ console.log(1,res.data.data.h_v_Sb_EquipMaintainBill_Edit);
if(res.data.code == 1){
- var data = res.data.data.h_v_Sb_EquipMaintainBillList[0]
+ var data = res.data.data.h_v_Sb_EquipMaintainBill_Edit[0]
this.hform = {
HInterID:hmainid,
HBillNo:data.鍗曟嵁鍙�,
diff --git a/pages/gongxuIn/form.vue b/pages/gongxuIn/form.vue
index b44cdb9..44737b7 100644
--- a/pages/gongxuIn/form.vue
+++ b/pages/gongxuIn/form.vue
@@ -4,16 +4,32 @@
<view class="form-item">
<view class="title"><text>*</text>鏉″舰鐮�:</view>
<view class="right" style="width: 380rpx;">
- <input name="HBarCode" v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�"/>
+ <input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�"/>
</view>
- <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
+ <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode(0)"></uni-icons>
</view>
<view class="form-item">
+ <view class="title"><text>*</text>閰嶄欢鏉″舰鐮�:</view>
+ <view class="right" style="width: 380rpx;">
+ <input name="HBarCode_Mater" v-model="hform.HBarCode_Mater" placeholder="璇锋壂鎻忔潯鐮�"/>
+ </view>
+ <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode(1)"></uni-icons>
+ </view>
+
+ <view class="tab_area"></view>
+
+ <view class="form-item" v-if="showHProcNo">
<view class="title"><text>*</text>娴佹按鍙�:</view>
<view class="right" style="width: 380rpx;">
<input name="HBarCode" v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
</view>
<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanProcNo"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>褰撳墠宸ュ簭:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
+ </view>
</view>
<view class="form-item">
<view class="title"><text>*</text>鎺ユ敹鏁伴噺:</view>
@@ -51,14 +67,6 @@
<textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
</view>
</view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="right">
- <picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
- </picker>
- </view>
- </view>
<view class="tab_area"></view>
@@ -69,26 +77,43 @@
</view>
</view>
<view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HDate" disabled v-model="hform.HDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇缁勭粐:</view>
+ <view class="righton">
+ <input v-model="hform.HPRDOrg" disabled />
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">鐢熶骇璁㈠崟:</view>
<view class="righton">
<input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">娴佽浆鍗�:</view>
+ <view class="title">璁㈠崟鏁伴噺:</view>
<view class="righton">
- <input disabled v-model="hform.HProcExchBillNo" />
+ <input name="HICMOQty" disabled v-model="hform.HICMOQty" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡浠ｇ爜:</view>
+ <view class="title">璁㈠崟璺熻釜鍙�:</view>
+ <view class="righton">
+ <input v-model="hform.HOrderProcNO" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧浠ｇ爜:</view>
<view class="righton">
<input disabled v-model="hform.HMaterNumber" />
- <!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡鍚嶇О:</view>
+ <view class="title">浜у搧鍚嶇О:</view>
<view class="righton">
<input v-model="hform.HMaterName" disabled />
</view>
@@ -100,181 +125,33 @@
</view>
</view>
<view class="form-item">
- <view class="title">璁￠噺鍗曚綅:</view>
+ <view class="title">娴佽浆鍗″彿:</view>
<view class="righton">
- <input v-model="hform.鍗曚綅" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">宸ュ簭:</view>
-<!-- <view class="right">
- <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
- </view> -->
- <view class="righton">
- <input v-model="hform.HProcName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇缁勭粐:</view>
- <view class="righton">
- <input v-model="hform.HPRDOrg" disabled />
- </view>
- </view>
-
-
-<!-- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇缁勭粐:</view>
- <view class="right">
- <input name="HPRDOrg" v-model="hform.HPRDOrg" placeholder="璇疯緭鍏ョ敓浜х粍缁�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>鐢熶骇璁㈠崟鍙�:</view>
- <view class="right">
- <input name="HICMOBillNo" v-model="hform.HICMOBillNo" placeholder="璇疯緭鍏ョ敓浜ц鍗曞彿" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁㈠崟鏁伴噺:</view>
- <view class="right">
- <input name="HICMOQty" v-model="hform.HICMOQty" placeholder="璇疯緭鍏ヨ鍗曟暟閲�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁㈠崟璺熻釜鍙�:</view>
- <view class="right">
- <input name="HOrderProcNO" v-model="hform.HOrderProcNO" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧浠ｇ爜:</view>
- <view class="right">
- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="right">
- <input v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>娴佽浆鍗″彿:</view>
- <view class="right">
- <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ユ祦杞崱鍙�" />
+ <input disabled v-model="hform.HProcExchBillNo" />
</view>
</view>
<view class="form-item">
<view class="title">娴佽浆鍗℃暟閲�:</view>
- <view class="right">
- <input v-model="hform.HPlanQty" placeholder="璇疯緭鍏ユ祦杞崱鏁伴噺" />
+ <view class="righton">
+ <input disabled v-model="hform.HPlanQty" />
</view>
</view>
-
- <view class="form-item">
- <view class="title"><text>*</text>褰撳墠宸ュ簭:</view>
- <view class="right">
- <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">澶囨敞:</view>
- <view class="right">
- <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
- </view>
- </view> -->
-<!--
- <view class="tab_area"></view>
-
<view class="form-item">
<view class="title">鎺ユ敹浠舵暟:</view>
- <view class="right">
- <input v-model="hform.HPieceQty" placeholder="璇疯緭鍏ユ帴鏀朵欢鏁�" />
+ <view class="righton">
+ <input disabled v-model="hform.HPieceQty" />
</view>
</view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮2:</view>
- <view class="right">
- <input v-model="hform.HSourceName" placeholder="璇疯緭鍏ョ敓浜ц祫婧�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮3:</view>
- <view class="right">
- <input v-model="hform.HSourceName" placeholder="璇疯緭鍏ョ敓浜ц祫婧�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮4:</view>
- <view class="right">
- <input v-model="hform.HSourceName" placeholder="璇疯緭鍏ョ敓浜ц祫婧�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮5:</view>
- <view class="right">
- <input v-model="hform.HSourceName" placeholder="璇疯緭鍏ョ敓浜ц祫婧�" />
- </view>
- </view>
-
<view class="form-item">
<view class="title">杩涚珯鏃堕棿:</view>
- <view class="right">
- <uni-datetime-picker v-model="hform.HStationInTime">
- <input disabled v-model="hform.HStationInTime" placeholder="璇烽�夋嫨鎺ユ敹鏃堕棿" />
- </uni-datetime-picker>
- </view>
- </view> -->
-
-<!-- <view class="form-item">
- <view class="title">鎿嶄綔鍛�:</view>
- <view class="right">
- <input v-model="hform.HEmp" placeholder="璇疯緭鍏ユ搷浣滃憳" />
+ <view class="righton">
+ <input disabled v-model="hform.HStationInTime" />
</view>
</view>
- <view class="form-item">
- <view class="title">閮ㄩ棬:</view>
- <view class="right">
- <input v-model="hform.HDept" placeholder="璇疯緭鍏ラ儴闂�" />
- </view>
- </view> -->
-
- <!-- <view class="tab_area"></view> -->
-
-<!-- <view class="form-item">
- <view class="title">閫夋嫨鏂囦欢:</view>
- <view class="right">
- 1111
- </view>
- </view> -->
<view class="tab_area"></view>
<view v-if="showmore">
- <view class="form-item">
- <view class="title">璁㈠崟璺熻釜鍙�:</view>
- <view class="righton">
- <input v-model="hform.HOrderProcNO" disabled />
- </view>
- </view>
<view class="form-item">
<view class="title">鍒跺崟浜�:</view>
<view class="righton">
@@ -312,6 +189,19 @@
<view class="righton">
<input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled/>
<input v-else v-model="hform.HCheckDate" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HCloseMan" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HCloseDate" v-model="hform.HCloseDate.substr(0,10)" disabled/>
+ <input v-else v-model="hform.HCloseDate" disabled/>
</view>
</view>
<view class="form-item">
@@ -362,9 +252,11 @@
HBillNo:'',
btnType:0,//0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
showmore: false,
+ OperationType:1,
- arrayHMaterNumber:[],//浜у搧
- HMaterNumberList:[],
+ showHProcNo:false,
+ arrayHProcNo:[],//宸ュ簭
+ HProcNoList:[],
arrayHProcName:[],//宸ュ簭
HProcNameList:[],
arrayHSourceName:[],//鐢熶骇璧勬簮
@@ -381,90 +273,71 @@
HInterID:'',
HBillNo:'',
HBarCode:'',
+ HBarCode_Mater:'',
+
+ HProcName:'',
+ HProcID:0,
HProcNo:'',
HQty:'',
HSourceName:'',
- HSourceID:'',
+ HSourceID:0,
HGroupName:'',
- HGroupID:'',
+ HGroupID:0,
HCenterName:'',
- HCenterID:'',
+ HCenterID:0,
HEmpName:'',
- HEmpID:'',
+ HEmpID:0,
HRemark:'',
HDate:getDateTime.dateTimeStr('y-m-d'),
+ HPRDOrg:'',
+ HPRDOrgID:0,
HICMOBillNo:'',
- HProcExchBillNo:'',
+ HICMOInterID:0,
+ HICMOQty:'',
+ HOrderProcNO:'',
HMaterNumber:'',
HMaterName:'',
- HMaterID:'',
+ HMaterID:0,
HMaterModel:'',
- 鍗曚綅:'',
- HProcName:'',
- HProcID:'',
- HPRDOrg:'',
- HOrderProcNO:'',
-
- // HPRDOrg:'',
- // HICMOBillNo:'',
- // HICMOInterID:'',
- // HICMOQty:'',
- // HOrderProcNO:'',
- // HMaterNumber:'',
- // HMaterName:'',
- // HMaterID:'',
- // HMaterModel:'',
- // HProcExchBillNo:'',
- // HProcExchHinteID:'',
- // HProcName:'',
- // HProcID:'',
- // HPlanQty:'',
- // HWWWorkOrderBillNo:'',
- // HPieceQty:'',
- // HWasterQty:'',
- // HTaxRate:'',
- // HPrice:'',
- // HMoney:'',
- // HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
- // // HStationOutTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
- // HSendBillNo:'',
- // HInnerBillNo:'',
- // HEmp:'',
- // HEmpID:'',
- // HDept:'',
- // HDeptID:'',
+ HProcExchBillNo:'',
+ HProcExchHinteID:0,
+ HPlanQty:'',
+ HPieceQty:'',
+ HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
- HMaker:'',
- HMakeDate:'',
+ HMaker:uni.getStorageSync('HUserName'),
+ HMakeDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
HUpDater:'',
HUpDateDate:'',
HChecker:'',
HCheckDate:'',
- // HCloseMan:'',
- // HCloseDate:'',
+ HCloseMan:'',
+ HCloseDate:'',
HDeleteMan:'',
HDeleteDate:'',
eventType:'Add',
+ HMainInterID:0,
+ lngICMOEntryID:'',
}
}
},
onLoad(e) {
- // this.getEditData('981','000000000894')
console.log(e,this.userInfo)
// this.hform.HEmpID = this.userInfo.Czybm
// this.hform.HEmp = uni.getStorageSync('HUserName')
this.hform.HMaker = uni.getStorageSync('HUserName')
if(e.linterid){
this.btnType = 1
+ this.OperationType = 4
this.linterid = e.linterid
this.HBillNo = e.HBillNo
this.getEditData(e.linterid,e.HBillNo)
}else{
this.getNewData()
}
- this.getHMaterList()
+ this.getBaseData()
this.getHProcList()
this.getHSourceList()
this.getHGroupList()
@@ -473,48 +346,60 @@
},
methods: {
//鎵爜
- toScanCode(){
- // this.hform.HBarCode = 'GXLX00001105'
- // this.getHBarCodeData('GXLX00001105')
+ toScanCode(e){
+ // this.hform.HBarCode = 'GXLX250603001-01'
+ // this.getHBarCodeData('GXLX250603001-01')
+
uni.scanCode({
onlyFromCamera: true,
success: (res) => {
console.log('鏉＄爜鍐呭锛�' + res.result);
- this.hform.HBarCode = res.result
- this.getHBarCodeData(res.result)
+ if(e==0){
+ this.hform.HBarCode = res.result
+ this.getHBarCodeData(res.result)
+ }else{
+ this.hform.HBarCode_Mater = res.result
+ this.getHBarCodeMater(res.result)
+ }
}
});
},
//鎵祦姘村彿
toScanProcNo(){
- uni.scanCode({
- onlyFromCamera: true,
- success: (res) => {
- console.log('鏉＄爜鍐呭锛�' + res.result);
- this.hform.HProcNo = res.result
- this.getHProcNoData(this.hform.HBarCode,res.result)
- }
- });
+ if(this.hform.HProcExchHinteID){
+ uni.scanCode({
+ onlyFromCamera: true,
+ success: (res) => {
+ console.log('鏉＄爜鍐呭锛�' + res.result);
+ this.hform.HProcNo = res.result
+ this.getHProcNoData(this.hform.HBarCode,res.result)
+ }
+ });
+ }else{
+ uni.showToast({
+ title:'璇锋壂瀹屾祦杞崱鍚庡啀鎵厤浠剁爜',
+ icon:'none'
+ })
+ }
},
- //鏃ユ湡
- HDateChange(e){
- console.log(e.detail.value)
- this.hform.HDate = e.detail.value
- },
-
- //鑾峰彇浜у搧鏁版嵁
- getHMaterList(){
- var Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID')
+ //閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ getBaseData(){
uni.request({
- url: this.serverUrl + '/Web/GetMaterialList_Json',
- data: { sWhere: Value },
- success: (res) => {
+ url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser',
+ data: { Czybm:this.userInfo.Czybm,Czymc:this.userInfo.Czymc },
+ success: (res) => {
+ console.log('base:', res.data)
if(res.data.count == 1){
- this.HMaterNumberList = res.data.data
- for(var i=0;i<res.data.data.length;i++){
- this.arrayHMaterNumber[i] = res.data.data[i].HNumber
- }
- this.$forceUpdate();
+ var data = res.data.data[0]
+ this.hform.HSourceID = data.HSourceID
+ this.hform.HSourceName = data.鐢熶骇璧勬簮鍚嶇О
+ this.hform.HGroupID = data.HGroupID
+ this.hform.HGroupName = data.鐢熶骇鐝粍鍚嶇О
+ this.hform.HCenterID = data.HWorkCenterID
+ this.hform.HCenterName = data.宸ヤ綔涓績鍚嶇О
+ this.hform.HEmpID = data.HEmpID
+ this.hform.HEmpNumber = data.鎿嶄綔鍛樹唬鐮�
+ this.hform.HEmpName = data.鎿嶄綔鍛樺悕绉�
}else{
uni.showToast({
title:res.data.Message,
@@ -531,17 +416,45 @@
},
});
},
- //閫夋嫨浜у搧鏁版嵁
- HMaterNumberChange(e){
- for(var i=0;i<this.HMaterNumberList.length;i++){
- if(this.HMaterNumberList[i].HNumber == e){
- this.hform.HMaterName = this.HMaterNumberList[i].HName
- this.hform.HMaterID = this.HMaterNumberList[i].HItemID
- }
- }
+ //鏃ユ湡
+ HDateChange(e){
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
},
- //宸ュ簭
+ //娴佹按鍙�
+ getHProcNoList(){
+ uni.request({
+ url: this.serverUrl + '/Web/GetProcNoList',
+ data: { sWhere: '',HInterID:this.hform.HProcExchHinteID,UserID:this.userInfo.Czybm },
+ success: (res) => {
+ if(res.data.count == 1){
+ this.HProcNoList = res.data.data
+ for(var i=0;i<res.data.data.length;i++){
+ this.arrayHProcNo[i] = res.data.data[i].娴佹按鍙�
+ }
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨娴佹按鍙�
+ HProcNoChange(e){
+ this.hform.HProcNo = e
+ this.getHProcNoData(this.hform.HBarCode,e)
+ },
getHProcList(){
+ //宸ュ簭
uni.request({
url: this.serverUrl + '/Web/GetProcList_Json',
data: { sWhere: '' },
@@ -735,6 +648,7 @@
console.log(res)
if(res.data.count == 1){
this.isEdit = true
+ this.OperationType = 3
this.hform.eventType = 'Modify'
}else{
uni.showToast({
@@ -811,11 +725,12 @@
},
getHBarCodeData(HBarCode){
uni.request({
- url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
- data: {HBarCode: HBarCode},
+ url: this.serverUrl + '/Cj_StationBill/txtHBarCode_KeyDown2',
+ // url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
+ data: {HBarCode: HBarCode,HInterID:this.hform.HProcExchHinteID,UserID:this.userInfo.Czybm,HBillType:"In"},
success: (res) => {
console.log(2,res.data);
- if(res.data.code == 1){
+ if(res.data.count == 1){
var data = res.data.data[0]
this.hform.HICMOInterID= data.hicmointerid
this.hform.lngICMOEntryID= data.lngICMOEntryID
@@ -824,7 +739,6 @@
this.hform.HMaterName= data.浜у搧
this.hform.HMaterNumber= data.浜у搧浠ｇ爜
this.hform.HMaterModel= data.瑙勬牸鍨嬪彿
- this.hform.鍗曚綅= data.鍗曚綅
this.hform.HPieceQty= data.娴佽浆鍗℃暟閲�
this.hform.HPlanQty= data.娴佽浆鍗℃暟閲�
this.hform.HProcExchBillNo= data.鍗曟嵁鍙�
@@ -833,6 +747,33 @@
this.hform.lngBillKey= data.hmainid
this.hform.HOrderProcNO= data.璁㈠崟璺熻釜鍙�
this.hform.HPRDOrg= data.缁勭粐
+ this.hform.HPRDOrgID= data.缁勭粐
+ // this.getHProcNoList()
+ this.showHProcNo = true
+ //鑷姩鍖归厤娴佹按鍙�
+ uni.request({
+ url: this.serverUrl + '/Sc_StationInBill/autoGetProcNo',
+ data: {HInterID:data.hmainid,HUserID:this.userInfo.Czybm,BillType:"In" },
+ success: (res1) => {
+ console.log(res1)
+ if(res1.data.count == 1){
+ var data1 = res1.data.data[0]
+ this.hform.lngBillSubKey= data1.hsubid
+ this.hform.HProcName= data1.宸ュ簭
+ this.hform.HProcID= data1.宸ュ簭ID
+ this.hform.HProcNo= data1.娴佹按鍙�
+ this.hform.HCenterName= data1.宸ヤ綔涓績
+ this.hform.HCenterID= data1.HCenterID
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
}else{
uni.showToast({
title:res.data.Message,
@@ -849,19 +790,57 @@
},
});
},
+ getHBarCodeMater(HBarCode){
+ uni.request({
+ url: this.serverUrl + '/Cj_StationBill/txtHBarCode_Mater_KeyDown',
+ data: {HBarCode: HBarCode},
+ success: (res) => {
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
getHProcNoData(HBarCode,HProcNo){
uni.request({
url: this.serverUrl + '/Cj_StationInBill/txtHProcNo_KeyDown',
data: {sBillNo: HBarCode,sProcNo: HProcNo},
success: (res) => {
console.log(3,res);
- if(res.data.code == 1){
+ if(res.data.count == 1){
var data = res.data.data[0]
this.hform.lngBillSubKey= data.hsubid
this.hform.HProcName= data.宸ュ簭
this.hform.HProcID= data.HProcID
this.hform.HCenterName= data.宸ヤ綔涓績
this.hform.HCenterID= data.HCenterID
+
+ uni.request({
+ url: this.serverUrl + '/Cj_StationInBill/MES_StationInBillSubBindSource',
+ data: {HInterID:this.hform.HProcExchHinteID,HProcExchInterID:this.hform.lngBillKey,HProcExchEntryID:this.hform.lngBillSubKey },
+ success: (res1) => {
+ console.log(res1)
+ uni.showToast({
+ title:res1.data.Message,
+ icon:'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
}else{
uni.showToast({
title:res.data.Message,
@@ -935,8 +914,7 @@
title:'璇风◢鍊�'
})
var sMainStr = JSON.stringify(this.hform);
- var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName');
- console.log(sMainSub);
+ var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName') + ";" + this.OperationType;
uni.request({
url: this.serverUrl + '/Cj_StationInBill/AddBill',
method:'POST',
@@ -985,6 +963,7 @@
data:{
CurUserName: uni.getStorageSync('HUserName'),
HInterID: this.linterid,
+ HBillSubType:'3792',
},
success: (res) => {
console.log(1,res);
@@ -1033,6 +1012,7 @@
data:{
CurUserName: uni.getStorageSync('HUserName'),
HInterID: this.linterid,
+ HBillSubType:'3792',
},
success: (res) => {
console.log(1,res);
diff --git a/pages/gongxuIn/table.vue b/pages/gongxuIn/table.vue
index 504c1b3..67eb761 100644
--- a/pages/gongxuIn/table.vue
+++ b/pages/gongxuIn/table.vue
@@ -273,7 +273,8 @@
url: this.serverUrl + '/Cj_StationInBill/get_Display',
data:{
sWhere: this.sWhere,
- user: uni.getStorageSync('HUserName')
+ user: uni.getStorageSync('HUserName'),
+ HBillSubType:'3790',
},
success: (res) => {
// console.log(1,res.data.data);
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index 40ac3cc..65c9b45 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -426,6 +426,7 @@
HBillNo:'',
btnType:0,//0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
FirstEndHProcNo:0,//榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
+ OperationType:1,
showmore: false,
arrayHMaterNumber:[],//浜у搧
@@ -453,13 +454,13 @@
HPieceQty:'',
HWasterQty:'',
HSourceName:'',
- HSourceID:'',
+ HSourceID:0,
HCenterName:'',
- HCenterID:'',
+ HCenterID:0,
HGroupName:'',
- HGroupID:'',
+ HGroupID:0,
HEmpName:'',
- HEmpID:'',
+ HEmpID:0,
HRemark:'',
HDate:getDateTime.dateTimeStr('y-m-d'),
@@ -467,7 +468,7 @@
HProcExchBillNo:'',
HMaterNumber:'',
HMaterName:'',
- HMaterID:'',
+ HMaterID:0,
HMaterModel:'',
鍗曚綅:'',
HProcName:'',
@@ -497,7 +498,7 @@
// HTaxRate:'',
// HPrice:'',
// HMoney:'',
- // // HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
// HStationOutTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
// HSendBillNo:'',
// HInnerBillNo:'',
@@ -519,8 +520,8 @@
// HPayProcID:'',
// HSourceNameList:'',
- HMaker:'',
- HMakeDate:'',
+ HMaker:uni.getStorageSync('HUserName'),
+ HMakeDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
HUpDater:'',
HUpDateDate:'',
HChecker:'',
@@ -545,6 +546,7 @@
// this.hform.HStationOutTime = getDateTime.dateTimeStr('y-m-d h:i:s')
if(e.linterid){
this.btnType = 1
+ this.OperationType = 4
this.linterid = e.linterid
this.HBillNo = e.HBillNo
this.getEditData(e.linterid,e.HBillNo)
@@ -1003,6 +1005,7 @@
console.log(res)
if(res.data.count == 1){
this.isEdit = true
+ this.OperationType = 3
this.hform.eventType = 'Modify'
}else{
uni.showToast({
@@ -1219,7 +1222,7 @@
title:'璇风◢鍊�'
})
var sMainStr = JSON.stringify(this.hform);
- var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName');
+ var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName') + ";" + this.OperationType;
console.log(sMainSub);
uni.request({
url: this.serverUrl + '/Cj_StationOutBill/AddBill',
@@ -1280,6 +1283,7 @@
data:{
CurUserName: uni.getStorageSync('HUserName'),
HInterID: this.linterid,
+ HBillSubType:'',
},
success: (res) => {
console.log(1,res);
@@ -1328,6 +1332,7 @@
data:{
CurUserName: uni.getStorageSync('HUserName'),
HInterID: this.linterid,
+ HBillSubType:'',
},
success: (res) => {
console.log(1,res);
diff --git a/pages/gongxuOut/table.vue b/pages/gongxuOut/table.vue
index 600a6e3..df030ef 100644
--- a/pages/gongxuOut/table.vue
+++ b/pages/gongxuOut/table.vue
@@ -214,7 +214,7 @@
<view class="op" v-if="operations == index">
<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">宸ュ簭妫�</button>
+ <!-- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">宸ュ簭妫�</button> -->
<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -295,7 +295,8 @@
url: this.serverUrl + '/Cj_StationOutBill/get_Display',
data:{
sWhere: this.sWhere,
- user: uni.getStorageSync('HUserName')
+ user: uni.getStorageSync('HUserName'),
+ HBillSubType:'',
},
success: (res) => {
// console.log(1,res.data.data);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9563735..2d4e4b1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,12 +13,18 @@
</view>
</view>
+
+
<!-- </scroll-view> -->
- </view>
+ <vers></vers> </view>
</template>
<script>
+ import vers from './vers.vue';
export default {
+ components: {
+ vers
+ },
data() {
return {
contentTop: 0,
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 5e8a582..839e4d0 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -180,5 +180,17 @@
font-size: 36rpx;
text-align: center;
}
+
+ .vers{
+ position: fixed;
+ z-index: 99;
+ bottom: 0;
+ left: 0;
+ font-size: 28rpx;
+ color: #888;
+ margin-bottom: 20rpx;
+ text-align: center;
+ width: 100%;
+ }
}
</style>
diff --git a/pages/index/vers.vue b/pages/index/vers.vue
index 9c4f518..b83dc4c 100644
--- a/pages/index/vers.vue
+++ b/pages/index/vers.vue
@@ -20,7 +20,7 @@
export default {
data() {
return {
- serverUrl: 'https://api.zj-yonghutong.com',
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
showTc:false,
// 鐗堟湰鏇存柊
loadPercent:0,
@@ -38,83 +38,38 @@
if(uni.getSystemInfoSync().platform !=='ios'){
this.update();
}else if(uni.getSystemInfoSync().platform =='ios'){
- this.updateIOS();
+ uni.showToast({
+ title:'璇蜂娇鐢ㄥ畨鍗撴墜鏈猴紝浠ュ厤鍙戠敓鍏煎鎬ч棶棰�',
+ icon:'none'
+ })
}
//#endif
},
methods: {
- updateIOS() {
- var _this = this;
- uni.request({
- url: 'https://api.zj-yonghutong.com/v1/config/configKeyObject/APPVersionIOS',
- header: {
- 'Authorization': 'Bearer ' + getToken(),
- 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
- },
- method: 'GET',
- success: result => {
- console.log(result)
- if (result.data.code == 200) {
- uni.setStorageSync('remarkURL',result.data.data.remark)
- plus.runtime.getProperty(plus.runtime.appid, function(inf) {
- console.log(inf)
- uni.setStorageSync('vers',inf.version)
- _this.vers = result.data.data.configValue
- if(result.data.data.configValue > inf.versionCode){ //濡傛灉绾夸笂鐗堟湰澶т簬褰撳墠鐗堟湰
- var configType = result.data.data.fieldOne //褰撳墠绾夸笂鏈�鏂版暣鍖呯増鏈�
- _this.fieldTwo = result.data.data.fieldTwo//鏇存柊鍐呭
- if(configType > inf.versionCode ){//濡傛灉绾夸笂鏈�鏂版暣鍖呯増鏈ぇ浜庡綋鍓嶇増鏈紝鍒欐暣鍖呮洿鏂�
- _this.showTc = true
- console.log(555555)
- }else{//鐑洿鏂�
- uni.showLoading({
- title:'鍙戠幇鏂拌祫婧愶紝姝ｅ湪涓嬭浇涓�...',
- mask:true,
- })
- uni.downloadFile({
- url: 'https://api.zj-yonghutong.com/profile/kangleju.wgt',
- success: (downloadResult) => {
- if (downloadResult.statusCode === 200) {
- uni.hideLoading()
- plus.runtime.install(downloadResult.tempFilePath, {
- force: false
- }, function() {
- console.log('install success...');
- plus.runtime.restart();
- }, function(e) {
- console.error('install fail...');
- });
- }
- }
- });
- }
- }
- });
- }
- },
- })
- },
update() {
var _this = this;
uni.request({
- url:'https://api.zj-yonghutong.com/v1/config/configKeyObject/APPVersion',
- header: {
- 'Authorization': 'Bearer ' + getToken(),
- // 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
- },
- method: 'GET',
+ url:_this.serverUrl + '/LMES/AppUpdate',
+ data: { type:'' },
success: result => {
- if (result.data.code == 200) {
- // console.log(1111111,result)
- uni.setStorageSync('remarkURL',result.data.data.remark)
+ console.log(1111111,result)
+ // "DowloadPath": 鏁村寘鏇存柊涓嬭浇鍦板潃,
+ // "HotDowloadPath": 鏈�鏂扮儹鏇存柊涓嬭浇鍦板潃,
+ // "VersionNumber": "鏈�鏂版暣鍖呯増鏈�",
+ // "HotVersionNumber": "鏈�鏂扮増鏈�",
+ // "Content": ""
+ if (result.data.count == 1) {
+ var datas = result.data.data[0]
+ uni.setStorageSync('remarkURL',datas.DowloadPath)
plus.runtime.getProperty(plus.runtime.appid, function(inf) {
console.log(inf)
- _this.vers = result.data.data.configValue
+ _this.vers = datas.HotVersionNumber
uni.setStorageSync('vers','V' + inf.version)
- if(result.data.data.configValue > inf.versionCode){ //濡傛灉绾夸笂鐗堟湰澶т簬褰撳墠鐗堟湰
- var configType = result.data.data.fieldOne //褰撳墠绾夸笂鏈�鏂版暣鍖呯増鏈�
- _this.fieldTwo = result.data.data.fieldTwo//鏇存柊鍐呭
- if(configType > inf.versionCode ){//濡傛灉绾夸笂鏈�鏂版暣鍖呯増鏈ぇ浜庡綋鍓嶇増鏈紝鍒欐暣鍖呮洿鏂�
+ console.log(datas.HotVersionNumber,inf.versionCode,datas.HotVersionNumber > inf.versionCode)
+ if(datas.HotVersionNumber > inf.versionCode){
+ var configType = datas.VersionNumber
+ _this.fieldTwo = datas.Content
+ if(configType > inf.versionCode ){
_this.showTc = true
console.log(configType,_this.showTc,_this.fieldTwo)
}else{
@@ -123,7 +78,7 @@
mask:true,
})
uni.downloadFile({
- url: 'https://api.zj-yonghutong.com/profile/kangleju.wgt',
+ url: datas.HotDowloadPath,
success: (downloadResult) => {
if (downloadResult.statusCode === 200) {
uni.hideLoading()
@@ -146,12 +101,8 @@
})
},
upOn(){
- if(uni.getSystemInfoSync().platform !=='ios'){
- this.doUpData();
- this.loadPercent = 0
- }else if(uni.getSystemInfoSync().platform =='ios'){
- plus.runtime.openURL(uni.getStorageSync('remarkURL'));
- }
+ this.doUpData();
+ this.loadPercent = 0
},
doUpData() {
this.waitLine = true
@@ -236,9 +187,9 @@
width: 550rpx;
height: 730rpx;
position: absolute;
- top: 10vh;
+ top: 20vh;
left: 100rpx;
- background-image: url('../../../static/images/newVer.png');
+ background-image: url('/static/images/newVer.png');
background-position: center;
background-repeat: no-repeat;
background-size: cover;
diff --git a/pages/shebeidangan/form.vue b/pages/shebeidangan/form.vue
index 07cb828..6c7c55b 100644
--- a/pages/shebeidangan/form.vue
+++ b/pages/shebeidangan/form.vue
@@ -108,7 +108,7 @@
<view class="tab_area"></view>
<view class="form-item">
- <view class="title"><text>*</text>瀵瑰簲ERP鐗╂枡:</view>
+ <view class="title">瀵瑰簲ERP鐗╂枡:</view>
<view class="right">
<uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨瀵瑰簲ERP鐗╂枡" v-model="hform.HName" @input="HMaterNumberChange"></uni-combox>
</view>
@@ -309,25 +309,25 @@
HEquipDotCheckRuleInterName:'',
HEquipDotCheckRuleInterID:0,
HSourceName:'',
- HSourceID:'',
+ HSourceID:0,
HMaterNumber:'',
- HMaterID:'',
+ HMaterID:0,
HEquipFileTypeName:'',
- HEquipFileTypeID:'',
+ HEquipFileTypeID:0,
HUnitName:'',
- HUnitID:'',
+ HUnitID:0,
HSellSupName:'',
- HSellSupID:'',
+ HSellSupID:0,
HDeptName:'',
- HDeptID:'',
+ HDeptID:0,
HUseEmpName:'',
- HUseEmpID:'',
+ HUseEmpID:0,
HRepairEmpName:'',
- HRepairEmpID:'',
+ HRepairEmpID:0,
HMakeSupName:'',
- HMakeSupID:'',
+ HMakeSupID:0,
HOutComDate:'',
HAddress:'',
@@ -822,29 +822,29 @@
HModel2:data.璁惧鍨嬪彿,
HEquipMaintainRuleInterName:data.榛樿淇濆吇瑙勭▼,
- HEquipMaintainRuleInterID:data.HEquipMaintainRuleInterID,
+ HEquipMaintainRuleInterID:data.HEquipMaintainRuleInterID||0,
HEquipDotCheckRuleInterName:data.榛樿鐐规瑙勭▼,
- HEquipDotCheckRuleInterID:data.HEquipDotCheckRuleInterID,
+ HEquipDotCheckRuleInterID:data.HEquipDotCheckRuleInterID||0,
HSourceName:data.HSourceName,
- HSourceID:data.HSourceID,
+ HSourceID:data.HSourceID||0,
HMaterNumber:data.鐗╂枡鍚嶇О,
- HMaterID:data.HMaterID,
+ HMaterID:data.HMaterID||0,
HEquipFileTypeName:data.璁惧绫诲瀷,
- HEquipFileTypeID:data.HEquipFileTypeID,
+ HEquipFileTypeID:data.HEquipFileTypeID||0,
HUnitName:data.鍗曚綅,
- HUnitID:data.HUnitID,
+ HUnitID:data.HUnitID||0,
HSellSupName:data.渚涘簲鍟�,
- HSellSupID:data.HSellSupID,
+ HSellSupID:data.HSellSupID||0,
HDeptName:data.浣跨敤閮ㄩ棬,
- HDeptID:data.HDeptID,
+ HDeptID:data.HDeptID||0,
HUseEmpName:data.浣跨敤璐熻矗浜�,
- HUseEmpID:data.HUseEmpID,
+ HUseEmpID:data.HUseEmpID||0,
HRepairEmpName:data.缁存姢璐熻矗浜�,
- HRepairEmpID:data.HRepairEmpID,
+ HRepairEmpID:data.HRepairEmpID||0,
HMakeSupName:data.鍒堕�犲晢,
- HMakeSupID:data.HMakeSupID,
+ HMakeSupID:data.HMakeSupID||0,
HOutComDate:data.璁惧鍑哄巶鏃ユ湡.substr(0,10),
HAddress:data.瀹夎鍦扮偣,
@@ -945,11 +945,6 @@
}else if(!this.hform.HEquipFileNumber){
uni.showToast({
title:'璇疯緭鍏ヨ澶囦唬鐮�',
- icon:'none'
- })
- }else if(!this.hform.HMaterID){
- uni.showToast({
- title:'璇烽�夋嫨瀵瑰簲ERP鐗╂枡',
icon:'none'
})
}else if(!this.hform.HEquipFileTypeID){
diff --git a/pages/shebeiweixiu/form.vue b/pages/shebeiweixiu/form.vue
index 7c8a19b..52125ee 100644
--- a/pages/shebeiweixiu/form.vue
+++ b/pages/shebeiweixiu/form.vue
@@ -403,9 +403,9 @@
url: this.serverUrl + '/Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListCheckDetai',
data: { HID: hmainid },
success: (res) => {
- console.log(1,res.data.data.h_v_Sb_EquipRepairWorkBillList[0]);
+ console.log(1,res.data.data.h_v_Sb_EquipRepairWorkBill_Edit);
if(res.data.code == 1){
- var data = res.data.data.h_v_Sb_EquipRepairWorkBillList[0]
+ var data = res.data.data.h_v_Sb_EquipRepairWorkBill_Edit[0]
this.hform = {
HInterID:hmainid,
HBillNo:data.鍗曟嵁鍙�,
@@ -453,11 +453,11 @@
//瀛愯〃
uni.request({
url: this.serverUrl + '/Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListProjectDetai',
- data: { "sqlWhere": "and hmainid=" + hmainid },
+ data: { HInterID: hmainid },
success: (res) => {
+ console.log(2,res.data.list);
if(res.data.count == 1){
- this.form1List = res.data.data
- console.log(2,res.data.data);
+ this.form1List = res.data.list
}else{
uni.showToast({
title:res.data.Message,
diff --git a/pages/shebeiweixiu/form1.vue b/pages/shebeiweixiu/form1.vue
index 433a4b6..6cc7ce3 100644
--- a/pages/shebeiweixiu/form1.vue
+++ b/pages/shebeiweixiu/form1.vue
@@ -104,6 +104,7 @@
this.getHConkReasonList()
this.getHManagerNameList()
this.hformList = this.form1List
+ console.log(this.hformList)
},
methods: {
//缁翠慨椤圭洰
diff --git a/pages/weiwaigxIn/form.vue b/pages/weiwaigxIn/form.vue
index 522f8e7..ab67434 100644
--- a/pages/weiwaigxIn/form.vue
+++ b/pages/weiwaigxIn/form.vue
@@ -402,8 +402,8 @@
methods: {
//鎵爜
toScanCode(){
- // this.hform.HBarCode = 'GXLX00000967'
- // this.getHBarCodeData('GXLX00000967')
+ // this.hform.HBarCode = 'OP000021_01'
+ // this.getHBarCodeData('OP000021_01')
uni.scanCode({
onlyFromCamera: true,
success: (res) => {
@@ -688,7 +688,7 @@
url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
data: {HBarCode: HBarCode},
success: (res) => {
- console.log(2,res.data.data[0]);
+ console.log(2,res.data);
if(res.data.code == 1){
var data = res.data.data[0]
this.hform.HICMOBillNo= data.浠诲姟鍗曞彿
diff --git a/pages/weiwaigxIn/table.vue b/pages/weiwaigxIn/table.vue
index 7ad6d91..44df963 100644
--- a/pages/weiwaigxIn/table.vue
+++ b/pages/weiwaigxIn/table.vue
@@ -244,7 +244,7 @@
url: this.serverUrl + '/Cj_StationEntrustInBill/list',
data:{
sWhere: this.sWhere,
- user: uni.getStorageSync('HUserName')
+ user: uni.getStorageSync('HUserName'),
},
success: (res) => {
console.log(1,res.data.data);
diff --git a/pages/weiwaigxOut/form.vue b/pages/weiwaigxOut/form.vue
index 3a8d426..41b4f7a 100644
--- a/pages/weiwaigxOut/form.vue
+++ b/pages/weiwaigxOut/form.vue
@@ -58,6 +58,12 @@
</view>
</view>
<view class="form-item">
+ <view class="title"><text>*</text>鐢熶骇鐝粍:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName" @input="HGroupNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">澶囨敞:</view>
<view class="right">
<textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
@@ -344,6 +350,8 @@
HSupNameList:[],
arrayHEmpName:[],//鎿嶄綔鍛�
HEmpNameList:[],
+ arrayHGroupName:[],//鐝粍
+ HGroupNameList:[],
isEdit: false,
hform:{
@@ -400,8 +408,8 @@
// HEmpID:'',
// HSource:'',
// HSourceID:'',
- // HGroup:'',
- // HGroupID:'',
+ HGroupName:'',
+ HGroupID:0,
// HDept:'',
// HDeptID:'',
@@ -434,6 +442,7 @@
}else{
this.getNewData()
}
+ this.getHGroupList()
this.getHMaterList()
this.getHProcList()
this.getHSupList()
@@ -442,16 +451,16 @@
methods: {
//鎵爜
toScanCode(){
- // this.hform.HBarCode = 'GXLX00000967'
- // this.getHBarCodeData('GXLX00000967')
- uni.scanCode({
- onlyFromCamera: true,
- success: (res) => {
- console.log('鏉＄爜鍐呭锛�' + res.result);
- this.hform.HBarCode = res.result
- this.getHBarCodeData(res.result)
- }
- });
+ this.hform.HBarCode = 'OP000021_01'
+ this.getHBarCodeData('OP000021_01')
+ // uni.scanCode({
+ // onlyFromCamera: true,
+ // success: (res) => {
+ // console.log('鏉＄爜鍐呭锛�' + res.result);
+ // this.hform.HBarCode = res.result
+ // this.getHBarCodeData(res.result)
+ // }
+ // });
},
//鎵祦姘村彿
toScanProcNo(){
@@ -612,6 +621,7 @@
})
},
});
+
},
//閫夋嫨鎺ユ敹浜�
HEmpNameChange(e){
@@ -619,6 +629,43 @@
if(this.HEmpNameList[i].HName == e){
this.hform.HEmpID = this.HEmpNameList[i].HItemID
this.hform.HQCCheckID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //鐢熶骇鐝粍
+ getHGroupList(){
+ uni.request({
+ url: this.serverUrl + '/Web/GetProductionTeamList_Json',
+ data: { sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') + "" },
+ success: (res) => {
+ if(res.data.count == 1){
+ this.HGroupNameList = res.data.data
+ for(var i=0;i<res.data.data.length;i++){
+ this.arrayHGroupName[i] = res.data.data[i].鐝粍
+ }
+ this.$forceUpdate();
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨鐢熶骇鐝粍
+ HGroupNameChange(e){
+ for(var i=0;i<this.HGroupNameList.length;i++){
+ if(this.HGroupNameList[i].鐝粍 == e){
+ this.hform.HGroupName = this.HGroupNameList[i].鐝粍
+ this.hform.HGroupID = this.HGroupNameList[i].HItemID
}
}
},
@@ -754,7 +801,7 @@
this.hform.HSourceID= data.HSourceID
this.hform.HSource= data.鐢熶骇璧勬簮
this.hform.HGroupID= data.HGroupID
- this.hform.HGroup= data.鐝粍
+ this.hform.HGroupName= data.鐝粍
this.hform.HDeptID= this.userInfo.HDeptID
this.hform.HDept= this.userInfo.HDept
this.hform.HProcExchHinteID= data.hmainid
diff --git a/pages/weiwaigxOut/table.vue b/pages/weiwaigxOut/table.vue
index 93014cc..e8f25d7 100644
--- a/pages/weiwaigxOut/table.vue
+++ b/pages/weiwaigxOut/table.vue
@@ -287,7 +287,7 @@
user: uni.getStorageSync('HUserName')
},
success: (res) => {
- // console.log(1,res);
+ console.log(1,res);
if(res.data.count == 1){
this.listData = res.data.data
this.showList = this.getPage(this.page,this.listData)
--
Gitblit v1.9.1