From 385f350ce6dca03d5ea1d9677dfa50d100a388a3 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 二月 2026 14:57:21 +0800
Subject: [PATCH] 新增 装箱追溯 模块 工艺参数点检 模块
---
utils/WebSocketServices.js | 4
pages.json | 19
pages/index/tab2.vue | 1368 +++++++++---------
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 2
pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue | 663 +++++++++
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue | 3
utils/common.js | 10
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 127
manifest.json | 4
pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue | 1071 ++++++++++++++
pages/index/login.vue | 4
pages/baogong/DayPlanBillList.vue | 946 +++++++------
pages/index/index.vue | 27
pages/index/mine.vue | 21
14 files changed, 3,081 insertions(+), 1,188 deletions(-)
diff --git a/manifest.json b/manifest.json
index c27e881..6277330 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.079",
- "versionCode" : 279,
+ "versionName" : "2.082",
+ "versionCode" : 282,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 0cdf87a..d74925b 100644
--- a/pages.json
+++ b/pages.json
@@ -1693,7 +1693,7 @@
"style": {
"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗曞垪琛�"
}
- },
+ },
{
"path" : "pages/ZLGL/awaitCheckBillList/awaitCheckBillList",
"style" :
@@ -1796,10 +1796,21 @@
"style": {
"navigationBarTitleText": "鐢熶骇閫�鏂欐牎楠岀紦瀛樺垪琛�"
}
+ },
+ {
+ "path" : "pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit",
+ "style" :
+ {
+ "navigationBarTitleText" : "璁惧宸ヨ壓鍙傛暟鐐规"
+ }
+ },
+ {
+ "path" : "pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast",
+ "style" :
+ {
+ "navigationBarTitleText" : "瑁呯杩芥函"
+ }
}
-
-
-
],
"tabBar": {
"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
diff --git a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
new file mode 100644
index 0000000..f40c806
--- /dev/null
+++ b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
@@ -0,0 +1,1071 @@
+<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: 'auto',
+ overflow: 'auto'
+ }">
+ <view class="form-item">
+ <view class="title">婧愬崟绫诲瀷:</view>
+ <zxz-uni-data-select class="right" :localdata="[{value: '3772', key: '宸ュ簭娴佽浆鍗�'}]" dataKey="key"
+ dataValue="value" v-model="hform.HMainSourceBillType">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="right">
+ <input type="text" v-model="hform.HMainSourceBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娴佽浆鍗″彿:</view>
+ <view class="right">
+ <input type="text" v-model="hform.HProcExchBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璁㈠崟鍙�:</view>
+ <view class="right">
+ <input v-model="hform.HICMOBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">宸ュ簭鍙�:</view>
+ <view class="right">
+ <input v-model="hform.HProcNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐗╂枡浠ｇ爜:</view>
+ <view class="right">
+ <input v-model="hform.HMaterNumber" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐗╂枡鍚嶇О:</view>
+ <view class="right">
+ <input v-model="hform.HMaterName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="right">
+ <input v-model="hform.HMaterModel" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">宸ュ簭:</view>
+ <view class="right">
+ <input v-model="hform.HProcName" />
+ </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>
+ <zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HItemID"
+ v-model="hform.HEmpID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <input v-model="hform.HSourceName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝粍:</view>
+ <zxz-uni-data-select class="right" :localdata="HGroupList" dataKey="鐝粍鍚嶇О" dataValue="HItemID"
+ v-model="hform.HGroupID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇杞﹂棿:</view>
+ <zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
+ v-model="hform.HDeptID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧:</view>
+ <view class="righton">
+ <input v-model="hform.HEquipName" disabled />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鍏朵粬淇℃伅 -->
+ <template v-if="tabs == 1">
+ <view class="form" :style="{
+ height: 'auto',
+ overflow: 'auto'
+ }">
+ <view class="form-item">
+ <view class="title">缁勭粐:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HStockOrgName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea cols="30" rows="10" v-model="hform.HRemark"></textarea>
+ </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>
+
+ </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="tabs">
+ <view class="on">宸ヨ壓鍙傛暟</view>
+ </view>
+ <template>
+ <view class="form" :style="{
+ height: 400 + 'px',
+ overflow: 'auto'
+ }">
+
+ <view class="list" v-for="(item,index) in HTechParams" :key="index">
+ <uni-card style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail">
+ <text>搴忓彿锛�</text>{{index+1}}
+ </view>
+
+ <view class="detail">
+ <text>宸ヨ壓鍙傛暟澶х被锛�</text>{{item.HTechParamClassName}}
+ </view>
+ <view class="detail">
+ <text>宸ヨ壓鍙傛暟浠ｇ爜锛�</text>{{item.HTechParamNumber}}
+ </view>
+ <view class="detail">
+ <text>宸ヨ壓鍙傛暟鍚嶇О锛�</text>{{item.HTechParamName}}
+ </view>
+ <view class="detail">
+ <text>宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜锛�</text>{{item.HTechParamUnitNumber}}
+ </view>
+ <view class="detail">
+ <text>宸ヨ壓鍙傛暟鍗曚綅鍚嶇О锛�</text>{{item.HTechParamUnitName}}
+ </view>
+ <view class="detail">
+ <text>宸ヨ壓娆″簭锛�</text>{{item.HSNO}}
+ </view>
+ <view class="detail">
+ <text>宸ヨ壓鍙傛暟鍊硷細</text>{{item.HVaule}}
+ </view>
+ <view class="detail">
+ <text>鏍囧噯鍊硷細</text>{{item.HStd}}
+ </view>
+ <view class="detail">
+ <text>涓婇檺锛�</text>{{item.HMax}}
+ </view>
+ <view class="detail">
+ <text>涓嬮檺锛�</text>{{item.HMin}}
+ </view>
+ <view class="detail">
+ <text>妫�娴嬬粨鏋滐細</text>
+ <checkbox-group style="display: inline-block;"
+ @change="checkBoxResultChangeHandler(index, $event)">
+ <checkbox value="enabled" :checked="item.HResult == 'OK'" />
+ </checkbox-group>
+ </view>
+ <view class="detail">
+ <text>鏄惁蹇呭綍锛�</text>
+ <checkbox-group style="display: inline-block;"
+ @change="checkBoxChangeHandler(index, $event)">
+ <checkbox value="enabled" :checked="item.HIsRequired" />
+ </checkbox-group>
+ </view>
+ <view class="detail">
+ <text>澶囨敞锛�</text>{{item.HRemark}}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</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>
+ <BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'DJ'"></BillSelectorPopupVue>
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import BillSelectorPopupVue from "../../../components/MJGL/BillSelectorPopup.vue";
+ export default {
+ name: 'sb_EquipDotCheckBill',
+ components: {
+ BillSelectorPopupVue
+ },
+ data() {
+ return {
+ tabs: 0,
+ HMainSourceBillType: "",
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "SB_EquipICMOTechParamBillEdit",
+ HBillType: '3919',
+ operationType: 1,
+ uploadOptions: {},
+
+ HTechParams: [], // 宸ヨ壓鍙傛暟
+
+ HDeptList: [],
+ HShiftsList: [],
+ HCheckFileList: [],
+ HEmpList: [], // 鑱屽憳鍒楄〃
+ HGroupList: [], // 鐢熶骇鐝粍鍒楄〃
+ attachmentInfo: [],
+
+ hform: {
+ "HBillNo": "",
+ "HInterID": 0,
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HStockOrgID": uni.getStorageSync("OrganizationID"),
+ "HStockOrgName": uni.getStorageSync("Organization"),
+ "HMainSourceBillType": "3772",
+ "HMainSourceInterID": 0,
+ "HMainSourceEntryID": 0,
+ "HMainSourceBillNo": "",
+ "HProcExchBillNo": "",
+ "HProcExchInterID": 0,
+ "HProcExchEntryID": 0,
+ "HICMOBillNo": "",
+ "HICMOInterID": 0,
+ "HICMOEntryID": 0,
+ "HProcNo": "",
+ "HMaterNumber": "",
+ "HMaterID": 0,
+ "HMaterName": "",
+ "HMaterModel": "",
+ "HProcName": "",
+ "HProcID": 0,
+ "HEmpName": "",
+ "HEmpID": getUserInfo()["HEmpID"],
+ "HSourceName": "",
+ "HSourceID": 0,
+ "HGroupName": "",
+ "HGroupID": getUserInfo()["HGroupID"],
+ "HDeptName": "",
+ "HDeptID": getUserInfo()["HDeptID"],
+ "HEquipName": "",
+ "HEquipID": 0,
+ "HRemark": "",
+ "HMaker": getUserInfo()["Czymc"],
+ "HChecker": "",
+ "HCloseMan": "",
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HCheckDate": "",
+ "HCloseDate": "",
+ "HUpDater": "",
+ "HDeleteMan": "",
+ "HUpDateDate": "",
+ "HDeleteDate": ""
+ }
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ },
+ calcHLastResult: {
+ get() {
+ if (this.HCheckFileList.length == 0) {
+ return 'OK'
+ } else {
+ let okCount = this.HCheckFileList.reduce((acc, item) => {
+ if (item.HDotCheckResult) {
+ return acc + 1
+ }
+ return acc
+ }, 0)
+ if (okCount == this.HCheckFileList.length) {
+ return 'OK'
+ }
+ return 'NG'
+ }
+ }
+ }
+
+ },
+ 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'
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HTechParams[index]["HIsRequired"] = false
+ } else {
+ this.HTechParams[index]["HIsRequired"] = true
+ }
+ },
+ checkBoxResultChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HTechParams[index]["HResult"] = 'NG'
+ } else {
+ this.HTechParams[index]["HResult"] = 'OK'
+ }
+ },
+ 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: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+ HMaker: getUserInfo()["Czymc"],
+ },
+ })
+
+ 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 getGroupList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Group/list',
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 != 'Y' and 瀹℃牳浜�!='' and HUSEORGID = '1'`,
+ user: getUserInfo()["Czymc"],
+ },
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HGroupList = 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
+ })
+ }
+ },
+ toScanCode() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HBarCode = cb
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Gy_EquipFileBill/txtHBarCode_KeyDown",
+ data: {
+ HBarCode: HBarCode,
+ user: getUserInfo()["Czymc"]
+ },
+ })
+
+
+ if (!res) {
+ return
+ }
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HEquipID = data[0].HInterID
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HQty = 1
+
+ // 鑾峰彇妫�楠岃绋�
+ this.GetItemByEquipFile()
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ })
+ }
+ },
+ // 鑾峰彇淇濆吇瑙勭▼
+ 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({
+ url: "/Web/GetItemByEquipFile",
+ data: {
+ "EquipProjectID": this.hform.HEquipID,
+ "Type": "DJ",
+ "HDate": this.hform.HBeginDate
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
+ this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
+ 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.榛樿鐐规缁撴灉 == 'OK' ? true : false
+ }
+ })
+ this.tabs = 1
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+ })
+ }
+ },
+ radioChange({
+ detail: {
+ value
+ }
+ }) {
+ this.HLastResult = 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 = data[0]["HInterID"]
+ this.hform.HBillNo = data[0]["HBillNo"]
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ })
+ }
+ },
+ async set_CheckBill(HInterID, num) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Check_Json',
+ data: {
+ "HInterID": HInterID,
+ "Type": num,
+ "HMaker": getUserInfo()["Czymc"]
+ }
+ })
+ let {
+ count
+ } = res.data
+ if (count == 1) {
+ return true
+ } else {
+ return false
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `瀹℃牳澶辫触: ${err}`
+ })
+ return false
+ }
+ },
+ async submit() {
+ try {
+ if (this.hform.HProcNo == '') {
+ this.hform.HProcNo = 0
+ }
+ let oMain = JSON.stringify(this.hform);
+ let sSubStr = JSON.stringify(this.HTechParams);
+ let operationType = this.operationType
+ if (operationType == 5) {
+ operationType = 1
+ }
+ let sMainSub = oMain + ';' + sSubStr + ';' + operationType + ';' + getUserInfo()["Czymc"];
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Save_Json",
+ data: {
+ "sMainSub": sMainSub
+ },
+ method: "POST"
+ })
+
+ if (!res) {
+ return
+ }
+
+ let {
+ count,
+ Message,
+ data,
+ HInterID,
+ Verify
+ } = res.data
+ if (count == 1) {
+
+ if (Verify) {
+ await this.set_CheckBill(HInterID, 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
+ })
+ }
+
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ },
+ async loadBillMain(HInterID, HEntryID) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/LEMS/MES_IF_EquipICMOTechParamList_Json",
+ data: {
+ hinterid: HInterID,
+ HEntryID,
+ HEntryID,
+ user: getUserInfo()["Czymc"]
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+
+ if (count == 1) {
+
+ Object.assign(this.hform, {
+ "HMaterID": data[0].HMaterID,
+ "HMaterNumber": data[0].浜у搧浠ｇ爜,
+ "HMaterName": data[0].浜у搧鍚嶇О,
+ "HMaterModel": data[0].瑙勬牸鍨嬪彿,
+ "HProcID": data[0].HProcID,
+ "HProcName": data[0].宸ュ簭鍚嶇О,
+ "HProcNo": data[0].宸ュ簭鍙�,
+ //"HGroupID": data[0].HGroupID == undefined ? 0 : data[0].HGroupID,
+ //"HGroupName": data[0].鐝粍,
+ "HDeptID": data[0].HDeptID == undefined ? 0 : data[0].HDeptID,
+ "HDeptName": data[0].鍔犲伐杞﹂棿,
+
+ "HSourceID": data[0].HSourceID,
+ "HSourceName": data[0].鐢熶骇璧勬簮,
+
+ "HEquipID": data[0].HEquipID,
+ "HEquipName": data[0].璁惧鍚嶇О,
+
+ "HICMOInterID": data[0].hicmointerid,
+ "HICMOEntryID": data[0].HICMOEntryID,
+ "HICMOBillNo": data[0].浠诲姟鍗曞彿,
+
+ "HProcExchInterID": data[0].hmainid,
+ "HProcExchEntryID": data[0].HEntryID,
+ "HProcExchBillNo": data[0].鍗曟嵁鍙�,
+
+ "HMainSourceInterID": data[0].hmainid,
+ "HMainSourceEntryID": data[0].HEntryID,
+ "HMainSourceBillNo": data[0].鍗曟嵁鍙�,
+ "HMainSourceBillType": data[0].鍗曟嵁绫诲瀷,
+ })
+
+ this.HTechParams = data.map(item => {
+ return {
+ "HTechParamClassID": item["HTechParamClassID"] == null ? 0 : item[
+ "HTechParamClassID"],
+ "HTechParamClassName": item["宸ヨ壓鍙傛暟澶х被鍚嶇О"],
+ "HTechParamID": item["HTechParamID"] == null ? 0 : item[
+ "HTechParamID"
+ ],
+ "HTechParamNumber": item["宸ヨ壓鍙傛暟浠ｇ爜"],
+ "HTechParamName": item["宸ヨ壓鍙傛暟鍚嶇О"],
+ "HTechParamUnitID": item["HTechParamUnitID"] == null ? 0 : item[
+ "HTechParamUnitID"],
+ "HTechParamUnitNumber": item["宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜"],
+ "HTechParamUnitName": item["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"],
+ "HSNO": item["宸ヨ壓娆″簭"] == null ? 0 : item["宸ヨ壓娆″簭"],
+ "HTechParamIDStd": item["HTechParamIDStd"] == null ? 0 : item[
+ "HTechParamIDStd"],
+ "HTechParamIDStdName": item["瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�"],
+ "HResultStd": "",
+ "HVaule": item["鏁伴噰鍊�"],
+ "HStd": item["鏍囧噯鍊�"],
+ "HMax": item["涓婇檺鍊�"],
+ "HMin": item["涓嬮檺鍊�"],
+ "HRemark": item["閲囬泦鏉ユ簮"],
+ "HResult": (item["鏁伴噰鍊�"] <= item["涓婇檺鍊�"] && item["鏁伴噰鍊�"] >= item["涓嬮檺鍊�"]) ?
+ "OK" : "NG",
+ "HIsRequired": item["HIsRequired"]
+ }
+ })
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟淇℃伅澶辫触: ${Message}`
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟淇℃伅澶辫触: ${err}`
+ })
+ }
+ },
+ async getEmpList() {
+ try {
+ let sWhere = " where 1=1 "
+ if (this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�') {
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/UserList',
+ data: {
+ sWhere: sWhere,
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HEmpList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ if (!e.operationType) {
+ this.operationType = 1
+ } else {
+ this.operationType = e.operationType
+ }
+
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
+
+ } else if (this.operationType == 4) {
+ // 娴忚
+
+ } else if (this.operationType == 5) {
+ // 鎶ュ伐骞冲彴涓嬫帹
+ this.getMaxNum()
+ let {
+ hinterid,
+ hsubid
+ } = e
+ this.loadBillMain(hinterid, hsubid)
+ }
+
+ this.getHDeptList()
+ // this.getShiftList()
+ this.getGroupList()
+ this.getEmpList()
+ },
+ 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"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index 468dcc6..58f6838 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -569,7 +569,7 @@
try {
let sWhere= " where 1=1 "
if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
- // sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
}
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
diff --git a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
new file mode 100644
index 0000000..8387bd1
--- /dev/null
+++ b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
@@ -0,0 +1,663 @@
+<template>
+ <view class="form">
+ <view class="form-base-info">
+ <view class="form-item">
+ <view class="title">SN鏉＄爜</view>
+ <view class="right">
+ <input type="text" :focus="HBarCodeFocus" v-model="HBarCode"
+ @confirm="GetMeesageByBarCode(HBarCode)" />
+ </view>
+ <view class="right-icon">
+ <uni-icons type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode2"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">绠辨潯鐮�</view>
+ <view class="right">
+ <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack"
+ @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="[EnableScanBarCodePack?'disabled':'']" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁ID</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HInterID" />
+ </view>
+ </view>
+ </view>
+ <view class="tabs" id="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">SN鏉＄爜淇℃伅</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍚堣淇℃伅</view>
+ </view>
+ <!-- 瑁呯淇℃伅 -->
+ <view v-if="tabs == 0">
+ <!-- <zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+ :show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
+ @toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" /> -->
+
+ <view class="item-wrapper">
+ <view v-for="(item, index) in listData" :key="index">
+ <uni-card :title="item['HMaterName']" :extra="`鏉＄爜鏁伴噺: ${item['HQtyMust']}`" @tap="cmdDelete(item)">
+ <view class="detail" v-if="item['HBarCode']">
+ <text>鏉＄爜缂栧彿锛�</text>{{item['HBarCode']}}
+ </view>
+ <view class="detail" v-if="item['HQty']">
+ <text>鏁伴噺锛�</text>{{item['HQty']}}
+ </view>
+ <view class="detail" v-if="item['HMaterNumber']">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item['HMaterNumber']}}
+ </view>
+ <view class="detail" v-if="item['HMaterModel']">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item['HMaterModel']}}
+ </view>
+ <view class="detail" v-if="item['HPieceQty']">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['HPieceQty']}}
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
+ </view>
+ <!-- 鍚堣淇℃伅 -->
+ <view v-if="tabs == 1">
+ <view class="form">
+ <view class="form-base-info">
+ <view class="form-item">
+ <view class="title">鏉＄爜鍚堣</view>
+ <view class="right disabled">
+ <input disabled type="text" v-model="hform.txtHBarcodeQtys" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁伴噺鍚堣</view>
+ <view class="right disabled">
+ <input disabled type="text" v-model="hform.txtHSumQtys" />
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="bottom-btn" id="bottom-btn">
+ <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini"
+ @tap="cmdSubmit">鎻愪氦</button>
+ <view style="flex: 1;"></view>
+ <!-- <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button> -->
+ <button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ getUserInfo
+ } from "../../utils/auth";
+ import {
+ CommonUtils
+ } from "@/utils/common.js"
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍒楄〃楂樺害
+ bottomBtnTop: 0,
+ listTableTop: 0,
+ // 鍏叡鍙橀噺
+
+ EnableScanBarCodePack: true,
+ EnableSubmit: true,
+ HBarCodePackFocus: false,
+ HBarCodeFocus: false,
+ HBarCode_Pack: '', //绠辨潯鐮�
+ HBarCode: '', // 鍖呮潯鐮�
+ tabs: 0,
+ HBillType: '3704',
+ HBillSubType: '1', //瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
+ OperationType: 1, //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ HMaterNumber_Pack: "", //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+ listOption: [],
+ listData: [],
+
+ selectedRows: [], // 瀛樺偍閫変腑鐨勬暟鎹�
+ HModName: "CE",
+ ModRightName: "CE_PackUnionCarryUp", //妯″潡鏉冮檺鍙傛暟
+ titleData: [], //涓嶉渶瑕佹樉绀虹殑瀛楁
+ OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ HBarCode_Pack_Temp: "", //浠庣紦瀛樺垪琛ㄤ腑杩斿洖绠辨潯鐮�
+
+ // 琛ㄥ崟鎻愪氦鍊�
+ hform: {
+ HMaker: getUserInfo()['Czymc'],
+ HBillNo: '',
+ HInterID: '',
+ HBillType: '3704',
+ HBarCode_Pack: '',
+ HStockOrgID: uni.getStorageSync("OrganizationID"),
+ txtHBarcodeQtys: 0,
+ txtHSumQtys: 0,
+ },
+ // 鍒嗛〉妯″潡鍏冩暟鎹�
+ paginationMeta: {
+
+ }
+ }
+ },
+ methods: {
+ checkboxGroupChangeHandler(e) {
+ let checkBoxValues = Array.from(e.detail.value)
+ if (checkBoxValues.findIndex(elem => elem == 'qualityApproval') != -1) {
+ this.hform.HQualityApproval = true
+ } else {
+ this.hform.HQualityApproval = false
+ }
+ },
+ onTableRowClickHandler(row, index) {
+ console.log('row: ', row);
+ if (!this.listData[index].checked) {
+ this.$set(this.listData[index], 'checked', true)
+ } else {
+ this.listData[index].checked = !this.listData[index].checked
+ }
+ },
+ async HBarCodeFocusRefresh() {
+ this.HBarCode = ''
+ this.HBarCodeFocus = false
+ await this.$nextTick()
+ this.HBarCodeFocus = true
+ },
+ async HBarCodePackFocusRefresh() {
+ this.HBarCode_Pack = ''
+ this.HBarCodePackFocus = false
+ await this.$nextTick()
+ this.HBarCodePackFocus = true
+ },
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_Pack = scanCode
+ this.GetMeesageByBarCode_Pack(HBarCode_Pack)
+ })
+ },
+ GetMeesageByBarCode_Pack(HBarCode_Pack) {
+ // 鑾峰彇绠辨潯鐮佸搴旂殑鏁版嵁
+ CommonUtils.doRequest2({
+ url: '/WEBSController/get_BarCode_PackUnionCarryUp',
+ data: {
+ sInterID: this.hform.HInterID || 0,
+ sBillNo: this.hform.HBillNo,
+ HBillType: this.HBillType,
+ sHBarCode_Pack: HBarCode_Pack,
+ sMaker: getUserInfo()['Czymc'],
+ HStockOrgID: uni.getStorageSync('OrganizationID')
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message,
+ list
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+
+ this.HBarCode_Pack = data["HBarCode"]
+ this.HBarCodeFocusRefresh()
+ this.DisBillEntryList();
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ } else {
+ CommonUtils.playSound(0)
+ this.HBarCodePackFocusRefresh()
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ toScanCode2() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode = scanCode
+ GetMeesageByBarCode(scanCode)
+ })
+ },
+ async GetMeesageByBarCode(HBarCode) {
+ // 鑾峰彇SN鐮佸搴旂殑鏁版嵁
+ let sInterID = this.hform.HInterID
+ let sBillNo = this.hform.HBillNo
+ let sHBarCode = this.HBarCode
+ let sHBarCode_Pack = this.HBarCode_Pack
+ let sMaker = getUserInfo()["Czymc"]
+ let HStockOrgID = uni.getStorageSync("OrganizationID")
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/get_SNBarCode_PackUnionCarryUp",
+ data: {
+ sHBarCode,
+ sInterID,
+ HBillType,
+ sBillNo,
+ sHBarCode_Pack,
+ sMaker,
+ HStockOrgID
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.playSound(0)
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鎵弿SN鏉＄爜澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.playSound(0)
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鎵弿SN鏉＄爜澶辫触: ${err}`
+ })
+ }
+ },
+ DisBillEntryList() {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/GetBillEntry_TmpList_PackUnionCarryUp',
+ data: {
+ "sInterID": this.hform.HInterID,
+ "sBillNo": this.hform.HBillNo,
+ "HBillType": this.hform.HBillType
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.listData = data
+
+ this.SetCount()
+ } else {
+ // 娌℃湁浠讳綍璁板綍瑙嗕负浠�0寮�濮嬫柊澧�
+ this.listData = []
+ }
+ }
+ })
+ },
+ handleSelect(selected, array) {
+ this.selectedRows = array
+ },
+ handleSelectAll(selected, array) {
+ this.selectedRows = array
+ },
+ SetCount() {
+ let sBarcodeQty = 0;
+ let sSumQtys = 0;
+ this.listData.forEach(item => {
+ sBarcodeQty += parseFloat(item["HPieceQty"])
+ sSumQtys += parseFloat(item["HQty"])
+ })
+
+ this.hform.txtHBarcodeQtys = sBarcodeQty
+ this.hform.txtHSumQtys = sSumQtys
+
+ },
+ getMaxNo() {
+ CommonUtils.doRequest2({
+ url: "/WEBSController/GetMaxBillNoAndID_Json",
+ data: {
+ "HBillType": this.hform.HBillType
+ },
+ resFunction: (d) => {
+ console.log('d: ', d);
+ let {
+ count,
+ data,
+ Message
+ } = d.data
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID;
+ this.hform.HBillNo = data[0].HBillNo
+ } else {
+
+ uni.showModal({
+ title: "娓╅Θ鎻愮ず",
+ showCancel: false,
+ content: Message
+
+ })
+
+ }
+ }
+ })
+ },
+ submitPreCheck() {
+ if (CommonUtils.isEmpty(this.hform.HInterID)) {
+ uni.showToast({
+ icon: 'none',
+ title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
+ })
+ return false
+ }
+ if (CommonUtils.isEmpty(this.hform.HBillNo)) {
+ uni.showToast({
+ icon: 'none',
+ title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
+ })
+ return false
+ }
+ if (this.listData.length < 1) {
+ uni.showToast({
+ icon: 'none',
+ title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
+ })
+ return false
+ }
+ return true
+ },
+ cmdDelete(item) {
+ uni.showModal({
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+ success: () => {
+ if (confirm) {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/set_DelPackUnionBill_Temp',
+ data: {
+ sInterID: this.hform.HInterID,
+ HBillType: this.HBillType,
+ sBarCode: item.HBarCode
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.playSound(0)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ }
+ }
+ })
+ },
+ cmdSubmit() {
+ let checkRes = this.submitPreCheck()
+ if (!checkRes) {
+ return
+ }
+ this.EnableSubmit = false
+ CommonUtils.doRequest2({
+ url: '/WEBSController/set_SavePackUnionCarryUpBill',
+ data: {
+ "ModRightNamePackUnionCarryUp": this.ModRightName,
+ "sInterID": this.hform.HInterID,
+ "HBillType": this.hform.HBillType,
+ "sBillNo": this.hform.HBillNo,
+ "sHBarCode_Pack": this.HBarCode_Pack,
+ "sMaker": this.hform.HMaker,
+ "HStockOrgID": this.hform.HStockOrgID
+
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: Message,
+ confirmText: "鏂板",
+ cancelText: '鍏抽棴',
+ success: ({
+ confirm,
+ cancel
+ }) => {
+ if (confirm) {
+ uni.redirectTo({
+ url: "./Sc_PackUnionCarryUpBill_Fast?operationType=1"
+ })
+ }
+
+ if (cancel) {
+ uni.navigateBack()
+ }
+ }
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ cmdExit() {
+ uni.navigateBack()
+ }
+ },
+ computed: {
+ listTableHeight: {
+ get() {
+ return this.bottomBtnTop - this.listTableTop - 10
+ }
+ }
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#bottom-btn")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.bottomBtnTop = data.top
+ } else {
+ console.log("鏈壘鍒�#bottom-btn鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#tabs")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.listTableTop = data.top
+ } else {
+ console.log("鏈壘鍒�#tabs鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+ },
+ onLoad(e) {
+ // 1涓� 鏂板
+ this.BarCodeType = e.BarCodeType || 1
+ this.OperationType = e.OperationType || 1
+ this.HBarCode_Pack = e.HBarCode_Pack_Temp || ""
+
+ if (this.OperationType == 1) {
+ this.getMaxNo()
+ } else if (this.OperationType == 2) {
+ // this.GetMeesageByBarCode_Pack(this.HBarCode_Pack)
+ let {
+ HBarCode_Pack,
+ HInterID,
+ HBillNo
+ } = e
+ this.HBarCode_Pack = HBarCode_Pack
+ this.hform.HInterID = HInterID
+ this.hform.HBillNo = HBillNo
+ this.DisBillEntryList()
+ this.tabs = 0
+ }
+
+ // 鍏夋爣榛樿鑱氱劍鍦ㄦ墭鏉＄爜涓�
+ this.HBarCodePackFocusRefresh()
+ }
+ }
+</script>
+
+<style lang="scss">
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .form {
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+
+ .form-base-info {
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ box-sizing: border-box;
+ padding: 30rpx;
+ }
+
+ .bill-info {
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ box-sizing: border-box;
+ padding: 16rpx 30rpx;
+ }
+
+ .form-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+
+ .title {
+ width: 5rem;
+ flex-shrink: 0;
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ .right-icon {
+ flex-shrink: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ }
+ }
+
+ .tabs {
+ width: 100%;
+ display: flex;
+ border-bottom: 1px solid #ddd;
+ margin: 20rpx 0;
+
+ view {
+ width: 25%;
+ font-size: 30rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .bottom-btn {
+ width: 100%;
+ box-sizing: border-box;
+ // height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
index 7dc9a5c..90d94b8 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -93,7 +93,7 @@
this.tabs = tabIndex
switch (tabIndex) {
case 0:
- this.sWhere = ` and 鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' and 闃呰鐘舵�� = '鏈槄'`
+ this.sWhere = ` and (鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' or 鎶勯�佹帴鏀朵汉 = '${getUserInfo()['HEmpName']}') and 闃呰鐘舵�� = '鏈槄'`
break;
case 1:
this.sWhere = ` and 鎺ユ敹浜� = '${getUserInfo()['HEmpName']}'`
@@ -159,6 +159,7 @@
}
},
displayDetail(item) {
+ console.log('item: ',item);
uni.showModal({
title: `${item["涓婚"]}`,
content: `${item["鍐呭"]}`,
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 8f46260..7d25578 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -709,7 +709,8 @@
let {
data,
Message,
- count
+ count,
+ code
} = res.data
if (count == 1) {
if (data[0]['HBack'] == 1) {
@@ -719,58 +720,73 @@
})
return;
}
- if (this.hform.HSourceBillType == "3791") { //鍑虹珯鍗�
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
- this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].HSourceBillQty
- this.hasSourceBill = true
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].HProcExchBillNo
- this.hform.HProcExchInterID = data[0].HProcExchInterID
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].宸ュ簭鍚嶇О
- this.hform.HCheckQty = data[0].鍑虹珯鏁伴噺
- } else {
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].HSourceBillQty
- this.hasSourceBill = true
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
- this.hform.HProcExchInterID = data[0].HInterID
- this.hform.HProcExchEntryID = data[0].HEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].褰撳墠宸ュ簭
+
+ if (code == 2) {
+ // 瀛樺湪宸叉湁鐨勫崟鎹紝鎻愮ず鏄惁闇�瑕佺户缁柊澧�
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: "姝ゅ崟鎹凡鐢熸垚鏈欢妫�楠屽崟,鏄惁闇�瑕佺户缁柊澧�",
+ confirmText: "鏄�",
+ cancelText: "鍚�",
+ success: (res) => {
+ if (res.confirm) {
+ if (this.hform.HSourceBillType == "3791") { //鍑虹珯鍗�
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hasSourceBill = true
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+ this.hform.HProcExchInterID = data[0].HProcExchInterID
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].宸ュ簭鍚嶇О
+ this.hform.HCheckQty = data[0].鍑虹珯鏁伴噺
+ } else {
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0]['HBillNo']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hasSourceBill = true
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HProcExchInterID = data[0].HInterID
+ this.hform.HProcExchEntryID = data[0].HEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭
+ }
+ this.hform.HRemarkSN = HBarCodeOld // 鎵�鎵弿鐨勬潯鐮佸瓨SN瀛楁
+ this.get_CheckItem();
+ } else if (res.cancel) {}
+ },
+ })
}
- this.hform.HRemarkSN = HBarCodeOld // 鎵�鎵弿鐨勬潯鐮佸瓨SN瀛楁
- this.get_CheckItem();
+
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -858,7 +874,7 @@
this.hform.HProcID = data[0].HProcID
this.hform.HProcName = data[0].褰撳墠宸ュ簭
}
-
+
this.get_CheckItem();
this.hasSourceBill = true
this.$refs['billList'].exit()
@@ -1963,7 +1979,7 @@
CurUserName: getUserInfo()['Czymc']
}
})
-
+
if (res.data.count == 1) {
return true
} else {
@@ -2318,7 +2334,7 @@
},
},
async onLoad(e) {
- this.setAuto();
+ this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
@@ -2359,7 +2375,6 @@
</script>
<style lang="scss" scoped>
-
input {
width: inherit;
font-size: 30rpx;
diff --git a/pages/baogong/DayPlanBillList.vue b/pages/baogong/DayPlanBillList.vue
index 4573cc0..ef38b70 100644
--- a/pages/baogong/DayPlanBillList.vue
+++ b/pages/baogong/DayPlanBillList.vue
@@ -1,451 +1,513 @@
<template>
- <view class="content">
- <view class="list" v-for="(item,index) in listData" :key="index">
- <uni-card :title="'宸ュ崟鍙凤細'+item.HICMOBillNo" :extra="'鏃ユ湡锛�'+item.璁″垝鏃ユ湡" style="margin: 10px;" @tap="edit(item)">
- <view class="card-detail">
- <view class="detail" v-if="item.HMaterName" style="width: 100%;">
- <text>浜у搧鍚嶇О锛�</text>{{item.HMaterName}}
- </view>
- <view class="detail" v-if="item.HModel" style="width: 100%;">
- <text>浜у搧鍨嬪彿锛�</text>{{item.HModel}}
- </view>
- <view class="detail">
- <text>璁″垝鏁伴噺锛�</text>{{item.HDatePlanQty?item.HDatePlanQty:0}}
- </view>
- <view class="detail">
- <text>姹囨姤鎬绘暟锛�</text>{{item.HDateFinishQty?item.HDateFinishQty:0}}
- </view>
- <view class="detail" v-if="item.HICMOStatus">
- <text>褰撳墠鐘舵�侊細</text>{{item.HICMOStatus}}
- </view>
- <view class="detail" v-if="item.棰嗘枡鐘舵��">
- <text>棰嗘枡鐘舵�侊細</text>{{item.棰嗘枡鐘舵�亇}
- </view>
- <view class="detail" style="width: 100%;display: flex;align-items: center;">
- <text>鐢熶骇杩涘害锛�</text>
- <zui-progress-bar :value="item.percent" :width="210" type="follow-left"/>
- </view>
- </view>
- </uni-card>
- </view>
- <uni-popup ref="popup" background-color="#fff">
- <view class="popup-content">
- <view class="tit">寮傚父绫诲瀷</view>
- <view class="item" v-for="(item,index) in popList" :key="index" @tap="toAbnm(item)">{{item}}</view>
- </view>
- </uni-popup>
- <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0">宸插埌搴�</view>
- </view>
+ <view class="content">
+ <view class="list" v-for="(item,index) in listData" :key="index">
+ <uni-card :title="'宸ュ崟鍙凤細'+item.HICMOBillNo" :extra="'鏃ユ湡锛�'+item.璁″垝鏃ユ湡" style="margin: 10px;" @tap="edit(item)">
+ <view class="card-detail">
+ <view class="detail" v-if="item.HMaterName" style="width: 100%;">
+ <text>浜у搧鍚嶇О锛�</text>{{item.HMaterName}}
+ </view>
+ <view class="detail" v-if="item.HModel" style="width: 100%;">
+ <text>浜у搧鍨嬪彿锛�</text>{{item.HModel}}
+ </view>
+ <view class="detail">
+ <text>璁″垝鏁伴噺锛�</text>{{item.HDatePlanQty?item.HDatePlanQty:0}}
+ </view>
+ <view class="detail">
+ <text>姹囨姤鎬绘暟锛�</text>{{item.HDateFinishQty?item.HDateFinishQty:0}}
+ </view>
+ <view class="detail" v-if="item.HICMOStatus">
+ <text>褰撳墠鐘舵�侊細</text>{{item.HICMOStatus}}
+ </view>
+ <view class="detail" v-if="item.棰嗘枡鐘舵��">
+ <text>棰嗘枡鐘舵�侊細</text>{{item.棰嗘枡鐘舵�亇}
+ </view>
+ <view class="detail" style="width: 100%;display: flex;align-items: center;">
+ <text>鐢熶骇杩涘害锛�</text>
+ <zui-progress-bar :value="item.percent" :width="210" type="follow-left" />
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <uni-popup ref="popup" background-color="#fff">
+ <view class="popup-content">
+ <view class="tit">寮傚父绫诲瀷</view>
+ <view class="item" v-for="(item,index) in popList" :key="index" @tap="toAbnm(item)">{{item}}</view>
+ </view>
+ </uni-popup>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0">宸插埌搴�</view>
+ </view>
</template>
<script>
- import { getUserInfo } from "@/utils/auth.js";
- export default {
- data() {
- return {
- userInfo:getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
- HSourceID:'',
- HSourceName:'',
- number:1,
- listData:[],
- chooseIt:'',
- popList:['浜哄憳鍘熷洜', '璁惧鍘熷洜', '鏉愭枡鍘熷洜', '宸ヨ壓鍘熷洜', '妯″叿鍘熷洜', '娴嬭瘯鍘熷洜', '鐜鍘熷洜'],
- // 瀹氫箟鎿嶄綔鏄犲皠閰嶇疆
- actionConfig: {
- '寮�宸�': {
- apiUrl: '/Sc_MESBeginWorkBill/FastBeginWorkBill',
- type: '寮�宸�',
- handler: 'handleBegin',
- checkStatus: true, // 闇�瑕佹鏌ョ姸鎬�
- denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻寮�宸ユ潯浠�!' // 鍥哄畾閿欒鎻愮ず
- },
- '瀹屽伐': {
- apiUrl: '/Sc_MESEndWorkBill/FastEndWorkBill',
- type: '瀹屽伐',
- handler: 'handleEnd',
- checkStatus: true,
- denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!' // 鍥哄畾閿欒鎻愮ず
- },
- '鍋滃伐': {
- apiUrl: '/Sc_MESStopWorkBill/FastStopWorkBill',
- type: '鍋滃伐',
- handler: 'handleStop',
- checkStatus: true,
- denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻鍋滃伐鏉′欢!' // 鍥哄畾閿欒鎻愮ず
- },
- '寮傚父鍙嶉': {
- apiUrl: '',
- type: '寮傚父鍙嶉',
- handler: 'handleAbnormal',
- checkStatus: true,
- denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻寮傚父鍙嶉鏉′欢!' // 鍥哄畾閿欒鎻愮ず
- }
- }
- }
- },
- onLoad(e) {
- console.log(e)
- uni.showLoading({
- title:'鍔犺浇涓�...'
- })
- this.HSourceName=e.HSourceName
- this.HSourceID=e.HSourceID
- this.getList(e.HSourceID)
- },
- onPullDownRefresh: function() {
- this.getList(this.HSourceID)
- setTimeout(()=>{
- uni.stopPullDownRefresh();
- }, 1000);
- },
- methods: {
- getList(e){
- uni.request({
- url: this.serverUrl + '/ReportPlatForm/SearchGetWorkBillList',
- data: { "HSourceID": e },
- success: (res) => {
- if(res.data.count == 1){
- console.log(res.data.data.h_p_JIT_GetWorkBillListInfoBySource)
- this.listData = res.data.data.h_p_JIT_GetWorkBillListInfoBySource
- for(var i=0;i<this.listData.length;i++){
- this.listData[i].percent = (this.listData[i].HDateFinishQty / this.listData[i].HDatePlanQty).toFixed(4)
- }
- setTimeout(()=>{
- uni.hideLoading()
- }, 1000);
- }else{
- setTimeout(()=>{
- uni.hideLoading()
- }, 1000);
- uni.showToast({
- title:'鑾峰彇鍒楄〃鍑洪敊锛�',
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- setTimeout(()=>{
- uni.hideLoading()
- }, 1000);
- uni.showToast({
- title:'鑾峰彇鍒楄〃鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- toAbnm(item){
- console.log(item,this.chooseIt)
- this.$refs.popup.close()
- uni.navigateTo({
- url:'./OA_ErrMsgBackBill?HICMOBillNo=' + this.chooseIt.HICMOBillNo
- +'&HSourceName=' + this.HSourceName
- +'&HSourceBillNo=' + this.chooseIt.HSourceBillNo
- +'&HType=' + item
- +'&OperationType=4&linterid=&HSouceBillType='
- })
- },
- edit(item){
- console.log(item)
- this.chooseIt = item
-
- // 浣跨敤瀵硅薄鏄犲皠閰嶇疆鐢熸垚鍙敤鐨勬搷浣滃垪琛�
- const availableActions = Object.keys(this.actionConfig)
-
- uni.showActionSheet({
- itemList: availableActions,
- success: (res)=> {
- const actionKey = availableActions[res.tapIndex]
- const actionConfig = this.actionConfig[actionKey]
-
- // 璋冪敤瀵瑰簲鐨勫鐞嗘柟娉�
- this[actionConfig.handler](item, actionConfig)
- },
- fail: function (res) {
- console.log(res.errMsg);
- }
- });
- },
- // 寮�宸ュ鐞�
- handleBegin(item, config) {
- const upData = this.createUpData(item)
- this.checkAndExecuteWorkStatus(
- item,
- config,
- config.apiUrl,
- upData
- )
- },
- // 瀹屽伐澶勭悊
- handleEnd(item, config) {
- const upData = this.createUpData(item)
- this.checkAndExecuteWorkStatus(
- item,
- config,
- config.apiUrl,
- upData
- )
- },
- // 鍋滃伐澶勭悊
- handleStop(item, config) {
- const upData = this.createUpData(item)
- this.checkAndExecuteWorkStatus(
- item,
- config,
- config.apiUrl,
- upData
- )
- },
- // 寮傚父鍙嶉澶勭悊
- handleAbnormal(item, config) {
- const sWhere = {
- "HSourceID": this.HSourceID,
- "HICMOBillNo": item.HICMOBillNo,
- "HInterID": item.HSourceInterID,
- "type": config.type
- }
-
- uni.request({
- url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
- type: "GET",
- data: { "sWhere": JSON.stringify(sWhere) },
- dataType: "json",
- async: false,
- success: (res) => {
- console.log('寮傚父鍙嶉鐘舵�佹鏌�:', res.data)
- // 鏍规嵁绗簩涓〉闈㈢殑閫昏緫锛氬鏋渃ount>0锛岃〃绀轰笉鍏佽鎿嶄綔
- if (res.data.count > 0) {
- // 涓嶅厑璁告搷浣滐紝鏄剧ず閿欒鎻愮ず
- const status = item.HICMOStatus || '鏈煡鐘舵��'
- uni.showToast({
- title: `宸ュ崟銆�${item.HICMOBillNo}銆戝綋鍓嶇姸鎬佷负銆�${status}銆戯紝${config.denyMsg}`,
- icon:'none',
- duration: 3000
- })
- }
- else {
- // count<=0锛岃〃绀哄厑璁告搷浣�
- this.$refs.popup.open('center')
- }
- },
- fail: (res) => {
- console.log(res)
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- })
- },
- // 鍒涘缓閫氱敤鐨勮姹傛暟鎹�
- createUpData(item) {
- return {
- HBillType: item.HBillType,
- HSourceInterID: item.HSourceInterID,
- HSourceEntryID: item.HSourceEntryID,
- HSourceBillNo: item.HSourceBillNo,
- HSourceBillType: item.HSourceBillType,
- user: uni.getStorageSync('HUserName')
- }
- },
- // 閫氱敤鐨勬鏌ュ拰鎵ц鏂规硶
- checkAndExecuteWorkStatus(item, config, apiUrl, upData) {
- const sWhere = {
- "HSourceID": this.HSourceID,
- "HICMOBillNo": item.HICMOBillNo,
- "HInterID": item.HSourceInterID,
- "type": config.type
- }
-
- console.log('鐘舵�佹鏌ュ弬鏁�:', JSON.stringify(sWhere))
-
- uni.request({
- url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
- type: "GET",
- data: { "sWhere": JSON.stringify(sWhere) },
- dataType: "json",
- async: false,
- success: (res) => {
- console.log('鐘舵�佹鏌ョ粨鏋�:', res.data)
- // 鏍规嵁绗簩涓〉闈㈢殑閫昏緫锛氬鏋渄ata.count>0锛岃〃绀轰笉鍏佽鎿嶄綔
- if (res.data.count > 0) {
- // 涓嶅厑璁告搷浣滐紝鏄剧ず閿欒鎻愮ず
- const status = item.HICMOStatus || '鏈煡鐘舵��'
- const operationMap = {
- '寮�宸�': '寮�宸�',
- '瀹屽伐': '瀹屽伐',
- '鍋滃伐': '鍋滃伐',
- '寮傚父鍙嶉': '寮傚父鍙嶉'
- }
- const operationName = operationMap[config.type] || config.type
-
- // 鏍规嵁鎿嶄綔绫诲瀷缁欏嚭涓嶅悓鐨勫缓璁�
- let suggestion = ''
- switch(config.type) {
- case '寮�宸�':
- suggestion = '寮�宸ユ搷浣滈渶瑕佸伐鍗曠姸鎬佷负"寰呯敓浜�"鎴�"鎸傝捣"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
- break
- case '瀹屽伐':
- suggestion = '瀹屽伐鎿嶄綔闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
- break
- case '鍋滃伐':
- suggestion = '鍋滃伐鎿嶄綔闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
- break
- case '寮傚父鍙嶉':
- suggestion = '寮傚父鍙嶉闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鎴�"寮�宸�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
- break
- default:
- suggestion = '璇锋鏌ュ伐鍗曠姸鎬佹槸鍚︾鍚堟搷浣滆姹�'
- }
-
- uni.showToast({
- title: `宸ュ崟銆�${item.HICMOBillNo}銆戝綋鍓嶇姸鎬佷负銆�${status}銆戯紝鏃犳硶杩涜銆�${operationName}銆戞搷浣溿�俓n${suggestion}`,
- icon:'none',
- duration: 4000
- })
- }
- else {
- // data.count<=0锛岃〃绀哄厑璁告搷浣�
- this.showConfirmDialog(config.type, item, apiUrl, upData)
- }
- },
- fail: (res) => {
- console.log(res)
- uni.hideLoading()
- uni.showToast({
- title:'鐘舵�佹鏌ユ帴鍙ｈ姹傚け璐�',
- icon:'none'
- })
- },
- })
- },
- // 鏄剧ず纭瀵硅瘽妗�
- showConfirmDialog(actionType, item, apiUrl, upData) {
- // 鑾峰彇褰撳墠宸ュ崟鐘舵�佹樉绀哄湪纭妗嗕腑
- const status = item.HICMOStatus || '鏈煡鐘舵��'
-
- uni.showModal({
- title: actionType + '纭',
- content: `璁惧锛�${this.HSourceName}\n宸ュ崟锛�${item.HICMOBillNo}\n浜у搧锛�${item.HMaterName}\n褰撳墠鐘舵�侊細${status}\n\n纭畾瑕佹墽琛屻��${actionType}銆戞搷浣滃悧锛焋,
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾')
- this.executeWork(apiUrl, upData, item, actionType)
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷')
- }
- }
- })
- },
- // 鎵ц宸ヤ綔鎿嶄綔
- executeWork(apiUrl, upData, item, actionType) {
- uni.showLoading({
- title:`姝ｅ湪${actionType}...`
- })
-
- console.log('鎵ц鎿嶄綔鍙傛暟:', upData)
-
- uni.request({
- url: this.serverUrl + apiUrl,
- data: upData,
- success: (res) => {
- console.log('鎵ц鎿嶄綔缁撴灉:', res)
- if(res.data.count == 1){
- // 鎿嶄綔鎴愬姛鍚庡埛鏂板垪琛�
- this.getList(this.HSourceID)
- uni.showToast({
- title:`${actionType}鎴愬姛锛乣,
- icon:'success'
- })
- }else{
- uni.hideLoading()
- // 鏄剧ず鏇磋缁嗙殑鎿嶄綔澶辫触鎻愮ず
- let errorMsg = res.data.Message || `${actionType}澶辫触`
- uni.showToast({
- title: `${actionType}澶辫触锛�${errorMsg}`,
- icon:'none',
- duration: 3000
- })
- }
- },
- fail: (res) => {
- console.log(res)
- uni.hideLoading()
- uni.showToast({
- title:`${actionType}鎺ュ彛璇锋眰澶辫触锛岃妫�鏌ョ綉缁渀,
- icon:'none'
- })
- },
- })
- },
- changeTab(e){
- this.number = e
- if(e==1){
- this.listData = this.listData1
- }else{
- this.listData = this.listData2
- }
- }
- }
- }
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ export default {
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ HSourceID: '',
+ HSourceName: '',
+ number: 1,
+ listData: [],
+ chooseIt: '',
+ popList: ['浜哄憳鍘熷洜', '璁惧鍘熷洜', '鏉愭枡鍘熷洜', '宸ヨ壓鍘熷洜', '妯″叿鍘熷洜', '娴嬭瘯鍘熷洜', '鐜鍘熷洜'],
+ // 瀹氫箟鎿嶄綔鏄犲皠閰嶇疆
+ actionConfig: {
+ '寮�宸�': {
+ apiUrl: '/Sc_MESBeginWorkBill/FastBeginWorkBill',
+ type: '寮�宸�',
+ handler: 'handleBegin',
+ checkStatus: true, // 闇�瑕佹鏌ョ姸鎬�
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻寮�宸ユ潯浠�!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '瀹屽伐': {
+ apiUrl: '/Sc_MESEndWorkBill/FastEndWorkBill',
+ type: '瀹屽伐',
+ handler: 'handleEnd',
+ checkStatus: true,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '鍋滃伐': {
+ apiUrl: '/Sc_MESStopWorkBill/FastStopWorkBill',
+ type: '鍋滃伐',
+ handler: 'handleStop',
+ checkStatus: true,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻鍋滃伐鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '寮傚父鍙嶉': {
+ apiUrl: '',
+ type: '寮傚父鍙嶉',
+ handler: 'handleAbnormal',
+ checkStatus: true,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻寮傚父鍙嶉鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '宸ヨ壓鍙傛暟鐐规': {
+ apiUrl: '',
+ type: '宸ヨ壓鍙傛暟鐐规',
+ handler: 'handleICMOTechParam',
+ checkStatus: true,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻宸ヨ壓鍙傛暟鐐规鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ }
+ }
+ }
+ },
+ onLoad(e) {
+ console.log(e)
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ })
+ this.HSourceName = e.HSourceName
+ this.HSourceID = e.HSourceID
+ this.getList(e.HSourceID)
+ },
+ onPullDownRefresh: function() {
+ this.getList(this.HSourceID)
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ methods: {
+ getList(e) {
+ uni.request({
+ url: this.serverUrl + '/ReportPlatForm/SearchGetWorkBillList',
+ data: {
+ "HSourceID": e
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ console.log(res.data.data.h_p_JIT_GetWorkBillListInfoBySource)
+ this.listData = res.data.data.h_p_JIT_GetWorkBillListInfoBySource
+ for (var i = 0; i < this.listData.length; i++) {
+ this.listData[i].percent = (this.listData[i].HDateFinishQty / this.listData[
+ i].HDatePlanQty).toFixed(4)
+ }
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000);
+ } else {
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000);
+ uni.showToast({
+ title: '鑾峰彇鍒楄〃鍑洪敊锛�',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000);
+ uni.showToast({
+ title: '鑾峰彇鍒楄〃鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ toAbnm(item) {
+ console.log(item, this.chooseIt)
+ this.$refs.popup.close()
+ uni.navigateTo({
+ url: './OA_ErrMsgBackBill?HICMOBillNo=' + this.chooseIt.HICMOBillNo +
+ '&HSourceName=' + this.HSourceName +
+ '&HSourceBillNo=' + this.chooseIt.HSourceBillNo +
+ '&HType=' + item +
+ '&OperationType=4&linterid=&HSouceBillType='
+ })
+ },
+ edit(item) {
+ console.log(item)
+ this.chooseIt = item
+
+ // 浣跨敤瀵硅薄鏄犲皠閰嶇疆鐢熸垚鍙敤鐨勬搷浣滃垪琛�
+ const availableActions = Object.keys(this.actionConfig)
+
+ uni.showActionSheet({
+ itemList: availableActions,
+ success: (res) => {
+ const actionKey = availableActions[res.tapIndex]
+ const actionConfig = this.actionConfig[actionKey]
+
+ // 璋冪敤瀵瑰簲鐨勫鐞嗘柟娉�
+ this[actionConfig.handler](item, actionConfig)
+ },
+ fail: function(res) {
+ console.log(res.errMsg);
+ }
+ });
+ },
+ // 寮�宸ュ鐞�
+ handleBegin(item, config) {
+ const upData = this.createUpData(item)
+ this.checkAndExecuteWorkStatus(
+ item,
+ config,
+ config.apiUrl,
+ upData
+ )
+ },
+ // 瀹屽伐澶勭悊
+ handleEnd(item, config) {
+ const upData = this.createUpData(item)
+ this.checkAndExecuteWorkStatus(
+ item,
+ config,
+ config.apiUrl,
+ upData
+ )
+ },
+ // 鍋滃伐澶勭悊
+ handleStop(item, config) {
+ const upData = this.createUpData(item)
+ this.checkAndExecuteWorkStatus(
+ item,
+ config,
+ config.apiUrl,
+ upData
+ )
+ },
+ // 寮傚父鍙嶉澶勭悊
+ handleAbnormal(item, config) {
+ const sWhere = {
+ "HSourceID": this.HSourceID,
+ "HICMOBillNo": item.HICMOBillNo,
+ "HInterID": item.HSourceInterID,
+ "type": config.type
+ }
+
+ uni.request({
+ url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
+ type: "GET",
+ data: {
+ "sWhere": JSON.stringify(sWhere)
+ },
+ dataType: "json",
+ async: false,
+ success: (res) => {
+ console.log('寮傚父鍙嶉鐘舵�佹鏌�:', res.data)
+ // 鏍规嵁绗簩涓〉闈㈢殑閫昏緫锛氬鏋渃ount>0锛岃〃绀轰笉鍏佽鎿嶄綔
+ if (res.data.count > 0) {
+ // 涓嶅厑璁告搷浣滐紝鏄剧ず閿欒鎻愮ず
+ const status = item.HICMOStatus || '鏈煡鐘舵��'
+ uni.showToast({
+ title: `宸ュ崟銆�${item.HICMOBillNo}銆戝綋鍓嶇姸鎬佷负銆�${status}銆戯紝${config.denyMsg}`,
+ icon: 'none',
+ duration: 3000
+ })
+ } else {
+ // count<=0锛岃〃绀哄厑璁告搷浣�
+ this.$refs.popup.open('center')
+ }
+ },
+ fail: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ })
+ },
+ // 宸ヨ壓鍙傛暟鐐规
+ handleICMOTechParam(item, config) {
+ const upData = this.createUpData(item)
+ this.checkAndExecuteWorkStatus(
+ item,
+ config,
+ config.apiUrl,
+ upData
+ )
+ },
+ // 鍒涘缓閫氱敤鐨勮姹傛暟鎹�
+ createUpData(item) {
+ return {
+ HBillType: item.HBillType,
+ HSourceInterID: item.HSourceInterID,
+ HSourceEntryID: item.HSourceEntryID,
+ HSourceBillNo: item.HSourceBillNo,
+ HSourceBillType: item.HSourceBillType,
+ user: uni.getStorageSync('HUserName')
+ }
+ },
+ // 閫氱敤鐨勬鏌ュ拰鎵ц鏂规硶
+ checkAndExecuteWorkStatus(item, config, apiUrl, upData) {
+ const sWhere = {
+ "HSourceID": this.HSourceID,
+ "HICMOBillNo": item.HICMOBillNo,
+ "HInterID": item.HSourceInterID,
+ "type": config.type
+ }
+
+ console.log('鐘舵�佹鏌ュ弬鏁�:', JSON.stringify(sWhere))
+
+ uni.request({
+ url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
+ type: "GET",
+ data: {
+ "sWhere": JSON.stringify(sWhere)
+ },
+ dataType: "json",
+ async: false,
+ success: (res) => {
+ console.log('鐘舵�佹鏌ョ粨鏋�:', res.data)
+ // 鏍规嵁绗簩涓〉闈㈢殑閫昏緫锛氬鏋渄ata.count>0锛岃〃绀轰笉鍏佽鎿嶄綔
+ if (res.data.count > 0) {
+ // 涓嶅厑璁告搷浣滐紝鏄剧ず閿欒鎻愮ず
+ const status = item.HICMOStatus || '鏈煡鐘舵��'
+ const operationMap = {
+ '寮�宸�': '寮�宸�',
+ '瀹屽伐': '瀹屽伐',
+ '鍋滃伐': '鍋滃伐',
+ '寮傚父鍙嶉': '寮傚父鍙嶉',
+ '宸ヨ壓鍙傛暟鐐规': '宸ヨ壓鍙傛暟鐐规'
+ }
+ const operationName = operationMap[config.type] || config.type
+
+ // 鏍规嵁鎿嶄綔绫诲瀷缁欏嚭涓嶅悓鐨勫缓璁�
+ let suggestion = ''
+ switch (config.type) {
+ case '寮�宸�':
+ suggestion = '寮�宸ユ搷浣滈渶瑕佸伐鍗曠姸鎬佷负"寰呯敓浜�"鎴�"鎸傝捣"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ case '瀹屽伐':
+ suggestion = '瀹屽伐鎿嶄綔闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ case '鍋滃伐':
+ suggestion = '鍋滃伐鎿嶄綔闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ case '寮傚父鍙嶉':
+ suggestion = '寮傚父鍙嶉闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鎴�"寮�宸�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ case '宸ヨ壓鍙傛暟鐐规':
+ suggestion = '宸ヨ壓鍙傛暟鐐规闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鎴�"寮�宸�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ default:
+ suggestion = '璇锋鏌ュ伐鍗曠姸鎬佹槸鍚︾鍚堟搷浣滆姹�'
+ }
+
+ uni.showToast({
+ title: `宸ュ崟銆�${item.HICMOBillNo}銆戝綋鍓嶇姸鎬佷负銆�${status}銆戯紝鏃犳硶杩涜銆�${operationName}銆戞搷浣溿�俓n${suggestion}`,
+ icon: 'none',
+ duration: 4000
+ })
+ } else {
+ // data.count<=0锛岃〃绀哄厑璁告搷浣�
+ this.showConfirmDialog(config.type, item, apiUrl, upData)
+ }
+ },
+ fail: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title: '鐘舵�佹鏌ユ帴鍙ｈ姹傚け璐�',
+ icon: 'none'
+ })
+ },
+ })
+ },
+ // 鏄剧ず纭瀵硅瘽妗�
+ showConfirmDialog(actionType, item, apiUrl, upData) {
+ // 鑾峰彇褰撳墠宸ュ崟鐘舵�佹樉绀哄湪纭妗嗕腑
+ const status = item.HICMOStatus || '鏈煡鐘舵��'
+
+ uni.showModal({
+ title: actionType + '纭',
+ content: `璁惧锛�${this.HSourceName}\n宸ュ崟锛�${item.HICMOBillNo}\n浜у搧锛�${item.HMaterName}\n褰撳墠鐘舵�侊細${status}\n\n纭畾瑕佹墽琛屻��${actionType}銆戞搷浣滃悧锛焋,
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾')
+ this.executeWork(apiUrl, upData, item, actionType)
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷')
+ }
+ }
+ })
+ },
+ // 鎵ц宸ヤ綔鎿嶄綔
+ executeWork(apiUrl, upData, item, actionType) {
+ uni.showLoading({
+ title: `姝ｅ湪${actionType}...`,
+ mask: true
+ })
+ console.log('鎵ц鎿嶄綔鍙傛暟:', upData)
+
+ if (actionType == '宸ヨ壓鍙傛暟鐐规') {
+ uni.hideLoading()
+ console.log('item: ',item);
+ uni.navigateTo({
+ url: `/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit?hinterid=${item.HSourceInterID}&hsubid=${item.HSourceEntryID}&operationType=5`
+ })
+ } else {
+ uni.request({
+ url: this.serverUrl + apiUrl,
+ data: upData,
+ success: (res) => {
+ console.log('鎵ц鎿嶄綔缁撴灉:', res)
+ if (res.data.count == 1) {
+ // 鎿嶄綔鎴愬姛鍚庡埛鏂板垪琛�
+ this.getList(this.HSourceID)
+ uni.showToast({
+ title: `${actionType}鎴愬姛锛乣,
+ icon: 'success'
+ })
+
+ if(actionType == '瀹屽伐') {
+ // 瀹屽伐鍗曟彁浜ゆ垚鍔熷悗銆傛彁绀烘槸鍚﹂渶瑕佽烦杞揪鍒颁笅妯″崟
+ uni.showModal({
+ title: "璺宠浆椤甸潰",
+ content: "瀹屽伐鍗曚繚瀛樻垚鍔燂紝鏄惁璺宠浆鍒颁笅妯″崟椤甸潰銆�",
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾')
+ uni.redirectTo({
+ url: "/pages/MJGL/xiamodan/MouldLowerBillList"
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷')
+ }
+ }
+ })
+
+ }
+ } else {
+ uni.hideLoading()
+ // 鏄剧ず鏇磋缁嗙殑鎿嶄綔澶辫触鎻愮ず
+ let errorMsg = res.data.Message || `${actionType}澶辫触`
+ uni.showToast({
+ title: `${actionType}澶辫触锛�${errorMsg}`,
+ icon: 'none',
+ duration: 3000
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title: `${actionType}鎺ュ彛璇锋眰澶辫触锛岃妫�鏌ョ綉缁渀,
+ icon: 'none'
+ })
+ },
+ })
+ }
+ },
+ changeTab(e) {
+ this.number = e
+ if (e == 1) {
+ this.listData = this.listData1
+ } else {
+ this.listData = this.listData2
+ }
+ }
+ }
+ }
</script>
<style lang="scss" scoped>
- .list{
- width: 100%;
- .card-detail{
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- line-height: 120%;
- .detail{
- width: 46%;
- font-size: 26rpx;
- margin-bottom: 12rpx;
- color: #555;
- margin-right: 20rpx;
- text{
- color: #999;
- font-size: 26rpx;
- }
- }
- }
- .more{
- color: #888;
- font-size: 24rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 20rpx;
- .part{
- width: 50%;
- text-align: center;
- }
- }
- }
+ .list {
+ width: 100%;
-.popup-content{
- width: 500rpx;
- border-radius: 20rpx;
- text-align: center;
- padding-bottom: 20rpx;
- .tit{
- height: 120rpx;
- line-height: 120rpx;
- font-size: 34rpx;
- color: #222;
- font-weight: bold;
- }
- .item{
- height: 88rpx;
- line-height: 88rpx;
- border-top: 1px solid #eee;
- font-size: 32rpx;
- color: #444;
- }
-}
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ width: 46%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
+
+ .popup-content {
+ width: 500rpx;
+ border-radius: 20rpx;
+ text-align: center;
+ padding-bottom: 20rpx;
+
+ .tit {
+ height: 120rpx;
+ line-height: 120rpx;
+ font-size: 34rpx;
+ color: #222;
+ font-weight: bold;
+ }
+
+ .item {
+ height: 88rpx;
+ line-height: 88rpx;
+ border-top: 1px solid #eee;
+ font-size: 32rpx;
+ color: #444;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3284b7a..5e78cd1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -322,69 +322,76 @@
"img": "../../static/icon/icon21.png",
"text": "鏍囩鎵撳嵃",
"url": "/pages/labelPrinter/index",
- "id": 24,
+ "id": 37,
"hidden": false
},
{
"img": "../../static/icon/icon21.png",
"text": "鏉＄爜鎷嗙爜",
"url": "/pages/tiaomachaima/tiaomachaima",
- "id": 25,
+ "id": 38,
"hidden": false
},
{
"img": "../../static/icon/icon21.png",
"text": "鏉＄爜鎷嗙爜2",
"url": "/pages/tiaomachaima/tiaomachaima2",
- "id": 26,
+ "id": 39,
"hidden": false
},
{
"img": "../../static/icon/icon21.png",
"text": "鏉＄爜鎷嗙爜",
"url": "/pages/tiaomachaima/tiaomachaimaCopy_HK",
- "id": 25,
+ "id": 40,
"hidden": false
},
{
"img": "../../static/icon/icon15.png",
"text": "閿�鍞嚭搴撳崟楠岃瘉",
"url": "/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP",
- "id": 26,
+ "id": 41,
"hidden": false
},
{
"img": "../../static/icon/icon15.png",
"text": "鐩存帴璋冩嫧鍗曢獙璇�",
"url": "/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP",
- "id": 28,
+ "id": 42,
"hidden": false
},{
"img": "../../static/icon/icon21.png",
"text": "灏忓崼鎷嗙",
"url": "/pages/chaixiang/chaixiang_xiaowei",
- "id": 27,
+ "id": 43,
"hidden": false
},
{
"img": "../../static/icon/icon21.png",
"text": "灏忓崼瑁呯",
"url": "/pages/zhuangxiang/snZhuangxiang_xiaowei",
- "id": 28,
+ "id": 44,
"hidden": false
},{
img: '../../static/icon/icon17.png',
text: '鐢熶骇閫�鏂欐牎楠�',
url: '/pages/shengchantuiliaoCheck/MateOutBackCheckBill?OperationType=1',
- id: 37,
+ id: 45,
hidden: false,
},
{
"img": "../../static/icon/icon15.png",
"text": "鍒嗘寮忚皟鍑哄崟楠岃瘉",
"url": "/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP",
- "id": 28,
+ "id": 46,
"hidden": false
+ },
+ {
+ "img": "../../static/icon/icon21.png",
+ "text": "瑁呯杩芥函",
+ "url": "/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast",
+ "id": 47,
+ "hidden": false
}
],
}
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 45c97a5..2e04dcd 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -110,7 +110,7 @@
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.102:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.20.35:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
// 灏忓崼鍐呭缃�
@@ -127,7 +127,7 @@
"瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
},
- serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍥涚淮灏�-澶栫綉',
+ serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
arrayOrganization: [],
Organization: '',
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 0ac7a2a..fd640b8 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -48,17 +48,18 @@
text:'宸插鏍�',
url:'/pages/ZLGL/checkFlowList/QC_CheckedBillflowList',
id:1
- },{
- img:'../../static/icon06.png',
- text:'鏈娑堟伅',
- url:'',
- id:2
- },{
- img:'../../static/icon07.png',
- text:'宸茶娑堟伅',
- url:'',
- id:3
},
+ // {
+ // img:'../../static/icon06.png',
+ // text:'鏈娑堟伅',
+ // url:'',
+ // id:2
+ // },{
+ // img:'../../static/icon07.png',
+ // text:'宸茶娑堟伅',
+ // url:'',
+ // id:3
+ // },
{
img:'../../static/icon05.png',
text:'淇敼瀵嗙爜',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 0304c3d..f9d35b3 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -1,677 +1,733 @@
<template>
- <view class="content">
- <view class="header">
- <view class="switch-button">
- <uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
- </view>
- </view>
- <view class="mains">
- <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
- :key="index" @tap="toUrl(item)">
- <image :src="item.img" mode=""></image>
- <view class="texts">
- {{item.text}}
- </view>
- </view>
- <view :enable-hidden="item.hidden" :hidden="!item.id" v-if="canEdit" class="box edit"
- v-for="(item,index) in itemData" :key="index" @tap="switchHidden(index)">
- <uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
- <image :src="item.img" mode=""></image>
- <view class="texts">
- {{item.text}}
- </view>
- </view>
- </view>
- </view>
+ <view class="content">
+ <view class="header">
+ <view class="switch-button">
+ <uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
+ </view>
+ </view>
+ <view class="mains">
+ <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
+ :key="index" @tap="toUrl(item)">
+ <template v-if="item.corner">
+ <uni-badge :text="bindingData[item.cornerCount]"
+ type="error"
+ :max-num="99"
+ size="normal"
+ absolute
+ :offset="[7, 7]">
+ <image :src="item.img" mode=""></image>
+ </uni-badge>
+ </template>
+ <template v-else>
+ <image :src="item.img" mode=""></image>
+ </template>
+ <view class="texts">
+ {{item.text}}
+ </view>
+ </view>
+ <view :enable-hidden="item.hidden" :hidden="!item.id" v-if="canEdit" class="box edit"
+ v-for="(item,index) in itemData" :key="index" @tap="switchHidden(index)">
+ <uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
+ <image :src="item.img" mode=""></image>
+ <view class="texts">
+ {{item.text}}
+ </view>
+ </view>
+ </view>
+ </view>
</template>
<script>
- import {
- CommonUtils
- } from '../../utils/common'
- import {
- getMenuList,
- setMenuList
- } from '../../utils/menuListApp'
- import {
- getUserInfo
- } from '../../utils/auth'
- export default {
- data() {
- return {
- updateCount: 0,
- menuListName: 'tab2',
- canEdit: false,
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- itemData: [
- // 閲囪喘鐩稿叧
- {
- "img": "../../static/icon/icon17.png",
- "text": "閲囪喘鍏ュ簱鏆傚瓨鍒楄〃",
- "url": "/pages/caigouruku/POStockInBillList",
- "id": 1,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon18.png",
- "text": "閲囪喘閫�鏂欐殏瀛樺垪琛�",
- "url": "/pages/caigoutuiliao/POStockInBackBillList",
- "id": 2,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon30.png",
- "text": "閲囪喘鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/caigourukujiaoyan/POStockInCheckBillList",
- "id": 3,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon18.png",
- "text": "閿�鍞嚭搴撴殏瀛樺垪琛�",
- "url": "/pages/xiaoshouchuku/SellOutBillList",
- "id": 4,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon20.png",
- "text": "閿�鍞��璐ф殏瀛樺垪琛�",
- "url": "/pages/xiaoshoutuihuo/ICStockBillMainList",
- "id": 5,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon18.png",
- "text": "閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�",
- "url": "/pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
- "id": 6,
- "hidden": false
- },
-
- // 鐢熶骇鐩稿叧
- {
- "img": "../../static/icon/icon30.png",
- "text": "鐢熶骇棰嗘枡鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
- "id": 7,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon31.png",
- "text": "鐢熶骇琛ユ枡鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanbuliao/MateReplenishOutBillList",
- "id": 8,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon17.png",
- "text": "鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanrukushengdan/Kf_ProductInBillList",
- "id": 9,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鐢熶骇閫�鏂欏崟鏆傚瓨鍒楄〃",
- "url": "/pages/shengchantuiliao/MateOutBackBillList",
- "id": 10,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon30.png",
- "text": "鐢熶骇棰嗘枡鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanlingliao/PPickingCheckBillList",
- "id": 11,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon31.png",
- "text": "鐢熶骇琛ユ枡鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBillList",
- "id": 12,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon17.png",
- "text": "鐢熶骇鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/shengchanruku/ProductInCheckBillList",
- "id": 13,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon32.png",
- "text": "鐢熶骇璋冩嫧鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/shengchandiaobo/MoveStockBillList",
- "id": 14,
- "hidden": false
- },
-
- // 濮斿鐩稿叧
- {
- "img": "../../static/icon/icon30.png",
- "text": "濮斿棰嗘枡鏆傚瓨鍒楄〃",
- "url": "/pages/weiwailingliao/Kf_EntrustOutBillList",
- "id": 15,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon20.png",
- "text": "濮斿鍏ュ簱鏆傚瓨鍒楄〃",
- "url": "/pages/weiwairuku/EntrustInBillList",
- "id": 16,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon30.png",
- "text": "濮斿棰嗘枡鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
- "id": 17,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon30.png",
- "text": "閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�",
- "url": "/pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
- "id": 18,
- "hidden": false
- },
-
- // 鍏朵粬鍑哄叆搴撶浉鍏�
- {
- "img": "../../static/icon/icon17.png",
- "text": "鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃",
- "url": "/pages/qitaruku_v2/OtherInBillList",
- "id": 19,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon18.png",
- "text": "鍏朵粬鍑哄簱鏆傚瓨鍒楄〃",
- "url": "/pages/qitachuku_v2/OtherOutBillList",
- "id": 20,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon18.png",
- "text": "鍏朵粬鍑哄簱鏍￠獙鏆傚瓨鍒楄〃",
- "url": "/pages/qitachuku/qitachuku",
- "id": 21,
- "hidden": false
- },
-
- // 璋冩嫧鐩稿叧
- {
- "img": "../../static/icon/icon32.png",
- "text": "鐩存帴璋冩嫧鏆傚瓨鍒楄〃",
- "url": "/pages/zhijiediaobo/MoveStockBillList",
- "id": 22,
- "hidden": false
- },
-
- // 鍏朵粬鏆傚瓨鐩稿叧
- {
- "img": "../../static/icon/icon8.png",
- "text": "缁勬墭鍗曟殏瀛樺垪琛�",
- "url": "/pages/zutuosaoma/PackUnionBillList",
- "id": 23,
- "hidden": false
- },
- {
- img: '../../static/icon/icon16.png',
- text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
- url: '/pages/fenbushidiaorudan/table',
- id: 24,
- hidden: false,
- },
- {
- img: '../../static/icon/icon9.png',
- text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuIn/Cj_StationInBillList',
- id: 25,
- hidden: false,
- },
- {
- img: '../../static/icon/icon10.png',
- text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/gongxuOut/Cj_StationOutBillList',
- id: 26,
- hidden: false,
- },
- {
- img: '../../static/icon/icon11.png',
- text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
- id: 27,
- hidden: false,
- },
- {
- img: '../../static/icon/icon12.png',
- text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
- tip: '鏌ョ湅鍒楄〃',
- url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
- id: 28,
- hidden: false,
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
- "id": 29,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍣ㄥ叿璋冩嫧鍗曞垪琛�",
- "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
- "id": 30,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
- "id": 31,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃",
- "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
- "id": 32,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "涓婃ā鍗曞垪琛�",
- "url": "/pages/MJGL/shangmudan/MouldUpperBillList",
- "id": 33,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "涓嬫ā鍗曞垪琛�",
- "url": "/pages/MJGL/xiamodan/MouldLowerBillList",
- "id": 34,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon5.png",
- "text": "鍣ㄥ叿鐐规璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
- "id": 35,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon5.png",
- "text": "鍣ㄥ叿淇濆吇璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
- "id": 36,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "鍣ㄥ叿鏁呴殰鐧昏鍒楄〃",
- "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
- "id": 37,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�",
- "url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
- "id": 38,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon13.png",
- "text": "鍣ㄥ叿缁翠慨璁板綍鍒楄〃",
- "url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
- "id": 39,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍣ㄥ叿缁翠慨楠屾敹鍗曞垪琛�",
- "url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
- "id": 40,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "棣栦欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
- "id": 41,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
- "id": 42,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBillList",
- "id": 43,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠屽垪琛�",
- "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
- "id": 44,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍏ㄦ妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
- "id": 45,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "杞﹂棿鑷鍗曞垪琛�",
- "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
- "id": 46,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
- "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
- "id": 47,
- "hidden": false
- },
- // 璁惧鐩稿叧
- {
- "img": "../../static/icon/icon3.png",
- "text": "璁惧鐐规璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
- "id": 48,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon3.png",
- "text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
- "id": 49,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon6.png",
- "text": "璁惧鏁呴殰鐧昏鍗曞垪琛�",
- "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
- "id": 50,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon8.png",
- "text": "璁惧缁翠慨娲惧伐鍗曞垪琛�",
- "url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
- "id": 51,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon7.png",
- "text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList",
- "id": 52,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "璁惧缁翠慨楠屾敹鍗曞垪琛�",
- "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
- "id": 53,
- "hidden": false
- },
-
- // 瀹夌伅鐩稿叧
- {
- "img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉鍗曞垪琛�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
- "id": 54,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon16.png",
- "text": "寮傚父鍙嶉鎺ユ敹鍗曞垪琛�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList",
- "id": 55,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon16.png",
- "text": "寮傚父鍙嶉绛惧埌鍗曞垪琛�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList",
- "id": 56,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon16.png",
- "text": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList",
- "id": 57,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon16.png",
- "text": "寮傚父鍙嶉楠屾敹鍗曞垪琛�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList",
- "id": 58,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon16.png",
- "text": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
- "id": 59,
- "hidden": false
- },
-
-
- // 鍙栨牱杩樻牱鐩稿叧
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍙栨牱鍗曞垪琛�",
- "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList",
- "id": 60,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "杩樻牱鍗曞垪琛�",
- "url": "/pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBillList",
- "id": 61,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon8.png",
- "text": "瑁呯鍗曟殏瀛樺垪琛�",
- "url": "/pages/zhuangxiangdan/table",
- "id": 62,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "宸ヤ綔鑱旂郴鍗曞垪琛�",
- "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList?OperationType=1",
- "id": 63,
- "hidden": false
- },
+ import {
+ CommonUtils
+ } from '../../utils/common'
+ import {
+ getMenuList,
+ setMenuList
+ } from '../../utils/menuListApp'
+ import {
+ getUserInfo
+ } from '../../utils/auth'
+ export default {
+ data() {
+ return {
+ updateCount: 0,
+ menuListName: 'tab2',
+ canEdit: false,
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ bindingData: {
+ UnReadCount: 0,
+ },
+ itemData: [
+ // 閲囪喘鐩稿叧
{
- "img": "../../static/icon/icon15.png",
- "text": "宸ヤ綔鑱旂郴鍗曟煡璇�",
- "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery?OperationType=1",
- "id": 64,
- "hidden": false
+ "img": "../../static/icon/icon17.png",
+ "text": "閲囪喘鍏ュ簱鏆傚瓨鍒楄〃",
+ "url": "/pages/caigouruku/POStockInBillList",
+ "id": 1,
+ "hidden": false
},
- {
- img: '../../static/icon/icon12.png',
- text: '鍛樺伐绛惧埌璁板綍鍗曞垪琛�',
- tip: '鐐瑰嚮杩涘叆',
- url: '/pages/EmployeeRecords/EmployeeRecordsBillList',
- id: 65,
- hidden: false,
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "閲囪喘璁㈠崟鍒楄〃",
- "url": "/pages/caigoudingdan/caigoudingdanList",
- "id": 66,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "閿�鍞鍗曞垪琛�",
- "url": "/pages/xiaoshoudingdan/xiaoshoudingdanBillList",
- "id": 67,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "鐗规壒鍗曞垪琛�",
- "url": "/pages/tepidan/TePiDanList",
- "id": 68,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "瀹㈣瘔澶勭悊鍗曞垪琛�",
- "url": "/pages/CustomerComplaintsBill/CustomerComplaintsBillList",
- "id": 69,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon17.png",
- "text": "鐢熶骇閫�鏂欐牎楠屾殏瀛樺垪琛�",
- "url": "/pages/shengchantuiliaoCheck/MateOutBackCheckBillList",
- "id": 66,
- "hidden": false
- },
- ]
- }
- },
- onLoad() {
- this.getHiddenItem()
- },
- methods: {
- judgeHidden() {
- return process.env.NODE_ENV === 'development'
- },
- async getHiddenItem() {
- let data = await getMenuList({
- menuName: this.menuListName
- })
- Array.from(data).forEach(e => {
- this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
- this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
- })
- },
- switchHidden(index) {
- this.updateCount++;
- this.itemData[index].hidden = !this.itemData[index].hidden
+ {
+ "img": "../../static/icon/icon18.png",
+ "text": "閲囪喘閫�鏂欐殏瀛樺垪琛�",
+ "url": "/pages/caigoutuiliao/POStockInBackBillList",
+ "id": 2,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon30.png",
+ "text": "閲囪喘鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃",
+ "url": "/pages/caigourukujiaoyan/POStockInCheckBillList",
+ "id": 3,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon18.png",
+ "text": "閿�鍞嚭搴撴殏瀛樺垪琛�",
+ "url": "/pages/xiaoshouchuku/SellOutBillList",
+ "id": 4,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon20.png",
+ "text": "閿�鍞��璐ф殏瀛樺垪琛�",
+ "url": "/pages/xiaoshoutuihuo/ICStockBillMainList",
+ "id": 5,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon18.png",
+ "text": "閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�",
+ "url": "/pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
+ "id": 6,
+ "hidden": false
+ },
- },
- switchIconsModeHandler() {
- this.canEdit = !this.canEdit
- if (this.canEdit == false && this.updateCount > 0) {
- this.$nextTick(() => {
- // uni.setStorageSync("HIndexItemData", this.itemData)
- setMenuList({
- menuName: this.menuListName,
- payload: this.itemData
- })
+ // 鐢熶骇鐩稿叧
+ {
+ "img": "../../static/icon/icon30.png",
+ "text": "鐢熶骇棰嗘枡鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
+ "id": 7,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon31.png",
+ "text": "鐢熶骇琛ユ枡鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchanbuliao/MateReplenishOutBillList",
+ "id": 8,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchanrukushengdan/Kf_ProductInBillList",
+ "id": 9,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鐢熶骇閫�鏂欏崟鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchantuiliao/MateOutBackBillList",
+ "id": 10,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon30.png",
+ "text": "鐢熶骇棰嗘枡鏍￠獙鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchanlingliao/PPickingCheckBillList",
+ "id": 11,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon31.png",
+ "text": "鐢熶骇琛ユ枡鏍￠獙鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBillList",
+ "id": 12,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鐢熶骇鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchanruku/ProductInCheckBillList",
+ "id": 13,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon32.png",
+ "text": "鐢熶骇璋冩嫧鏍￠獙鏆傚瓨鍒楄〃",
+ "url": "/pages/shengchandiaobo/MoveStockBillList",
+ "id": 14,
+ "hidden": false
+ },
- this.updateCount = 0
- })
- }
- this.$forceUpdate()
- },
- toUrl(item) {
- if (item.url) {
- uni.navigateTo({
- url: item.url
- })
- } else {
- uni.showToast({
- title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
- icon: 'none'
- })
- }
- }
- }
- }
+ // 濮斿鐩稿叧
+ {
+ "img": "../../static/icon/icon30.png",
+ "text": "濮斿棰嗘枡鏆傚瓨鍒楄〃",
+ "url": "/pages/weiwailingliao/Kf_EntrustOutBillList",
+ "id": 15,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon20.png",
+ "text": "濮斿鍏ュ簱鏆傚瓨鍒楄〃",
+ "url": "/pages/weiwairuku/EntrustInBillList",
+ "id": 16,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon30.png",
+ "text": "濮斿棰嗘枡鏍￠獙鏆傚瓨鍒楄〃",
+ "url": "/pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
+ "id": 17,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon30.png",
+ "text": "閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�",
+ "url": "/pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
+ "id": 18,
+ "hidden": false
+ },
+
+ // 鍏朵粬鍑哄叆搴撶浉鍏�
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃",
+ "url": "/pages/qitaruku_v2/OtherInBillList",
+ "id": 19,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon18.png",
+ "text": "鍏朵粬鍑哄簱鏆傚瓨鍒楄〃",
+ "url": "/pages/qitachuku_v2/OtherOutBillList",
+ "id": 20,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon18.png",
+ "text": "鍏朵粬鍑哄簱鏍￠獙鏆傚瓨鍒楄〃",
+ "url": "/pages/qitachuku/qitachuku",
+ "id": 21,
+ "hidden": false
+ },
+
+ // 璋冩嫧鐩稿叧
+ {
+ "img": "../../static/icon/icon32.png",
+ "text": "鐩存帴璋冩嫧鏆傚瓨鍒楄〃",
+ "url": "/pages/zhijiediaobo/MoveStockBillList",
+ "id": 22,
+ "hidden": false
+ },
+
+ // 鍏朵粬鏆傚瓨鐩稿叧
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "缁勬墭鍗曟殏瀛樺垪琛�",
+ "url": "/pages/zutuosaoma/PackUnionBillList",
+ "id": 23,
+ "hidden": false
+ },
+ {
+ img: '../../static/icon/icon16.png',
+ text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
+ url: '/pages/fenbushidiaorudan/table',
+ id: 24,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon9.png',
+ text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/gongxuIn/Cj_StationInBillList',
+ id: 25,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon10.png',
+ text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/gongxuOut/Cj_StationOutBillList',
+ id: 26,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon11.png',
+ text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
+ id: 27,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon12.png',
+ text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
+ tip: '鏌ョ湅鍒楄〃',
+ url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
+ id: 28,
+ hidden: false,
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
+ "id": 29,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍣ㄥ叿璋冩嫧鍗曞垪琛�",
+ "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+ "id": 30,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+ "id": 31,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃",
+ "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+ "id": 32,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "涓婃ā鍗曞垪琛�",
+ "url": "/pages/MJGL/shangmudan/MouldUpperBillList",
+ "id": 33,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "涓嬫ā鍗曞垪琛�",
+ "url": "/pages/MJGL/xiamodan/MouldLowerBillList",
+ "id": 34,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "鍣ㄥ叿鐐规璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
+ "id": 35,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "鍣ㄥ叿淇濆吇璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
+ "id": 36,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "鍣ㄥ叿鏁呴殰鐧昏鍒楄〃",
+ "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
+ "id": 37,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�",
+ "url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
+ "id": 38,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "鍣ㄥ叿缁翠慨璁板綍鍒楄〃",
+ "url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
+ "id": 39,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍣ㄥ叿缁翠慨楠屾敹鍗曞垪琛�",
+ "url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
+ "id": 40,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "棣栦欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
+ "id": 41,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+ "id": 42,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBillList",
+ "id": 43,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠屽垪琛�",
+ "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
+ "id": 44,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍏ㄦ妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
+ "id": 45,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "杞﹂棿鑷鍗曞垪琛�",
+ "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
+ "id": 46,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
+ "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+ "id": 47,
+ "hidden": false
+ },
+ // 璁惧鐩稿叧
+ {
+ "img": "../../static/icon/icon3.png",
+ "text": "璁惧鐐规璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
+ "id": 48,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon3.png",
+ "text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
+ "id": 49,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon6.png",
+ "text": "璁惧鏁呴殰鐧昏鍗曞垪琛�",
+ "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
+ "id": 50,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "璁惧缁翠慨娲惧伐鍗曞垪琛�",
+ "url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
+ "id": 51,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon7.png",
+ "text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList",
+ "id": 52,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "璁惧缁翠慨楠屾敹鍗曞垪琛�",
+ "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
+ "id": 53,
+ "hidden": false
+ },
+
+ // 瀹夌伅鐩稿叧
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "寮傚父鍙嶉鍗曞垪琛�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
+ "id": 54,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon16.png",
+ "text": "寮傚父鍙嶉鎺ユ敹鍗曞垪琛�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList",
+ "id": 55,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon16.png",
+ "text": "寮傚父鍙嶉绛惧埌鍗曞垪琛�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList",
+ "id": 56,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon16.png",
+ "text": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList",
+ "id": 57,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon16.png",
+ "text": "寮傚父鍙嶉楠屾敹鍗曞垪琛�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList",
+ "id": 58,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon16.png",
+ "text": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
+ "id": 59,
+ "hidden": false
+ },
+
+
+ // 鍙栨牱杩樻牱鐩稿叧
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍙栨牱鍗曞垪琛�",
+ "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList",
+ "id": 60,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "杩樻牱鍗曞垪琛�",
+ "url": "/pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBillList",
+ "id": 61,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "瑁呯鍗曟殏瀛樺垪琛�",
+ "url": "/pages/zhuangxiangdan/table",
+ "id": 62,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "宸ヤ綔鑱旂郴鍗曞垪琛�",
+ "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList?OperationType=1",
+ "id": 63,
+ "hidden": false,
+ "corner": true,
+ "cornerCount": "UnReadCount"
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "宸ヤ綔鑱旂郴鍗曟煡璇�",
+ "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery?OperationType=1",
+ "id": 64,
+ "hidden": false
+ },
+ {
+ img: '../../static/icon/icon12.png',
+ text: '鍛樺伐绛惧埌璁板綍鍗曞垪琛�',
+ tip: '鐐瑰嚮杩涘叆',
+ url: '/pages/EmployeeRecords/EmployeeRecordsBillList',
+ id: 65,
+ hidden: false,
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閲囪喘璁㈠崟鍒楄〃",
+ "url": "/pages/caigoudingdan/caigoudingdanList",
+ "id": 66,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閿�鍞鍗曞垪琛�",
+ "url": "/pages/xiaoshoudingdan/xiaoshoudingdanBillList",
+ "id": 67,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "鐗规壒鍗曞垪琛�",
+ "url": "/pages/tepidan/TePiDanList",
+ "id": 68,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "瀹㈣瘔澶勭悊鍗曞垪琛�",
+ "url": "/pages/CustomerComplaintsBill/CustomerComplaintsBillList",
+ "id": 69,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鐢熶骇閫�鏂欐牎楠屾殏瀛樺垪琛�",
+ "url": "/pages/shengchantuiliaoCheck/MateOutBackCheckBillList",
+ "id": 70,
+ "hidden": false
+ },
+ ]
+ }
+ },
+ onLoad() {
+ this.getHiddenItem()
+ },
+ onShow() {
+ this.getWorkLinkList()
+ },
+ methods: {
+ async getWorkLinkList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
+ data: {
+ sWhere: ` and (鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' or 鎶勯�佹帴鏀朵汉 = '${getUserInfo()['HEmpName']}') and 闃呰鐘舵�� = '鏈槄'`,
+ user: getUserInfo()["Czymc"]
+ }
+ })
+
+ let {
+ count,
+ data,
+ Message,
+ list
+ } = res.data
+ if (count == 1) {
+ this.bindingData.UnReadCount = data.length
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞紓甯�: ${Message}`
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞紓甯�: ${err}`
+ })
+ }
+ },
+ judgeHidden() {
+ return process.env.NODE_ENV === 'development'
+ },
+ async getHiddenItem() {
+ let data = await getMenuList({
+ menuName: this.menuListName
+ })
+ Array.from(data).forEach(e => {
+ this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
+ this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
+
+ if( this.itemData[e["HIndex"]].text == '宸ヤ綔鑱旂郴鍗曟煡璇�') {
+ this.itemData[e["HIndex"]]["corner"]= true,
+ this.itemData[e["HIndex"]]["cornerCount"]= "UnReadCount"
+ }
+ })
+ },
+ switchHidden(index) {
+ this.updateCount++;
+ this.itemData[index].hidden = !this.itemData[index].hidden
+
+ },
+ switchIconsModeHandler() {
+ this.canEdit = !this.canEdit
+ if (this.canEdit == false && this.updateCount > 0) {
+ this.$nextTick(() => {
+ // uni.setStorageSync("HIndexItemData", this.itemData)
+ setMenuList({
+ menuName: this.menuListName,
+ payload: this.itemData
+ })
+
+ this.updateCount = 0
+ })
+ }
+ this.$forceUpdate()
+ },
+ toUrl(item) {
+ if (item.url) {
+ uni.navigateTo({
+ url: item.url
+ })
+ } else {
+ uni.showToast({
+ title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
+ icon: 'none'
+ })
+ }
+ }
+ }
+ }
</script>
<style lang="scss" scoped>
+ .header {
+ width: 100%;
+ height: 2em;
+ position: relative;
- .header {
- width: 100%;
- height: 2em;
- position: relative;
+ .switch-button {
+ position: absolute;
+ right: 10rpx;
+ bottom: 0;
+ }
+ }
- .switch-button {
- position: absolute;
- right: 10rpx;
- bottom: 0;
- }
- }
+ .mains {
+ width: 720rpx;
+ margin: 0 auto;
+ display: flex;
+ flex-wrap: wrap;
+ padding-bottom: 80rpx;
- .mains {
- width: 720rpx;
- margin: 0 auto;
- display: flex;
- flex-wrap: wrap;
- padding-bottom: 80rpx;
+ .box {
+ width: 25%;
+ margin-top: 2.5vh;
+ text-align: center;
- .box {
- width: 25%;
- margin-top: 2.5vh;
- text-align: center;
+ image {
+ width: 18vw;
+ height: 18vw;
+ }
- image {
- width: 18vw;
- height: 18vw;
- }
+ .texts {
+ width: 120rpx;
+ margin: 0 auto;
+ font-size: 29rpx;
+ font-weight: normal;
+ color: #333333;
+ margin-top: .2vh;
+ }
+ }
- .texts {
- width: 120rpx;
- margin: 0 auto;
- font-size: 29rpx;
- font-weight: normal;
- color: #333333;
- margin-top: .2vh;
- }
- }
+ .edit {
+ position: relative;
+ }
- .edit {
- position: relative;
- }
+ .edit-mark {
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
- .edit-mark {
- position: absolute;
- top: 0;
- right: 0;
- }
+ view[enable-hidden] {
+ opacity: .4 !important;
+ }
- view[enable-hidden] {
- opacity: .4 !important;
- }
-
- view[hidden] {
- display: none;
- }
- }
+ view[hidden] {
+ display: none;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/utils/WebSocketServices.js b/utils/WebSocketServices.js
index c1a0526..f083872 100644
--- a/utils/WebSocketServices.js
+++ b/utils/WebSocketServices.js
@@ -98,7 +98,7 @@
// 澶勭悊涓氬姟娑堟伅
if (message.Type === "MessageUnRead") { // 鏈娑堟伅
let payload = {
- pagePath: "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList",
+ pagePath: "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery",
itemId: 0
}
const content = JSON.parse(message.Content);
@@ -107,7 +107,7 @@
} else if (message.Type === "Message") {
const content = JSON.parse(message.Content)
let payload = {
- pagePath: "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList",
+ pagePath: "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery",
itemId: 0
}
this.showTaskTip(content[0]["鍐呭"], payload, content[0]["涓婚"]);
diff --git a/utils/common.js b/utils/common.js
index 6905022..cc66952 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -498,10 +498,16 @@
httpFormatWs(httpUrl=this.serverUrl) {
if(httpUrl.indexOf("http://") === 0){
httpUrl = httpUrl.replace("http://", "")
- httpUrl = "ws://" + httpUrl.split(":")[0]+":8089/ws"
+ httpUrl = httpUrl.substring(0, httpUrl.length - 1)
+ let BackSlashLast = httpUrl.lastIndexOf('/')
+ httpUrl = httpUrl.substring(0, BackSlashLast)
+ httpUrl = "ws://" + httpUrl.split(":")[0]+":8888/ws"
}else if(httpUrl.indexOf("https://") === 0) {
httpUrl = httpUrl.replace("https://", "")
- httpUrl = "wss://" + httpUrl.split(":")[0]+":8089/ws"
+ httpUrl = httpUrl.substring(0, httpUrl.length - 1)
+ let BackSlashLast = httpUrl.lastIndexOf('/')
+ httpUrl = httpUrl.substring(0, BackSlashLast)
+ httpUrl = "wss://" + httpUrl.split(":")[0]+":8888/ws"
}else{
// 鎻愮ず浼犲叆杩炴帴閿欒
}
--
Gitblit v1.9.1