From 08132eb6a645b4a42205d142feb14c9118a4a16a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期日, 04 一月 2026 08:02:29 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue | 3
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | 6
pages/simaheyi/BarCodeCheck_SN.vue | 874 ++++++++++++++++
pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue | 68 +
utils/auth.js | 2
components/ZLGL/CheckProjectPopup.vue | 14
pages.json | 38
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 6
pages/index/tab2.vue | 170 ---
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue | 6
pages/index/tab4.vue | 278 +++++
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 26
pages/index/tab1.vue | 24
pages/mujvzhuangtai/mujvzhuangtai.vue | 140 +-
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 8
pages/ZLGL/checkFlowList/QC_CheckedBillflowList.vue | 544 ++++++++++
pages/index/tab3.vue | 281 +++++
pages/simaheyi/table.vue | 487 +++++++++
components/BillListPopup/BillListPopup.vue | 23
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 70 +
pages/index/index.vue | 4
pages/index/mine.vue | 89 +
pages/qijvguzhangdengji/mouldMistakeBill.vue | 7
23 files changed, 2,866 insertions(+), 302 deletions(-)
diff --git a/components/BillListPopup/BillListPopup.vue b/components/BillListPopup/BillListPopup.vue
index ae4c641..5855496 100644
--- a/components/BillListPopup/BillListPopup.vue
+++ b/components/BillListPopup/BillListPopup.vue
@@ -10,6 +10,11 @@
<view class="title"><text>鐗╂枡: </text></view>
<view class="right"><input type="text" :focus="enablefocus" v-model="HMater"
@confirm="getBillList" /></view>
+ <view class="icon-wrapper-big">
+ <uni-icons class="right-icon"
+ :class="'enable-icon-button'"
+ type="scan" size="20" @click="toScanCode"></uni-icons>
+ </view>
</view>
<view class="search-condition">
<view class="title"><text>鍏宠仈椤�: </text></view>
@@ -71,6 +76,9 @@
CommonUtils
} from '../../utils/common';
import dayjs from 'dayjs';
+ import {
+ MpaasScan
+ } from "../../utils/mpaasScan";
export default {
name: "BillListPopup",
data() {
@@ -115,6 +123,15 @@
event: 'change'
},
methods: {
+ //鎵爜
+ toScanCode() {
+ MpaasScan.scanCode((res) => {
+ if (res) {
+ this.HMater = res;
+ this.getBillList();
+ }
+ });
+ },
popupChangeHandler(e) {
if (e.show === true) {
this.getBillList()
@@ -347,4 +364,10 @@
background-color: rgba(0, 122, 255, 0.2);
}
}
+ .enable-icon-button {
+ background-color: #3a78ff;
+ padding: 6rpx;
+ color: #fff;
+ border-radius: 100%;
+ }
</style>
\ No newline at end of file
diff --git a/components/ZLGL/CheckProjectPopup.vue b/components/ZLGL/CheckProjectPopup.vue
index 0fb9d35..2192288 100644
--- a/components/ZLGL/CheckProjectPopup.vue
+++ b/components/ZLGL/CheckProjectPopup.vue
@@ -5,7 +5,7 @@
<view class="search-condition">
<view class="title"><text>鏃ユ湡: </text></view>
<view class="daterange" style="flex: 1;">
- <view class="right general">
+ <!-- <view class="right general">
<uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
<view>{{HBeginDate}}</view>
</uni-datetime-picker>
@@ -15,7 +15,7 @@
<uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
<view>{{HEndDate}}</view>
</uni-datetime-picker>
- </view>
+ </view> -->
</view>
</view>
<view class="buttons">
@@ -109,8 +109,8 @@
panelHeight: 0,
HProcessName: '',
HMaterName: '',
- HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ // HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
+ // HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
multiSouceBillList: []
};
},
@@ -161,9 +161,9 @@
getsWhere() {
let sWhere =
` and ISNULL(瀹℃牳浜�,'')!='' and HOrgID = '${ uni.getStorageSync("OrganizationID")}'`
- if (this.HBeginDate && this.HEndDate) {
- sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
- }
+ // if (this.HBeginDate && this.HEndDate) {
+ // sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
+ // }
if (this.HMaterName && this.HProcessName) {
sWhere += ` and 鐗╂枡鍚嶇О = '${this.HMaterName}' and 宸ュ簭鍚嶇О = '${this.HProcessName}'`
diff --git a/pages.json b/pages.json
index 9b0d291..0f5c9a6 100644
--- a/pages.json
+++ b/pages.json
@@ -26,6 +26,18 @@
"navigationBarTitleText": "鍗曟嵁鍒楄〃"
}
},
+ {
+ "path": "pages/index/tab3",
+ "style": {
+ "navigationBarTitleText": "鍣ㄥ叿绠＄悊"
+ }
+ },
+ {
+ "path": "pages/index/tab4",
+ "style": {
+ "navigationBarTitleText": "璐ㄩ噺绠＄悊"
+ }
+ },
{
"path": "pages/index/mine",
"style": {
@@ -1272,6 +1284,12 @@
"navigationBarTitleText": "涓夌爜鍚堜竴"
}
},
+ {
+ "path": "pages/simaheyi/BarCodeCheck_SN",
+ "style": {
+ "navigationBarTitleText": "鍥涚爜鍚堜竴"
+ }
+ },
{
"path": "pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
"style": {
@@ -1329,6 +1347,14 @@
"enablePullDownRefresh": true
}
},
+ {
+ "path" : "pages/ZLGL/checkFlowList/QC_CheckedBillflowList",
+ "style" :
+ {
+ "navigationBarTitleText" : "宸插鏍�",
+ "enablePullDownRefresh": true
+ }
+ },
{
"path" : "pages/MJGL/Gy_MouldFile/Gy_MouldFileList",
"style" :
@@ -1397,6 +1423,18 @@
"selectedIconPath": "static/tabBar/icon2-default.png",
"text": "鍗曟嵁鍒楄〃"
},
+ {
+ "pagePath": "pages/index/tab3",
+ "iconPath": "static/tabBar/icon2.png",
+ "selectedIconPath": "static/tabBar/icon2-default.png",
+ "text": "鍣ㄥ叿绠＄悊"
+ },
+ {
+ "pagePath": "pages/index/tab4",
+ "iconPath": "static/tabBar/icon2.png",
+ "selectedIconPath": "static/tabBar/icon2-default.png",
+ "text": "璐ㄩ噺绠＄悊"
+ },
{
"pagePath": "pages/index/mine",
"iconPath": "static/tabBar/user.png",
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index bcfae5f..db2e66c 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -94,7 +94,7 @@
<view class="form-item">
<view class="title">婧愬崟绫诲瀷:</view>
<view class="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+ <picker :range="arrayHMainSourceBillType"
@change="HMainSourceBillTypeChange">
<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
@@ -232,12 +232,12 @@
HBarCode: '',
HInterID: '',
HBillType: 3802,
- HWHName: getUserInfo().HWHName,
+ HWHName: getUserInfo().HWhName,
HWHID: getUserInfo().HWhID,
HStockPlaceName: getUserInfo().HSPName,
HStockPlaceID: getUserInfo().HSPID,
- HKeeperName: getUserInfo().User,
- HKeeperID: getUserInfo().User,//鍙戞枡浜�
+ HKeeperName: getUserInfo().HKeeperName,
+ HKeeperID: getUserInfo().HKeeperID,//鍙戞枡浜�
HSecManagerName: getUserInfo().HEmpName,
HSecManagerID: getUserInfo().HEmpID,//棰嗘枡浜�
HDeptName: getUserInfo().HDept,
diff --git a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
index 6ab3387..ae4969a 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -273,7 +273,7 @@
HBarCode: '',
HInterID: '',
HBillType: 3803,
- HWHName: getUserInfo().HWHName,
+ HWHName: getUserInfo().HWhName,
HWHID: getUserInfo().HWhID,
HStockPlaceName: getUserInfo().HSPName,
HStockPlaceID: getUserInfo().HSPID,
@@ -282,8 +282,8 @@
HDeptID: getUserInfo().HDeptID,
HSecManagerID: getUserInfo().HEmpID,
HSecManagerName: getUserInfo().HEmpName,
- HKeeperID: 0,
- HKeeperName: '',
+ HKeeperName: getUserInfo().HKeeperName,
+ HKeeperID: getUserInfo().HKeeperID,//鍙戞枡浜�
//婧愬崟淇℃伅
HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') :
3849,
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 0e9f667..3df60d0 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -511,7 +511,8 @@
HBarCode: HBarCode,
HInterID: 0,
HEntryID: 0,
- Mode: 1 //鎵爜妯″紡
+ Mode: 1 ,//鎵爜妯″紡
+ user:getUserInfo()["Czymc"]
}
})
@@ -571,7 +572,8 @@
HBarCode: "",
HInterID: e?.HInterID,
HEntryID: e?.HEntryID,
- Mode: 2 //閫夊崟妯″紡
+ Mode: 2 ,//閫夊崟妯″紡
+ user:getUserInfo()["Czymc"]
}
})
diff --git a/pages/ZLGL/checkFlowList/QC_CheckedBillflowList.vue b/pages/ZLGL/checkFlowList/QC_CheckedBillflowList.vue
new file mode 100644
index 0000000..d2e6f78
--- /dev/null
+++ b/pages/ZLGL/checkFlowList/QC_CheckedBillflowList.vue
@@ -0,0 +1,544 @@
+<template>
+ <view class="page" id="pageContent">
+ <view class="search-condition-zone">
+ <view class="form-item">
+ <view class="left">婧愬崟绫诲瀷</view>
+
+ <uni-combox :candidates="arrayHSourceBillTypeName" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="hform.HSourceBillTypeName"
+ @input="HSourceBillTypeNameChange"></uni-combox>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鍗曟嵁鍙�:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HBillNo" />
+ </view>
+ </view>
+ </view>
+ <view class="button-zone">
+ <button type="default" class="btn-a" size="mini" @tap="cmdSearch">鏌ヨ</button>
+ <button type="default" class="btn-c" size="mini" @tap="exit">閫�鍑�</button>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="card-item" v-for="(item, index) in showList" :key="index">
+ <uni-card :title="item['鍗曟嵁鍙�']" :extra="'鏃ユ湡:' + item['鏃ユ湡'].split('T')[0]"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <!-- 鍔ㄦ�佺敓鎴愭墍鏈夐潪绌哄瓧娈� -->
+ <view
+ class="detail"
+ v-for="(value, key,keyIndex) in item"
+ :key="key"
+ v-if="keyIndex<=10 && shouldShowField(key, value)"
+ >
+ <text>{{ formatFieldName(key) }}锛�</text>{{ value }}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view
+ class="detail"
+ v-for="(value, key,keyIndex) in item"
+ :key="key"
+ v-if="keyIndex>=15 && shouldShowField(key, value)"
+ >
+ <text>{{ formatFieldName(key) }}锛�</text>{{ value }}
+ </view>
+
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <button class="op3" size="mini" plain @tap.stop="audit(item, 1)">鍙嶅鏍�</button>
+ <button class="op3" size="mini" plain @tap.stop="Reject(item)">椹冲洖</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+
+
+ </view>
+</template>
+
+<script>
+ import {
+ CommonUtils
+ } from '@/utils/common'
+ import {
+ getUserInfo
+ } from '@/utils/auth'
+ import dayjs, {
+ Dayjs
+ } from 'dayjs'
+ export default {
+ data() {
+ return {
+ showDetail: -1,
+ operations : -1,
+ hform: {
+ HSourceBillType:'8505',
+ HSourceBillTypeName: "棣栦欢妫�楠屽崟",
+ HBillNo: ''
+ },
+ sWhere: '',
+ listData: [],
+ showList: [],
+ page: 1,
+ HSourceBillTypeList: {棣栦欢妫�楠屽崟:'8505',鏈欢妫�楠屽崟:'8507'},
+ arrayHSourceBillTypeName: [
+ "棣栦欢妫�楠屽崟",
+ "鏈欢妫�楠屽崟",
+ ],
+ }
+ },
+ onReachBottom: function() {
+ this.page++
+ setTimeout(() => {
+ this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ }, 100)
+ },
+ onPullDownRefresh: function() {
+ this.cmdSearch()
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ computed: {
+
+ },
+ methods: {
+ // 鍒ゆ柇鍝簺瀛楁闇�瑕佹樉绀�
+ shouldShowField(key, value) {
+ // 鎺掗櫎涓嶉渶瑕佹樉绀虹殑瀛楁
+ const excludeKeys = ['鍗曟嵁鍙�', '鏃ユ湡']; // 杩欎簺瀛楁宸茬粡鍦ㄥ叾浠栧湴鏂规樉绀轰簡
+
+ // 鍒ゆ柇key鏄惁鍏ㄨ嫳鏂囷紙涓嶅寘鍚腑鏂囷級
+ const isAllEnglish = /^[a-zA-Z]+$/.test(key);
+
+ // 鍒ゆ柇key鏄惁鍖呭惈"ID"锛堜笉鍖哄垎澶у皬鍐欙級
+ const containsID = key.toUpperCase().includes('ID');
+
+ return !excludeKeys.includes(key) &&
+ !isAllEnglish && // 鎺掗櫎鍏ㄨ嫳鏂囩殑key
+ !containsID && // 鎺掗櫎鍖呭惈ID鐨刱ey
+ value !== null &&
+ value !== undefined &&
+ value !== '';
+ },
+
+ // 鏍煎紡鍖栧瓧娈靛悕鏄剧ず
+ formatFieldName(key) {
+ // 浣犲彲浠ユ牴鎹渶姹傝嚜瀹氫箟鏄剧ず鍚嶇О
+ const nameMap = {
+ '鐗╂枡浠ｇ爜': '鐗╂枡浠ｇ爜',
+ '鐗╂枡鍚嶇О': '鐗╂枡鍚嶇О',
+ '瑙勬牸鍨嬪彿': '瑙勬牸鍨嬪彿',
+ // ... 鍏朵粬瀛楁鏄犲皠
+ };
+ return nameMap[key] || key;
+ },
+ HSourceBillTypeNameChange(e) {
+ console.log(e);
+ this.hform.HSourceBillType = this.HSourceBillTypeList[this.hform.HSourceBillTypeName];
+ console.log(this.hform.HSourceBillType);
+ this.cmdSearch();
+ },
+ exit() {
+ uni.navigateBack()
+ },
+ getPage(page, list) {
+ let sindex = (parseInt(page) - 1) * 20
+ let eindex = parseInt(page) * 20
+ let newList = list.slice(sindex, eindex)
+ return newList
+ },
+ async cmdSearch() {
+ let sWhere = ' '
+
+ if (this.hform.HBillNo != "") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'"
+ }
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/LEMS/CheckFlowList',
+ data: {
+ "sWhere": sWhere,
+ "billType":this.hform.HSourceBillType,
+ "type":3,
+ "userid": getUserInfo()["Czybm"]
+ },
+ })
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ this.listData = res.data.data
+ this.showList = this.getPage(this.page, this.listData)
+
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ } catch (err) {
+ console.warn(err);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触:' + err,
+ icon: 'none'
+ })
+ }
+ },
+
+ async audit(item, mode) {
+ console.log('瀹℃牳鍗曟嵁: ',item);
+ let url = '';
+ let ajaxData = '';
+ if(this.hform.HSourceBillType=='8505'){
+ url = 'QC_FirstPieceCheckBill/AuditFlow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ IsAudit: mode,
+ CurUserName: getUserInfo()["Czymc"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='8507'){
+ url = 'QC_ProcessCheckBill/AuditFlow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ IsAudit: mode,
+ CurUserName: getUserInfo()["Czymc"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }
+ try{
+ let res = await CommonUtils.doRequest2Sync({
+ method: 'GET',
+ url: url,
+ data: ajaxData
+ })
+
+ if(!res) {
+ return
+ }
+
+ let {count, data, Message} = res.data
+
+ if(count == 1) {
+ CommonUtils.showTips({
+ message: `瀹℃牳鎴愬姛`
+ })
+ this.$forceUpdate()
+ setTimeout(() => {
+ this.cmdSearch()
+ }, 2000)
+ }else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `瀹℃牳澶辫触: ${Message}`
+ })
+ }
+ }catch(err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍗曟嵁瀹℃牳鍑虹幇閿欒: ${err}`
+ })
+ }
+ },
+ async Reject(item) {
+ console.log("delItem: ", item);
+ let url = '';
+ let ajaxData = '';
+ if(this.hform.HSourceBillType=='8505'){
+ url = 'QC_FirstPieceCheckBill/RejectCheckFlow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='8507'){
+ url = 'QC_ProcessCheckBill/RejectCheckFlow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕侀┏鍥炶褰曪紵',
+ success: async (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: url,
+ data: ajaxData
+ })
+
+ if (!res) {
+ return
+ }
+
+ let {
+ count,
+ code,
+ Message
+ } = res.data
+ if (count == 0) {
+ return uni.showModal({
+ title: '閿欒鎻愮ず',
+ content: `椹冲洖閿欒: ${Message}`,
+ showCancel: false
+ })
+ }
+ uni.showToast({
+ title: '椹冲洖鎴愬姛',
+ icon: 'none'
+ })
+ this.cmdSearch()
+ } catch (err) {
+ uni.showModal({
+ title: '閿欒鎻愮ず',
+ content: `鎺ュ彛璇锋眰澶辫触: ${err}`,
+ showCancel: false
+ })
+ }
+ }
+ },
+ })
+
+ },
+
+ },
+ onShow() {
+ this.$nextTick(() => {
+ this.cmdSearch()
+ })
+ },
+
+ }
+</script>
+
+<style lang="scss" scoped>
+ .page {
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ padding: 20rpx 0;
+ position: relative;
+
+ .button-zone {
+ height: auto;
+ box-sizing: border-box;
+ padding-top: 20rpx;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ flex-wrap: wrap;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #ff5722;
+ color: #fff;
+ }
+ }
+
+ .search-condition-zone {
+ height: auto;
+ box-sizing: border-box;
+ padding: 0 60rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+
+ .form-item {
+ display: flex;
+ flex-direction: row;
+ gap: 20rpx;
+ align-items: center;
+ font-size: 28rpx;
+
+ .left {
+ width: 4rem;
+ }
+
+ .right {
+ flex: 1;
+ padding: 8rpx 16rpx;
+
+ .search {
+ width: 28rpx;
+ height: 28rpx;
+ }
+
+ input {
+ font-size: 28rpx;
+ }
+
+ .uni-combox {
+ padding: 0;
+ margin: 0;
+
+ ::v-deep .uni-combox__input {
+ font-size: 28rpx;
+ height: auto;
+ }
+ }
+ }
+
+ .general {
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .disabled {
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+ }
+ }
+
+ .info-list-zone {
+ overflow-y: auto;
+
+ .card-item {
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+ }
+ }
+
+ .daterange {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-between;
+ gap: 20rpx;
+ margin-top: 20rpx;
+ flex-wrap: wrap;
+ align-content: flex-start;
+ button {
+ margin: 0;
+ flex-shrink: 0;
+ padding: 0;
+ width: 150rpx;
+ flex-basis: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+
+ .pagination-zone {
+ position: fixed;
+ bottom: 0;
+ box-sizing: border-box;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 20rpx 40rpx 20rpx 40rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ justify-content: space-between;
+ width: 100%;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue b/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
index f4b7b7a..d222463 100644
--- a/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
+++ b/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
@@ -775,7 +775,8 @@
HBarCode: "",
HInterID: e?.HInterID,
HEntryID: e?.HEntryID,
- Mode: 2 //閫夊崟妯″紡
+ Mode: 2 ,//閫夊崟妯″紡
+ user:getUserInfo()["Czymc"]
}
})
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index 6c0945f..512fb27 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -631,13 +631,19 @@
ArrayAnalysisMethodValue: [1, 2, 3],
// 瀛愯〃 椤电淇℃伅
subTabs: {
- 0: {
- id: "0",
- name: "鍏朵粬绫诲瀷",
- },
-
-
- },
+ 1: {
+ id: "1",
+ name: "妫�楠岄」鐩�",
+ },
+ 2: {
+ id: "2",
+ name: "涓嶈壇鍘熷洜",
+ },
+ 3: {
+ id: "3",
+ name: "鎶芥牱妫�楠�",
+ },
+ },
// 婧愬崟绫诲瀷
HSourceBillType: "鏀舵枡閫氱煡鍗�",
@@ -763,7 +769,8 @@
HBarCode: "",
HInterID: e?.HInterID,
HEntryID: e?.HEntryID,
- Mode: 2 //閫夊崟妯″紡
+ Mode: 2 ,//閫夊崟妯″紡
+ user:getUserInfo()["Czymc"]
}
})
@@ -862,7 +869,8 @@
HBarCode: HBarCode,
HInterID: 0,
HEntryID: 0,
- Mode: 1 //鎵爜妯″紡
+ Mode: 1 ,//鎵爜妯″紡
+ user:getUserInfo()["Czymc"]
}
})
diff --git a/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue b/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
index 7b428ee..212e1c0 100644
--- a/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
@@ -696,7 +696,8 @@
HBarCode: HBarCode,
HInterID: 0,
HEntryID: 0,
- Mode: 1 //鎵爜妯″紡
+ Mode: 1, //鎵爜妯″紡
+ user:getUserInfo()["Czymc"]
}
})
@@ -709,7 +710,7 @@
if (count == 1) {
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['HMaterNumber']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
this.hform.HMainSourceBillNo = data[0]['HBillNo']
this.hform.HSourceBillNo = data[0]['HBillNo']
this.hform.HMainSourceInterID = data[0].HInterID
@@ -739,6 +740,69 @@
})
}
},
+ async HandleBillSelectComplete(e) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+ data: {
+ HBillType: this.hform.HBillType,
+ HSourceBillType: this.hform.HSourceBillType,
+ HBarCode: "",
+ HInterID: e?.HInterID,
+ HEntryID: e?.HEntryID,
+ Mode: 2 ,//閫夊崟妯″紡
+ user:getUserInfo()["Czymc"]
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ console.log('鑾峰彇婧愬崟锛�', data)
+ 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]['HBillNo']
+ 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.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.get_CheckItem();
+ this.hasSourceBill = true
+ this.$refs['billList'].exit()
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: "婧愬崟涓嬫帹閿欒: " + err
+ })
+ }
+
+ },
async GetCheckItemID() {
if (!this.hform.HMaterName && !this.hform.HProcName) {
try {
diff --git a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index 5551ec4..dfef792 100644
--- a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -782,7 +782,8 @@
HBarCode: "",
HInterID: e?.HInterID,
HEntryID: e?.HEntryID,
- Mode: 2 //閫夊崟妯″紡
+ Mode: 2 ,//閫夊崟妯″紡
+ user:getUserInfo()["Czymc"]
}
})
@@ -880,7 +881,8 @@
HBarCode: HBarCode,
HInterID: 0,
HEntryID: 0,
- Mode: 1 //鎵爜妯″紡
+ Mode: 1, //鎵爜妯″紡
+ user:getUserInfo()["Czymc"]
}
})
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index d507198..4509b14 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -705,7 +705,7 @@
toScanCode() {
MpaasScan.scanCode((res) => {
if (res) {
- this.getSourceBillInfo(HBarCode);
+ this.getSourceBillInfo(res);
}
});
},
@@ -719,7 +719,8 @@
HBarCode: HBarCode,
HInterID: 0,
HEntryID: 0,
- Mode: 1 //鎵爜妯″紡
+ Mode: 1, //鎵爜妯″紡
+ user:getUserInfo()["Czymc"]
}
})
@@ -732,7 +733,7 @@
if (count == 1) {
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['HMaterNumber']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
this.hform.HMainSourceBillNo = data[0]['HBillNo']
this.hform.HSourceBillNo = data[0]['HBillNo']
this.hform.HMainSourceInterID = data[0].HInterID
@@ -772,6 +773,69 @@
// }
},
+ async HandleBillSelectComplete(e) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+ data: {
+ HBillType: this.hform.HBillType,
+ HSourceBillType: this.hform.HSourceBillType,
+ HBarCode: "",
+ HInterID: e?.HInterID,
+ HEntryID: e?.HEntryID,
+ Mode: 2 ,//閫夊崟妯″紡
+ user:getUserInfo()["Czymc"]
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ console.log('鑾峰彇婧愬崟锛�', data)
+ 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]['HBillNo']
+ 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.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.get_CheckItem();
+ this.hasSourceBill = true
+ this.$refs['billList'].exit()
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: "婧愬崟涓嬫帹閿欒: " + err
+ })
+ }
+
+ },
async GetCheckItemID() {
if (!this.hform.HMaterName && !this.hform.HProcName) {
try {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0203ac5..59b9ab9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -309,8 +309,8 @@
},
{
img: '../../static/icon/icon8.png',
- text: '妯″叿妗ｆ鏌ヨ',
- url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
+ text: '鍥涚爜鍚堜竴',
+ url: `/pages/simaheyi/BarCodeCheck_SN`,
id: 36,
hidden: false,
},
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 1cb0c33..7ffbc22 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -27,12 +27,16 @@
<script>
import { getUserInfo } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '@/utils/common'
export default {
data() {
return {
userInfo:getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
vers:uni.getStorageSync('vers'),
+ checkCount:0,
itemData:[{
img:'../../static/icon00.png',
text:'寰呮垜瀹℃牳',
@@ -41,7 +45,7 @@
},{
img:'../../static/icon01.png',
text:'宸插鏍�',
- url:'',
+ url:'/pages/ZLGL/checkFlowList/QC_CheckedBillflowList',
id:1
},{
img:'../../static/icon06.png',
@@ -69,8 +73,11 @@
]
}
},
- onLoad() {
+ async onLoad() {
console.log(this.userInfo)
+ await this.cmdSearchFirst()
+ await this.cmdSearchLast()
+ this.itemData[0].text = `寰呮垜瀹℃牳(${this.checkCount})`
},
methods: {
toUrl(item){
@@ -100,8 +107,84 @@
}
}
});
+ },
+ //鑾峰彇寰呭鎵规�绘暟棣栦欢
+ async cmdSearchFirst() {
+
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/LEMS/CheckFlowList',
+ data: {
+ "sWhere": ' ',
+ "billType":8505,
+ "type":2,
+ "userid": getUserInfo()["Czybm"]
+ },
+ })
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ this.checkCount += res.data.data.length
+ console.log(res.data.data.length)
+
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ } catch (err) {
+ console.warn(err);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触:' + err,
+ icon: 'none'
+ })
+ }
+ },
+ //鏈欢鍏ㄩ儴
+ async cmdSearchLast(){
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/LEMS/CheckFlowList',
+ data: {
+ "sWhere": ' ',
+ "billType":8507,
+ "type":2,
+ "userid": getUserInfo()["Czybm"]
+ },
+ })
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ this.checkCount += res.data.data.length
+
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ } catch (err) {
+ console.warn(err);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触:' + err,
+ icon: 'none'
+ })
+ }
}
- }
+ }
}
</script>
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 0624cfa..e368513 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -110,25 +110,19 @@
img: '../../static/icon/icon14.png',
text: '鎴戠殑鎶ュ伐骞冲彴',
tip: '鐐瑰嚮杩涘叆',
- url: '/pages/baogong/table',
+ url: '/pages/baogong/IpadIndex',
id: 11,
hidden: true,
- }, {
+ },
+ {
img: '../../static/icon/icon32.png',
text: '璁惧杩愯鐘舵��',
tip: '鏌ョ湅璇︽儏',
url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
id: 14,
hidden: true,
- }, {
- img: '../../static/icon/icon6.png',
- text: '妯″叿鐘舵�佸垎鏋�',
- tip: '鏌ョ湅璇︽儏',
- url: '/pages/mujvzhuangtai/mujvzhuangtai',
- id: 15,
- hidden: true,
-
- }, {
+ },
+ {
img: '../../static/icon/icon10.png',
text: '鎴戠殑浠诲姟',
tip: '绔嬪嵆鏂板',
@@ -136,13 +130,7 @@
id: 16,
hidden: false,
},
- {
- img: '../../static/icon/icon16.png',
- text: '鍣ㄥ叿瀵垮懡',
- url: '/pages/shoujishouming/table',
- id: 17,
- hidden: false,
- },
+
]
// itemData: [{
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index d855596..6c895d6 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -319,118 +319,7 @@
"id": 36,
"hidden": false
},
- {
- "img": "../../static/icon/icon13.png",
- "text": "妯″叿鏁呴殰鐧昏鍒楄〃",
- "url": "/pages/qijvguzhangdengji/mouldMistake",
- "id": 37,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "妯″叿鏁呴殰鐧昏鍗�",
- "url": "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1",
- "id": 38,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "妯″叿缁翠慨璁板綍鍒楄〃",
- "url": "/pages/weixiujilu/mouldRepairRecordBillList",
- "id": 39,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "妯″叿缁翠慨璁板綍鍗�",
- "url": "/pages/weixiujilu/mouldRepairRecordBill",
- "id": 40,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "棣栦欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
- "id": 41,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon13.png",
- "text": "棣栦欢妫�楠屽崟",
- "url": "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
- "id": 42,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
- "id": 43,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃妫�楠屽崟",
- "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
- "id": 44,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
- "id": 45,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1",
- "id": 46,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon5.png",
- "text": "妯″叿鐐规璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
- "id": 47,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon5.png",
- "text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
- "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
- "id": 48,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿棰嗘枡鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
- "id": 49,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿棰嗘枡閫�搴撳崟鍒楄〃",
- "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
- "id": 50,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿璋冩嫧鍗曞垪琛�",
- "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
- "id": 51,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
- "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
- "id": 51,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
"text": "瑁呯鍗曟殏瀛樺垪琛�",
@@ -438,62 +327,7 @@
"id": 52,
"hidden": false
},
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠屽崟",
- "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBill",
- "id": 53,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠屽垪琛�",
- "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
- "id": 54,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鐢熶骇鍏ュ簱鏍￠獙鍗�",
- "url": "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
- "id": 53,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍑哄巶鏍￠獙鍗�",
- "url": "/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
- "id": 54,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠�(鎵归噺)",
- "url": "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
- "id": 55,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍏ㄦ妫�楠屽崟",
- "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBill",
- "id": 55,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍏ㄦ妫�楠屽崟鏌ヨ",
- "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
- "id": 55,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍦ㄥ簱妫�楠屽崟鏌ヨ",
- "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBill",
- "id": 58,
- "hidden": false
- }
+
]
}
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
new file mode 100644
index 0000000..c75f8e6
--- /dev/null
+++ b/pages/index/tab3.vue
@@ -0,0 +1,281 @@
+<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>
+</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: 'tab3',
+ canEdit: false,
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ itemData: [
+ {
+ img: '../../static/icon/icon6.png',
+ text: '妯″叿鐘舵�佸垎鏋�',
+ tip: '鏌ョ湅璇︽儏',
+ url: '/pages/mujvzhuangtai/mujvzhuangtai',
+ id: 15,
+ hidden: false,
+
+ },
+ {
+ img: '../../static/icon/icon8.png',
+ text: '妯″叿妗ｆ鏌ヨ',
+ url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
+ id: 36,
+ hidden: false,
+ },
+ {
+ img: '../../static/icon/icon16.png',
+ text: '鍣ㄥ叿瀵垮懡',
+ url: '/pages/shoujishouming/table',
+ id: 17,
+ hidden: false,
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿鏁呴殰鐧昏鍒楄〃",
+ "url": "/pages/qijvguzhangdengji/mouldMistake",
+ "id": 37,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿鏁呴殰鐧昏鍗�",
+ "url": "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1",
+ "id": 38,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿缁翠慨璁板綍鍒楄〃",
+ "url": "/pages/weixiujilu/mouldRepairRecordBillList",
+ "id": 39,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "妯″叿缁翠慨璁板綍鍗�",
+ "url": "/pages/weixiujilu/mouldRepairRecordBill",
+ "id": 40,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "妯″叿鐐规璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
+ "id": 47,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon5.png",
+ "text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+ "url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
+ "id": 48,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿棰嗘枡鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+ "id": 49,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿棰嗘枡閫�搴撳崟鍒楄〃",
+ "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+ "id": 50,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿璋冩嫧鍗曞垪琛�",
+ "url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+ "id": 51,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
+ "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
+ "id": 51,
+ "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
+
+ },
+ 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>
+ // .mains{
+ // width: 720rpx;
+ // margin: 0 auto;
+ // display: flex;
+ // flex-wrap: wrap;
+ // margin-top: 10rpx;
+ // padding-bottom: 80rpx;
+ // .box{
+ // width: 100%;
+ // margin: 26rpx 26rpx 0 26rpx;
+ // padding: 0 0 16rpx 10rpx;
+ // display: flex;
+ // align-items: center;
+ // border-bottom: 1px solid #f0f0f0;
+ // image{
+ // width: 52rpx;
+ // height: 52rpx;
+ // }
+ // .texts{
+ // font-size: 30rpx;
+ // color: #333333;
+ // margin-left: 30rpx;
+ // }
+ // }
+ // }
+
+ .header {
+ width: 100%;
+ height: 2em;
+ position: relative;
+
+ .switch-button {
+ position: absolute;
+ right: 10rpx;
+ bottom: 0;
+ }
+ }
+
+ .mains {
+ width: 720rpx;
+ margin: 0 auto;
+ display: flex;
+ flex-wrap: wrap;
+ padding-bottom: 80rpx;
+
+ .box {
+ width: 25%;
+ margin-top: 2.5vh;
+ text-align: center;
+
+ image {
+ width: 18vw;
+ height: 18vw;
+ }
+
+ .texts {
+ width: 120rpx;
+ margin: 0 auto;
+ font-size: 29rpx;
+ font-weight: normal;
+ color: #333333;
+ margin-top: .2vh;
+ }
+ }
+
+ .edit {
+ position: relative;
+ }
+
+ .edit-mark {
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
+
+ view[enable-hidden] {
+ opacity: .4 !important;
+ }
+
+ view[hidden] {
+ display: none;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
new file mode 100644
index 0000000..2e86cc1
--- /dev/null
+++ b/pages/index/tab4.vue
@@ -0,0 +1,278 @@
+<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>
+</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: 'tab4',
+ canEdit: false,
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ itemData: [
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "棣栦欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
+ "id": 41,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "棣栦欢妫�楠屽崟",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
+ "id": 42,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+ "id": 43,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
+ "id": 44,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟鍒楄〃",
+ "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+ "id": 45,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟",
+ "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1",
+ "id": 46,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠屽崟",
+ "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBill",
+ "id": 53,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠屽垪琛�",
+ "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
+ "id": 54,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鐢熶骇鍏ュ簱妫�楠屽崟",
+ "url": "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
+ "id": 53,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍑哄巶鏍￠獙鍗�",
+ "url": "/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
+ "id": 54,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠�(鎵归噺)",
+ "url": "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
+ "id": 55,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍏ㄦ妫�楠屽崟",
+ "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBill",
+ "id": 55,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍏ㄦ妫�楠屽崟鏌ヨ",
+ "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
+ "id": 55,
+ "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
+
+ },
+ 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>
+ // .mains{
+ // width: 720rpx;
+ // margin: 0 auto;
+ // display: flex;
+ // flex-wrap: wrap;
+ // margin-top: 10rpx;
+ // padding-bottom: 80rpx;
+ // .box{
+ // width: 100%;
+ // margin: 26rpx 26rpx 0 26rpx;
+ // padding: 0 0 16rpx 10rpx;
+ // display: flex;
+ // align-items: center;
+ // border-bottom: 1px solid #f0f0f0;
+ // image{
+ // width: 52rpx;
+ // height: 52rpx;
+ // }
+ // .texts{
+ // font-size: 30rpx;
+ // color: #333333;
+ // margin-left: 30rpx;
+ // }
+ // }
+ // }
+
+ .header {
+ width: 100%;
+ height: 2em;
+ position: relative;
+
+ .switch-button {
+ position: absolute;
+ right: 10rpx;
+ bottom: 0;
+ }
+ }
+
+ .mains {
+ width: 720rpx;
+ margin: 0 auto;
+ display: flex;
+ flex-wrap: wrap;
+ padding-bottom: 80rpx;
+
+ .box {
+ width: 25%;
+ margin-top: 2.5vh;
+ text-align: center;
+
+ image {
+ width: 18vw;
+ height: 18vw;
+ }
+
+ .texts {
+ width: 120rpx;
+ margin: 0 auto;
+ font-size: 29rpx;
+ font-weight: normal;
+ color: #333333;
+ margin-top: .2vh;
+ }
+ }
+
+ .edit {
+ position: relative;
+ }
+
+ .edit-mark {
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
+
+ view[enable-hidden] {
+ opacity: .4 !important;
+ }
+
+ view[hidden] {
+ display: none;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/mujvzhuangtai/mujvzhuangtai.vue b/pages/mujvzhuangtai/mujvzhuangtai.vue
index c7cc673..f640c33 100644
--- a/pages/mujvzhuangtai/mujvzhuangtai.vue
+++ b/pages/mujvzhuangtai/mujvzhuangtai.vue
@@ -3,13 +3,15 @@
<view class="container">
<view class="warehouse-selector">
<view class="left">褰撳墠浠撳簱锛�</view>
- <picker :range="warehouseRange" :value="warehouseSelected" @change="warehouseChange">
- <view class="right">
- <input type="text" disabled v-model="warehouseSelected" placeholder="璇烽�夋嫨褰撳墠浠撳簱">
- <uni-icons type="forward" color="#808080"
- style="border-left: 1rpx solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
- </view>
- </picker>
+ <zxz-uni-data-select
+ v-model="HWHID"
+ dataKey="HName"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HWHList"
+ :clear="false"
+ @change="warehouseChange"
+ ></zxz-uni-data-select>
</view>
<!-- 鍒嗗壊绾� -->
@@ -31,6 +33,9 @@
</view>
<view class="detail" v-if="item['浠撳簱']">
<text>浠撳簱锛�</text>{{item['浠撳簱']}}
+ </view>
+ <view class="detail" v-if="item['浠撲綅']">
+ <text>浠撲綅锛�</text>{{item['浠撲綅']}}
</view>
<view class="detail" v-if="item['璁捐瀵垮懡']">
<text>璁捐瀵垮懡锛�</text>{{item['璁捐瀵垮懡']}}
@@ -80,12 +85,12 @@
import {
getUserInfo
} from "@/utils/auth.js";
+ import { CommonUtils } from '@/utils/common';
export default {
data() {
return {
- warehouseRange: [],
- warehouseIDRange: [],
- warehouseSelected: "",
+ HWHList: [],
+ HWHID:getUserInfo()["HWhID"],
userInfo: getUserInfo(),
organInfo: {
id: uni.getStorageSync("OrganizationID") || "",
@@ -130,14 +135,12 @@
})
uni.hideLoading()
},
- async warehouseChange(e) {
- let index = e.detail.value
- this.warehouseSelected = this.warehouseRange[index]
- let id = this.warehouseIDRange[index]
+ async warehouseChange() {
+ let id = this.HWHID
this.moulds = []
this.doRequest(
"/Web/Get_Sc_MouldStatusAnalysisList", {
- sWhere: ` and HWHID = ${id}`,
+ sWhere: ` and HWHID = ${id} and HUSEORGID = ${uni.getStorageSync("OrganizationID")}`,
user: this.userInfo.Czymc,
Organization: this.organInfo.name
},
@@ -163,36 +166,27 @@
)
},
async initWHSelector() {
- this.doRequest(
- "/Gy_Warehouse/listTree", {
- sWhere: "",
- user: this.userInfo.Czymc,
- Organization: this.organInfo.name
- },
- function(res) {
- console.log(res)
- let {
- count,
- data
- } = res.data
- this.warehouseRange = []
- this.warehouseIDRange = []
- if (count > 0) {
- JSON.parse(data)[0].children.forEach(item => {
- this.warehouseRange.push(`${item.Number}-${item.Title}`)
- this.warehouseIDRange.push(item.Id)
- })
- }
-
- this.warehouseChange({
- detail: {
- value: 0
- }
- })
- },
- function(err) {
- console.error(err)
- },
+ CommonUtils.doRequest(
+ "/Web/GetWarehouseList_Json_New", {
+ Warehouse: "",
+ HOrgID: uni.getStorageSync('OrganizationID')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HWHList = data
+ this.warehouseChange();
+ } else {
+ uni.showToast({
+ title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
)
},
ToDetail(item) {
@@ -205,37 +199,35 @@
await this.initWHSelector()
},
onPullDownRefresh() {
- let whIndex = this.warehouseRange.indexOf(this.warehouseSelected);
- if(whIndex != -1){
- let id = this.warehouseIDRange[whIndex]
- this.moulds = []
- this.doRequest(
- "/Web/Get_Sc_MouldStatusAnalysisList", {
- sWhere: ` and HWHID = ${id}`,
- user: this.userInfo.Czymc,
- Organization: this.organInfo.name
- },
- function(res) {
- console.log(res)
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count > 0) {
- console.log(data)
- this.moulds = data.map(item => {
- return Object.assign(item, {
- imgSrc: "../../static/mold.png"
- })
+ let id = this.HWHID
+ this.moulds = []
+ this.doRequest(
+ "/Web/Get_Sc_MouldStatusAnalysisList", {
+ sWhere: ` and HWHID = ${id} and HUSEORGID = ${uni.getStorageSync("OrganizationID")}`,
+ user: this.userInfo.Czymc,
+ Organization: this.organInfo.name
+ },
+ function(res) {
+ console.log(res)
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count > 0) {
+ console.log(data)
+ this.moulds = data.map(item => {
+ return Object.assign(item, {
+ imgSrc: "../../static/mold.png"
})
- }
- },
- function(err) {
- console.error(err)
+ })
}
- )
- }
+ },
+ function(err) {
+ console.error(err)
+ }
+ )
+
uni.stopPullDownRefresh()
}
}
diff --git a/pages/qijvguzhangdengji/mouldMistakeBill.vue b/pages/qijvguzhangdengji/mouldMistakeBill.vue
index f9d29af..72018db 100644
--- a/pages/qijvguzhangdengji/mouldMistakeBill.vue
+++ b/pages/qijvguzhangdengji/mouldMistakeBill.vue
@@ -803,9 +803,10 @@
message = '鏈～鍐欓儴闂�'
} else if (!this.hform.HEmpName) {
message = '鏈～鍐欏彂鐜颁汉'
- } else if (!this.hform.HManagerName) {
- message = '鏈～鍐欒礋璐ｄ汉'
- }
+ }
+ // else if (!this.hform.HManagerName) {
+ // message = '鏈～鍐欒礋璐ｄ汉'
+ // }
if (!message) {
return true
diff --git a/pages/simaheyi/BarCodeCheck_SN.vue b/pages/simaheyi/BarCodeCheck_SN.vue
new file mode 100644
index 0000000..baa67c8
--- /dev/null
+++ b/pages/simaheyi/BarCodeCheck_SN.vue
@@ -0,0 +1,874 @@
+<template>
+ <view class="form">
+ <view class="form-base-info">
+ <view class="form-item">
+ <view class="title">鏍堟澘鐮�</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCodePallet ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet"
+ @confirm="CheckBarcode(HBarCode_Pallet,1)" :disabled="disableBarCodePallet" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="disableBarCodePallet ? 'disabled':''" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCodePallet"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐩殑浠撶爜</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCodeDest ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination"
+ @confirm="CheckBarcode(HBarCode_Destination,2)" :disabled="disableBarCodeDest" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="disableBarCodeDest ? 'disabled':''" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCodeDest"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓鐮�</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCodeMiddle ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox "
+ @confirm="CheckBarcode(HBarCode_MiddleBox,3)" :disabled="disableBarCodeMiddle" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="disableBarCodeMiddle ? 'disabled':''" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCodeMiddle"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧鐮�</view>
+ <!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+ <view class="right" :class="disableBarCodeSN ? 'disabled' : ''">
+ <input type="text" :focus="HBarCodeSNFocus" v-model="HBarCode_SN"
+ @confirm="CheckBarcode(HBarCode_SN,4)" :disabled="disableBarCodeSN" />
+ </view>
+ <view class="right-icon">
+ <uni-icons class="right-icon" :class="[disableBarCodeSN ? 'disabled':'']" type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+ @click="toScanCode" :disabled="disableBarCodeSN"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">澶嶆牳淇℃伅</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>
+ <!-- 鍗曟嵁淇℃伅 -->
+ <view v-if="tabs == 1">
+
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="date" v-model="hform.HDate">
+ <input type="text" v-model="hform.HDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ </view>
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaker" />
+ </view>
+ </view>
+ </view>
+ <view class="bill-info">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HBillNo" />
+ </view>
+ </view>
+ </view>
+ <view class="bill-info">
+ <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="bill-info">
+ <view class="form-item">
+ <view class="title">缁勭粐</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HStockOrgName" />
+ </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,
+
+ // ==================== 鐣岄潰鐘舵�佹帶鍒� ====================
+ EnableSubmit: true, // 鏄惁鍏佽鎻愪氦
+ disableBarCodePallet: false, // 鏍堟澘鐮佺鐢ㄧ姸鎬�
+ disableBarCodeDest: false, // 鐩殑浠撶爜绂佺敤鐘舵��
+ disableBarCodeMiddle: false, // 涓鐮佺鐢ㄧ姸鎬�
+ disableBarCodeSN: false, // 浜у搧鐮佺鐢ㄧ姸鎬�
+ HBarCodePalletFocus: false, // 鏍堟澘鐮佽緭鍏ユ鑱氱劍鐘舵��
+ HBarCodeDestFocus: false, // 鐩殑浠撶爜杈撳叆妗嗚仛鐒︾姸鎬�
+ HBarCodeMiddleFocus: false, // 涓鐮佽緭鍏ユ鑱氱劍鐘舵��
+ HBarCodeSNFocus: false, // 浜у搧鐮佽緭鍏ユ鑱氱劍鐘舵��
+ tabs: 0, // 褰撳墠閫夐」鍗�(0:鍗曟嵁淇℃伅,1:瑁呯淇℃伅)
+
+
+ // ==================== 涓氬姟鏁版嵁 ====================
+ HBarCode_Pallet: '', // 鏍堟澘鐮�
+ HBarCode_Destination: '', //鐩殑浠撶爜
+ HBarCode_MiddleBox: '', //涓鐮�
+ HBarCode_SN: '', // 浜у搧鐮�
+ HBillType: '1283', // 鍗曟嵁绫诲瀷
+ HBillSubType: '1', // 瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
+ OperationType: 1, // 鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ HMaterNumber_Pack: "", // 鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+ HBarCode_Pallet_Temp: "", // 浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏍堟澘鐮�
+ BarCodeType: 1, // 鏉＄爜绫诲瀷(1:瑁呯,2:缁勬墭)
+
+
+ // ==================== 鍒楄〃鏁版嵁 ====================
+ listOption: [], // 鍒楄〃閫夐」
+ listData: [], // 琛ㄦ牸鏁版嵁
+ selectedRows: [], // 琛ㄦ牸閫変腑鐨勬暟鎹�
+ columns: [ // 琛ㄦ牸鍒楅厤缃�
+ {
+ type: 'selection',
+ fixed: true,
+ width: 50
+ },
+ {
+ name: 'index',
+ label: '搴忓彿',
+ width: 60,
+ hidden: true
+ },
+ {
+ name: '鏍堟澘鐮�',
+ label: '鏍堟澘鐮�',
+ width: 200
+ },
+ {
+ name: '鐩殑浠撶爜',
+ label: '鐩殑浠撶爜',
+ width: 200
+ },
+ {
+ name: '涓鐮�',
+ label: '涓鐮�',
+ width: 200
+ },
+ {
+ name: 'SN鐮�',
+ label: 'SN鐮�',
+ width: 200
+ }
+ ],
+
+ // ==================== 涓昏〃鍗曟暟鎹� ====================
+ hform: {
+ HDate: dayjs(new Date()).format('YYYY-MM-DD'), // 鍗曟嵁鏃ユ湡
+ HMaker: getUserInfo()['Czymc'], // 鍒跺崟浜�
+ HBillNo: '', // 鍗曟嵁鍙�
+ HInterID: '', // 鍗曟嵁ID
+ HStockOrgName: uni.getStorageSync("Organization"), // 缁勭粐鍚嶇О
+ HStockOrgID: uni.getStorageSync("OrganizationID"), // 缁勭粐ID
+ },
+
+ // ==================== 绯荤粺閰嶇疆 ====================
+ HModName: "Sc_PackUnionBill_Packing_PDA", // 妯″潡鍚嶇О
+ ModRightName: "CE_PackUnionBill_Packing", // 妯″潡鏉冮檺鍙傛暟
+ titleData: [] // 涓嶉渶瑕佹樉绀虹殑瀛楁
+ }
+ },
+ components: {
+
+ },
+ // ==================== 璁＄畻灞炴�� ====================
+ computed: {
+ // 璁＄畻琛ㄦ牸楂樺害
+ listTableHeight: {
+ get() {
+ return this.bottomBtnTop - this.listTableTop - 10
+ }
+ }
+ },
+
+ // ==================== 鏂规硶 ====================
+ methods: {
+ // 澶嶉�夋鍙樺寲澶勭悊
+ checkboxGroupChangeHandler(e) {
+ let checkBoxValues = Array.from(e.detail.value)
+ this.hform.HQualityApproval = checkBoxValues.includes('qualityApproval')
+ },
+
+ // 琛ㄦ牸琛岀偣鍑诲鐞�
+ onTableRowClickHandler(row, index) {
+ if (!this.listData[index].checked) {
+ this.$set(this.listData[index], 'checked', true)
+ } else {
+ this.listData[index].checked = !this.listData[index].checked
+ }
+ },
+
+ // 鍒锋柊SN鐮佽緭鍏ユ鐒︾偣
+ async HBarCodeSNFocusRefresh() {
+ this.HBarCode_SN = ''
+ this.HBarCodeSNFocus = false
+ await this.$nextTick()
+ this.HBarCodeSNFocus = true
+ },
+
+ // 鍒锋柊鏍堟澘鐮佽緭鍏ユ鐒︾偣
+ async HBarCodePalletFocusRefresh() {
+ this.HBarCode_Pallet = ''
+ this.HBarCodePalletFocus = false
+ await this.$nextTick()
+ this.HBarCodePalletFocus = true
+ },
+
+ // 鍒锋柊鐩殑浠撶爜杈撳叆妗嗙劍鐐�
+ async HBarCodeDestFocusRefresh() {
+ this.HBarCode_Destination = ''
+ this.HBarCodeDestFocus = false
+ await this.$nextTick()
+ this.HBarCodeDestFocus = true
+ },
+
+ // 鍒锋柊涓鐮佽緭鍏ユ鐒︾偣
+ async HBarCodeMiddleFocusRefresh() {
+ this.HBarCode_MiddleBox = ''
+ this.HBarCodeMiddleFocus = false
+ await this.$nextTick()
+ this.HBarCodeMiddleFocus = true
+ },
+
+ // 鎵弿鏍堟澘鐮�
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_Pallet = scanCode
+ this.CheckBarcode(this.HBarCode_Pallet, 1)
+ })
+ },
+
+ // 鎵弿鐩殑浠撶爜
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_Destination = scanCode
+ this.CheckBarcode(this.HBarCode_Destination, 2)
+ })
+ },
+
+ // 鎵弿涓鐮�
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_MiddleBox = scanCode
+ this.CheckBarcode(this.HBarCode_MiddleBox, 3)
+ })
+ },
+
+ // 鎵弿浜у搧SN鐮�
+ toScanCode() {
+ MpaasScan.scanCode((scanCode) => {
+ this.HBarCode_SN = scanCode
+ this.CheckBarcode(this.HBarCode_SN, 4)
+ })
+ },
+
+ // 鎵潯鐮佹牳瀵规牎楠屼俊鎭�
+ CheckBarcode(HBarCode, HBarCodeType) {
+ CommonUtils.doRequest2({
+ url: '/CheckBarcodeController/Get_BarCode_BarcodeCheck',
+ data: {
+ HBarCode_Pallet: this.HBarCode_Pallet,
+ HBarCode_Destination: this.HBarCode_Destination,
+ HBarCode_MiddleBox: this.HBarCode_MiddleBox,
+ HBarCode_SN: this.HBarCode_SN,
+ HBarCodeType: HBarCodeType,
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HMaker: this.hform.HMaker
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message,
+ list
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+
+ if(HBarCodeType == 1){
+ //澶勭悊鎴愬姛鍚庤仛鐒﹀埌鐩殑浠撶爜杈撳叆妗�
+ this.HBarCodeDestFocusRefresh()
+ }else if(HBarCodeType == 2){
+ //澶勭悊鎴愬姛鍚庤仛鐒﹀埌涓鐮佽緭鍏ユ
+ this.HBarCodeMiddleFocusRefresh()
+ }else if(HBarCodeType == 3){
+ //澶勭悊鎴愬姛鍚庤仛鐒﹀埌SN鐮佽緭鍏ユ
+ this.HBarCodeSNFocusRefresh()
+ }else if(HBarCodeType == 4){
+ //澶勭悊鎴愬姛鍚庤仛鐒﹀埌SN鐮佽緭鍏ユ
+ this.HBarCodeSNFocusRefresh()
+ }
+
+ //this.DisBillEntryList();
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ this.listData = [];
+ for (let i = 0; i < data.length; i++) {
+ this.listData.push(Object.assign(data[i], {
+ index: i
+ }))
+ }
+ } else {
+ CommonUtils.playSound(0)
+ this.HBarCodePalletFocusRefresh()
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+
+ // 鏍规嵁浜у搧鐮佽幏鍙栦俊鎭�
+ GetMeesageByBarCode(HBarCode) {
+ let HBarCode_Pallet = this.HBarCode_Pallet
+ let sOldBarCode = this.HBarCode_SN
+ let HDeleteFlag = sOldBarCode.substring(0, 1)
+ let sBarCode = sOldBarCode.slice(1)
+
+ if (!HBarCode_Pallet) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏍堟澘鐮佷笉鑳戒负绌猴紝璇峰厛鎵弿鎵樻潯鐮侊紒'
+ })
+ }
+ if (HDeleteFlag == '*') {
+ // 鍒犻櫎鏉＄爜閫昏緫
+ if (!sBarCode) {
+ return uni.showToast({
+ icon: 'none',
+ title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�'
+ })
+ } else {
+ this.HBarCodeSNFocusRefresh()
+ }
+ CommonUtils.doRequest2({
+ url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+ data: {
+ "HInterID": this.hform.HInterID,
+ "HBarCode": sBarCode,
+ "HBillType": this.HBillType
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ this.tabs = 1
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.playSound(0)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ } else {
+ // 鏂板鏉＄爜閫昏緫
+ let sBarCode = this.HBarCode_SN
+ if (!sBarCode) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�'
+ })
+ }
+ CommonUtils.doRequest2({
+ url: '/WEBSController/Get_BarCode_PackUnionBill_New_Json_Cus',
+ data: {
+ "HBarCode": sBarCode,
+ "HInterID": this.hform.HInterID,
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": this.HBillType,
+ "HBillSubType": this.HBillSubType,
+ "HBarCode_Pallet": this.HBarCode_Pallet,
+ "HMaterNumber_Pack": this.HMaterNumber_Pack,
+ "HMaker": this.hform.HMaker,
+ "HStockOrgID": this.hform.HStockOrgID
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ this.tabs = 1
+ this.HBarCodeSNFocusRefresh()
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.playSound(0)
+ this.HBarCodeSNFocusRefresh()
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ }
+ },
+ // 鏄剧ず鍗曟嵁鏄庣粏鍒楄〃
+ DisBillEntryList() {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+ data: {
+ "HInterID": this.hform.HInterID,
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": this.HBillType
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ this.listData = []
+ if (count == 1) {
+ for (let i = 0; i < data.length; i++) {
+ this.listData.push(Object.assign(data[i], {
+ index: i
+ }))
+ }
+
+
+ } else {
+
+ }
+ }
+ })
+ },
+
+ // 琛ㄦ牸閫夋嫨澶勭悊
+ handleSelect(selected, array) {
+ this.selectedRows = array
+ },
+
+ // 琛ㄦ牸鍏ㄩ�夊鐞�
+ handleSelectAll(selected, array) {
+ this.selectedRows = array
+ },
+ // 鎾斁鎻愮ず闊�
+ playSound(type) {
+ const innerAudioContext = uni.createInnerAudioContext();
+ innerAudioContext.src = type == 1 ? '/static/success.wav' : '/static/jingbao.wav';
+ innerAudioContext.play();
+ },
+
+
+ // 鑾峰彇鏈�澶у崟鎹彿
+ getMaxNo() {
+ CommonUtils.doRequest2({
+ url: "/WEBSController/GetMaxBillNoAndID_Json",
+ data: {
+ "HBillType": this.HBillType
+ },
+ resFunction: (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() {
+ if (this.selectedRows.length != 1) {
+ return uni.showToast({
+ icon: 'none',
+ title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
+ })
+ }
+ uni.showModal({
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+ success: ({
+ confirm
+ }) => {
+ if (confirm) {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillType: this.HBillType,
+ HBarCode: this.selectedRows[0].HBarCode_SN
+ },
+ 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: '/CheckBarcodeController/Save_BarCode_BarcodeCheck',
+ data: {
+ "HInterID": this.hform.HInterID,
+ "HBillNo": this.hform.HBillNo
+ },
+ 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: "/pages/sanmaheyi/BarCodeCheck"
+ })
+ }
+ if (cancel) {
+ uni.navigateBack()
+ }
+ }
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+
+ // 閫�鍑洪〉闈�
+ cmdExit() {
+ uni.navigateBack()
+ }
+ },
+
+ // ==================== 鐢熷懡鍛ㄦ湡 ====================
+ async onReady() {
+ // 璁＄畻琛ㄦ牸楂樺害
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#bottom-btn").boundingClientRect((data) => {
+ if (data) this.bottomBtnTop = data.top
+ }).exec();
+ query.select("#list-table").boundingClientRect((data) => {
+ if (data) this.listTableTop = data.top
+ }).exec();
+ // #endif
+ },
+
+ onLoad(e) {
+ // 鍒濆鍖栧弬鏁�
+ this.BarCodeType = e.BarCodeType || 1
+ this.OperationType = e.OperationType || 1
+ this.HBarCode_Pallet = e.HBarCode_Pallet_Temp || ""
+ this.hform.HSourceBillNo = e.HSourceBillNo || ""
+ this.HBarCode_Destination = e.HBarCode_Destination || ""
+ this.HBarCode_MiddleBox = e.HBarCode_MiddleBox || ""
+
+ // 鏍规嵁鎿嶄綔绫诲瀷鍒濆鍖栨暟鎹�
+ if (this.OperationType == 1) {
+ this.getMaxNo() // 鏂板妯″紡锛氳幏鍙栨柊鍗曟嵁鍙�
+ // 鍒濆鍖栨椂鑱氱劍鍒版簮鍗曞崟鍙�
+ this.HSourcebillNoFocus = true
+ } else if (this.OperationType == 2) {
+ this.disableBarCodePallet = false
+ this.disableBarCodeDest = false
+ this.disableBarCodeMiddle = false
+ this.disableBarCodeSN = false
+ this.CheckBarcode(this.HBarCode_Pallet, 1) // 缂撳瓨妯″紡锛氬姞杞藉凡鏈夋暟鎹�
+ this.DisBillEntryList()
+ this.tabs = 0
+ }
+
+ // 榛樿鑱氱劍鍒版爤鏉跨爜杈撳叆妗�
+ this.HBarCodePalletFocusRefresh()
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ }
+ }
+</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;
+ }
+
+ .icon-wrapper {
+ background-color: #3A78FF;
+ border-radius: 100%;
+ width: 52rpx;
+ height: 52rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
+ }
+ }
+
+ .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;
+ }
+ }
+
+ .right-icon.disabled {
+ background-color: #ccc !important;
+ color: #666 !important;
+ cursor: not-allowed;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/simaheyi/table.vue b/pages/simaheyi/table.vue
new file mode 100644
index 0000000..b08c7ea
--- /dev/null
+++ b/pages/simaheyi/table.vue
@@ -0,0 +1,487 @@
+<template>
+ <view class="content">
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="form" v-if="tabs == 0">
+ <view class="buttons" @tap="add">
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ </view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+ <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鎵樻潯鐮�">
+ <text>鎵樻潯鐮侊細</text>{{item.鎵樻潯鐮亇}
+ </view>
+ <view class="detail" v-if="item.HSourceBillNo">
+ <text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{ item.鍒跺崟鏃ユ湡.split('T')[0] }}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ </view>
+ </view>
+
+ <view class="more">
+ <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+ </view>
+ <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+ <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鐘舵��">
+ <text>鐘舵�侊細</text>{{item.鐘舵�亇}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鏁伴噺">
+ <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ </view>
+ </view>
+
+ <view class="more">
+ <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ </view>
+ <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ </view>
+ </view>
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ export default {
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ tabs: 0,
+ urls: '/WEBSController/GetSc_PackUnionBill_TempList_Json',
+ MvarReportTitle: '瑁呯鍗曠紦瀛樺垪琛�',
+ hform: {
+ // HBillNo: '',
+ // HSourceBillNo: '',
+ HBillType: 3783,
+ HMaker: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ },
+ sWhere: '',
+ listData: [],
+ showList: [],
+ showDetail: -1,
+
+ page: 1,
+ }
+ },
+ components: {
+ BarCodePopupVue
+ },
+ onShow() {
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ this.CheckModRight()
+ this.changeTab(0)
+ console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ },
+ onReachBottom: function() {
+ this.page++
+ setTimeout(() => {
+ this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ }, 100)
+ },
+ onPullDownRefresh: function() {
+ this.clear()
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ methods: {
+ async qrCodeDisplay(item) {
+ this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+ await this.$nextTick()
+ this.$refs.barcodePopup.open()
+ },
+ CheckModRight() {
+ uni.request({
+ url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+ data: {
+ ModRightName: 'CE_PackUnion',
+ HUserName: uni.getStorageSync('HUserName')
+ },
+ success: (res) => {
+ if (res.data.count == 1) {} else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getPage(page, list) {
+ let sindex = (parseInt(page) - 1) * 20
+ let eindex = parseInt(page) * 20
+ let newList = list.slice(sindex, eindex)
+ return newList
+ },
+ changeTab(e) {
+ this.tabs = e
+ this.page = 1
+ this.showList = []
+
+ if (this.tabs == 0) {
+ this.urls = '/WEBSController/GetSc_PackUnionBill_TempList_Json'
+ }
+ // if(this.tabs == 1){
+ // this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+ // }
+ this.getList()
+ },
+ getList() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ })
+ uni.request({
+ url: this.serverUrl + this.urls,
+ data: this.hform,
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.listData = res.data.data
+ this.showList = this.getPage(this.page, this.listData)
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000)
+ } else {
+ uni.hideLoading()
+ this.listData = []
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ search() {
+ this.sWhere = ''
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ console.log(this.hform)
+ this.getList()
+ },
+ clear() {
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ this.sWhere = ''
+ this.hform = {
+ HBillNo: '',
+ HSourceBillNo: '',
+ HBillType: 3783,
+ HMaker: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ }
+ this.getList()
+ },
+ add() {
+ uni.navigateTo({
+ url: './form?OperationType=1'
+ })
+ },
+ //缂栬緫
+ edit(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: './form?OperationType=2&HBarCode_Pack_Temp=' + item["HBarCode_Pack"] + '&HSourceBillNo=' +item["HSourceBillNo"],
+ })
+ },
+ //鍒犻櫎
+ del(item) {
+ // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/DeleteTemp_PackUnionBill_Json',
+ data: {
+ HInterID: item.HInterID,
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ //鎾ら攢
+ revoke(item) {
+ // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '鏄惁纭鎾ら攢',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+ data: {
+ HInterID: item.HInterID,
+ HBillNo: item.鍗曟嵁鍙�,
+ HBillType: this.hform.HBillType,
+ HMaker: uni.getStorageSync('HUserName'),
+ MvarReportTitle: this.MvarReportTitle,
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ width: 640rpx;
+ margin: 20rpx auto;
+ margin-top: 90rpx;
+ }
+
+ .tabs {
+ width: 100%;
+ position: fixed;
+ left: 0;
+ z-index: 9;
+ display: flex;
+ background-color: #e5e5e5;
+
+ view {
+ width: 50%;
+ font-size: 30rpx;
+ color: #333;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .buttons {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ margin-top: 20rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 180rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+
+ .list {
+ width: 100%;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/utils/auth.js b/utils/auth.js
index 7574e40..488f616 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -74,7 +74,7 @@
}
export function getUserInfo() {
let userinfo = uni.getStorageSync('userinfo');
- // console.log('userinfo', userinfo)
+ console.log('userinfo', userinfo)
if (userinfo) {
return JSON.parse(userinfo);
}
--
Gitblit v1.9.1