From 218cec7b640bbdc73b2831735d293e12ba344656 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 29 一月 2026 15:41:16 +0800
Subject: [PATCH] 设备、模具保养任务 今日改为近七日 增加对应的下推任务 模具、设备维修任务 增加下推按钮 三个待派工（故障单的负责人）、待维修（故障单的维修人）、待验收（故障单发现人）
---
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue | 63
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue | 1687 ++++++++-------
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue | 50
pages/qitaruku_v2/OtherInBill.vue | 6
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 1615 +++++++-------
pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue | 1130 +++++-----
pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue | 127 +
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 2
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue | 48
manifest.json | 4
pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue | 23
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue | 6
pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue | 124 +
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | 44
pages/index/login.vue | 2
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue | 1402 ++++++------
16 files changed, 3,410 insertions(+), 2,923 deletions(-)
diff --git a/manifest.json b/manifest.json
index 796f8b5..b542431 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.65",
- "versionCode" : 265,
+ "versionName" : "2.0.66",
+ "versionCode" : 266,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
index 4da4cad..d23b2f2 100644
--- a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
+++ b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
@@ -145,6 +145,7 @@
</view>
<view class="op" v-if="operations == item.hmainid">
+ <button class="op1" v-if="activeTab == 0" size="mini" plain @tap.stop="pushBill(0,item)">涓嬫帹淇濆吇鍗�</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
@@ -180,7 +181,7 @@
activeTab: 0,
tabs: [{
- label: '浠婃棩寰呬繚鍏�',
+ label: '杩戞棩寰呬繚鍏�',
type: 0,
count: 0,
listData: [], // 娣诲姞杩欎釜
@@ -191,7 +192,7 @@
}
},
{
- label: '浠婃棩宸蹭繚鍏�',
+ label: '杩戞棩宸蹭繚鍏�',
type: 1,
count: 0,
listData: [], // 娣诲姞杩欎釜
@@ -202,7 +203,7 @@
}
},
{
- label: '浠婃棩鍏ㄩ儴浠诲姟',
+ label: '杩戞棩鍏ㄩ儴浠诲姟',
type: 2,
count: 0,
listData: [], // 娣诲姞杩欎釜
@@ -221,9 +222,9 @@
},
dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
- curDateGap: "浠婂ぉ",
+ curDateGap: "杩戜竷澶�",
enableCustomDateRange: false,
- startDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ startDate: dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
endDate: dayjs(new Date()).format('YYYY-MM-DD'),
HBillNo: '',
@@ -268,6 +269,14 @@
// #endif
},
methods: {
+ pushBill(currTab, item) {
+ let Query = `?operationType=4&HBarCode=${item['璁惧浠ｇ爜']}`
+ if(currTab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill' + Query
+ })
+ }
+ },
goTop: function(e) {
// 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
this.scrollTop = this.old.scrollTop
@@ -335,9 +344,9 @@
},
clear() {
- this.curDateGap = "浠婂ぉ"
+ this.curDateGap = "杩�7澶�"
this.enableCustomDateRange = false
- this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.startDate = dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD')
this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
this.HBillNo = ''
},
diff --git a/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
index 87bc93b..cfba498 100644
--- a/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
+++ b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
@@ -1,627 +1,637 @@
<template>
- <view>
- <view class="page-header">
- <view class="search-item">
- <view class="left">鏃ユ湡闂撮殧</view>
- <view class="right">
- <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
- @change="onDateRangePickerChangeHandler">
- <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
- <view class="picker-overlay"></view>
- </picker>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
- </view>
- </view>
- <view class="search-item">
- <view class="left">寮�濮嬫棩鏈�</view>
- <view class="right">
- <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
- :disabled="!enableCustomDateRange">
- <view class="datetime-picker-inner"
- :class="enableCustomDateRange?'font__enable':'font__disable'">
- <text>{{ startDate }}</text>
- </view>
- </uni-datetime-picker>
- </view>
- </view>
- <view class="search-item">
- <view class="left">缁撴潫鏃ユ湡</view>
- <view class="right">
- <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
- :disabled="!enableCustomDateRange">
- <view class="datetime-picker-inner"
- :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
- </uni-datetime-picker>
- </view>
- </view>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
- <view class="button-groups">
- <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
- <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
- </view>
- </view>
+ <view class="button-groups">
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
- <!-- 椤电鍖哄煙 -->
- <view class="tab-container">
- <view class="tab-list">
- <view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
- @tap="switchTab(index)">
- <text>{{ tab.label }}</text>
- <text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
- </view>
- </view>
- </view>
+ <!-- 椤电鍖哄煙 -->
+ <view class="tab-container">
+ <view class="tab-list">
+ <view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
+ @tap="switchTab(index)">
+ <text>{{ tab.label }}</text>
+ <text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
+ </view>
+ </view>
+ </view>
- <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
- <!-- 椤电鍐呭鍖哄煙 -->
- <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
- scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
- <view class="list" v-for="(item,index) in tab.listData" :key="index">
- <uni-card :title="item.鍣ㄥ叿鍙�" :extra="item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿" style="margin: 10px;"
- @tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
- <view class="card-detail">
- <view class="detail" v-if="item.鍣ㄥ叿鍚嶇О">
- <text>鍣ㄥ叿鍚嶇О锛�</text>{{item.鍣ㄥ叿鍚嶇О}}
- </view>
- <view class="detail" v-if="item.鍣ㄥ叿瑙勬牸">
- <text>鍣ㄥ叿瑙勬牸锛�</text>{{item.鍣ㄥ叿瑙勬牸}}
- </view>
- <view class="detail" v-if="item.鍣ㄥ叿鍨嬪彿">
- <text>鍣ㄥ叿鍨嬪彿锛�</text>{{item.鍣ㄥ叿鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
- <text>淇濆吇鍛ㄦ湡锛�</text>{{item.淇濆吇鍛ㄦ湡}}
- </view>
- <view class="detail" v-if="item.鎽樿">
- <text>鎽樿锛�</text>{{item.鎽樿}}
- </view>
- <view class="detail" v-if="item.淇濆吇璐熻矗浜�">
- <text>淇濆吇璐熻矗浜猴細</text>{{item.淇濆吇璐熻矗浜簘}
- </view>
- <view class="detail" v-if="item.鏄惁淇濆吇">
- <text>鏄惁淇濆吇锛�</text>{{item.鏄惁淇濆吇}}
- </view>
- <view class="detail" v-if="item.璁″垝寮�濮嬫椂闂寸偣">
- <text>璁″垝寮�濮嬫椂闂寸偣锛�</text>{{item.璁″垝寮�濮嬫椂闂寸偣.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.璁″垝缁撴潫鏃堕棿鐐�">
- <text>璁″垝缁撴潫鏃堕棿鐐癸細</text>{{item.璁″垝缁撴潫鏃堕棿鐐�.substr(0,10)}}
- </view>
- </view>
- <view class="card-detail" v-if="showDetail == item.hmainid">
- <view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
- </view>
- <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
- <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.瀹℃牳浜�">
- <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
- </view>
- <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
- <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.淇敼浜�">
- <text>淇敼浜猴細</text>{{item.淇敼浜簘}
- </view>
- <view class="detail" v-if="item.淇敼鏃ユ湡">
- <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.鍏抽棴浜�">
- <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
- </view>
- <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
- <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.浣滃簾浜�">
- <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
- </view>
- <view class="detail" v-if="item.浣滃簾鏃ユ湡">
- <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
- </view>
- </view>
+ <!-- 椤电鍐呭鍖哄煙 -->
+ <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
+ scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view class="list" v-for="(item,index) in tab.listData" :key="index">
+ <uni-card :title="item.鍣ㄥ叿鍙�" :extra="item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿" style="margin: 10px;"
+ @tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鍣ㄥ叿鍚嶇О">
+ <text>鍣ㄥ叿鍚嶇О锛�</text>{{item.鍣ㄥ叿鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.鍣ㄥ叿瑙勬牸">
+ <text>鍣ㄥ叿瑙勬牸锛�</text>{{item.鍣ㄥ叿瑙勬牸}}
+ </view>
+ <view class="detail" v-if="item.鍣ㄥ叿鍨嬪彿">
+ <text>鍣ㄥ叿鍨嬪彿锛�</text>{{item.鍣ㄥ叿鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
+ <text>淇濆吇鍛ㄦ湡锛�</text>{{item.淇濆吇鍛ㄦ湡}}
+ </view>
+ <view class="detail" v-if="item.鎽樿">
+ <text>鎽樿锛�</text>{{item.鎽樿}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇璐熻矗浜�">
+ <text>淇濆吇璐熻矗浜猴細</text>{{item.淇濆吇璐熻矗浜簘}
+ </view>
+ <view class="detail" v-if="item.鏄惁淇濆吇">
+ <text>鏄惁淇濆吇锛�</text>{{item.鏄惁淇濆吇}}
+ </view>
+ <view class="detail" v-if="item.璁″垝寮�濮嬫椂闂寸偣">
+ <text>璁″垝寮�濮嬫椂闂寸偣锛�</text>{{item.璁″垝寮�濮嬫椂闂寸偣.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.璁″垝缁撴潫鏃堕棿鐐�">
+ <text>璁″垝缁撴潫鏃堕棿鐐癸細</text>{{item.璁″垝缁撴潫鏃堕棿鐐�.substr(0,10)}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == item.hmainid">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.浣滃簾浜�">
+ <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+ </view>
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+ </view>
+ </view>
- <view class="more" v-if="showDetail == item.hmainid && operations != item.hmainid">
- <view class="part" style="border-right: 1px solid #eee;">
- <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
- </view>
- <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鎿嶄綔
- </view>
- </view>
- <view class="more" v-if="showDetail != item.hmainid && operations != item.hmainid">
- <view class="part" style="border-right: 1px solid #eee;">
- <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
- </view>
- <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鎿嶄綔
- </view>
- </view>
+ <view class="more" v-if="showDetail == item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
- <view class="op" v-if="operations == item.hmainid">
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
- </scroll-view>
+ <view class="op" v-if="operations == item.hmainid">
+ <button class="op1" v-if="activeTab == 0" size="mini" plain
+ @tap.stop="pushBill(0,item)">涓嬫帹淇濆吇鍗�</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
- <!-- 鍒嗛〉鍣� -->
- <view class="page-footer">
- <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
- :pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
- @change="onPageChangeHandler"></uni-pagination>
- </view>
- </view>
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
+ :pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
+ @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
</template>
<script>
- import dayjs from 'dayjs'
- import {
- CommonUtils
- } from '@/utils/common.js'
- import {
- getUserInfo
- } from '../../../utils/auth'
- export default {
- data() {
- return {
- // 璁＄畻鍗＄墖鍒楄〃楂樺害
- pagination_top: 0,
- pageContent_top: 0,
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from '../../../utils/auth'
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
- // 褰撳墠婵�娲荤殑椤电
- activeTab: 0,
+ // 褰撳墠婵�娲荤殑椤电
+ activeTab: 0,
- tabs: [{
- label: '浠婃棩寰呬繚鍏�',
- type: 0,
- count: 0,
- listData: [], // 娣诲姞杩欎釜
- pageMeta: { // 娣诲姞杩欎釜
- curPage: 1,
- size: 50,
- total: 0,
- }
- },
- {
- label: '浠婃棩宸蹭繚鍏�',
- type: 1,
- count: 0,
- listData: [], // 娣诲姞杩欎釜
- pageMeta: { // 娣诲姞杩欎釜
- curPage: 1,
- size: 50,
- total: 0,
- }
- },
- {
- label: '浠婃棩鍏ㄩ儴浠诲姟',
- type: 2,
- count: 0,
- listData: [], // 娣诲姞杩欎釜
- pageMeta: { // 娣诲姞杩欎釜
- curPage: 1,
- size: 50,
- total: 0,
- }
- }
- ],
+ tabs: [{
+ label: '杩戞棩寰呬繚鍏�',
+ type: 0,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '杩戞棩宸蹭繚鍏�',
+ type: 1,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '杩戞棩鍏ㄩ儴浠诲姟',
+ type: 2,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ }
+ ],
- // 婊氬姩鎺у埗
- scrollTop: 0,
- old: {
- scrollTop: 0
- },
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
- dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
- curDateGap: "浠婂ぉ",
- enableCustomDateRange: false,
- startDate: dayjs(new Date()).format('YYYY-MM-DD'),
- endDate: dayjs(new Date()).format('YYYY-MM-DD'),
- HBillNo: '',
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ curDateGap: "杩戜竷澶�",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
- showDetail: -1,
- operations: -1,
- }
- },
- computed: {
- pageContentHeight: {
- get() {
- return (this.pagination_top - this.pageContent_top)
- }
- },
- },
- onLoad() {
- this.onSearchClickHandler()
- },
- onPullDownRefresh() {
- this.onSearchClickHandler()
- },
- async onReady() {
- // #ifndef MP-WEIXIN
- let query = uni.createSelectorQuery().in(this)
- query.select("#pagination")
- .boundingClientRect((data) => {
- if (data) {
- this.pagination_top = data.top
- } else {
- console.log("鏈壘鍒�#pagination鑺傜偣");
- }
- })
- .exec();
- query.select("#pageContent")
- .boundingClientRect((data) => {
- if (data) {
- this.pageContent_top = data.top
- } else {
- console.log("鏈壘鍒�#pageContent鑺傜偣");
- }
- })
- .exec();
- // #endif
- },
- methods: {
- goTop: function(e) {
- // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
- this.scrollTop = this.old.scrollTop
- this.$nextTick(function() {
- this.scrollTop = 0
- });
- },
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onShow() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+ },
+ methods: {
+ pushBill(currTab, item) {
+ let Query = `?operationType=4&HBarCode=${item['鍣ㄥ叿缂栧彿']}`
+ if (currTab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill' + Query
+ })
+ }
+ },
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
- // 鍒囨崲椤电
- switchTab(index) {
- this.activeTab = index
- this.showDetail = -1
- this.operations = -1
- },
+ // 鍒囨崲椤电
+ switchTab(index) {
+ this.activeTab = index
+ this.showDetail = -1
+ this.operations = -1
+ },
- onDateRangePickerChangeHandler({
- detail
- }) {
- this.enableCustomDateRange = false
- this.curDateGap = this.dateRangePicker[detail.value]
- let date = new Date()
- switch (this.curDateGap) {
- case "浠婂ぉ":
- this.startDate = dayjs(date).format("YYYY-MM-DD")
- break;
- case "杩戜竴澶�":
- this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜袱澶�":
- this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜笁澶�":
- this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
- break;
- case "杩戝洓澶�":
- this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜簲澶�":
- this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
- break;
- case "杩戝叚澶�":
- this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜竷澶�":
- this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
- break;
- case "杩�30澶�":
- this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
- break;
- }
- if (this.curDateGap == '浠绘剰闂撮殧') {
- this.enableCustomDateRange = true
- }
- },
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
- onSearchClickHandler() {
- let sWhere = ""
- // 鑾峰彇褰撳墠婵�娲荤殑椤电
- const currentTab = this.tabs[this.activeTab]
- sWhere = {
- HBeginDate: this.startDate,
- HEndDate: this.endDate
- }
- this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
- },
+ onSearchClickHandler() {
+ let sWhere = ""
+ // 鑾峰彇褰撳墠婵�娲荤殑椤电
+ const currentTab = this.tabs[this.activeTab]
+ sWhere = {
+ HBeginDate: this.startDate,
+ HEndDate: this.endDate
+ }
+ this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
+ },
- clear() {
- this.curDateGap = "浠婂ぉ"
- this.enableCustomDateRange = false
- this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
- this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
- this.HBillNo = ''
- },
+ clear() {
+ this.curDateGap = "杩戜竷澶�"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
- async onResetClickHandler() {
- this.clear()
- await this.$nextTick()
- this.onSearchClickHandler()
- },
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
- get_DisplayPage(sWhere, tabType) {
- CommonUtils.doRequest2({
- url: '/Sb_EquipMaintainTaskReport/MaintainList_APP',
- data: {
- "sWhere": sWhere,
- "user": getUserInfo()["Czymc"],
- },
- resFunction: (res) => {
- let {
- data,
- Message,
- count
- } = res.data
- console.log('res.data: ', res.data)
+ get_DisplayPage(sWhere, tabType) {
+ CommonUtils.doRequest2({
+ url: '/Sc_MouldMaintainTaskReport/MaintainList_APP',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data)
- if (data && data.h_p_Sb_EquipMaintainTaskReport_APP) {
- // 鏇存柊寰呯鍒伴〉绛�
- this.tabs[0].listData = data.h_p_Sb_EquipMaintainTaskReport_APP
- this.tabs[0].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP.length
- this.tabs[0].count = data.h_p_Sb_EquipMaintainTaskReport_APP.length
- }
+ if (data && data.h_p_Sc_MouldMaintainTaskReport_APP) {
+ // 鏇存柊寰呯鍒伴〉绛�
+ this.tabs[0].listData = data.h_p_Sc_MouldMaintainTaskReport_APP
+ this.tabs[0].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP.length
+ this.tabs[0].count = data.h_p_Sc_MouldMaintainTaskReport_APP.length
+ }
- if (data && data.h_p_Sb_EquipMaintainTaskReport_APP1) {
- // 鏇存柊寰呭鐞嗛〉绛�
- this.tabs[1].listData = data.h_p_Sb_EquipMaintainTaskReport_APP1
- this.tabs[1].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
- this.tabs[1].count = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
- }
+ if (data && data.h_p_Sc_MouldMaintainTaskReport_APP1) {
+ // 鏇存柊寰呭鐞嗛〉绛�
+ this.tabs[1].listData = data.h_p_Sc_MouldMaintainTaskReport_APP1
+ this.tabs[1].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
+ this.tabs[1].count = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
+ }
- if (data && data.h_p_Sb_EquipMaintainTaskReport_APP2) {
- // 鏇存柊寰呴獙鏀堕〉绛�
- this.tabs[2].listData = data.h_p_Sb_EquipMaintainTaskReport_APP2
- this.tabs[2].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
- this.tabs[2].count = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
- }
+ if (data && data.h_p_Sc_MouldMaintainTaskReport_APP2) {
+ // 鏇存柊寰呴獙鏀堕〉绛�
+ this.tabs[2].listData = data.h_p_Sc_MouldMaintainTaskReport_APP2
+ this.tabs[2].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
+ this.tabs[2].count = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
+ }
-
- uni.stopPullDownRefresh()
- }
- })
- },
- onPageChangeHandler() {
- this.onSearchClickHandler()
- this.goTop()
- },
- },
- }
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ },
+ },
+ }
</script>
<style lang="scss">
- .page-header {
- display: flex;
- box-sizing: border-box;
- padding: 20rpx;
- flex-direction: column;
- gap: 10rpx;
- font-size: 32rpx;
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
- .search-item {
- display: flex;
- flex-direction: row;
- gap: 10rpx;
- justify-content: center;
- align-items: center;
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
- .left {
- width: 4em;
- }
+ .left {
+ width: 4em;
+ }
- .right {
- flex: 1;
- position: relative;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- display: flex;
- padding: 4rpx 10rpx;
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
- picker {
- width: 100%;
- }
- }
- }
+ picker {
+ width: 100%;
+ }
+ }
+ }
- input {
- width: inherit;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
- .datetime-picker-inner {
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- display: flex;
- align-items: center;
- }
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
- .font__enable {
- color: #000;
- }
+ .font__enable {
+ color: #000;
+ }
- .font__disable {
- color: #cccccc;
- }
- }
+ .font__disable {
+ color: #cccccc;
+ }
+ }
- .button-groups {
- box-sizing: border-box;
- padding: 10rpx 0 0 0;
- display: flex;
- flex-direction: row;
- gap: 10rpx;
- justify-content: space-between;
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
- .btn-a {
- background-color: #acacac;
- color: #fff;
- }
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .btn-c {
- background-color: #3a78ff;
- color: #fff;
- }
- }
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
- /* 椤电鏍峰紡 */
- .tab-container {
- background-color: #fff;
- }
+ /* 椤电鏍峰紡 */
+ .tab-container {
+ background-color: #fff;
+ }
- .tab-list {
- display: flex;
- flex-direction: row;
- border-bottom: 1px solid #e5e5e5;
- }
+ .tab-list {
+ display: flex;
+ flex-direction: row;
+ border-bottom: 1px solid #e5e5e5;
+ }
- .tab-item {
- flex: 1;
- padding: 20rpx 0;
- text-align: center;
- font-size: 28rpx;
- color: #666;
- position: relative;
+ .tab-item {
+ flex: 1;
+ padding: 20rpx 0;
+ text-align: center;
+ font-size: 28rpx;
+ color: #666;
+ position: relative;
- &.active {
- color: #3a78ff;
- font-weight: bold;
+ &.active {
+ color: #3a78ff;
+ font-weight: bold;
- &::after {
- content: '';
- position: absolute;
- bottom: 0;
- left: 50%;
- transform: translateX(-50%);
- width: 80rpx;
- height: 4rpx;
- background-color: #3a78ff;
- }
- }
+ &::after {
+ content: '';
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 80rpx;
+ height: 4rpx;
+ background-color: #3a78ff;
+ }
+ }
- .tab-count {
- display: inline-block;
- margin-left: 10rpx;
- padding: 0 12rpx;
- background-color: #ff6b6b;
- color: #fff;
- border-radius: 20rpx;
- font-size: 20rpx;
- min-width: 30rpx;
- text-align: center;
- }
- }
+ .tab-count {
+ display: inline-block;
+ margin-left: 10rpx;
+ padding: 0 12rpx;
+ background-color: #ff6b6b;
+ color: #fff;
+ border-radius: 20rpx;
+ font-size: 20rpx;
+ min-width: 30rpx;
+ text-align: center;
+ }
+ }
- .page-content {
- box-sizing: border-box;
- padding: 10rpx 0;
+ .page-content {
+ box-sizing: border-box;
+ padding: 10rpx 0;
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- line-height: 120%;
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
- .detail {
- font-size: 26rpx;
- margin-bottom: 12rpx;
- color: #555;
- margin-right: 20rpx;
+ .detail {
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
- text {
- color: #999;
- font-size: 26rpx;
- }
- }
- }
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
- .more {
- color: #888;
- font-size: 24rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 20rpx;
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
- .part {
- width: 50%;
- text-align: center;
- }
- }
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
- .op {
- display: flex;
- justify-content: space-around;
- margin-top: 20rpx;
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
- button {
- padding: 0;
- width: 150rpx;
- font-size: 25rpx;
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
- &:disabled {
- opacity: 0.5;
- }
- }
+ &:disabled {
+ opacity: 0.5;
+ }
+ }
- .op1 {
- border: 1px solid #41a863;
- color: #41a863;
- }
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
- .op2 {
- border: 1px solid #d98d00;
- color: #d98d00;
- }
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
- .op3 {
- border: 1px solid #3a78ff;
- color: #3a78ff;
- }
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
- .op4 {
- border: 1px solid #da0000;
- color: #da0000;
- }
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
- .op5 {
- border: 1px solid #888;
- color: #888;
- }
- }
- }
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
- .over {
- text-align: center;
- padding: 40rpx;
- color: #999;
- font-size: 28rpx;
- }
+ .over {
+ text-align: center;
+ padding: 40rpx;
+ color: #999;
+ font-size: 28rpx;
+ }
- .page-footer {
- position: fixed;
- bottom: 0;
- width: 100%;
- box-sizing: border-box;
- padding: 32rpx 40rpx;
- }
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 40rpx;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
index 1876d92..5faca64 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -1,718 +1,764 @@
<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 none-border">
- <radio-group @change="radioChange" class="radio_Container">
- <label>
- <view>
- <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
- <text>OK</text>
- </view>
- </label>
- </label>
- <view>
- <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
- <text>NG</text>
- </view>
- </label>
- </radio-group>
- </view>
- </view>
- <view class="form-item">
- <view class="title">楠屾敹鍐呭:</view>
- <view class="right">
- <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
- </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 none-border">
+ <radio-group @change="radioChange" class="radio_Container">
+ <label>
+ <view>
+ <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+ <text>OK</text>
+ </view>
+ </label>
+ </label>
+ <view>
+ <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+ <text>NG</text>
+ </view>
+ </label>
+ </radio-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">楠屾敹鍐呭:</view>
+ <view class="right">
+ <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+ </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="right" v-show="hform.HMainSourceBillType != 1">
- <input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
- </view>
- <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
- :disabled="hform.HMainSourceBillType == -1">
- <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
- </view>
- <view class="righton" v-show="hform.HMainSourceBillType == 1">
- <input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
- </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 required">閮ㄩ棬:</view>
- <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
- dataValue="HItemID" v-model="hform.HDeptID">
+ <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="right" v-show="hform.HMainSourceBillType != 1">
+ <input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+ :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+ <view class="righton" v-show="hform.HMainSourceBillType == 1">
+ <input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </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 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="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairCheckMainID">
- </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 required">缁翠慨璁板綍:</view>
- <view class="right" v-show="hform.HMainSourceBillType != 1">
- <input type="text" v-model="hform.HMouldRepairWorkName"
- :disabled="hform.HMainSourceBillType == -1" placeholder="璇烽�夋嫨缁翠慨璁板綍" />
- </view>
- <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
- :disabled="hform.HMainSourceBillType == -1">
- <uni-icons type="search" size="20" @click="showRepairRecordList"></uni-icons>
- </view>
- <view class="righton" v-show="hform.HMainSourceBillType == 1">
- <input type="text" disabled v-model="hform.HMouldRepairWorkName" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鍚嶇О:</view>
- <view class="righton">
- <input v-model="hform.HMouldName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿瑙勬牸:</view>
- <view class="righton">
- <input v-model="hform.HMouldSpec" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鍨嬪彿:</view>
- <view class="righton">
- <input v-model="hform.HMouldModel" disabled />
- </view>
- </view>
- </view>
- </template>
- <!-- 鍏朵粬淇℃伅 -->
- <template v-if="tabs == 2">
- <view class="form" :style="{
+ </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="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+ dataValue="hitemid" v-model="hform.HRepairCheckMainID">
+ </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 required">缁翠慨璁板綍:</view>
+ <view class="right" v-show="hform.HMainSourceBillType != 1">
+ <input type="text" v-model="hform.HMouldRepairWorkName"
+ :disabled="hform.HMainSourceBillType == -1" placeholder="璇烽�夋嫨缁翠慨璁板綍" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+ :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showRepairRecordList"></uni-icons>
+ </view>
+ <view class="righton" v-show="hform.HMainSourceBillType == 1">
+ <input type="text" disabled v-model="hform.HMouldRepairWorkName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿瑙勬牸:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldSpec" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldModel" disabled />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鍏朵粬淇℃伅 -->
+ <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" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- <!-- 寮瑰嚭妯″叿鏁呴殰鐧昏鍗曠殑閫夋嫨鍒楄〃 -->
- <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
- :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
- </BillListPopupMouldConkBookBillVue>
- <!-- 寮瑰嚭妯″叿缁翠慨璁板綍鍗曠殑閫夋嫨鍒楄〃 -->
- <RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID">
- </RepairRecordPopup>
- </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" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ <!-- 寮瑰嚭妯″叿鏁呴殰鐧昏鍗曠殑閫夋嫨鍒楄〃 -->
+ <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupMouldConkBookBillVue>
+ <!-- 寮瑰嚭妯″叿缁翠慨璁板綍鍗曠殑閫夋嫨鍒楄〃 -->
+ <RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID">
+ </RepairRecordPopup>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
- import RepairRecordPopup from '../../../components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue';
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+ import RepairRecordPopup from '../../../components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue';
- export default {
- components: {
- BillListPopupMouldConkBookBillVue,
- RepairRecordPopup
- },
- name: 'Sc_MouldRepairCheckBill',
- data() {
- return {
- tabs: 0,
- btnTop: 0,
- tabsBottom: 0,
- HModName: "Sc_MouldRepairCheckBill",
- HBillType: '3817',
- operationType: 1,
- enableEdit: true,
+ export default {
+ components: {
+ BillListPopupMouldConkBookBillVue,
+ RepairRecordPopup
+ },
+ name: 'Sc_MouldRepairCheckBill',
+ data() {
+ return {
+ tabs: 0,
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "Sc_MouldRepairCheckBill",
+ HBillType: '3817',
+ operationType: 1,
+ enableEdit: true,
- // 鎺у埗婧愬崟绫诲瀷鏄惁鍙紪杈�
- showHMainSourceBillType: true,
- HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
- arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
- arrayHMainSourceBillTypeID: ['3815'],
+ // 鎺у埗婧愬崟绫诲瀷鏄惁鍙紪杈�
+ showHMainSourceBillType: true,
+ HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
+ arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
+ arrayHMainSourceBillTypeID: ['3815'],
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
+ HDeptList: [],
+ HRepairCheckList: [],
+ HEmpList: [],
- hform: {
- "HBillType": 3817,
- "HBarCode": "",
- "HBillNo": "",
- "HInterID": 0,
- "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
- "HInnerBillNo": "",
- "HMouldName": "",
- "HMouldSpec": "",
- "HMouldModel": "",
- "HMouldID": 0,
- "HMainSourceBillType": "3815",
- "HMainSourceInterID": 0,
- "HMainSourceEntryID": 0,
- "HCheckResult": "OK",
- "HEmpName": getUserInfo().HEmpName,
- "HEmpID": getUserInfo().HEmpID,
- "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
- "HDeptName": getUserInfo().HDeptName,
- "HDeptID": getUserInfo().HDeptID,
- "HMainSourceBillNo": "",
- "HManagerName": getUserInfo().HManagerName,
- "HManagerID": getUserInfo().HManagerID,
- "HMouldRepairWorkName": "",
- "HMouldRepairWorkID": 0,
- "HExplanation": "",
- "HRemark": "",
- "HOrgID": uni.getStorageSync("OrganizationID"),
- "HStockOrgID": uni.getStorageSync("OrganizationID"),
- "HMaker": getUserInfo()["Czymc"],
- "HChecker": "",
- "HCloseMan": "",
- "HUpDater": "",
- "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
- "HCheckDate": "",
- "HCloseDate": "",
- "HUpDateDate": "",
- "HDeleteMan": "",
- "HDeleteDate": "",
- "HRepairCheckMainID": 0,
- "HRepairCheckMainContent": "",
- },
- HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
- "HRepairCheckID": 0,
- "HRepairCheckCode": "",
- "HRepairCheckName": "",
- "HRepairCheckContent": "",
- "HManagerID": 0,
- "HManagerCode": "",
- "HManagerName": "",
- "HRemark": "",
- "LAY_TABLE_INDEX": 0
- }]
- };
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- },
- },
- methods: {
- // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
- 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
- }
- }
+ hform: {
+ "HBillType": 3817,
+ "HBarCode": "",
+ "HBillNo": "",
+ "HInterID": 0,
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HInnerBillNo": "",
+ "HMouldName": "",
+ "HMouldSpec": "",
+ "HMouldModel": "",
+ "HMouldID": 0,
+ "HMainSourceBillType": "3815",
+ "HMainSourceInterID": 0,
+ "HMainSourceEntryID": 0,
+ "HCheckResult": "OK",
+ "HEmpName": getUserInfo().HEmpName,
+ "HEmpID": getUserInfo().HEmpID,
+ "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HDeptName": getUserInfo().HDeptName,
+ "HDeptID": getUserInfo().HDeptID,
+ "HMainSourceBillNo": "",
+ "HManagerName": getUserInfo().HManagerName,
+ "HManagerID": getUserInfo().HManagerID,
+ "HMouldRepairWorkName": "",
+ "HMouldRepairWorkID": 0,
+ "HExplanation": "",
+ "HRemark": "",
+ "HOrgID": uni.getStorageSync("OrganizationID"),
+ "HStockOrgID": uni.getStorageSync("OrganizationID"),
+ "HMaker": getUserInfo()["Czymc"],
+ "HChecker": "",
+ "HCloseMan": "",
+ "HUpDater": "",
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HCheckDate": "",
+ "HCloseDate": "",
+ "HUpDateDate": "",
+ "HDeleteMan": "",
+ "HDeleteDate": "",
+ "HRepairCheckMainID": 0,
+ "HRepairCheckMainContent": "",
+ },
+ HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
+ "HRepairCheckID": 0,
+ "HRepairCheckCode": "",
+ "HRepairCheckName": "",
+ "HRepairCheckContent": "",
+ "HManagerID": 0,
+ "HManagerCode": "",
+ "HManagerName": "",
+ "HRemark": "",
+ "LAY_TABLE_INDEX": 0
+ }]
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ },
+ },
+ methods: {
+ // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+ 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
+ }
+ }
- return {
- Message: "",
- state: true
- }
- },
- addNew() {
- uni.redirectTo({
- url: './Sc_MouldRepairCheckBill?operationType=1'
- })
- },
- goBack() {
- uni.navigateBack()
- },
- showBillList() {
- this.$refs.billList.showPopup()
- },
- showRepairRecordList() {
- if (this.hform.HMouldID === 0) {
- CommonUtils.showTips({
- title: '鎻愮ず',
- message: '璇峰厛閫夋嫨妯″叿'
- });
- return;
- }
- this.$refs.repairRecordList.showPopup(this.hform.HMouldID);
- },
- //閫夋嫨婧愬崟绫诲瀷
- HMainSourceBillTypeChange(e) {
- if (e.detail.value == -1 || e.detail.value == NaN) {
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- this.hform.HMainSourceBillType = -1
- return
- }
- 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
- })
- },
- checkBoxChangeHandler(index, e) {
- let cr = e.detail.value
- if (cr.length == 0) {
- this.HCheckFileList[index]["HDotCheckResult"] = false
- } else {
- this.HCheckFileList[index]["HDotCheckResult"] = true
- }
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- 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')
- }
- })
+ return {
+ Message: "",
+ state: true
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: './Sc_MouldRepairCheckBill?operationType=1'
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
+ showRepairRecordList() {
+ if (this.hform.HMouldID === 0) {
+ CommonUtils.showTips({
+ title: '鎻愮ず',
+ message: '璇峰厛閫夋嫨妯″叿'
+ });
+ return;
+ }
+ this.$refs.repairRecordList.showPopup(this.hform.HMouldID);
+ },
+ //閫夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ if (e.detail.value == -1 || e.detail.value == NaN) {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = -1
+ return
+ }
+ 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
+ })
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HDotCheckResult"] = false
+ } else {
+ this.HCheckFileList[index]["HDotCheckResult"] = true
+ }
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ 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.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.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)
- })
- },
- async GetMessageByBarCode(HBarCode) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
- data: {
- HBarCode: HBarCode,
- },
- })
+ 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)
+ })
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_PDA_MouldRepairCheckBill/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.HMouldID = data[0].hmainid
- this.hform.HMouldName = data[0].妯″叿鍚嶇О
- this.hform.HMouldSpec = data[0].妯″叿鍝佺被
- this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
- this.hform.HQty = 1
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HMouldID = data[0].hmainid
+ this.hform.HMouldName = data[0].妯″叿鍚嶇О
+ this.hform.HMouldSpec = data[0].妯″叿鍝佺被
+ this.hform.HMouldModel = 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
- }
- })
+ } 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
- console.log('data: ', 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 {
+ count,
+ data,
+ Message
+ } = res.data
+ console.log('data: ', 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.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
- this.HBillSub[0].HManagerID = this.hform.HManagerID
- this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
- let sSubStr = JSON.stringify(this.HBillSub);
- let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
+ try {
+ let oMain = JSON.stringify(this.hform);
+ this.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
+ this.HBillSub[0].HManagerID = this.hform.HManagerID
+ this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
+ let sSubStr = JSON.stringify(this.HBillSub);
+ let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
- if (!res) {
- return
- }
+ if (!res) {
+ return
+ }
- let {
- count,
- Message
- } = res.data
- if (count == 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + Message
- })
- }
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?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
- })
- }
- }
- },
- onLoad(e) {
- console.log('e: ', e);
- if (!e.operationType) {
- this.operationType = 1
- } else {
- this.operationType = e.operationType
- }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ 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 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.HMouldName = data1.浜у搧妯″叿
+ this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
+ this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
+ }
+ },
+ 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) {
- // 缂栬緫
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
- } else if (this.operationType == 4) {
- // 娴忚
+ } else if (this.operationType == 4) {
+ // 涓嬫帹
+ // 涓嬫帹
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo
+ } = e
+ // 涓嬫帹
+ // this.enableEdit = false;
+ // this.enableSourceBillEdit = false;
+ // this.showHMainSourceBillType = false;
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ }
- }
-
- this.getHDeptList()
- this.getEmpList()
- this.getCheckProjList()
- // 鐩戝惉鏁呴殰鐧昏鍗曢�夋嫨瀹屾垚浜嬩欢
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
- this.hform.HMainSourceInterID = e.HInterID
- this.hform.HMainSourceBillNo = e.HBillNo
- this.hform.HMainSourceEntryID = e.HEntryID
- this.hform.HMouldID = e.HMouldID
- this.hform.HMouldName = e.HMouldName
- this.hform.HMouldSpec = e.HMouldSpec
- this.hform.HMouldModel = e.HMouldModel
- this.$refs.billList.exit()
- })
- // 鐩戝惉缁翠慨璁板綍閫夋嫨瀹屾垚浜嬩欢
- uni.$on('RepairRecordSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮淮淇褰曢�夋嫨: ", e);
- if (e.HInterID) {
- this.hform.HMouldRepairWorkName = e.HBillNo;
- this.hform.HMouldRepairWorkID = e.HInterID;
- // 鍙互鏍规嵁闇�瑕佽缃叾浠栧瓧娈�
- }
- this.$refs.repairRecordList.exit();
- });
- },
- onUnload() {
- uni.$off('BillSelectComplete');
- uni.$off('RepairRecordSelectComplete');
- },
- 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)
- })
- }
- }
+ this.getHDeptList()
+ this.getEmpList()
+ this.getCheckProjList()
+ // 鐩戝惉鏁呴殰鐧昏鍗曢�夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HMouldID = e.HMouldID
+ this.hform.HMouldName = e.HMouldName
+ this.hform.HMouldSpec = e.HMouldSpec
+ this.hform.HMouldModel = e.HMouldModel
+ this.$refs.billList.exit()
+ })
+ // 鐩戝惉缁翠慨璁板綍閫夋嫨瀹屾垚浜嬩欢
+ uni.$on('RepairRecordSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮淮淇褰曢�夋嫨: ", e);
+ if (e.HInterID) {
+ this.hform.HMouldRepairWorkName = e.HBillNo;
+ this.hform.HMouldRepairWorkID = e.HInterID;
+ // 鍙互鏍规嵁闇�瑕佽缃叾浠栧瓧娈�
+ }
+ this.$refs.repairRecordList.exit();
+ });
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete');
+ uni.$off('RepairRecordSelectComplete');
+ },
+ 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"
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
index 487706a..f4f8be8 100644
--- a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -783,7 +783,7 @@
})
return
}
-
+
try {
let oMain = JSON.stringify(this.hform);
this.HDetailList[0].HManagerID = this.hform.HManagerID
@@ -795,8 +795,8 @@
this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
- 'Czymc'];
+ let sMainSub = oMain + ';' + sSubStr;
+ console.log('sMainSub: ',sMainSub);
let res = await CommonUtils.doRequest2Sync({
url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
data: {
@@ -912,7 +912,42 @@
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.HMainSourceBillNo = 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) {
console.log('e: ', e);
@@ -935,7 +970,12 @@
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()
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
index 6f90a74..8094176 100644
--- a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -804,8 +804,10 @@
// 缂栬緫
} else if (this.operationType == 4) {
- // 娴忚
-
+ // 涓嬫帹
+ let HBarCode = e.HBarCode
+ this.getMaxNum()
+ this.GetMessageByBarCode(HBarCode)
}
this.getHDeptList()
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index 46200f5..99ea259 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -1,834 +1,879 @@
<template>
- <view>
- <view class="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>
- <!-- 鍩烘湰淇℃伅 -->
- <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 == 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>
+ <!-- 鍩烘湰淇℃伅 -->
+ <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 none-border">
- <radio-group @change="radioChange" class="radio_Container">
- <label>
- <view>
- <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
- <text>OK</text>
- </view>
- </label>
- </label>
- <view>
- <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
- <text>NG</text>
- </view>
- </label>
- </radio-group>
- </view>
- </view>
- <view class="form-item">
- <view class="title">楠屾敹鍐呭:</view>
- <view class="right">
- <textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
- </view>
- </view>
- <!-- 缁翠慨璁板綍锛堟簮鍗曪級 -->
- <view class="form-item">
- <view class="title required">缁翠慨璁板綍:</view>
- <view :class="enableSourceBillEdit?'right':'righton'">
- <input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
- @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
- placeholder="璇疯緭鍏�(鎴栨壂鎻�)缁翠慨璁板綍鍗曞彿" />
- </view>
- <!-- 鏀惧ぇ闀滃浘鏍� -->
- <view class="icon-wrapper">
- <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="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 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="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairCheckID">
- </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="{
+ <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 none-border">
+ <radio-group @change="radioChange" class="radio_Container">
+ <label>
+ <view>
+ <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+ <text>OK</text>
+ </view>
+ </label>
+ </label>
+ <view>
+ <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+ <text>NG</text>
+ </view>
+ </label>
+ </radio-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">楠屾敹鍐呭:</view>
+ <view class="right">
+ <textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+ </view>
+ </view>
+ <!-- 缁翠慨璁板綍锛堟簮鍗曪級 -->
+ <view class="form-item">
+ <view class="title required">缁翠慨璁板綍:</view>
+ <view :class="enableSourceBillEdit?'right':'righton'">
+ <input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
+ @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
+ placeholder="璇疯緭鍏�(鎴栨壂鎻�)缁翠慨璁板綍鍗曞彿" />
+ </view>
+ <!-- 鏀惧ぇ闀滃浘鏍� -->
+ <view class="icon-wrapper">
+ <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="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 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="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+ dataValue="hitemid" v-model="hform.HRepairCheckID">
+ </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="{
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" 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>
+ </template>
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="buttons" id="buttons">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <view style="flex: 1;"></view>
+ <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
- <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
- <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="'璁惧缁翠慨璁板綍鍗�'"
- :HStockOrgID="hform.HStockOrgID">
- </BillListPopupEquipConkBookBillVue>
- </view>
+ <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="'璁惧缁翠慨璁板綍鍗�'"
+ :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_EquipRepairCheckBill',
- components: {
- BillListPopupEquipConkBookBillVue
- },
- data() {
- return {
- tabs: 0,
- btnTop: 0,
- tabsBottom: 0,
- HModName: "sb_EquipRepairCheckBill",
- HBillType: '3911',
- operationType: 1,
- uploadOptions: {},
- enableEdit: true,
- enableSourceBillEdit: true, // 鏂板锛氭帶鍒剁淮淇褰曠紪杈戠姸鎬�
+ export default {
+ name: 'sb_EquipRepairCheckBill',
+ components: {
+ BillListPopupEquipConkBookBillVue
+ },
+ data() {
+ return {
+ tabs: 0,
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "sb_EquipRepairCheckBill",
+ HBillType: '3911',
+ operationType: 1,
+ uploadOptions: {},
+ enableEdit: true,
+ enableSourceBillEdit: true, // 鏂板锛氭帶鍒剁淮淇褰曠紪杈戠姸鎬�
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
+ HDeptList: [],
+ HRepairCheckList: [],
+ HEmpList: [],
- hform: {
- "HBillType": '3911',
- "HBarCode": "",
- "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HCheckResult": "OK",
- "HRepairCheckContent": "",
- "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,
- "HManagerName": getUserInfo().HManagerName,
- "HManagerID": getUserInfo().HManagerID,
- "HRepairCheckMainName": "",
- "HRepairCheckID": 0,
- "HBarName": "",
- "HEquipID": 0,
- "HBarSpec": "",
- "HBarModel": "",
- "HMaker": getUserInfo()["Czymc"],
- "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HUpDater": "",
- "HUpDateDate": "",
- "HChecker": "",
- "HCheckDate": "",
- "HDeleteMan": "",
- "HDeleteDate": "",
- "lngBillKey": "",
- "lngBillSubKey": "",
- // 鏂板锛氱淮淇褰曪紙婧愬崟锛夌浉鍏冲瓧娈�
- "HMainSourceBillNo": "",
- "HMainSourceInterID": 0,
- "HMainSourceEntryID": 0,
- "HMouldRepairWorkName":"",
- "HMouldRepairWorkID":0,
- "HStockOrgID": uni.getStorageSync("OrganizationID"),
- },
- HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
- "HRepairCheckID": 0,
- "HRepairCode": "",
- "HRepairName": "",
- "HManagerID": 0,
- "HManagerCode": "",
- "HManagerName": "",
- "HRepairCheckContent": "",
- "HRemark": "",
- "LAY_TABLE_INDEX": 0
- }]
- };
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- },
- },
- methods: {
- // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
- showBillList() {
- this.$refs.billList.showPopup();
- },
+ hform: {
+ "HBillType": '3911',
+ "HBarCode": "",
+ "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HCheckResult": "OK",
+ "HRepairCheckContent": "",
+ "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,
+ "HManagerName": getUserInfo().HManagerName,
+ "HManagerID": getUserInfo().HManagerID,
+ "HRepairCheckMainName": "",
+ "HRepairCheckID": 0,
+ "HBarName": "",
+ "HEquipID": 0,
+ "HBarSpec": "",
+ "HBarModel": "",
+ "HMaker": getUserInfo()["Czymc"],
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HUpDater": "",
+ "HUpDateDate": "",
+ "HChecker": "",
+ "HCheckDate": "",
+ "HDeleteMan": "",
+ "HDeleteDate": "",
+ "lngBillKey": "",
+ "lngBillSubKey": "",
+ // 鏂板锛氱淮淇褰曪紙婧愬崟锛夌浉鍏冲瓧娈�
+ "HMainSourceBillNo": "",
+ "HMainSourceInterID": 0,
+ "HMainSourceEntryID": 0,
+ "HMouldRepairWorkName": "",
+ "HMouldRepairWorkID": 0,
+ "HStockOrgID": uni.getStorageSync("OrganizationID"),
+ },
+ HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
+ "HRepairCheckID": 0,
+ "HRepairCode": "",
+ "HRepairName": "",
+ "HManagerID": 0,
+ "HManagerCode": "",
+ "HManagerName": "",
+ "HRepairCheckContent": "",
+ "HRemark": "",
+ "LAY_TABLE_INDEX": 0
+ }]
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ },
+ },
+ methods: {
+ // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+ showBillList() {
+ this.$refs.billList.showPopup();
+ },
- // 鎵弿缁翠慨璁板綍鍗曞彿
- toScanHMainSourceBillNo() {
- MpaasScan.scanCode(cb => {
- this.hform.HMainSourceBillNo = cb;
- this.GetMessageByHMainSourceBillNo(cb);
- });
- },
+ // 鎵弿缁翠慨璁板綍鍗曞彿
+ toScanHMainSourceBillNo() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HMainSourceBillNo = cb;
+ this.GetMessageByHMainSourceBillNo(cb);
+ });
+ },
- // 鏍规嵁缁翠慨璁板綍鍗曞彿鑾峰彇淇℃伅
- async GetMessageByHMainSourceBillNo(HSouceBillNo) {
- try {
- let url = "/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillListPage";
- let dataField = {
- sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
- user: getUserInfo()["Czymc"],
- page: 1,
- size: 1,
- };
+ // 鏍规嵁缁翠慨璁板綍鍗曞彿鑾峰彇淇℃伅
+ async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+ try {
+ let url = "/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillListPage";
+ let dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
- 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"];
- // 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
- if (data[0].HEquipID) {
- this.hform.HEquipID = data[0].HEquipID;
- this.getEquipFileMain(data[0].HEquipID);
- }
+ // 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
+ if (data[0].HEquipID) {
+ this.hform.HEquipID = data[0].HEquipID;
+ this.getEquipFileMain(data[0].HEquipID);
+ }
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${Message}`
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${err}`
- });
- }
- },
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${Message}`
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${err}`
+ });
+ }
+ },
- // 鏍规嵁璁惧ID鑾峰彇璁惧淇℃伅
- async getEquipFileMain(HInterID) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
- data: {
- HEquipID: HInterID,
- },
- });
+ // 鏍规嵁璁惧ID鑾峰彇璁惧淇℃伅
+ 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) {
- this.hform.HEquipID = data[0].hmainid;
- this.hform.HBarName = data[0].璁惧鍚嶇О;
- this.hform.HBarSpec = data[0].璁惧瑙勬牸;
- this.hform.HBarModel = data[0].璁惧鍨嬪彿;
- this.hform.HBarCode = data[0].璁惧鏉＄爜 || "";
- this.enableEdit = false;
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: Message
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: err
- });
- }
- },
+ if (count == 1) {
+ this.hform.HEquipID = data[0].hmainid;
+ this.hform.HBarName = data[0].璁惧鍚嶇О;
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸;
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿;
+ this.hform.HBarCode = data[0].璁惧鏉＄爜 || "";
+ this.enableEdit = false;
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ });
+ }
+ },
- // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
- 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.HRepairCheckID == 0) {
- return {
- Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
- state: false
- }
- }
- if (this.hform.HManagerID == 0) {
- return {
- Message: "璐熻矗浜轰笉寰椾负绌�!",
- state: false
- }
- }
- // 鏂板锛氱淮淇褰曟牎楠�
- if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
- return {
- Message: "缁翠慨璁板綍涓嶅緱涓虹┖!",
- state: false
- }
- }
+ // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+ 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.HRepairCheckID == 0) {
+ return {
+ Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
+ if (this.hform.HManagerID == 0) {
+ return {
+ Message: "璐熻矗浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ // 鏂板锛氱淮淇褰曟牎楠�
+ if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+ return {
+ Message: "缁翠慨璁板綍涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
- return {
- Message: "",
- state: true
- }
- },
- addNew() {
- uni.redirectTo({
- url: './Sb_EquipRepairCheckBill?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)
- }
- },
- })
+ return {
+ Message: "",
+ state: true
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: './Sb_EquipRepairCheckBill?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: "",
- }
- })
+ },
+ 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.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.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.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; // 淇锛氬師鏉ユ槸 hfrom 搴旇鏄� hform
- this.GetMessageByBarCode(cb)
- })
- },
- async GetMessageByBarCode(HBarCode) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
- data: {
- HBarCode: HBarCode,
- },
- })
+ 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; // 淇锛氬師鏉ユ槸 hfrom 搴旇鏄� hform
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ 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.HBarCode = HBarCode;
- 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.HBarCode = HBarCode;
+ 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
- }
- })
+ } 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
- console.log('data: ', 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 {
+ count,
+ data,
+ Message
+ } = res.data
+ console.log('data: ', data);
+ this.hform.HInterID = 0
+ this.hform.HBillNo = data[0]["HBillNo"]
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ })
+ }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ if (HSourceBillType == 3907) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sb_EqpRepairWorkBill/GetEquipMatainanceBillBySourceInterID",
+ data: {
+ user: getUserInfo()["Czymc"],
+ HSourceInterID: HInterID
+ }
+ })
- try {
- let oMain = JSON.stringify(this.hform);
- this.HDetailList[0].HManagerID = this.hform.HManagerID
- this.HDetailList[0].HRepairCheckID = this.hform.HRepairCheckID
- let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
+ let {
+ data,
+ code,
+ count,
+ Message
+ } = res.data
- if (!res) {
- return
- }
+ if (count == 1) {
+ console.log('data: ', data);
+ let data1 = data[0]
+ this.hform.HEquipID = data[0].HEquipID
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarModel = data[0].璁惧瑙勬牸
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+
+ this.hform.HMainSourceBillNo = data[0]["璁惧缁翠慨璁板綍鍗�"];
+ this.hform.HMainSourceInterID = data[0]["HEquipRepairCheckBillInterID"];
+ this.hform.HMainSourceEntryID = data[0]["HEquipRepairCheckBillEntryID"];
+
+
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
+ },
+ async submit() {
+ let valid = this.ValidCheck()
+ if (!valid.state) {
+ CommonUtils.showTips({
+ message: valid.Message
+ })
+ return
+ }
- let {
- count,
- Message
- } = res.data
- if (count == 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + Message
- })
- }
+ try {
+ let oMain = JSON.stringify(this.hform);
+ this.HDetailList[0].HManagerID = this.hform.HManagerID
+ this.HDetailList[0].HRepairCheckID = this.hform.HRepairCheckID
+ let sSubStr = JSON.stringify(this.HDetailList);
+ let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + err
- })
- }
- }
- },
- onLoad(e) {
- console.log('e: ', e);
- if (!e.operationType) {
- this.operationType = 1
- } else {
- this.operationType = e.operationType
- }
+ if (!res) {
+ return
+ }
- if (this.operationType == 1) {
- // 鏂板
- this.getMaxNum()
- this.enableEdit = true;
- this.enableSourceBillEdit = true;
- } else if (this.operationType == 2) {
- // 澶嶅埗
- } else if (this.operationType == 3) {
- // 缂栬緫
- } else if (this.operationType == 4) {
- // 娴忚
- this.enableEdit = false;
- this.enableSourceBillEdit = false;
- }
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+ })
+ }
- this.getHDeptList()
- this.getEmpList()
- this.getCheckProjList()
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ }
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ if (!e.operationType) {
+ this.operationType = 1
+ } else {
+ this.operationType = e.operationType
+ }
- // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
- this.hform.HMainSourceInterID = e.HInterID
- this.hform.HMainSourceBillNo = e.HBillNo
- this.hform.HMainSourceEntryID = e.HEntryID
- this.hform.HMouldRepairWorkID = e.HInterID
- this.hform.HMouldRepairWorkName = e.HBillNo
- this.hform.HEquipID = e.HEquipID
- this.hform.HBarName = e.HEquipName
- this.hform.HBarSpec = e.HEquipSpec
- this.hform.HBarModel = e.HEquipModel
- this.hform.HBarCode = e.HEquipBarCode || ""
- 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)
- })
- }
- }
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ this.enableEdit = true;
+ this.enableSourceBillEdit = true;
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
+ } else if (this.operationType == 4) {
+ // 涓嬫帹
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo
+ } = e
+ // 涓嬫帹
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ }
+
+ this.getHDeptList()
+ this.getEmpList()
+ this.getCheckProjList()
+
+ // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HMouldRepairWorkID = e.HInterID
+ this.hform.HMouldRepairWorkName = e.HBillNo
+ this.hform.HEquipID = e.HEquipID
+ this.hform.HBarName = e.HEquipName
+ this.hform.HBarSpec = e.HEquipSpec
+ this.hform.HBarModel = e.HEquipModel
+ this.hform.HBarCode = e.HEquipBarCode || ""
+ 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"
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
index 7a5e2fb..e6f35c6 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -223,7 +223,7 @@
</view>
<!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
<!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
- <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="HBillType"
:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
</BillListPopupEquipConkBookBillVue>
</view>
@@ -907,6 +907,41 @@
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.HMainSourceBillNo = 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) {
@@ -925,10 +960,13 @@
} else if (this.operationType == 3) {
// 缂栬緫
} else if (this.operationType == 4) {
- // 娴忚
- this.enableEdit = false;
- this.enableSourceBillEdit = false;
- this.showHMainSourceBillType = false;
+ let {HSourceBillType, HInterID, HBillNo} = e
+ // 涓嬫帹
+ // this.enableEdit = false;
+ // this.enableSourceBillEdit = false;
+ // this.showHMainSourceBillType = false;
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
this.getHDeptList()
diff --git a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
index b0618b2..dc7e7ea 100644
--- a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
+++ b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
@@ -1,18 +1,43 @@
<template>
<view>
<view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呯淮淇�</view>
- <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">宸茬淮淇�</view>
- <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鍏ㄩ儴浠诲姟</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呮淳宸�</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">寰呯淮淇�</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">寰呴獙鏀�</view>
</view>
<!-- 璁惧缁翠慨浠诲姟鍒楄〃鍒楄〃 -->
<view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
- <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.璁惧鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`" style="margin: 10px;">
+ <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)" :key="index">
+ <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+ :key="index">
<text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
</view>
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+ <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
</view>
@@ -36,6 +61,9 @@
dayjs,
CommonUtils,
tabs: 0,
+ showDetail: -1,
+ operations: -1,
+
reportBillsDisplay: [],
reportBillsAwaitRepair: [], // 寰呯淮淇�
reportBillsRepaired: [], // 宸茬淮淇�
@@ -44,6 +72,25 @@
};
},
methods: {
+ pushBill(tab, item) {
+ console.log('item: ', item);
+ let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
+ if (tab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
+ Query
+ })
+ } else if (tab == 1) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query
+ })
+ } else if (tab == 2) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
+ Query
+ })
+ }
+ },
switchTab(tabIndex) {
this.tabs = tabIndex
switch (tabIndex) {
@@ -61,7 +108,7 @@
async getRepairList() {
try {
let res = await CommonUtils.doRequest2Async({
- url: 'Sb_EquipRepairTaskReport/RepairList',
+ url: '/Sb_EquipRepairCheckTaskReport/RepairCheckList2',
data: {
user: getUserInfo()["Czymc"]
}
@@ -76,22 +123,22 @@
if (count == 1) {
console.log('data: ', data);
- this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairTaskReport
- this.reportBillsRepaired = data.h_p_Sb_EquipRepairTaskReport1
- this.reportBillsAll = data.h_p_Sb_EquipRepairTaskReport2
-
+ this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairCheckTaskReport_2
+ this.reportBillsRepaired = data.h_p_Sb_EquipRepairCheckTaskReport_21
+ this.reportBillsAll = data.h_p_Sb_EquipRepairCheckTaskReport_22
+
let fieldList = CommonUtils.fieldListFilterRole({
- ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿', '璁惧鏁呴殰鏃ユ湡'],
+ ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿'],
FieldList: list
})
-
+
if (fieldList.status == false) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
})
}
-
+
this.HFieldList = fieldList.data
this.switchTab(0)
@@ -117,5 +164,57 @@
</script>
<style lang="scss">
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
index d7feb1b..5a747c3 100644
--- a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
@@ -269,17 +269,25 @@
},
async onLoad(e) {
console.log(e, this.userInfo)
- this.OperationType = e.OperationType
- if (e.HInterID) {
- this.HInterID_Temp = e.HInterID
- this.RoadBillMain(e.HInterID)
- this.barCodeFocus = true
- } else {
- this.getNewData()
- this.HSourceBillNoFocus = true
- this.refreshBarCodeState()
+ this.OperationType = e.OperationType || 1
+ if(operationType == 1) {
+ if (e.HInterID) {
+ this.HInterID_Temp = e.HInterID
+ this.RoadBillMain(e.HInterID)
+ this.barCodeFocus = true
+ } else {
+ this.getNewData()
+ this.HSourceBillNoFocus = true
+ this.refreshBarCodeState()
+ }
+
+ }else if(operationType == 5) {
+ // 鍗曟嵁涓嬫帹
+ let {HSourceBillType, HInterID, HBillNo} = e
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
-
+
this.InitConkType()
this.InitConkReason()
this.InitDept()
@@ -719,6 +727,41 @@
}
}
});
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ 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 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.HMouldName = data1.浜у搧妯″叿
+ this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
+ this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
}
}
}
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
index 26da410..ca8997e 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -842,6 +842,41 @@
message: "鎻愪氦鍗曟嵁澶辫触: " + err
})
}
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ 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 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.HMouldName = data1.浜у搧妯″叿
+ this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
+ this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
}
},
onLoad(e) {
@@ -861,7 +896,14 @@
// 缂栬緫
} else if (this.operationType == 4) {
- // 娴忚
+ // 涓嬫帹
+ let {HSourceBillType, HInterID, HBillNo} = e
+ // 涓嬫帹
+ // this.enableEdit = false;
+ // this.enableSourceBillEdit = false;
+ // this.showHMainSourceBillType = false;
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
diff --git a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
index e5b6577..9866e89 100644
--- a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
+++ b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
@@ -1,18 +1,44 @@
<template>
<view>
<view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呯淮淇�</view>
- <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">宸茬淮淇�</view>
- <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鍏ㄩ儴浠诲姟</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呮淳宸�</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">寰呯淮淇�</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">寰呴獙鏀�</view>
</view>
<!-- 璁惧缁翠慨浠诲姟鍒楄〃鍒楄〃 -->
<view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
- <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.鍣ㄥ叿鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`" style="margin: 10px;">
+ <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.鍣ㄥ叿鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`"
+ style="margin: 10px;">
<view class="card-detail">
- <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)" :key="index">
+ <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+ :key="index">
<text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
</view>
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+ <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
</view>
@@ -36,6 +62,9 @@
dayjs,
CommonUtils,
tabs: 0,
+ showDetail: -1,
+ operations: -1,
+
reportBillsDisplay: [],
reportBillsAwaitRepair: [], // 寰呯淮淇�
reportBillsRepaired: [], // 宸茬淮淇�
@@ -44,6 +73,23 @@
};
},
methods: {
+ pushBill(tab, item) {
+ console.log('item: ',item);
+ let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3815`
+ if(tab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?operationType=4' + Query
+ })
+ }else if(tab == 1) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill?operationType=5' + Query
+ })
+ }else if(tab == 2) {
+ uni.navigateTo({
+ url: '/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill?operationType=4' + Query
+ })
+ }
+ },
switchTab(tabIndex) {
this.tabs = tabIndex
switch (tabIndex) {
@@ -61,7 +107,7 @@
async getRepairList() {
try {
let res = await CommonUtils.doRequest2Async({
- url: 'Sc_MouldRepairTaskReport/RepairList',
+ url: 'Sc_MouldRepairCheckTaskReport/RepairCheckList2',
data: {
user: getUserInfo()["Czymc"]
}
@@ -76,22 +122,22 @@
if (count == 1) {
console.log('data: ', data);
- this.reportBillsAwaitRepair = data.h_p_Sc_MouldRepairTaskReport
- this.reportBillsRepaired = data.h_p_Sc_MouldRepairTaskReport1
- this.reportBillsAll = data.h_p_Sc_MouldRepairTaskReport2
-
+ this.reportBillsAwaitRepair = data.h_p_Sc_MouldRepairTaskReport_2
+ this.reportBillsRepaired = data.h_p_Sc_MouldRepairTaskReport_21
+ this.reportBillsAll = data.h_p_Sc_MouldRepairTaskReport_22
+
let fieldList = CommonUtils.fieldListFilterRole({
ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿', '鍣ㄥ叿鏁呴殰鏃ユ湡'],
FieldList: list
})
-
+
if (fieldList.status == false) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
})
}
-
+
this.HFieldList = fieldList.data
this.switchTab(0)
@@ -117,5 +163,57 @@
</script>
<style lang="scss">
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
index fd27f18..a164ff2 100644
--- a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -1,875 +1,886 @@
<template>
- <view>
- <view class="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>
- <!-- 鍩烘湰淇℃伅 -->
- <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">
- <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>
- </view>
- <view class="form-item">
- <view class="title">淇濆吇寮�濮�:</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
- <input :value="hform.HBeginDate" />
- </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.HEndDate">
- <input :value="hform.HEndDate" />
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item" v-if="false">
- <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 none-border">
- <radio-group @change="radioChange" class="radio_Container">
- <label>
- <view>
- <radio value="OK" :checked="hform.HLastResult == 'OK'" />
- <text>OK</text>
- </view>
- </label>
- </label>
- <view>
- <radio value="NG" :checked="hform.HLastResult == 'NG'" />
- <text>NG</text>
- </view>
- </label>
- </radio-group>
- </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">
- <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </view>
- </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 class="form-item">
- <view class="title">淇濆吇璁″垝:</view>
- <view class="righton">
- <input v-model="hform.HPlanNo" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇濆吇绾у埆:</view>
- <zxz-uni-data-select class="right" :localdata="HMaintainLevList" dataKey="淇濆吇绾у埆鍚嶇О"
- dataValue="HItemID" v-model="hform.HMaintainLevID">
- </zxz-uni-data-select>
- </view>
- </view>
- </template>
- <!-- 鏄庣粏淇℃伅 -->
- <template v-if="tabs == 1">
- <view class="form">
- <view class="form-item">
- <view class="left">
- 妯″叿淇濆吇瑙勭▼
- </view>
- <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>
- </view>
- </view>
- <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
- <uni-card style="margin: 10px;">
- <view class="card-detail">
- <view class="detail">
- <text>搴忓彿锛�</text>{{index+1}}
- </view>
- <view class="detail">
- <text>缁撴灉锛�</text>
- <checkbox-group style="display: inline-block;"
- @change="checkBoxChangeHandler(index, $event)">
- <checkbox value="enabled" :checked="item.HMaintainResult" />
- </checkbox-group>
- </view>
- <view class="detail" v-if="false">
- <text>淇濆吇椤圭洰ID锛�</text>{{item.HMaintainItemID}}
- </view>
- <view class="detail">
- <text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
- </view>
- <view class="detail">
- <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
- </view>
- <view class="detail">
- <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
- </view>
- <view class="detail" v-if="false">
- <text>璐熻矗浜篒D锛�</text>{{item.HManagerID}}
- </view>
- <view class="detail">
- <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
- </view>
- <view class="detail">
- <text>澶囨敞锛�</text>{{item.HRemark}}
- </view>
- <view class="detail" v-if="false">
- <text>婧愬崟ID锛�</text>{{item.HSourceInterID}}
- </view>
- <view class="detail" v-if="false">
- <text>婧愬崟瀛怚D锛�</text>{{item.HSourceEntryID}}
- </view>
- <view class="detail" v-if="false">
- <text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
- </view>
+ <view>
+ <view class="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>
+ <!-- 鍩烘湰淇℃伅 -->
+ <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">
+ <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>
+ </view>
+ <view class="form-item">
+ <view class="title">淇濆吇寮�濮�:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+ <input :value="hform.HBeginDate" />
+ </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.HEndDate">
+ <input :value="hform.HEndDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <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 none-border">
+ <radio-group @change="radioChange" class="radio_Container">
+ <label>
+ <view>
+ <radio value="OK" :checked="hform.HLastResult == 'OK'" />
+ <text>OK</text>
+ </view>
+ </label>
+ </label>
+ <view>
+ <radio value="NG" :checked="hform.HLastResult == 'NG'" />
+ <text>NG</text>
+ </view>
+ </label>
+ </radio-group>
+ </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">
+ <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </view>
+ </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 class="form-item">
+ <view class="title">淇濆吇璁″垝:</view>
+ <view class="righton">
+ <input v-model="hform.HPlanNo" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇濆吇绾у埆:</view>
+ <zxz-uni-data-select class="right" :localdata="HMaintainLevList" dataKey="淇濆吇绾у埆鍚嶇О"
+ dataValue="HItemID" v-model="hform.HMaintainLevID">
+ </zxz-uni-data-select>
+ </view>
+ </view>
+ </template>
+ <!-- 鏄庣粏淇℃伅 -->
+ <template v-if="tabs == 1">
+ <view class="form">
+ <view class="form-item">
+ <view class="left">
+ 妯″叿淇濆吇瑙勭▼
+ </view>
+ <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>
+ </view>
+ </view>
+ <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+ <uni-card style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail">
+ <text>搴忓彿锛�</text>{{index+1}}
+ </view>
+ <view class="detail">
+ <text>缁撴灉锛�</text>
+ <checkbox-group style="display: inline-block;"
+ @change="checkBoxChangeHandler(index, $event)">
+ <checkbox value="enabled" :checked="item.HMaintainResult" />
+ </checkbox-group>
+ </view>
+ <view class="detail" v-if="false">
+ <text>淇濆吇椤圭洰ID锛�</text>{{item.HMaintainItemID}}
+ </view>
+ <view class="detail">
+ <text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
+ </view>
+ <view class="detail">
+ <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
+ </view>
+ <view class="detail">
+ <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>璐熻矗浜篒D锛�</text>{{item.HManagerID}}
+ </view>
+ <view class="detail">
+ <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
+ </view>
+ <view class="detail">
+ <text>澶囨敞锛�</text>{{item.HRemark}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>婧愬崟ID锛�</text>{{item.HSourceInterID}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>婧愬崟瀛怚D锛�</text>{{item.HSourceEntryID}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+ </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
- </template>
- <!-- 鍏朵粬淇℃伅 -->
- <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>
+ </uni-card>
+ </view>
+ <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+ </template>
+ <!-- 鍏朵粬淇℃伅 -->
+ <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>
- </template>
- <!-- 闄勪欢淇℃伅 -->
- <template v-if="tabs == 3">
- <view class="card-item-wrapper">
- <view class="attachment-btns">
- <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
- <view style="flex: 1;"></view>
- </view>
- <view v-for="(item, index) in attachmentInfo" :key="index">
- <uni-card :title="item['fileName']" :thumbnail="item.filePath">
- <view class="card-detail">
- <view class="detail">
- <text>澶у皬锛�</text>{{item["size"]}}
- </view>
- <view class="detail">
- <text>鐘舵�侊細</text>{{item["status"]}}
- </view>
- <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
- <text>鎿嶄綔锛�</text>
- <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
- <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
- </view>
- </view>
- </uni-card>
- </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" 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>
- </view>
+ </template>
+ <!-- 闄勪欢淇℃伅 -->
+ <template v-if="tabs == 3">
+ <view class="card-item-wrapper">
+ <view class="attachment-btns">
+ <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+ <view style="flex: 1;"></view>
+ </view>
+ <view v-for="(item, index) in attachmentInfo" :key="index">
+ <uni-card :title="item['fileName']" :thumbnail="item.filePath">
+ <view class="card-detail">
+ <view class="detail">
+ <text>澶у皬锛�</text>{{item["size"]}}
+ </view>
+ <view class="detail">
+ <text>鐘舵�侊細</text>{{item["status"]}}
+ </view>
+ <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+ <text>鎿嶄綔锛�</text>
+ <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+ <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+ </view>
+ </view>
+ </uni-card>
+ </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" 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>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- import {
- TrackOpTypes
- } from "vue";
- export default {
- name: 'Sc_MouldMaintainBill',
- data() {
- return {
- tabs: 0,
- HMainSourceBillType: "",
- btnTop: 0,
- tabsBottom: 0,
- HModName: "Sc_MouldMaintainBill",
- HBillType: '3819',
- operationType: 1,
- uploadOptions: {},
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import {
+ TrackOpTypes
+ } from "vue";
+ export default {
+ name: 'Sc_MouldMaintainBill',
+ data() {
+ return {
+ tabs: 0,
+ HMainSourceBillType: "",
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "Sc_MouldMaintainBill",
+ HBillType: '3819',
+ operationType: 1,
+ uploadOptions: {},
- HMaintainLevList: [],
- HCheckFileList: [],
- attachmentInfo: [],
+ HMaintainLevList: [],
+ HCheckFileList: [],
+ attachmentInfo: [],
- hform: {
- HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HQty: 1,
- HBillNo: "",
- HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HMaintainLevName: "",
- HMaintainLevID: 0,
- HRemark: "",
- HBarName: "",
- HMouldID: 0,
- HBarSpec: "",
- HBarModel: "",
- HPlanNo: "",
- HPlanInterID: 0,
- HMouldMaintainRuleInterID: 0,
- HMouldMaintainRuleInterNo: "",
- HRequestComDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HRecentMainModule: 0,
- HCumulativeModule: 0,
- HProductionModule: 0,
- HExplanation: "",
- HInnerBillNo: "",
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillNo: "",
- HMaker: getUserInfo()['Czymc'],
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HUpDater: "",
- HUpDateDate: "",
- HChecker: "",
- HCheckDate: "",
- HDeleteMan: "",
- HDeleteDate: "",
- lngBillKey: 0,
- lngBillSubKey: 0,
- HLastResult: "OK"
- }
- };
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- }
- },
- methods: {
+ hform: {
+ HBarCode: "",
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HQty: 1,
+ HBillNo: "",
+ HInterID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HMaintainLevName: "",
+ HMaintainLevID: 0,
+ HRemark: "",
+ HBarName: "",
+ HMouldID: 0,
+ HBarSpec: "",
+ HBarModel: "",
+ HPlanNo: "",
+ HPlanInterID: 0,
+ HMouldMaintainRuleInterID: 0,
+ HMouldMaintainRuleInterNo: "",
+ HRequestComDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HRecentMainModule: 0,
+ HCumulativeModule: 0,
+ HProductionModule: 0,
+ HExplanation: "",
+ HInnerBillNo: "",
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HMainSourceBillNo: "",
+ HMaker: getUserInfo()['Czymc'],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HUpDater: "",
+ HUpDateDate: "",
+ HChecker: "",
+ HCheckDate: "",
+ HDeleteMan: "",
+ HDeleteDate: "",
+ lngBillKey: 0,
+ lngBillSubKey: 0,
+ HLastResult: "OK"
+ }
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ }
+ },
+ methods: {
addNew() {
- uni.redirectTo({
- url: "./Sc_MouldMaintainBill?operationType=1"
- })
+ uni.redirectTo({
+ url: "./Sc_MouldMaintainBill?operationType=1"
+ })
},
- goBack() {
- uni.navigateBack()
- },
- checkBoxChangeHandler(index, e) {
- let cr = e.detail.value
- if (cr.length == 0) {
- this.HCheckFileList[index]["HMaintainResult"] = false
- } else {
- this.HCheckFileList[index]["HMaintainResult"] = true
- }
- },
- uploadFile(index) {
- console.log('filePath: ', this.attachmentInfo[index].filePath);
- // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
- uni.uploadFile({
- url: CommonUtils.getServerUrl() + "/Sc_MouldMaintainBill/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)
- }
- },
- })
+ goBack() {
+ uni.navigateBack()
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HMaintainResult"] = false
+ } else {
+ this.HCheckFileList[index]["HMaintainResult"] = true
+ }
+ },
+ uploadFile(index) {
+ console.log('filePath: ', this.attachmentInfo[index].filePath);
+ // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+ uni.uploadFile({
+ url: CommonUtils.getServerUrl() + "/Sc_MouldMaintainBill/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 getHMaintainLevList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_BadReason/Gy_MaintainLevList',
- data: {
- sWhere: " and HUSEORGID = " + uni.getStorageSync('OrganizationID'),
- user: uni.getStorageSync('HUserName')
- }
- })
+ },
+ 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 getHMaintainLevList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_BadReason/Gy_MaintainLevList',
+ data: {
+ sWhere: " and HUSEORGID = " + uni.getStorageSync('OrganizationID'),
+ user: uni.getStorageSync('HUserName')
+ }
+ })
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HMaintainLevList = 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)
- })
- },
- async GetMessageByBarCode(HBarCode) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
- data: {
- HBarCode: HBarCode,
- user: uni.getStorageSync('HUserName')
- },
- })
- if (!res) {
- return
- }
- let {
- data,
- count,
- Message
- } = res.data
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HMaintainLevList = 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)
+ })
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
+ data: {
+ HBarCode: HBarCode,
+ user: uni.getStorageSync('HUserName')
+ },
+ })
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
- console.log('data: ', data);
- this.hform.HMouldID = data[0].HInterID
- this.hform.HBarName = data[0].HName
- this.hform.HBarSpec = data[0].HModel
- this.hform.HBarModel = data[0].HModel2
- this.hform.HQty = 1
- // 鑾峰彇妫�楠岃绋�
- this.GetItemByMouldFile()
- } catch (err) {
+ console.log('data: ', data);
+ this.hform.HMouldID = data[0].HInterID
+ this.hform.HBarName = data[0].HName
+ this.hform.HBarSpec = data[0].HModel
+ this.hform.HBarModel = data[0].HModel2
+ this.hform.HQty = 1
+ // 鑾峰彇妫�楠岃绋�
+ this.GetItemByMouldFile()
+ } catch (err) {
- }
- },
- async GetItemByMouldFile() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetItemByMouldFile",
- data: {
- "MouldProjectID": this.hform.HMouldID,
- "Type": "BY",
- "HDate": this.hform.HBeginDate
- }
- })
+ }
+ },
+ async GetItemByMouldFile() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetItemByMouldFile",
+ data: {
+ "MouldProjectID": this.hform.HMouldID,
+ "Type": "BY",
+ "HDate": this.hform.HBeginDate
+ }
+ })
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- this.hform.HMouldMaintainRuleInterID = data[0].HMouldMaintainRuleID
- this.hform.HMouldMaintainRuleInterNo = data[0].鍣ㄥ叿淇濆吇瑙勭▼
- this.hform.HPlanNo = data[0].鍗曟嵁鍙�
- this.hform.HMouldMaintainPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ?
- 0 : data[0].hmainid
- this.hform.HMouldMaintainPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) ==
- "" ? 0 : data[0].HEntryID
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ this.hform.HMouldMaintainRuleInterID = data[0].HMouldMaintainRuleID
+ this.hform.HMouldMaintainRuleInterNo = data[0].鍣ㄥ叿淇濆吇瑙勭▼
+ this.hform.HPlanNo = data[0].鍗曟嵁鍙�
+ this.hform.HMouldMaintainPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) ==
+ "" ?
+ 0 : data[0].hmainid
+ this.hform.HMouldMaintainPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) ==
+ "" ? 0 : data[0].HEntryID
- this.HCheckFileList = Array.from(data).map(item => {
- return {
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
- "HMaintainItemID": item.淇濆吇椤圭洰ID,
- "HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
- "HMaintainPart": item.淇濆吇閮ㄤ綅, // 淇敼瀛楁鍚�
- "HClaim": item.鍏蜂綋瑕佹眰,
- "HManagerID": item.璐熻矗浜篒D,
- "HManagerName": item.璐熻矗浜哄悕绉�,
- "HSourceInterID": item.hmainid == null ? 0 : item.hmainid, // 闇�纭鏄惁姝ｇ‘
- "HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID, // 闇�纭鏄惁姝ｇ‘
- "HSourceBillNo": item.鍗曟嵁鍙�, // 闇�纭鏄惁姝ｇ‘
+ this.HCheckFileList = Array.from(data).map(item => {
+ return {
+ "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ "HMaintainItemID": item.淇濆吇椤圭洰ID,
+ "HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
+ "HMaintainPart": item.淇濆吇閮ㄤ綅, // 淇敼瀛楁鍚�
+ "HClaim": item.鍏蜂綋瑕佹眰,
+ "HManagerID": item.璐熻矗浜篒D,
+ "HManagerName": item.璐熻矗浜哄悕绉�,
+ "HSourceInterID": item.hmainid == null ? 0 : item.hmainid, // 闇�纭鏄惁姝ｇ‘
+ "HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID, // 闇�纭鏄惁姝ｇ‘
+ "HSourceBillNo": item.鍗曟嵁鍙�, // 闇�纭鏄惁姝ｇ‘
"HMaintainResult": item.榛樿淇濆吇缁撴灉 == 'OK' ? true : false
- }
- })
+ }
+ })
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${err}`
- })
- }
- },
- toCheckFile() {
- // 鍒ゆ柇鏄惁宸叉壂鎻忔ā鍏�
- if (!this.hform.HMouldID || this.hform.HMouldID == 0) {
- uni.showToast({
- title: '璇峰厛鎵弿妯″叿浜岀淮鐮佸甫鍑烘ā鍏蜂俊鎭�',
- icon: 'none'
- });
- return;
- }
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${err}`
+ })
+ }
+ },
+ toCheckFile() {
+ // 鍒ゆ柇鏄惁宸叉壂鎻忔ā鍏�
+ if (!this.hform.HMouldID || this.hform.HMouldID == 0) {
+ uni.showToast({
+ title: '璇峰厛鎵弿妯″叿浜岀淮鐮佸甫鍑烘ā鍏蜂俊鎭�',
+ icon: 'none'
+ });
+ return;
+ }
- // 鎵撳紑淇濆吇瑙勭▼閫夋嫨椤甸潰
- uni.navigateTo({
- url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList?mouldId=' + this.hform
- .HMouldID,
- success: (res) => {
- // 閫氳繃浜嬩欢閫氶亾鐩戝惉杩斿洖鐨勬暟鎹�
- res.eventChannel.on('selectedPlanData', (data) => {
- console.log('鎺ユ敹鍒伴�夋嫨鐨勬暟鎹�:', data);
- // 璧嬪�煎瓧娈�
- this.hform.HMouldMaintainRuleInterNo = data.鍗曟嵁鍙�;
- this.hform.HMouldMaintainRuleInterID = data.hmainid;
- this.hform.HPlanNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
- this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : ata.淇濆吇璁″垝id,
- this.hform.HMouldMaintainPlanInterID = data.淇濆吇璁″垝id == null ? 0 : data.淇濆吇璁″垝id;
- this.hform.HMouldMaintainPlanEntryID = data.淇濆吇璁″垝瀛恑d == null ? 0 : data.淇濆吇璁″垝瀛恑d;
- this.hform.HMainSourceBillNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
- this.hform.HMaintainLevName = data.淇濆吇绾у埆;
- this.hform.HMaintainLevID = data.HMaintainLevID;
+ // 鎵撳紑淇濆吇瑙勭▼閫夋嫨椤甸潰
+ uni.navigateTo({
+ url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList?mouldId=' + this.hform
+ .HMouldID,
+ success: (res) => {
+ // 閫氳繃浜嬩欢閫氶亾鐩戝惉杩斿洖鐨勬暟鎹�
+ res.eventChannel.on('selectedPlanData', (data) => {
+ console.log('鎺ユ敹鍒伴�夋嫨鐨勬暟鎹�:', data);
+ // 璧嬪�煎瓧娈�
+ this.hform.HMouldMaintainRuleInterNo = data.鍗曟嵁鍙�;
+ this.hform.HMouldMaintainRuleInterID = data.hmainid;
+ this.hform.HPlanNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
+ this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : ata.淇濆吇璁″垝id,
+ this.hform.HMouldMaintainPlanInterID = data.淇濆吇璁″垝id == null ? 0 :
+ data.淇濆吇璁″垝id;
+ this.hform.HMouldMaintainPlanEntryID = data.淇濆吇璁″垝瀛恑d == null ? 0 : data
+ .淇濆吇璁″垝瀛恑d;
+ this.hform.HMainSourceBillNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
+ this.hform.HMaintainLevName = data.淇濆吇绾у埆;
+ this.hform.HMaintainLevID = data.HMaintainLevID;
- // 璋冪敤鑾峰彇淇濆吇椤圭洰鐨勬柟娉�
- this.get_MaintainItem2();
- });
+ // 璋冪敤鑾峰彇淇濆吇椤圭洰鐨勬柟娉�
+ this.get_MaintainItem2();
+ });
- res.eventChannel.on('closePage', () => {
- console.log('鍏抽棴閫夋嫨椤甸潰');
- });
- }
- });
- },
+ res.eventChannel.on('closePage', () => {
+ console.log('鍏抽棴閫夋嫨椤甸潰');
+ });
+ }
+ });
+ },
- // 鑾峰彇淇濆吇瑙勫垯椤圭洰
- async get_MaintainItem2() {
- try {
- // 楠岃瘉鏄惁宸查�夋嫨淇濆吇瑙勭▼
- if (!this.hform.HMouldMaintainRuleInterID || this.hform.HMouldMaintainRuleInterID == 0) {
- uni.showToast({
- title: '璇峰厛閫夋嫨淇濆吇瑙勭▼',
- icon: 'none'
- });
- return;
- }
+ // 鑾峰彇淇濆吇瑙勫垯椤圭洰
+ async get_MaintainItem2() {
+ try {
+ // 楠岃瘉鏄惁宸查�夋嫨淇濆吇瑙勭▼
+ if (!this.hform.HMouldMaintainRuleInterID || this.hform.HMouldMaintainRuleInterID == 0) {
+ uni.showToast({
+ title: '璇峰厛閫夋嫨淇濆吇瑙勭▼',
+ icon: 'none'
+ });
+ return;
+ }
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetMaintainItemByMaintainRuleID/Mould',
- data: {
- "HMouldMaintainRuleInterID": this.hform.HMouldMaintainRuleInterID
- }
- });
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetMaintainItemByMaintainRuleID/Mould',
+ data: {
+ "HMouldMaintainRuleInterID": this.hform.HMouldMaintainRuleInterID
+ }
+ });
- let {
- data,
- count,
- Message
- } = res.data;
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
- if (count == 1) {
- if (data && data.length > 0) {
- this.HCheckFileList = Array.from(data).map(item => {
- return {
- "HMaintainItemID": item.HMaintainItemID || 0,
- "HMaintainItem": item.淇濆吇椤圭洰 || "",
- "HMaintainPart": item.淇濆吇閮ㄤ綅 || "",
- "HClaim": item.鍏蜂綋瑕佹眰 || "",
- "HManagerID": item.璐熻矗浜篒D || 0,
- "HManagerCode": item.璐熻矗浜轰唬鐮� || "",
- "HManagerName": item.璐熻矗浜哄悕绉� || "",
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
- "HRemark": item.琛ㄤ綋澶囨敞 || "",
- };
- });
- } else {
- this.HCheckFileList = [];
- uni.showToast({
- title: '璇ヤ繚鍏昏绋嬫殏鏃犱繚鍏婚」鐩褰�',
- icon: 'none'
- });
- }
- } else {
- this.HCheckFileList = [];
- uni.showToast({
- title: Message || '鑾峰彇淇濆吇椤圭洰澶辫触',
- icon: 'none'
- });
- }
- } catch (err) {
- this.HCheckFileList = [];
- uni.showToast({
- title: `鑾峰彇淇濆吇椤圭洰澶辫触: ${err}`,
- icon: 'none'
- });
- }
- },
- radioChange(e) {
- console.log('radioChange:', e.detail.value);
- this.hform.HLastResult = e.detail.value;
- },
- getEditData(hmainid) {
- // 涓昏〃鏁版嵁
- uni.request({
- url: CommonUtils.getServerUrl() + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai',
- data: {
- HID: hmainid
- },
- success: (res) => {
- console.log('缂栬緫鎺ュ彛杩斿洖鏁版嵁:', res.data);
- if (res.data.code == 1) {
- var data = res.data.data.h_v_Sc_MouldMaintain[0];
- this.hform = {
- HInterID: hmainid,
- HBillNo: data.鍗曟嵁鍙�,
- HDate: data.鏃ユ湡.substr(0, 10),
- HMouldID: data.HMouldID || 0,
- HBarCode: data.妯″叿鏉＄爜 || "",
- HBarName: data.浜у搧妯″叿 || "",
- HBarSpec: data.妯″叿瑙勬牸 || "",
- HBarModel: data.妯″叿鍨嬪彿 || "",
- HPlanNo: data.淇濆吇璁″垝缂栧彿 || "",
- HPlanInterID: data.淇濆吇璁″垝鍐呯爜 || 0,
- HBeginDate: data.淇濆吇寮�濮嬫棩鏈� ? data.淇濆吇寮�濮嬫棩鏈�.substr(0, 10) : dayjs(new Date())
- .format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: data.淇濆吇缁撴潫鏃ユ湡 ? data.淇濆吇缁撴潫鏃ユ湡.substr(0, 10) : dayjs(new Date())
- .format("YYYY-MM-DD HH:mm:ss"),
- HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸' ? 'OK' : (data.鏈�缁堢粨璁� === '涓嶅悎鏍�' ? 'NG' :
- 'OK'),
- HMouldMaintainRuleInterID: data.HMouldMaintainRuleInterID || 0,
- HMouldMaintainRuleInterNo: data.鍣ㄥ叿淇濆吇瑙勭▼ || "",
- HRemark: data.澶囨敞 || "",
- HMaintainLevID: data.HMaintainLevID || 0,
- HMaintainLevName: data.淇濆吇绾у埆鍚嶇О || "",
- HQty: data.鏁伴噺 || 1,
- HMaker: data.鍒跺崟浜� || getUserInfo()['Czymc'],
- HMakeDate: data.鍒跺崟鏃ユ湡 ? data.鍒跺崟鏃ユ湡.substr(0, 10) : dayjs(new Date()).format(
- "YYYY-MM-DD"),
- HUpDater: data.淇敼浜� || "",
- HUpDateDate: data.淇敼鏃ユ湡 ? data.淇敼鏃ユ湡.substr(0, 10) : "",
- HChecker: data.瀹℃牳浜� || "",
- HCheckDate: data.瀹℃牳鏃ユ湡 ? data.瀹℃牳鏃ユ湡.substr(0, 10) : "",
- HDeleteMan: data.浣滃簾浜� || "",
- HDeleteDate: data.浣滃簾鏃ユ湡 ? data.浣滃簾鏃ユ湡.substr(0, 10) : "",
- lngBillKey: 0,
- lngBillSubKey: 0,
- HInnerBillNo: data.鍐呴儴鍗曟嵁鍙� || "",
- HExplanation: data.鎽樿 || "",
- HRequestComDate: data.瑕佹眰瀹屾垚鏃ユ湡 ? data.瑕佹眰瀹屾垚鏃ユ湡.substr(0, 10) : "",
- HRecentMainModule: data.鏈�杩戜繚鍏绘ā鏁� || 0,
- HCumulativeModule: data.绱妯℃暟 || 0,
- HProductionModule: data.鏈鐢熶骇妯℃暟 || 0
- };
+ if (count == 1) {
+ if (data && data.length > 0) {
+ this.HCheckFileList = Array.from(data).map(item => {
+ return {
+ "HMaintainItemID": item.HMaintainItemID || 0,
+ "HMaintainItem": item.淇濆吇椤圭洰 || "",
+ "HMaintainPart": item.淇濆吇閮ㄤ綅 || "",
+ "HClaim": item.鍏蜂綋瑕佹眰 || "",
+ "HManagerID": item.璐熻矗浜篒D || 0,
+ "HManagerCode": item.璐熻矗浜轰唬鐮� || "",
+ "HManagerName": item.璐熻矗浜哄悕绉� || "",
+ "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ "HRemark": item.琛ㄤ綋澶囨敞 || "",
+ };
+ });
+ } else {
+ this.HCheckFileList = [];
+ uni.showToast({
+ title: '璇ヤ繚鍏昏绋嬫殏鏃犱繚鍏婚」鐩褰�',
+ icon: 'none'
+ });
+ }
+ } else {
+ this.HCheckFileList = [];
+ uni.showToast({
+ title: Message || '鑾峰彇淇濆吇椤圭洰澶辫触',
+ icon: 'none'
+ });
+ }
+ } catch (err) {
+ this.HCheckFileList = [];
+ uni.showToast({
+ title: `鑾峰彇淇濆吇椤圭洰澶辫触: ${err}`,
+ icon: 'none'
+ });
+ }
+ },
+ radioChange(e) {
+ console.log('radioChange:', e.detail.value);
+ this.hform.HLastResult = e.detail.value;
+ },
+ getEditData(hmainid) {
+ // 涓昏〃鏁版嵁
+ uni.request({
+ url: CommonUtils.getServerUrl() +
+ '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai',
+ data: {
+ HID: hmainid
+ },
+ success: (res) => {
+ console.log('缂栬緫鎺ュ彛杩斿洖鏁版嵁:', res.data);
+ if (res.data.code == 1) {
+ var data = res.data.data.h_v_Sc_MouldMaintain[0];
+ this.hform = {
+ HInterID: hmainid,
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: data.鏃ユ湡.substr(0, 10),
+ HMouldID: data.HMouldID || 0,
+ HBarCode: data.妯″叿鏉＄爜 || "",
+ HBarName: data.浜у搧妯″叿 || "",
+ HBarSpec: data.妯″叿瑙勬牸 || "",
+ HBarModel: data.妯″叿鍨嬪彿 || "",
+ HPlanNo: data.淇濆吇璁″垝缂栧彿 || "",
+ HPlanInterID: data.淇濆吇璁″垝鍐呯爜 || 0,
+ HBeginDate: data.淇濆吇寮�濮嬫棩鏈� ? data.淇濆吇寮�濮嬫棩鏈�.substr(0, 10) : dayjs(new Date())
+ .format("YYYY-MM-DD HH:mm:ss"),
+ HEndDate: data.淇濆吇缁撴潫鏃ユ湡 ? data.淇濆吇缁撴潫鏃ユ湡.substr(0, 10) : dayjs(new Date())
+ .format("YYYY-MM-DD HH:mm:ss"),
+ HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸' ? 'OK' : (data.鏈�缁堢粨璁� === '涓嶅悎鏍�' ? 'NG' :
+ 'OK'),
+ HMouldMaintainRuleInterID: data.HMouldMaintainRuleInterID || 0,
+ HMouldMaintainRuleInterNo: data.鍣ㄥ叿淇濆吇瑙勭▼ || "",
+ HRemark: data.澶囨敞 || "",
+ HMaintainLevID: data.HMaintainLevID || 0,
+ HMaintainLevName: data.淇濆吇绾у埆鍚嶇О || "",
+ HQty: data.鏁伴噺 || 1,
+ HMaker: data.鍒跺崟浜� || getUserInfo()['Czymc'],
+ HMakeDate: data.鍒跺崟鏃ユ湡 ? data.鍒跺崟鏃ユ湡.substr(0, 10) : dayjs(new Date())
+ .format(
+ "YYYY-MM-DD"),
+ HUpDater: data.淇敼浜� || "",
+ HUpDateDate: data.淇敼鏃ユ湡 ? data.淇敼鏃ユ湡.substr(0, 10) : "",
+ HChecker: data.瀹℃牳浜� || "",
+ HCheckDate: data.瀹℃牳鏃ユ湡 ? data.瀹℃牳鏃ユ湡.substr(0, 10) : "",
+ HDeleteMan: data.浣滃簾浜� || "",
+ HDeleteDate: data.浣滃簾鏃ユ湡 ? data.浣滃簾鏃ユ湡.substr(0, 10) : "",
+ lngBillKey: 0,
+ lngBillSubKey: 0,
+ HInnerBillNo: data.鍐呴儴鍗曟嵁鍙� || "",
+ HExplanation: data.鎽樿 || "",
+ HRequestComDate: data.瑕佹眰瀹屾垚鏃ユ湡 ? data.瑕佹眰瀹屾垚鏃ユ湡.substr(0, 10) : "",
+ HRecentMainModule: data.鏈�杩戜繚鍏绘ā鏁� || 0,
+ HCumulativeModule: data.绱妯℃暟 || 0,
+ HProductionModule: data.鏈鐢熶骇妯℃暟 || 0
+ };
- // 鑾峰彇閮ㄩ棬鍒楄〃骞惰缃繚鍏荤骇鍒�
- if (data.HMaintainLevID) {
- this.$nextTick(() => {
- this.hform.HMaintainLevID = data.HMaintainLevID;
- });
- }
- } else {
- uni.showToast({
- title: res.data.Message || '鑾峰彇鏁版嵁澶辫触',
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log('涓昏〃璇锋眰澶辫触:', res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- complete: () => {
- // 鑾峰彇瀛愯〃鏁版嵁
- this.getSubEditData(hmainid);
- }
- });
- },
+ // 鑾峰彇閮ㄩ棬鍒楄〃骞惰缃繚鍏荤骇鍒�
+ if (data.HMaintainLevID) {
+ this.$nextTick(() => {
+ this.hform.HMaintainLevID = data.HMaintainLevID;
+ });
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message || '鑾峰彇鏁版嵁澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log('涓昏〃璇锋眰澶辫触:', res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ complete: () => {
+ // 鑾峰彇瀛愯〃鏁版嵁
+ this.getSubEditData(hmainid);
+ }
+ });
+ },
- // 鑾峰彇瀛愯〃鏁版嵁
- getSubEditData(hmainid) {
- uni.request({
- url: CommonUtils.getServerUrl() +
- '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
- data: {
- "HInterID":hmainid
- },
- success: (res) => {
- console.log('瀛愯〃鏁版嵁:', res.data);
- if (res.data.count == 1) {
- this.HCheckFileList = res.data.list[0].map(item => {
- const isChecked = item.HMaintainResult === '鍚堟牸' ? true : false;
- return {
- "HMaintainItemID": item.HMaintainItemID || 0,
- "HMaintainItem": item.HMaintainItem || "",
- "HMaintainPart": item.HMaintainPart || "",
- "HClaim": item.HClaim || "",
- "HManagerID": item.HManagerID || 0,
- "HManagerName": item.HManagerName || "",
- "HMaintainResult": isChecked,
- "HRemark": item.HManagerName || ""
- };
- });
- } else {
- console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
- this.HCheckFileList = [];
- }
- },
- fail: (res) => {
- console.log('瀛愯〃璇锋眰澶辫触:', res);
- this.HCheckFileList = [];
- }
- });
- },
- async getMaxNum() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetMAXNum",
- data: {
- "HBillType": this.HBillType
- }
- })
+ // 鑾峰彇瀛愯〃鏁版嵁
+ getSubEditData(hmainid) {
+ uni.request({
+ url: CommonUtils.getServerUrl() +
+ '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
+ data: {
+ "HInterID": hmainid
+ },
+ success: (res) => {
+ console.log('瀛愯〃鏁版嵁:', res.data);
+ if (res.data.count == 1) {
+ this.HCheckFileList = res.data.list[0].map(item => {
+ const isChecked = item.HMaintainResult === '鍚堟牸' ? true : false;
+ return {
+ "HMaintainItemID": item.HMaintainItemID || 0,
+ "HMaintainItem": item.HMaintainItem || "",
+ "HMaintainPart": item.HMaintainPart || "",
+ "HClaim": item.HClaim || "",
+ "HManagerID": item.HManagerID || 0,
+ "HManagerName": item.HManagerName || "",
+ "HMaintainResult": isChecked,
+ "HRemark": item.HManagerName || ""
+ };
+ });
+ } else {
+ console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
+ this.HCheckFileList = [];
+ }
+ },
+ fail: (res) => {
+ console.log('瀛愯〃璇锋眰澶辫触:', res);
+ this.HCheckFileList = [];
+ }
+ });
+ },
+ async getMaxNum() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetMAXNum",
+ data: {
+ "HBillType": this.HBillType
+ }
+ })
- let {
- count,
- data,
- Message
- } = res.data
- console.log('data: ', data);
- this.hform.HInterID = 0
- this.hform.HBillNo = data[0]["HBillNo"]
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
- })
- }
- },
- async submit() {
- try {
- let oMain = JSON.stringify(this.hform);
- let sSubStr = JSON.stringify(this.HCheckFileList);
- let sMainSub = oMain + ';' + sSubStr + ';' + uni.getStorageSync('HUserName');
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sc_MouldMaintainBill/SaveGetMouldMaintainBillListAPP",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ console.log('data: ', data);
+ this.hform.HInterID = 0
+ this.hform.HBillNo = data[0]["HBillNo"]
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ })
+ }
+ },
+ async submit() {
+ try {
+ let oMain = JSON.stringify(this.hform);
+ let sSubStr = JSON.stringify(this.HCheckFileList);
+ let sMainSub = oMain + ';' + sSubStr + ';' + uni.getStorageSync('HUserName');
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_MouldMaintainBill/SaveGetMouldMaintainBillListAPP",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
- if (!res) {
- return
- }
+ if (!res) {
+ return
+ }
- let {
- count,
- Message
- } = res.data
- if (count == 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + Message
- })
- }
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill?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
- })
- }
- }
- },
- onLoad(e) {
- console.log('e: ', e);
- this.getHMaintainLevList()
- if (!e.operationType) {
- this.operationType = 1
- } else {
- this.operationType = e.operationType
- }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ }
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ this.getHMaintainLevList()
+ 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) {
- // 缂栬緫
- this.getEditData(e.hmainid)
- } else if (this.operationType == 4) {
- // 娴忚
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
+ this.getEditData(e.hmainid)
+ } else if (this.operationType == 4) {
+ // 娴忚
+ // 涓嬫帹
+ let HBarCode = e.HBarCode
+ this.getMaxNum()
+ if (HBarCode) {
+ this.GetMessageByBarCode(HBarCode)
+ }
- }
- },
- 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)
- })
- }
- }
+ }
+ },
+ 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">
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 0734c9f..7d435de 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -466,6 +466,7 @@
},
//浠撳簱鐩戝惉浜嬩欢
HWHNameChange(e) {
+ console.log('e: ',e);
for (var i = 0; i < this.HWHNameList.length; i++) {
if (this.HWHNameList[i]["HName"] == e) {
this.hform.HWHName = this.HWHNameList[i]["HName"]
@@ -517,6 +518,7 @@
for (var i = 0; i < data.length; i++) {
this.arrayHWHName[i] = data[i]["HName"]
}
+ this.HWHNameChange(data[0]['HName'])
}
},
)
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 1684ccc..68a3b0e 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -110,7 +110,7 @@
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.89.27:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
// 灏忓崼鍐呭缃�
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index a5f0cc6..3c7f9bb 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -332,8 +332,10 @@
tabs: 0,
HMainSourceBillType: '鎵嬪伐褰曞叆',
- arrayHMainSourceBillType: ['鍏ュ簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
- arrayHMainSourceBillValue: [1241, -1],
+ // arrayHMainSourceBillType: ['鍏ュ簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
+ // arrayHMainSourceBillValue: [1241, -1],
+ arrayHMainSourceBillType: ['鎵嬪伐褰曞叆'],
+ arrayHMainSourceBillValue: [-1],
linterid: '',
HBillNo: '',
btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
--
Gitblit v1.9.1