From ef93b6a6c96afa81d68c9f0daaa6116a656fce1b Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 09 三月 2026 15:58:49 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue | 194 +++
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 12
pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue | 531 ++++++++++
manifest.json | 18
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 13
pages.json | 23
pages/index/tab2.vue | 77
pages/index/tab4.vue | 584 +++++-----
utils/i18n.js | 13
pages/index/login.vue | 1022 ++++++++++----------
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 12
pages/ZLGL/Gy_MaterialPrevention/Gy_MateralPreventionList.vue | 479 +++++++++
12 files changed, 2,118 insertions(+), 860 deletions(-)
diff --git a/manifest.json b/manifest.json
index 6014a7e..7963043 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.086",
- "versionCode" : 286,
+ "versionName" : "2.088",
+ "versionCode" : 288,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -130,6 +130,20 @@
}
}
}
+ },
+ "LcPrinter" : {
+ "__plugin_info__" : {
+ "name" : "LcPrinter",
+ "description" : "鏂扮増鎵撳嵃鎻掍欢",
+ "platforms" : "Android",
+ "url" : "",
+ "android_package_name" : "",
+ "ios_bundle_id" : "",
+ "isCloud" : false,
+ "bought" : -1,
+ "pid" : "",
+ "parameters" : {}
+ }
}
}
},
diff --git a/pages.json b/pages.json
index 5eaaf93..21a89e8 100644
--- a/pages.json
+++ b/pages.json
@@ -1897,12 +1897,23 @@
}
},
{
- "path" : "pages/ziwodaiban/todoMain",
- "style" :
- {
- "navigationBarTitleText" : "鎴戠殑寰呭姙鍒楄〃"
- }
- }
+ "path": "pages/ziwodaiban/todoMain",
+ "style": {
+ "navigationBarTitleText": "鎴戠殑寰呭姙鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention",
+ "style": {
+ "navigationBarTitleText": "鎶曟枡闃查敊"
+ }
+ },
+ {
+ "path": "pages/ZLGL/Gy_MaterialPrevention/Gy_MateralPreventionList",
+ "style": {
+ "navigationBarTitleText": "鎶曟枡闃查敊鍗曞垪琛�"
+ }
+ }
],
"tabBar": {
"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
diff --git a/pages/ZLGL/Gy_MaterialPrevention/Gy_MateralPreventionList.vue b/pages/ZLGL/Gy_MaterialPrevention/Gy_MateralPreventionList.vue
new file mode 100644
index 0000000..d59de0a
--- /dev/null
+++ b/pages/ZLGL/Gy_MaterialPrevention/Gy_MateralPreventionList.vue
@@ -0,0 +1,479 @@
+<template>
+ <view class="content">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">寮�濮嬫椂闂�:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+ <input :value="hform.HBeginDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁撴潫鏃堕棿:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+ <input :value="hform.HEndDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view v-if="showmore">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="right">
+ <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ </view>
+ </view>
+
+ </view>
+ <view class="other">
+ <view v-if="!showmore" @tap="changeShowMore">
+ 灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+ </view>
+ <view v-if="showmore" @tap="changeShowMore">
+ 鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+ </view>
+ </view>
+
+ <view class="buttons">
+ <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+ <button class="btn-b" size="mini" type="default" @tap="add">鏂板</button>
+ <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ </view>
+ </view>
+
+ <view id="divide" style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+ <view :style="{
+ height: calcContentHeight + 'px',
+ overflowY: 'auto'
+ }">
+ <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">
+ <template
+ v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)">
+ <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+ </view>
+ <view class="detail" v-else>
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+ </view>
+ </template>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="card-detail">
+ <template
+ v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)">
+ <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+ </view>
+ <view class="detail" v-else>
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+ </view>
+ </template>
+
+ </view>
+ </view>
+
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="showList.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
+ <view class="pagination-zone" id="pagination-zone">
+ <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+ @change="onPaginationChangeHandler"></uni-pagination>
+ </view>
+ <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+ </view>
+</template>
+
+<script>
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+ import {
+ CommonUtils
+ } from "../../../utils/common";
+ import dayjs from "dayjs";
+ export default {
+ data() {
+ return {
+ dayjs,
+ CommonUtils,
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ tabs: 0,
+ urls: '/Sc_FeedingErrorProofingController/getBillListPage',
+ MvarReportTitle: '璁惧缁翠慨娲惧伐鍗曠紦瀛�',
+ hform: {
+ HBillNo: '',
+ HSourceBillNo: '',
+ HBillType: 3909,
+ user: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ sWhere: "",
+ HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ },
+ sWhere: '',
+ listData: [],
+ showList: [],
+ HFieldList: [],
+ showDetail: -1,
+ operations: -1,
+
+ page: 1,
+ size: 20,
+ dataLength: 0,
+ divideBottom: 0,
+ paginationTop: 0,
+ showmore: false,
+ }
+ },
+ computed: {
+ calcContentHeight: {
+ get() {
+ return this.paginationTop - this.divideBottom
+ }
+ }
+ },
+ onShow() {
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ // this.CheckModRight()
+ this.changeTab(0)
+ console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ },
+ components: {
+ BarCodePopupVue
+ },
+ onPullDownRefresh: function() {
+ this.clear()
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ onReady() {
+ this.getCalcHeight()
+ },
+ methods: {
+ changeShowMore() {
+ this.showmore = !this.showmore
+ this.$nextTick(() => {
+ // 閲嶆柊璁＄畻鍐呭瑙嗗彛楂樺害
+ this.getCalcHeight()
+ })
+ },
+ getCalcHeight() {
+ let query = uni.createSelectorQuery().in(this)
+ query
+ .select("#divide")
+ .boundingClientRect()
+ .select("#pagination-zone")
+ .boundingClientRect()
+ .exec(res => {
+ this.divideBottom = Math.ceil(res[0].bottom)
+ this.paginationTop = Math.floor(res[1].top)
+ })
+ },
+ 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_OtherOut',
+ 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'
+ })
+ },
+ });
+ },
+ onPaginationChangeHandler({
+ current
+ }) {
+ this.page = current
+ // this.showList = this.getPage(current, this.size, this.listData)
+ this.getList()
+ },
+ getPage(page, size, list) {
+ let sindex = (parseInt(page) - 1) * size
+ let eindex = parseInt(page) * size
+ let newList = list.slice(sindex, eindex)
+ return newList
+ },
+ changeTab(e) {
+ this.tabs = e
+ this.page = 1
+ this.showList = []
+
+ if (this.tabs == 0) {
+ this.urls = '/Sc_FeedingErrorProofingController/getBillListPage'
+ }
+ // if (this.tabs == 1) {
+ // this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+ // }
+ this.search()
+ },
+ async getList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: this.urls,
+ data: {
+ sWhere: this.hform.sWhere,
+ user: this.hform.user,
+ page: this.page,
+ size: this.size
+ }
+ })
+
+ let {
+ count,
+ data,
+ Message,
+ list
+ } = res.data
+
+ if (count == 1) {
+ if (data == null) {
+ data = []
+ }
+ this.listData = data
+ console.log('data: ', data);
+ this.showList = data
+ this.dataLength = count
+
+ let fieldList = CommonUtils.fieldListFilterRole({
+ ExcludeKeys: ['鏃ユ湡', '鍗曟嵁鍙�'],
+ FieldList: list
+ })
+
+ if (fieldList.status == false) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
+ })
+ }
+
+ this.HFieldList = fieldList.data
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇涓婃枡闃查敊鍗曞け璐�: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇涓婃枡闃查敊鍗曞け璐�: ${err}`
+ })
+ }
+
+ },
+ search() {
+ this.hform.sWhere = ''
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ console.log(this.hform)
+ if (this.hform.HBillNo) {
+ this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ }
+ if (this.hform.HBeginDate && this.hform.HEndDate) {
+ this.hform.sWhere +=
+ ` and convert(date,鏃ユ湡) between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+ }
+ this.getList()
+ },
+ clear() {
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ this.sWhere = ''
+ this.hform = {
+ HBillNo: '',
+ HSourceBillNo: '',
+ HBillType: 3909,
+ user: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ sWhere: "",
+ HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ }
+ this.search()
+ },
+ add() {
+ uni.navigateTo({
+ url: '/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention?operationType=1'
+ })
+ },
+ //缂栬緫
+ edit(item) {
+ console.log(item)
+ // uni.request({
+ // url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+ // data: {
+ // "HInterID": item.HInterID,
+ // "HBillNo": item.鍗曟嵁鍙�,
+ // "HBillType": this.hform.HBillType
+ // },
+ // success: (res) => {
+ // console.log(1, res);
+ // if (res.data.count == 1) {
+ uni.navigateTo({
+ url: '/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention?operationType=4&HInterID=' +
+ item.HInterID
+ })
+ // } else {
+ // uni.showToast({
+ // title: res.data.Message,
+ // icon: 'none'
+ // })
+ // }
+
+ // },
+ // fail: (res) => {
+ // console.log(res);
+ // uni.hideLoading()
+ // uni.showToast({
+ // title: '鎺ュ彛璇锋眰澶辫触',
+ // icon: 'none'
+ // })
+ // },
+ // })
+ },
+ //鍒犻櫎
+ del(item) {
+ console.log('item: ', item);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl +
+ '/Sc_FeedingErrorProofingController/delBill',
+ data: {
+ HInterID: item.HInterID,
+ user: uni.getStorageSync('HUserName'),
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ } else {
+ 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>
+ @import "@/pages/ZLGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue b/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue
new file mode 100644
index 0000000..8df3fb2
--- /dev/null
+++ b/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue
@@ -0,0 +1,531 @@
+<template>
+ <view>
+ <view class="form">
+ <view class="form-item">
+ <view class="title">宸ヤ綅鐮�:</view>
+ <view class="right" v-if="!HWorkCodeScanned && !editBill">
+ <input type="text" v-model="HWorkCode" :focus="HWorkCodeFocus" placeholder="璇疯緭鍏�(鎵弿)宸ヤ綅鐮�"
+ @confirm="getWorkCodeMessage" />
+ </view>
+ <view class="righton" v-else>
+ <input type="text" disabled v-model="HWorkCode" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐗╂枡鐮�:</view>
+ <view class="right" v-if="!editBill">
+ <input type="text" v-model="HMaterCode" :focus="HMaterCodeFocus" placeholder="璇疯緭鍏�(鎵弿)鐗╂枡鐮�"
+ @confirm="getMaterCodeFocus" />
+ </view>
+ <view class="righton" v-else>
+ <input type="text" disabled v-model="HMaterCode" />
+ </view>
+ </view>
+ </view>
+ <view class="tabs" id="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鐗╂枡淇℃伅</view>
+ </view>
+ <template v-if="tabs == 0">
+ <view class="form" :style="{
+ height: containerHeight + 'px',
+ overflowY: 'auto'
+ }">
+ <view class="form-item">
+ <view class="title">宸ヤ綅鍚嶇О:</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HWorkStationName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎶曟枡浜�:</view>
+ <zxz-uni-data-select v-if="!editBill" class="right" :localdata="HEmpList" dataKey="HName"
+ dataValue="HItemID" v-model="hform.HEmpID" :filterable="true">
+ </zxz-uni-data-select>
+ <view class="righton" v-else>
+ <input disabled type="text" v-model="hform.HEmpName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閮ㄩ棬:</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HDeptName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍐呯爜:</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HInterID" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HDate" />
+ </view>
+ </view>
+ </view>
+ </template>
+ <template v-if="tabs == 1">
+ <view :style="{
+ height: containerHeight + 'px',
+ overflowY: 'auto'
+ }">
+ <view v-if="HMaterUpperList.length > 0" class="list" v-for="(item,index) in HMaterUpperList"
+ :key="index" @tap.stop="delMater(index)">
+ <uni-card :title="item.HBarCode" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.HMaterNumber">
+ <text>鐗╂枡缂栫爜锛�</text>{{item.HMaterNumber}}
+ </view>
+ <view class="detail" v-if="item.HMaterName">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.HMaterName}}
+ </view>
+ <view class="detail" v-if="item.HMaterModel">
+ <text>瑙勫垯鍨嬪彿锛�</text>{{item.HMaterModel}}
+ </view>
+ <view class="detail" v-if="item.HQty">
+ <text>鎶曟枡鏁伴噺锛�</text>{{item.HQty}}
+ </view>
+ <view class="detail" v-if="item.HScanDate">
+ <text>鎵爜鏃堕棿锛�</text>{{dayjs(item.HScanDate).format("YYYY-MM-DD HH:mm:ss")}}
+ </view>
+
+ </view>
+ </uni-card>
+ </view>
+ <view v-if="HMaterUpperList.length == 0" class="over">
+ 鏆傛棤鏁版嵁
+ </view>
+ </view>
+ </template>
+
+ <view class="buttons" id="buttons">
+ <button :class="editBill?'btn-c':'btn-a'" :disabled="editBill" 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>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs';
+ import {
+ getUserInfo
+ } from '../../../utils/auth';
+ import {
+ CommonUtils
+ } from '../../../utils/common';
+
+ export default {
+ data() {
+ return {
+ btnTop: 0,
+ tabsBottom: 0,
+
+ dayjs,
+ tabs: 0,
+ operationType: 1,
+ editBill: false,
+
+ HWorkCode: "", // 宸ヤ綅鐮�
+ HMaterCode: "", // 鐗╂枡鐮�
+
+ HWorkCodeScanned: false, // 鏄惁鎵弿杩囧伐浣嶇爜
+ HWorkCodeFocus: false, // 鏄惁鑱氱劍宸ヤ綅鐮�
+ HMaterCodeFocus: false, // 鏄惁鑱氱劍鐗╂枡鐮�
+
+ HEmpList: [], // 鎶曟枡浜哄垪琛�
+ hform: {
+ HInterID: 0,
+ HBillNo: "",
+ HWorkCode: "",
+ HWorkStationName: "",
+ HWorkStationID: 0,
+ HDeptName: getUserInfo()["HDeptName"],
+ HDeptID: getUserInfo()["HDeptID"],
+ HEmpID: getUserInfo()["HEmpID"],
+ HEmpName: getUserInfo()["HEmpName"],
+ HBillType: 1257,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HOrgID: uni.getStorageSync("OrganizationID")
+ },
+
+ HMaterList: [], // 宸ヤ綅缁戝畾鐗╂枡淇℃伅缂撳瓨
+ HMaterUpperList: [], // 鐗╂枡鎶曟枡缂撳瓨
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ },
+ },
+ methods: {
+ // 鑾峰彇鍗曟嵁鍙峰拰鍗曟嵁ID
+ async GetMaxBillNoAndID() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/WEBSController/GetMaxBillNoAndID_Json',
+ data: {
+ HBillType: this.hform.HBillType
+ },
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (res.data.count == 1) {
+ this.hform.HInterID = data[0].HInterID
+ this.hform.HBillNo = data[0].HBillNo
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍗曟嵁鍙峰け璐�: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍗曟嵁鍙峰け璐�: ${err}`
+ })
+ }
+ },
+ refreshHWorkCodeFocus() {
+ this.HWorkCodeFocus = false
+ this.$nextTick(() => {
+ this.HWorkCode = ""
+ this.HWorkCodeFocus = true
+ })
+ },
+ refreshHMaterCodeFocus() {
+ this.HMaterCodeFocus = false
+ this.$nextTick(() => {
+ this.HMaterCode = "",
+ this.HMaterCodeFocus = true
+ })
+ },
+ async getWorkCodeMessage() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_WorkStationBill/cx1',
+ data: {
+ HBarCode: this.HWorkCode
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ this.HMaterList = data
+ this.HWorkCodeScanned = true
+ this.hform.HWorkStationName = data[0]["宸ヤ綅鍚嶇О"]
+ this.hform.HWorkStationID = data[0]["HItemID"]
+ this.refreshHMaterCodeFocus()
+ } else {
+ CommonUtils.playSound(0)
+ this.refreshHWorkCodeFocus()
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇宸ヤ綅淇℃伅澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ this.refreshHWorkCodeFocus()
+ CommonUtils.playSound(0)
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇宸ヤ綅淇℃伅澶辫触: ${err}`
+ })
+ }
+ },
+ // 鏉＄爜涓绘。涓煡璇㈢墿鏂欎俊鎭紝骞朵簬鐗╂枡缂撳瓨涓殑鐗╂枡淇℃伅鍋氭瘮瀵�
+ async getMaterCodeFocus() {
+ if (this.HWorkCodeScanned == false) {
+ // 杩樻病鏈夋壂杩囧伐浣嶇爜锛屼笉鍏佽鎵墿鏂�
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '鏈壂鎻忓伐浣嶇爜锛屾棤娉曟壂鎻忕墿鏂欑爜锛岃鍏堟壂鎻忓伐浣嶇爜鍚庡啀鎵弿鐗╂枡鐮�...'
+ })
+ }
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Sc_FeedingErrorProofingController/MaterErrorPreventionScanCode',
+ data: {
+ HBarCode: this.HMaterCode
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+
+ let findIndex = this.HMaterList.findIndex(item => data[0]["HMaterNumber"] == item["鐗╂枡浠ｇ爜"])
+ let findIndexExist = this.HMaterUpperList.findIndex(item => data[0]["HBarCode"] == item[
+ "HBarCode"])
+ if (findIndex == -1) {
+ CommonUtils.playSound(0)
+ this.refreshHMaterCodeFocus()
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '褰曞叆鐗╂枡淇℃伅澶辫触锛屽伐浣嶇粦瀹氱殑鐗╂枡涓病鏈夋墍鎵墿鏂欎俊鎭��'
+ })
+ return
+ }
+
+ if (findIndexExist != -1) {
+ CommonUtils.playSound(0)
+ this.refreshHMaterCodeFocus()
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '褰曞叆鐗╂枡淇℃伅澶辫触锛屼笉鍏佽閲嶅褰曞叆鐗╂枡淇℃伅銆�'
+ })
+ return
+ }
+
+ data[0]["HScanDate"] = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss")
+ CommonUtils.playSound(1)
+ this.tabs = 1
+ this.HMaterUpperList.push(data[0])
+ this.refreshHMaterCodeFocus()
+ } else {
+ CommonUtils.playSound(0)
+ this.refreshHMaterCodeFocus()
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鐗╂枡淇℃伅澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ this.refreshHMaterCodeFocus()
+ CommonUtils.playSound(0)
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鐗╂枡淇℃伅澶辫触: ${err}`
+ })
+ }
+ },
+ delMater(index) {
+ if (this.editBill) {
+ return
+ }
+ let that = this
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: "鏄惁鍒犻櫎鐗╂枡锛屽垹闄ゅ悗鏃犳硶鎭㈠!",
+ success(res) {
+ if (res.confirm) {
+ that.HMaterUpperList.splice(index, 1)
+ }
+ }
+ })
+ },
+ async submit() {
+ if (this.HMaterUpperList.length == 0) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: "鏃犳壂鐮佽褰曪紝鏃犳硶鎻愪氦鍗曟嵁"
+ })
+ return
+ }
+
+ this.hform.HWorkCode = this.HWorkCode
+ let HMain = this.hform
+ let HSub = this.HMaterUpperList
+
+ let sMainSub =
+ `${JSON.stringify(HMain)};${getUserInfo()["Czymc"]};${this.operationType};${JSON.stringify(HSub)}`
+
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/Sc_FeedingErrorProofingController/saveBill',
+ data: {
+ sMainSub: sMainSub
+ },
+ method: 'POST'
+ })
+
+ if (!res) {
+ throw '鍗曟嵁涓嶅彲閲嶅鎻愪氦'
+ }
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: "淇濆瓨鎴愬姛",
+ content: '鍗曟嵁淇濆瓨鎴愬姛锛屾槸鍚︾户缁柊澧�',
+ confirmText: "鏂板",
+ cancelText: '杩斿洖',
+ success: (res) => {
+ if (res.confirm) {
+ this.addNew()
+ }
+ if (res.cancel) {
+ uni.navigateBack()
+ }
+ }
+ })
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `淇濆瓨鍗曟嵁澶辫触锛� ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `淇濆瓨鍗曟嵁澶辫触锛� ${err}`
+ })
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention?operationType=1"
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ async roadBillMain(HInterID) {
+ try {
+
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Sc_FeedingErrorProofingController/getBillListDetai',
+ data: {
+ HInterID: HInterID
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ CommonUtils.playSound(1)
+ this.HWorkCode = data[0]["宸ヤ綅鐮�"]
+ this.hform.HWorkCode = data[0]["宸ヤ綅鐮�"]
+ this.hform.HEmpID = data[0]["HEmpID1"]
+ this.hform.HEmpName = data[0]["涓婃枡鍛�"]
+ this.hform.HBillNo = data[0]["鍗曟嵁鍙�"]
+ this.hform.HInterID = data[0]["HInterID1"]
+ this.hform.HDate = data[0]["鏃ユ湡"]
+ this.hform.HDeptID = data[0]["HDept1"]
+ this.hform.HDeptName = data[0]["HDeptName"]
+ this.hform.HWorkStationID = data[0]["HWorkStationID"]
+ this.hform.HWorkStationName = data[0]["宸ヤ綅鍚嶇О"]
+ this.HMaterUpperList = data
+
+ this.editBill = true
+ this.tabs = 1
+ } else {
+ CommonUtils.playSound(0)
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍗曟嵁鏄庣粏澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.playSound(0)
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鍗曟嵁鏄庣粏澶辫触: ${err}`
+ })
+ }
+ },
+ // 鑱屽憳
+ async InitEmp() { // 鍒濆鍖栬亴鍛�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
+ }
+ })
+ let {
+ count,
+ code,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.HEmpList = data
+ // this.EmpNameList = Array.from(data).map(elem => elem['HName'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栬亴鍛橀敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栬亴鍛橀敊璇�: " + err,
+ })
+ }
+ },
+ },
+ onLoad(e) {
+
+ let {
+ operationType,
+ HInterID
+ } = e
+ if (!operationType) {
+ operationType = 1
+
+ }
+ this.operationType = operationType
+ if (operationType == 1) {
+ this.GetMaxBillNoAndID()
+ this.refreshHWorkCodeFocus()
+ } else if (operationType == 4) {
+ this.roadBillMain(HInterID)
+ }
+
+ this.InitEmp();
+ },
+ 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">
+ @import "@/pages/ZLGL/style/MJBillStyle.scss";
+</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 90d94b8..09189f9 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -1,5 +1,45 @@
<template>
<view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
+
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+
+ <view class="button-groups">
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
<view class="tabs" id="tabs">
<view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">鏈娑堟伅</view>
<view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">鎴戞帴鏀剁殑</view>
@@ -78,6 +118,12 @@
name: 'OA_WorkLinkBillQuery',
data() {
return {
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ curDateGap: "杩戜竷澶�",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+
dayjs,
CommonUtils,
tabs: 0,
@@ -89,11 +135,62 @@
};
},
methods: {
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
+ onSearchClickHandler() {
+ this.getWorkLinkList()
+ },
+ onResetClickHandler() {
+ this.dateRangePicker = ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ this.curDateGap = "杩戜竷澶�",
+ this.enableCustomDateRange = false,
+ this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD'),
+ this.getWorkLinkList()
+ },
switchTab(tabIndex) {
this.tabs = tabIndex
switch (tabIndex) {
case 0:
- this.sWhere = ` and (鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' or 鎶勯�佹帴鏀朵汉 = '${getUserInfo()['HEmpName']}') and 闃呰鐘舵�� = '鏈槄'`
+ this.sWhere =
+ ` and (鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' or 鎶勯�佹帴鏀朵汉 = '${getUserInfo()['HEmpName']}') and 闃呰鐘舵�� = '鏈槄'`
break;
case 1:
this.sWhere = ` and 鎺ユ敹浜� = '${getUserInfo()['HEmpName']}'`
@@ -111,6 +208,8 @@
},
async getWorkLinkList() {
try {
+ this.sWhere += ` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
+
let res = await CommonUtils.doRequest2Async({
url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
data: {
@@ -159,7 +258,7 @@
}
},
displayDetail(item) {
- console.log('item: ',item);
+ console.log('item: ', item);
uni.showModal({
title: `${item["涓婚"]}`,
content: `${item["鍐呭"]}`,
@@ -204,8 +303,8 @@
},
reply(item) {
uni.navigateTo({
- url: `/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill?HInterID=${item.hmainid}`
- + `&HEntryID=${item.HEntryID}&operationType=5`
+ url: `/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill?HInterID=${item.hmainid}` +
+ `&HEntryID=${item.HEntryID}&operationType=5`
})
}
},
@@ -269,4 +368,91 @@
color: #888;
}
}
+
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ .left {
+ width: 4em;
+ }
+
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
+
+ picker {
+ width: 100%;
+ }
+ }
+ }
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .font__enable {
+ color: #000;
+ }
+
+ .font__disable {
+ color: #cccccc;
+ }
+ }
+
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
+
+ button {
+ 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;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 8858565..6054005 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -439,10 +439,10 @@
</view>
<view style="height: 120rpx"></view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap.stop="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>
+ <button class="btn-a" size="mini" @tap.stop="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap.stop="goBack">閫�鍑�</button>
</view>
<SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
@update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
@@ -2165,7 +2165,11 @@
this.$refs.popup.open('center')
return
}
-
+ // 鏍规嵁 鎻愪氦杩斿洖 鐨勬槸鍚﹀厑璁告樉绀烘彁绀轰俊鎭� 鍒ゆ柇鏄洿鎺ユ柊澧炲崟鎹繕鏄彁绀轰俊鎭�
+ if(res.data.NotShowTips) {
+ this.addNew()
+ return
+ }
uni.showModal({
title: "鎻愮ず",
content: res.data.Message + "銆傛槸鍚﹁繑鍥烇紵",
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index afe9b1c..fbacecf 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -445,10 +445,10 @@
</view>
<view style="height: 120rpx"></view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap.stop="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>
+ <button class="btn-a" size="mini" @tap.stop="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap.stop="goBack">閫�鍑�</button>
</view>
<SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
@update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
@@ -2101,6 +2101,12 @@
this.$refs.popup.open('center')
return
}
+
+ // 鏍规嵁 鎻愪氦杩斿洖 鐨勬槸鍚﹀厑璁告樉绀烘彁绀轰俊鎭� 鍒ゆ柇鏄洿鎺ユ柊澧炲崟鎹繕鏄彁绀轰俊鎭�
+ if(res.data.NotShowTips) {
+ this.addNew()
+ return
+ }
uni.showModal({
title: "鎻愮ず",
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 6598ae4..dc81f37 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -431,10 +431,10 @@
</view>
<view style="height: 120rpx"></view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap.stop="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>
+ <button class="btn-a" size="mini" @tap.stop="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap.stop="goBack">閫�鍑�</button>
</view>
<SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
@update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
@@ -1818,7 +1818,12 @@
this.$refs.popup.open('center')
return
}
-
+ // 鏍规嵁 鎻愪氦杩斿洖 鐨勬槸鍚﹀厑璁告樉绀烘彁绀轰俊鎭� 鍒ゆ柇鏄洿鎺ユ柊澧炲崟鎹繕鏄彁绀轰俊鎭�
+ if(res.data.NotShowTips) {
+ this.addNew()
+ return
+ }
+
uni.showModal({
title: "鎻愮ず",
content: res.data.Message + "銆傛槸鍚﹁繑鍥烇紵",
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 872acf4..0aa88f6 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -1,14 +1,14 @@
<template>
- <view class="content">
- <image class="bg-img" src="../../static/login.jpg"></image>
- <view class="container">
- <view class="title">{{ $t("login.title") }}</view>
- <view class="box">
- <view class="logo">
- <image src="../../static/logo.png" mode=""></image>
- </view>
- <view class="login">
- <!-- <view class="item">
+ <view class="content">
+ <image class="bg-img" src="../../static/login.jpg"></image>
+ <view class="container">
+ <view class="title">{{ $t("login.title") }}</view>
+ <view class="box">
+ <view class="logo">
+ <image src="../../static/logo.png" mode=""></image>
+ </view>
+ <view class="login">
+ <!-- <view class="item">
<view class="left">褰撳墠甯愬锛�</view>
<picker :range="arrayDataBases" :value="DataBases" @change="DataBasesChange">
<view class="right" style="display: flex;align-items: center;">
@@ -17,537 +17,541 @@
</view>
</picker>
</view> -->
- <view class="item">
- <view class="left">{{ $t("login.Language") }}锛�</view>
- <picker :range="['涓枃','English','Thai']" :value="Language" @change="onLanguageChangeHandler">
- <view class="right" style="display: flex;align-items: center;">
- <input type="text" disabled v-model="Language" placeholder="璇烽�夋嫨璇█">
- <uni-icons type="forward" color="#808080"
- style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
- </view>
- </picker>
- </view>
- <view class="item">
- <view class="left">{{ $t("login.CurrentOrganization") }}锛�</view>
- <picker :range="arrayOrganization" :value="Organization" @change="OrganizationChange">
- <view class="right" style="display: flex;align-items: center;">
- <input type="text" disabled v-model="Organization" placeholder="璇烽�夋嫨褰撳墠缁勭粐">
- <uni-icons type="forward" color="#808080"
- style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
- </view>
- </picker>
- </view>
+ <view class="item">
+ <view class="left">{{ $t("login.Language") }}锛�</view>
+ <picker :range="['涓枃','English','Thai']" :value="Language" @change="onLanguageChangeHandler">
+ <view class="right" style="display: flex;align-items: center;">
+ <input type="text" disabled v-model="Language" placeholder="璇烽�夋嫨璇█">
+ <uni-icons type="forward" color="#808080"
+ style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
+ </view>
+ </picker>
+ </view>
+ <view class="item">
+ <view class="left">{{ $t("login.CurrentOrganization") }}锛�</view>
+ <picker :range="arrayOrganization" :value="Organization" @change="OrganizationChange">
+ <view class="right" style="display: flex;align-items: center;">
+ <input type="text" disabled v-model="Organization" placeholder="璇烽�夋嫨褰撳墠缁勭粐">
+ <uni-icons type="forward" color="#808080"
+ style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
+ </view>
+ </picker>
+ </view>
- <view class="item">
- <view class="left">{{ $t("login.UserName") }}锛�</view>
- <view class="right">
- <input type="text" v-model="UserName">
- </view>
- </view>
- <view class="item">
- <view class="left">{{ $t("login.PassWord") }}锛�</view>
- <view class="right">
- <input type="password" v-model="PassWord">
- </view>
- </view>
- <!-- <view class="api">
+ <view class="item">
+ <view class="left">{{ $t("login.UserName") }}锛�</view>
+ <view class="right">
+ <input type="text" v-model="UserName">
+ </view>
+ </view>
+ <view class="item">
+ <view class="left">{{ $t("login.PassWord") }}锛�</view>
+ <view class="right">
+ <input type="password" v-model="PassWord">
+ </view>
+ </view>
+ <!-- <view class="api">
褰撳墠鏈嶅姟鍣ㄥ湴鍧�锛歿{serverUrl}}
</view>
<view class="apibtn" @tap="changeApi=true">淇敼鏈嶅姟鍣ㄥ湴鍧�</view> -->
- </view>
- </view>
- <uni-popup ref="popup" type="center">
- <uni-popup-dialog :title="$t('login.ServiceSetting')" mode="input" @confirm="confirmHandler"
- :before-close="true" @close="close">
- <view class="popup-content">
- <input type="text" v-model="serverUrlName" placeholder="璇疯緭鍏ユ湇鍔″櫒鍚嶇О">
- </view>
- </uni-popup-dialog>
- </uni-popup>
+ </view>
+ </view>
+ <uni-popup ref="popup" type="center">
+ <uni-popup-dialog :title="$t('login.ServiceSetting')" mode="input" @confirm="confirmHandler"
+ :before-close="true" @close="close">
+ <view class="popup-content">
+ <input type="text" v-model="serverUrlName" placeholder="璇疯緭鍏ユ湇鍔″櫒鍚嶇О">
+ </view>
+ </uni-popup-dialog>
+ </uni-popup>
- <view class="btn" @tap="submit">{{$t("login.Login")}}</view>
- <view class="btn apibtn" @click="openServerSettingHandler">{{$t("login.ServiceSetting")}}</view>
+ <view class="btn" @tap="submit">{{$t("login.Login")}}</view>
+ <view class="btn apibtn" @click="openServerSettingHandler">{{$t("login.ServiceSetting")}}</view>
- </view>
- </view>
+ </view>
+ </view>
</template>
<script>
- import {
- setLoginData,
- setUserInfo
- } from "@/utils/auth.js";
- import hFormAlert from '@/components/h-form-alert/h-form-alert.vue';
- import {
- CommonUtils
- } from "../../utils/common";
- import {
- getLanguagePackJson
- } from "../../utils/i18n";
- import WebSocketServices from "@/utils/WebSocketServices";
- import getuiUtils from "../../utils/getuiUtils";
- export default {
- components: {
- hFormAlert
- },
- mounted() {
- console.log(uni.getLocale())
- },
- data() {
- return {
- WebSocketServices,
- CommonUtils,
- arrayDataBases: [],
- DataBases: '',
- Language: '涓枃',
- serverUrlandName: {
- "娴欐睙鏅轰簯杩堟��": 'http://47.96.97.237/API/',
- "娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
- "瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
- "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
- "鏉庢灄淇婃湰鍦版祴璇�": 'http://localhost:8082/LuBaoAPI/',
- "鏉庢灄淇婃湰鍦版祴璇�2": 'http://192.168.2.91:8082/LuBaoAPI/',
- "鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
- "鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
- "缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
- "寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
- "浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
- // 灏忓崼鍐呭缃�
- "鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
- "鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
- // 鍥涚淮灏斿唴澶栫綉
- "瀹佹尝鍥涚淮灏�-鍐呯綉": "http://192.168.0.236:9010/API/",
- "瀹佹尝鍥涚淮灏�-澶栫綉": "http://220.189.218.155:9010/API/",
- // 閿﹂殕
- "閿﹂殕-鏅鸿兘瀹跺眳": "http://192.168.1.11/API/",
- "閿﹂殕-鏅鸿兘瀹跺眳-澶栫綉": "http://61.174.29.234:8880/API/",
- // 鍗庤垷鍖呰
- "瀹佹尝鍗庤垷鍖呰1": "http://192.168.110.222:8082/API_NW/",
- "瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
- "瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
- },
- serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
+ import {
+ setLoginData,
+ setUserInfo
+ } from "@/utils/auth.js";
+ import hFormAlert from '@/components/h-form-alert/h-form-alert.vue';
+ import {
+ CommonUtils
+ } from "../../utils/common";
+ import {
+ getLanguagePackJson
+ } from "../../utils/i18n";
+ import WebSocketServices from "@/utils/WebSocketServices";
+ import getuiUtils from "../../utils/getuiUtils";
+ export default {
+ components: {
+ hFormAlert
+ },
+ mounted() {
+ console.log(uni.getLocale())
+ },
+ data() {
+ return {
+ WebSocketServices,
+ CommonUtils,
+ arrayDataBases: [],
+ DataBases: '',
+ Language: '涓枃',
+ serverUrlandName: {
+ "娴欐睙鏅轰簯杩堟��": 'http://47.96.97.237/API/',
+ "娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
+ "瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
+ "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
+ "鏉庢灄淇婃湰鍦版祴璇�": 'http://localhost:8082/LuBaoAPI/',
+ "鏉庢灄淇婃湰鍦版祴璇�2": 'http://192.168.2.91:8082/LuBaoAPI/',
+ "鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
+ "鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
+ "缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
+ "寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
+ "浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
+ // 灏忓崼鍐呭缃�
+ "鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
+ "鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
+ // 鍥涚淮灏斿唴澶栫綉
+ "瀹佹尝鍥涚淮灏�-鍐呯綉": "http://192.168.0.236:9010/API/",
+ "瀹佹尝鍥涚淮灏�-澶栫綉": "http://220.189.218.155:9010/API/",
+ // 閿﹂殕
+ "閿﹂殕-鏅鸿兘瀹跺眳": "http://192.168.1.11/API/",
+ "閿﹂殕-鏅鸿兘瀹跺眳-澶栫綉": "http://61.174.29.234:8880/API/",
+ // 鍗庤垷鍖呰
+ "瀹佹尝鍗庤垷鍖呰1": "http://192.168.110.222:8082/API_NW/",
+ "瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
+ "瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
+ //浣欏鍗庤繙
+ "浣欏鍗庤繙": "http://192.168.3.248:82/HuaYuaAPI/",
+ },
+ serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
- arrayOrganization: [],
- Organization: '',
- HOrgNameList: [],
+ arrayOrganization: [],
+ Organization: '',
+ HOrgNameList: [],
- HOrgName: '',
- UserName: '', //admin 001
- PassWord: '', //123456
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API/',
- serverUrlCache: '',
- }
- },
- onLoad() {
- this.ApplyLanguagePack(this.$i18n.locale)
- },
- onShow() {
- var logindata = uni.getStorageSync('loginData') || ''
- // console.log(logindata)
- if (logindata) {
- logindata = JSON.parse(logindata)
- this.HOrgName = logindata.HOrgName
- this.Organization = logindata.Organization
- this.UserName = logindata.HUserNumber
- this.PassWord = logindata.HPassWord
- // this.UserName = logindata.UserName
- // this.PassWord = logindata.PassWord
- }
- this.getOrganization()
- this.getDataBases()
- },
- methods: {
- async ApplyLanguagePack(lang, forceUpdate = false) {
- // 璇诲彇璇█鍖呭苟鍔犺浇
- let languagePack = await getLanguagePackJson(lang)
- // this.$i18n.setLocaleMessage(lang, languagePack)
- // this.$i18n.locale = lang
- },
- onLanguageChangeHandler(e) {
- //鍔ㄦ�佽幏鍙栧悗绔殑璇█鍖呮枃浠讹紝骞跺皢璇█鍖呭簲鐢ㄥ埌鍏ㄥ眬
- console.log('e: ', e.detail.value);
- if (e.detail.value == 0) {
- this.Language = '涓枃'
- this.ApplyLanguagePack("zh-Hans")
- // this.$i18n.locale = 'zh-Hans'
- }
- if (e.detail.value == 1) {
- this.Language = 'English'
- this.ApplyLanguagePack("en")
- // this.$i18n.locale = 'en'
- }
- if (e.detail.value == 2) {
- this.Language = 'Thai'
- this.ApplyLanguagePack("Thai")
- // this.$i18n.locale = 'en'
- }
- },
- async InitOrgination() {
- console.log("鍒濆鍖栫粍缁�")
- await this.$nextTick(() => {
- this.Organization = this.arrayOrganization[0]
- this.HOrgName = this.HOrgNameList[0]
+ HOrgName: '',
+ UserName: '', //admin 001
+ PassWord: '', //123456
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API/',
+ serverUrlCache: '',
+ }
+ },
+ onLoad() {
+ this.ApplyLanguagePack(this.$i18n.locale)
+ },
+ onShow() {
+ var logindata = uni.getStorageSync('loginData') || ''
+ // console.log(logindata)
+ if (logindata) {
+ logindata = JSON.parse(logindata)
+ this.HOrgName = logindata.HOrgName
+ this.Organization = logindata.Organization
+ this.UserName = logindata.HUserNumber
+ this.PassWord = logindata.HPassWord
+ // this.UserName = logindata.UserName
+ // this.PassWord = logindata.PassWord
+ }
+ this.getOrganization()
+ this.getDataBases()
+ },
+ methods: {
+ async ApplyLanguagePack(lang, forceUpdate = false) {
+ // 璇诲彇璇█鍖呭苟鍔犺浇
+ let {data, getRemoteFile} = await getLanguagePackJson(lang)
+ if(getRemoteFile){
+ this.$i18n.setLocaleMessage(lang, data)
+ }
+ this.$i18n.locale = lang
+ },
+ onLanguageChangeHandler(e) {
+ //鍔ㄦ�佽幏鍙栧悗绔殑璇█鍖呮枃浠讹紝骞跺皢璇█鍖呭簲鐢ㄥ埌鍏ㄥ眬
+ console.log('e: ', e.detail.value);
+ if (e.detail.value == 0) {
+ this.Language = '涓枃'
+ this.ApplyLanguagePack("zh-Hans")
+ // this.$i18n.locale = 'zh-Hans'
+ }
+ if (e.detail.value == 1) {
+ this.Language = 'English'
+ this.ApplyLanguagePack("en")
+ // this.$i18n.locale = 'en'
+ }
+ if (e.detail.value == 2) {
+ this.Language = 'Thai'
+ this.ApplyLanguagePack("Thai")
+ // this.$i18n.locale = 'en'
+ }
+ },
+ async InitOrgination() {
+ console.log("鍒濆鍖栫粍缁�")
+ await this.$nextTick(() => {
+ this.Organization = this.arrayOrganization[0]
+ this.HOrgName = this.HOrgNameList[0]
- let org = uni.getStorageSync('Organization')
- let orgName = uni.getStorageSync('OrganizationID')
- let orgHas = Array.from(this.arrayOrganization).findIndex((e) => e == org)
- if (org && (orgHas != -1)) {
- this.Organization = org
- this.HOrgName = orgName
- }
- })
- },
- confirmHandler() {
- console.log(this.serverUrlName)
- console.log(this.serverUrlandName[this.serverUrlName])
- let url = this.serverUrlandName[this.serverUrlName];
- if (url != undefined) {
- uni.setStorageSync('serverUrl', url)
- uni.setStorageSync('serverUrlName', this.serverUrlName)
- this.serverUrl = url
- this.changeApi = false
- this.getOrganization()
- this.$refs.popup.close()
- } else {
- uni.showToast({
- title: '鏈嶅姟鍣ㄥ悕绉伴敊璇閲嶆柊杈撳叆',
- icon: 'none',
- })
- }
- },
- close() {
- this.$refs.popup.close()
- },
- openServerSettingHandler() {
- this.$refs.popup.open()
- },
- getDataBases() {
- uni.request({
- url: this.serverUrl + '/Web/GetDataBases',
- success: (result) => {
- console.log(result);
- if (result.count == 1) {
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayDataBases[i] = result.data.data[i].name;
- }
- }
- console.log(this.arrayDataBases);
- this.$forceUpdate();
- },
- fail: (res) => {
- console.log(res);
- },
- });
- },
- DataBasesChange(e) {
- console.log(e.detail.value)
- this.DataBases = this.arrayDataBases[e.detail.value]
- uni.setStorageSync('DataBases', this.DataBases);
- },
+ let org = uni.getStorageSync('Organization')
+ let orgName = uni.getStorageSync('OrganizationID')
+ let orgHas = Array.from(this.arrayOrganization).findIndex((e) => e == org)
+ if (org && (orgHas != -1)) {
+ this.Organization = org
+ this.HOrgName = orgName
+ }
+ })
+ },
+ confirmHandler() {
+ console.log(this.serverUrlName)
+ console.log(this.serverUrlandName[this.serverUrlName])
+ let url = this.serverUrlandName[this.serverUrlName];
+ if (url != undefined) {
+ uni.setStorageSync('serverUrl', url)
+ uni.setStorageSync('serverUrlName', this.serverUrlName)
+ this.serverUrl = url
+ this.changeApi = false
+ this.getOrganization()
+ this.$refs.popup.close()
+ } else {
+ uni.showToast({
+ title: '鏈嶅姟鍣ㄥ悕绉伴敊璇閲嶆柊杈撳叆',
+ icon: 'none',
+ })
+ }
+ },
+ close() {
+ this.$refs.popup.close()
+ },
+ openServerSettingHandler() {
+ this.$refs.popup.open()
+ },
+ getDataBases() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetDataBases',
+ success: (result) => {
+ console.log(result);
+ if (result.count == 1) {
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayDataBases[i] = result.data.data[i].name;
+ }
+ }
+ console.log(this.arrayDataBases);
+ this.$forceUpdate();
+ },
+ fail: (res) => {
+ console.log(res);
+ },
+ });
+ },
+ DataBasesChange(e) {
+ console.log(e.detail.value)
+ this.DataBases = this.arrayDataBases[e.detail.value]
+ uni.setStorageSync('DataBases', this.DataBases);
+ },
- getOrganization() {
- this.arrayOrganization = []
- uni.request({
- url: this.serverUrl + '/Web/GetOrganizations',
- success: (res) => {
- console.log(res.data.data);
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayOrganization[i] = res.data.data[i].Name
- this.HOrgNameList[i] = res.data.data[i].ID
- }
- // this.Organization = res.data.data[0].Name
- // this.HOrgName = res.data.data[0].ID
- this.$forceUpdate();
- this.InitOrgination()
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇缁勭粐澶辫触,璇锋鏌ユ湇鍔″櫒鍦板潃',
- icon: 'none'
- })
- },
- });
- },
- OrganizationChange(e) {
- // console.log(e.detail.value)
- this.Organization = this.arrayOrganization[e.detail.value]
- this.HOrgName = this.HOrgNameList[e.detail.value]
- },
- submit() {
- if (!this.Organization) {
- uni.showToast({
- title: '璇烽�夋嫨缁勭粐',
- icon: 'none'
- })
- } else if (!this.UserName) {
- uni.showToast({
- title: '璇疯緭鍏ョ敤鎴峰悕',
- icon: 'none'
- })
- } else if (!this.PassWord) {
- uni.showToast({
- title: '璇疯緭鍏ュ瘑鐮�',
- icon: 'none'
- })
- } else {
- uni.showLoading({
- title: '鐧诲綍涓�...',
- mask: true
- })
- var data = {
- HUserNumber: this.UserName,
- HPassWord: this.PassWord,
- HStockOrgID: this.HOrgName,
- HStockOrgName: this.Organization
- }
+ getOrganization() {
+ this.arrayOrganization = []
+ uni.request({
+ url: this.serverUrl + '/Web/GetOrganizations',
+ success: (res) => {
+ console.log(res.data.data);
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayOrganization[i] = res.data.data[i].Name
+ this.HOrgNameList[i] = res.data.data[i].ID
+ }
+ // this.Organization = res.data.data[0].Name
+ // this.HOrgName = res.data.data[0].ID
+ this.$forceUpdate();
+ this.InitOrgination()
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇缁勭粐澶辫触,璇锋鏌ユ湇鍔″櫒鍦板潃',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ OrganizationChange(e) {
+ // console.log(e.detail.value)
+ this.Organization = this.arrayOrganization[e.detail.value]
+ this.HOrgName = this.HOrgNameList[e.detail.value]
+ },
+ submit() {
+ if (!this.Organization) {
+ uni.showToast({
+ title: '璇烽�夋嫨缁勭粐',
+ icon: 'none'
+ })
+ } else if (!this.UserName) {
+ uni.showToast({
+ title: '璇疯緭鍏ョ敤鎴峰悕',
+ icon: 'none'
+ })
+ } else if (!this.PassWord) {
+ uni.showToast({
+ title: '璇疯緭鍏ュ瘑鐮�',
+ icon: 'none'
+ })
+ } else {
+ uni.showLoading({
+ title: '鐧诲綍涓�...',
+ mask: true
+ })
+ var data = {
+ HUserNumber: this.UserName,
+ HPassWord: this.PassWord,
+ HStockOrgID: this.HOrgName,
+ HStockOrgName: this.Organization
+ }
- // UserName: this.UserName,
- // PassWord: this.PassWord,
- // HOrgName: this.HOrgName,
- // Organization: this.Organization
- // }
- uni.setStorageSync('loginData', JSON.stringify(data));
- uni.request({
- url: this.serverUrl + 'WEBSController/GetUser_Json',
- method: 'GET',
- data: data,
- success: (res) => {
- console.log(res)
- uni.hideLoading()
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- if (res.data.count == 1) {
- setLoginData(data)
- setUserInfo(res.data.data[0])
- uni.setStorageSync('HUserName', res.data.data[0].Czymc);
- uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
- uni.setStorageSync('SourceFlag', false);
- uni.setStorageSync('login', "login");
- uni.setStorageSync('Organization', this.Organization);
- uni.setStorageSync('OrganizationID', this.HOrgName);
- //瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
- uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
- uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
- uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
- uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
- uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
- uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
- uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
- uni.setStorageSync('HWhName', res.data.data[0].HWhName);
- uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
- uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
- uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
- uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
- uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
- uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
- uni.setStorageSync('HProcID', res.data.data[0].HProcID); //瀵瑰簲宸ュ簭
- uni.setStorageSync('HProcName', res.data.data[0].HProcName);
- uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //瀵瑰簲鐢熶骇璧勬簮
- uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
- this.CommonUtils.setServerUrl(this.serverUrl)
- // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
- // getuiUtils.getClientID()
- getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
- uni.reLaunch({
- url: '/pages/index/index'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
+ // UserName: this.UserName,
+ // PassWord: this.PassWord,
+ // HOrgName: this.HOrgName,
+ // Organization: this.Organization
+ // }
+ uni.setStorageSync('loginData', JSON.stringify(data));
+ uni.request({
+ url: this.serverUrl + 'WEBSController/GetUser_Json',
+ method: 'GET',
+ data: data,
+ success: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ if (res.data.count == 1) {
+ setLoginData(data)
+ setUserInfo(res.data.data[0])
+ uni.setStorageSync('HUserName', res.data.data[0].Czymc);
+ uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
+ uni.setStorageSync('SourceFlag', false);
+ uni.setStorageSync('login', "login");
+ uni.setStorageSync('Organization', this.Organization);
+ uni.setStorageSync('OrganizationID', this.HOrgName);
+ //瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
+ uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
+ uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
+ uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
+ uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
+ uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
+ uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
+ uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
+ uni.setStorageSync('HWhName', res.data.data[0].HWhName);
+ uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
+ uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
+ uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
+ uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
+ uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
+ uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
+ uni.setStorageSync('HProcID', res.data.data[0].HProcID); //瀵瑰簲宸ュ簭
+ uni.setStorageSync('HProcName', res.data.data[0].HProcName);
+ uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //瀵瑰簲鐢熶骇璧勬簮
+ uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
+ this.CommonUtils.setServerUrl(this.serverUrl)
+ // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
+ // getuiUtils.getClientID()
+ getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
- // uni.request({
- // url: this.serverUrl + '/Web/GetUser',
- // method: 'GET',
- // data: data,
- // success: (res) => {
- // console.log(res)
- // uni.hideLoading()
- // uni.showToast({
- // title: res.data.Message,
- // icon: 'none'
- // })
- // if (res.data.count == 1) {
- // setLoginData(data)
- // setUserInfo(res.data.data[0])
- // uni.setStorageSync('HUserName', res.data.data[0].Czymc);
- // uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
- // uni.setStorageSync('SourceFlag', false);
- // uni.setStorageSync('login', "login");
- // uni.setStorageSync('Organization', this.Organization);
- // uni.setStorageSync('OrganizationID', this.HOrgName);
- // this.CommonUtils.setServerUrl(this.serverUrl)
- // uni.reLaunch({
- // url: '/pages/index/index'
- // })
- // }
- // },
- // fail: (res) => {
- // console.log(res);
- // uni.hideLoading()
- // uni.showToast({
- // title: '鎺ュ彛璇锋眰澶辫触',
- // icon: 'none'
- // })
- // },
- // });
- }
- }
- }
- }
+ // uni.request({
+ // url: this.serverUrl + '/Web/GetUser',
+ // method: 'GET',
+ // data: data,
+ // success: (res) => {
+ // console.log(res)
+ // uni.hideLoading()
+ // uni.showToast({
+ // title: res.data.Message,
+ // icon: 'none'
+ // })
+ // if (res.data.count == 1) {
+ // setLoginData(data)
+ // setUserInfo(res.data.data[0])
+ // uni.setStorageSync('HUserName', res.data.data[0].Czymc);
+ // uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
+ // uni.setStorageSync('SourceFlag', false);
+ // uni.setStorageSync('login', "login");
+ // uni.setStorageSync('Organization', this.Organization);
+ // uni.setStorageSync('OrganizationID', this.HOrgName);
+ // this.CommonUtils.setServerUrl(this.serverUrl)
+ // uni.reLaunch({
+ // url: '/pages/index/index'
+ // })
+ // }
+ // },
+ // fail: (res) => {
+ // console.log(res);
+ // uni.hideLoading()
+ // uni.showToast({
+ // title: '鎺ュ彛璇锋眰澶辫触',
+ // icon: 'none'
+ // })
+ // },
+ // });
+ }
+ }
+ }
+ }
</script>
<style lang="scss" scoped>
- .bg-img {
- position: fixed;
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- z-index: -1;
- }
+ .bg-img {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
- .container {
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
+ .container {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
- .title {
- margin-top: 174rpx;
- font-size: 47rpx;
- font-weight: bold;
- color: #FFFFFF;
- }
+ .title {
+ margin-top: 174rpx;
+ font-size: 47rpx;
+ font-weight: bold;
+ color: #FFFFFF;
+ }
- .box {
- width: 682rpx;
- position: relative;
- top: 120rpx;
- display: flex;
- justify-content: center;
+ .box {
+ width: 682rpx;
+ position: relative;
+ top: 120rpx;
+ display: flex;
+ justify-content: center;
- .logo {
- width: 155rpx;
- height: 155rpx;
- padding: 10rpx;
- position: absolute;
- z-index: 9;
- background-color: rgba(255, 255, 255, 0.5);
- border-radius: 100%;
+ .logo {
+ width: 155rpx;
+ height: 155rpx;
+ padding: 10rpx;
+ position: absolute;
+ z-index: 9;
+ background-color: rgba(255, 255, 255, 0.5);
+ border-radius: 100%;
- image {
- width: 100%;
- height: 100%;
- border-radius: 100%;
- background-color: #f0f3f7;
- }
- }
+ image {
+ width: 100%;
+ height: 100%;
+ border-radius: 100%;
+ background-color: #f0f3f7;
+ }
+ }
- .login {
- width: 100%;
- height: 520rpx;
- position: absolute;
- top: 90rpx;
- z-index: 0;
- background: #FFFFFF;
- border-radius: 25rpx 0 25rpx 0;
- box-shadow: 0 6rpx 24rpx 8rpx rgba(21, 99, 210, 0.14);
- padding-top: 160rpx;
+ .login {
+ width: 100%;
+ height: 520rpx;
+ position: absolute;
+ top: 90rpx;
+ z-index: 0;
+ background: #FFFFFF;
+ border-radius: 25rpx 0 25rpx 0;
+ box-shadow: 0 6rpx 24rpx 8rpx rgba(21, 99, 210, 0.14);
+ padding-top: 160rpx;
- .item {
- display: flex;
- align-items: center;
- justify-content: flex-end;
- margin-right: 38rpx;
- margin-bottom: 70rpx;
+ .item {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ margin-right: 38rpx;
+ margin-bottom: 70rpx;
- .left {
- font-size: 34rpx;
- font-weight: 400;
- color: #3C3C3C;
- }
+ .left {
+ font-size: 34rpx;
+ font-weight: 400;
+ color: #3C3C3C;
+ }
- .right {
- width: 441rpx;
- height: 68rpx;
- background: #EBEBEB;
- border-radius: 10rpx;
+ .right {
+ width: 441rpx;
+ height: 68rpx;
+ background: #EBEBEB;
+ border-radius: 10rpx;
- input {
- height: 100%;
- padding: 0 30rpx;
- font-size: 30rpx;
- }
- }
- }
+ input {
+ height: 100%;
+ padding: 0 30rpx;
+ font-size: 30rpx;
+ }
+ }
+ }
- // .api{
- // margin-left: 30rpx;
- // font-size: 27rpx;
- // color: #888;
- // }
- // .apibtn{
- // text-align: center;
- // font-size: 27rpx;
- // margin-top: 14rpx;
- // color: #066fb8;
- // text-decoration: underline; /* 娣诲姞涓嬪垝绾� */
- // font-style: italic; /* 灏嗗瓧浣撳彉涓烘枩浣� */
- // }
- }
- }
+ // .api{
+ // margin-left: 30rpx;
+ // font-size: 27rpx;
+ // color: #888;
+ // }
+ // .apibtn{
+ // text-align: center;
+ // font-size: 27rpx;
+ // margin-top: 14rpx;
+ // color: #066fb8;
+ // text-decoration: underline; /* 娣诲姞涓嬪垝绾� */
+ // font-style: italic; /* 灏嗗瓧浣撳彉涓烘枩浣� */
+ // }
+ }
+ }
- .btn {
- width: 540rpx;
- height: 92rpx;
- line-height: 92rpx;
- margin-top: 940rpx;
- background: #78CEFD;
- box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(120, 206, 253, 0.3);
- border-radius: 10rpx;
- font-weight: 400;
- color: #FEFEFE;
- text-align: center;
- font-size: 36rpx;
- }
+ .btn {
+ width: 540rpx;
+ height: 92rpx;
+ line-height: 92rpx;
+ margin-top: 940rpx;
+ background: #78CEFD;
+ box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(120, 206, 253, 0.3);
+ border-radius: 10rpx;
+ font-weight: 400;
+ color: #FEFEFE;
+ text-align: center;
+ font-size: 36rpx;
+ }
- .apibtn {
- margin-top: 50rpx;
- background: #eec18e;
- box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(253, 186, 118, 0.3);
- }
- }
+ .apibtn {
+ margin-top: 50rpx;
+ background: #eec18e;
+ box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(253, 186, 118, 0.3);
+ }
+ }
- .popup-content {
- box-sizing: border-box;
- display: flex;
- flex-direction: column;
- gap: 30rpx;
+ .popup-content {
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ gap: 30rpx;
- .pop-item {
- border: #EBEBEB 2rpx solid;
- border-radius: 10rpx;
- padding: 14rpx 8rpx;
- }
+ .pop-item {
+ border: #EBEBEB 2rpx solid;
+ border-radius: 10rpx;
+ padding: 14rpx 8rpx;
+ }
- >picker {
- background-color: #EBEBEB;
- }
- }
+ >picker {
+ background-color: #EBEBEB;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 56ce8f4..17c1c93 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -9,12 +9,8 @@
<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]">
+ <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>
@@ -486,7 +482,7 @@
"id": 58,
"hidden": false
},
-
+
// 鍙栨牱杩樻牱鐩稿叧
@@ -558,24 +554,24 @@
"img": "../../static/icon/icon17.png",
"text": "鐢熶骇閫�鏂欐牎楠屾殏瀛樺垪琛�",
"url": "/pages/shengchantuiliaoCheck/MateOutBackCheckBillList",
-
+
"id": 70,
"hidden": false
},
- {
- "img": "../../static/icon/icon17.png",
- "text": "閿�鍞��璐ф牎楠屾殏瀛樺垪琛�",
- "url": "/pages/xiaoshotuihuoCheck/Kf_SellOutBackCheckBillList",
- "id": 71,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon17.png",
- "text": "鐢熶骇閫�搴撴牎楠屾殏瀛樺垪琛�",
- "url": "/pages/shengchantuikuCheck/Kf_ProductInBackCheckBillList",
- "id": 72,
- "hidden": false
- },
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "閿�鍞��璐ф牎楠屾殏瀛樺垪琛�",
+ "url": "/pages/xiaoshotuihuoCheck/Kf_SellOutBackCheckBillList",
+ "id": 71,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鐢熶骇閫�搴撴牎楠屾殏瀛樺垪琛�",
+ "url": "/pages/shengchantuikuCheck/Kf_ProductInBackCheckBillList",
+ "id": 72,
+ "hidden": false
+ },
{
"img": "../../static/icon/icon17.png",
"text": "瑁呯杩芥函鍗曟殏瀛樺垪琛�",
@@ -583,20 +579,27 @@
"id": 73,
"hidden": false
},
- {
- "img": "../../static/icon/icon17.png",
- "text": "鍣ㄥ叿缁翠慨鍑哄簱鍒楄〃",
- "url": "/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList",
- "id": 74,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon17.png",
- "text": "鍣ㄥ叿缁翠慨鍏ュ簱鍒楄〃",
- "url": "/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList",
- "id": 75,
- "hidden": false
- }
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鍣ㄥ叿缁翠慨鍑哄簱鍒楄〃",
+ "url": "/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList",
+ "id": 74,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鍣ㄥ叿缁翠慨鍏ュ簱鍒楄〃",
+ "url": "/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList",
+ "id": 75,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon17.png",
+ "text": "鎶曟枡闃查敊鍒楄〃",
+ "url": "/pages/ZLGL/Gy_MaterialPrevention/Gy_MateralPreventionList",
+ "id": 76,
+ "hidden": false
+ }
]
}
},
@@ -604,7 +607,7 @@
this.getHiddenItem()
},
onShow() {
-
+
},
methods: {
judgeHidden() {
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index abce8c9..eed6250 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -1,180 +1,180 @@
<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)">
+ <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/firstCheckBill?operationType=1",
- "id": 1,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon8.png",
- "text": "宸℃妫�楠屽崟",
- "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
- "id": 2,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏈欢妫�楠屽崟",
- "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
- "id": 3,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠屽崟",
- "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBill",
- "id": 4,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon8.png",
- "text": "鐢熶骇鍏ュ簱妫�楠屽崟",
- "url": "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
- "id": 5,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍑哄巶鏍￠獙鍗�",
- "url": "/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
- "id": 6,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠�(鎵归噺)",
- "url": "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
- "id": 7,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon8.png",
- "text": "鍏ㄦ妫�楠屽崟",
- "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBill",
- "id": 8,
- "hidden": false
- },
-
- {
- "img": "../../static/icon/icon8.png",
- "text": "杞﹂棿鑷鍗�",
- "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill",
- "id": 9,
- "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: 'tab4',
+ canEdit: false,
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ itemData: [
+
+ {
+ "img": "../../static/icon/icon13.png",
+ "text": "棣栦欢妫�楠屽崟",
+ "url": "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
+ "id": 1,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "宸℃妫�楠屽崟",
+ "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
+ "id": 2,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏈欢妫�楠屽崟",
+ "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
+ "id": 3,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠屽崟",
+ "url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBill",
+ "id": 4,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鐢熶骇鍏ュ簱妫�楠屽崟",
+ "url": "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
+ "id": 5,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍑哄巶鏍￠獙鍗�",
+ "url": "/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
+ "id": 6,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鏉ユ枡妫�楠�(鎵归噺)",
+ "url": "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
+ "id": 7,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "鍏ㄦ妫�楠屽崟",
+ "url": "/pages/ZLGL/QualityReportStep/QualityReportStepBill",
+ "id": 8,
+ "hidden": false
+ },
+
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "杞﹂棿鑷鍗�",
+ "url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill",
+ "id": 9,
+ "hidden": false
+ },
+ {
"img": "../../static/icon/icon8.png",
"text": "鍦ㄥ簱妫�楠屽崟",
"url": "/pages/ZLGL/zaikujianyandan/InStockCheckBill",
"id": 10,
"hidden": false
},
- {
- "img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉鍗�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill",
- "id": 11,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉鎺ユ敹鍗�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill",
- "id": 12,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉绛惧埌鍗�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill",
- "id": 13,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉澶勭悊鍗�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill",
- "id": 14,
- "hidden": false
- },
{
- "img": "../../static/icon/icon15.png",
- "text": "寮傚父鍙嶉楠屾敹鍗�",
- "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill",
- "id": 15,
- "hidden": false
+ "img": "../../static/icon/icon15.png",
+ "text": "寮傚父鍙嶉鍗�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill",
+ "id": 11,
+ "hidden": false
},
{
- "img": "../../static/icon/icon15.png",
- "text": "宸ヤ綔鑱旂郴鍗�",
- "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill?OperationType=1",
- "id": 16,
- "hidden": false
+ "img": "../../static/icon/icon15.png",
+ "text": "寮傚父鍙嶉鎺ユ敹鍗�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill",
+ "id": 12,
+ "hidden": false
},
- // {
- // "img": "../../static/icon/icon15.png",
- // "text": "鍙栨牱鍗�",
- // "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
- // "id": 17,
- // "hidden": false
- // },
- {
- "img": "../../static/icon/icon15.png",
- "text": "杩樻牱鍗�",
- "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
- "id": 18,
- "hidden": false
- },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "寮傚父鍙嶉绛惧埌鍗�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill",
+ "id": 13,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "寮傚父鍙嶉澶勭悊鍗�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill",
+ "id": 14,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "寮傚父鍙嶉楠屾敹鍗�",
+ "url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill",
+ "id": 15,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "宸ヤ綔鑱旂郴鍗�",
+ "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill?OperationType=1",
+ "id": 16,
+ "hidden": false
+ },
+ // {
+ // "img": "../../static/icon/icon15.png",
+ // "text": "鍙栨牱鍗�",
+ // "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
+ // "id": 17,
+ // "hidden": false
+ // },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "杩樻牱鍗�",
+ "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
+ "id": 18,
+ "hidden": false
+ },
{
"img": "../../static/icon/icon15.png",
"text": "寰呮楠屽垪琛�",
@@ -182,144 +182,150 @@
"id": 19,
"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
- })
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "鎶曟枡闃查敊",
+ "url": "/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention",
+ "id": 20,
+ "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
- this.updateCount = 0
- })
- }
- this.$forceUpdate()
- },
- toUrl(item) {
- if (item.url) {
- uni.navigateTo({
- url: item.url
- })
- } else {
- uni.showToast({
- title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
- icon: 'none'
- })
- }
- }
- }
- }
+ },
+ 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;
- // }
- // }
- // }
+ // .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;
+ .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/i18n.js b/utils/i18n.js
index 7f118f7..927b989 100644
--- a/utils/i18n.js
+++ b/utils/i18n.js
@@ -26,7 +26,16 @@
} = res.data
if (count == 1) {
enableCollectMissingKey = true
- return data
+ let getRemoteFile = true
+ if (!res.data.EnableRemoteI18n || res.data.EnableRemoteI18n == 'N') {
+ // 鍒ゆ柇鏈嶅姟鍣ㄦ槸鍚﹀惎鐢ㄥ璇█閰嶇疆椤癸紝鏃犺閰嶇疆椤规垨鑰呬笉鍚敤閰嶇疆椤癸紝鍒欎笉鏀堕泦缂哄け瀛楃涓诧紝浣跨敤鏈湴缈昏瘧鏂囦欢
+ enableCollectMissingKey = false
+ getRemoteFile = false
+ }
+ return {
+ data: data,
+ getRemoteFile: getRemoteFile
+ }
} else {
enableCollectMissingKey = false
CommonUtils.showTips({
@@ -81,7 +90,7 @@
})
// 娓呴櫎缂哄け瀛楁缂撳瓨
MissingKeysMap = {}
-
+
uni.hideLoading()
// 閲嶅惎搴旂敤
const systemInfo = uni.getSystemInfoSync();
--
Gitblit v1.9.1