From 15bd4962b44577d0eb9e8fc52f7b9a1eadff42db Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期五, 13 三月 2026 09:02:51 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue | 175 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 127 insertions(+), 48 deletions(-)
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index c4a1998..908e4de 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -156,39 +156,40 @@
<uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
</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.HDotCheckResult" />
+ </checkbox-group>
+ </view>
+ <view class="detail">
+ <text>鐐规椤圭洰鍒嗙被锛�</text>{{item.HDotCheckItemClassName}}
+ </view>
+ <view class="detail">
+ <text>鐐规椤圭洰锛�</text>{{item.HDotCheckItem}}
+ </view>
+ <view class="detail">
+ <text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
+ </view>
+ <view class="detail">
+ <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
+ </view>
+ <view class="detail">
+ <text>澶囨敞锛�</text>{{item.HRemark}}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</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.HDotCheckResult" />
- </checkbox-group>
- </view>
- <view class="detail">
- <text>鐐规椤圭洰鍒嗙被锛�</text>{{item.HDotCheckItemClassName}}
- </view>
- <view class="detail">
- <text>鐐规鏂规硶锛�</text>{{item.HDotCheckItemMethodName}}
- </view>
- <view class="detail">
- <text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
- </view>
- <view class="detail">
- <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
- </view>
- <view class="detail">
- <text>澶囨敞锛�</text>{{item.HRemark}}
- </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
</template>
<!-- 鍏朵粬淇℃伅 -->
<template v-if="tabs == 2">
@@ -281,6 +282,7 @@
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+ <BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'DJ'"></BillSelectorPopupVue>
</view>
</template>
@@ -295,11 +297,12 @@
import {
getUserInfo
} from "../../../utils/auth";
- import {
- TrackOpTypes
- } from "vue";
+ import BillSelectorPopupVue from "../../../components/MJGL/BillSelectorPopup.vue";
export default {
name: 'sb_EquipDotCheckBill',
+ components: {
+ BillSelectorPopupVue
+ },
data() {
return {
tabs: 0,
@@ -318,8 +321,8 @@
hform: {
HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
HQty: 0,
HErrNote: "",
HBigSafeNote: "",
@@ -328,9 +331,9 @@
HShiftsID: 0,
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HDeptName: "",
- HDeptID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HDeptName: getUserInfo().HDeptName,
+ HDeptID: getUserInfo().HDeptID,
HRemark: "",
HBarName: "",
HEquipID: 0,
@@ -382,6 +385,20 @@
},
methods: {
+ billSelectHandler(billData) {
+ console.log('billData: ', billData);
+ let data = billData.retVal[this.hform.HEquipID]
+ this.get_DocCheckItem2(data.hmainid)
+ },
+
+ toCheckFile() {
+ if (this.hform.HEquipID == 0) {
+ return CommonUtils.showTips({
+ message: '涓嶈兘閫夋嫨鐐规瑙勭▼锛岃鍏堟壂鎻忚澶囨潯鐮�!!!'
+ })
+ }
+ this.$refs['billSelector'].showPopup(this.hform.HEquipID)
+ },
addNew() {
uni.redirectTo({
url: './Sb_EquipDotCheckBill?operationType=1'
@@ -455,10 +472,11 @@
async getShiftList() {
try {
let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetGy_ShiftsList_Json',
+ url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
data: {
- Shifts: "",
- }
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+ HMaker: getUserInfo()["Czymc"],
+ },
})
let {
@@ -487,7 +505,7 @@
let res = await CommonUtils.doRequest2Async({
url: '/Gy_Department/list',
data: {
- sWhere: "",
+ sWhere: ` AND HUSEORGID = ${uni.getStorageSync('OrganizationID')} `,
user: uni.getStorageSync('HUserName'),
Organization: uni.getStorageSync('Organization')
}
@@ -515,7 +533,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -564,6 +582,67 @@
})
}
},
+ // 鑾峰彇淇濆吇瑙勭▼
+ async get_DocCheckItem2(HDotCheckRuleInterID) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetDotCheckRuleItemByDotCheckRuleID",
+ data: {
+ "HDotCheckRuleInterID": HDotCheckRuleInterID
+ },
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ',data);
+ this.hform.HEquipDotCheckRuleInterID = data[0].HInterID
+ this.hform.HEquipDotCheckRuleInterNo = data[0].HBillNo
+ this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+ this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+ .鐐规璁″垝ID
+ this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+ 0].鐐规璁″垝瀛怚D
+
+ this.HCheckFileList = Array.from(data).map(item => {
+ return {
+ "HDotCheckItemID": item.HDotCheckItemID,
+ "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
+ "HDotCheckItem": item.鐐规椤圭洰,
+ "HDotCheckPart": item.鐐规閮ㄤ綅,
+ "HClaim": item.鍏蜂綋瑕佹眰,
+ "HManagerID": item.璐熻矗浜篒D,
+ "HManagerCode": item.璐熻矗浜轰唬鐮�,
+ "HManagerName": item.璐熻矗浜哄悕绉�,
+ "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+ "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+ "HSourceBillNo": item.鐐规璁″垝鍗�,
+ "HDotCheckItemClassID": 0,
+ "HDotCheckItemClassName": "",
+ "HDotCheckItemMethodID": 0,
+ "HDotCheckItemMethodName": "",
+ //"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ "HDotCheckResult": item.榛樿鐐规缁撴灉 == 'OK' ? true : false
+ }
+ })
+
+ this.enableEdit = false
+ this.$refs["billSelector"].exit()
+
+ } else {
+ CommonUtils.showTips({
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ message: err
+ })
+ }
+ },
async GetItemByEquipFile() {
try {
let res = await CommonUtils.doRequest2Async({
@@ -593,7 +672,7 @@
return {
"HDotCheckItemID": item.HDotCheckItemID,
"HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
- "HDotCheckItem": item.鐐规椤圭洰,
+ "HDotCheckItem": item.鐐规椤圭洰鍚嶇О,
"HDotCheckPart": item.鐐规閮ㄤ綅,
"HClaim": item.鍏蜂綋瑕佹眰,
"HManagerID": item.璐熻矗浜篒D,
@@ -606,10 +685,10 @@
"HDotCheckItemClassName": "",
"HDotCheckItemMethodID": 0,
"HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ "HDotCheckResult": item.榛樿鐐规缁撴灉 == 'OK' ? true : false
}
})
-
+ this.tabs = 1
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
--
Gitblit v1.9.1