From fd1b170bde962990fd0926776139ec94a85052a2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 21 十月 2025 14:01:03 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/index/tab1.vue | 9
pages/gongxuOutSendWork/table.vue | 124 ++--
manifest.json | 42
components/ProcListPopup/ProcListPopup.vue | 209 ++++++++
pages.json | 6
pages/gongxuOut/form.vue | 71 ++
pages/index/login.vue | 1
components/StationOutBillPopup/StationOutBillPopup.vue | 984 ++++++++++++++++++--------------------
.hbuilderx/launch.json | 2
9 files changed, 826 insertions(+), 622 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index d7abf73..4dd14cd 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -25,7 +25,7 @@
"localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
"openVueDevtools" : true,
"packageName" : "com.shebeiguanli.www",
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
}
]
diff --git a/components/ProcListPopup/ProcListPopup.vue b/components/ProcListPopup/ProcListPopup.vue
new file mode 100644
index 0000000..6084b3e
--- /dev/null
+++ b/components/ProcListPopup/ProcListPopup.vue
@@ -0,0 +1,209 @@
+<template>
+ <view>
+ <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+ <view class="content">
+ <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
+ <view class="options-wrapper" v-show="HBillList.length != 0">
+ <uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''"
+ v-for="(bill, index) in HBillList[curPage-1]" :key="index" :title="bill['宸ュ簭鍚嶇О']"
+ @tap="clickCard(bill['娴佹按鍙�'],bill['搴忓垪鍙�'], index)">
+ <view class="item">
+ <view class="left">娴佹按鍙�: </view>
+ <view class="right">{{bill['娴佹按鍙�']}}</view>
+ </view>
+ <view class="item">
+ <view class="left">宸ュ簭浠ｇ爜: </view>
+ <view class="right">{{bill['宸ュ簭浠ｇ爜']}}</view>
+ </view>
+
+ </uni-card>
+ </view>
+ <view class="over" v-show="HBillList.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+ <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+ :total="length"></uni-pagination>
+ </view>
+
+ </uni-popup>
+ </view>
+</template>
+
+<script>
+ import {
+ CommonUtils
+ } from '../../utils/common';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ export default {
+ name: "BillListPopup_Check",
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ size: 20,
+ curPage: 1,
+ length: 0,
+ page: 0,
+ // HMater: this.HMater,
+ HCustom: '',
+ HBillList: [],
+ panelHeight: 0,
+
+ };
+ },
+ props: {
+ HProcExchHBillNo: {
+ type: [String, String],
+ required: true
+ },
+ HProcExchHInteID: {
+ type: [String, Number],
+ required: true
+ },
+ },
+ methods: {
+ popupChangeHandler(e) {
+ if (e.show === true) {
+ this.getBillList()
+ }
+ },
+ async exit() {
+ this.size = 20
+ this.curPage = 1
+ this.length = 0
+ this.page = 0
+ this.HBillList = []
+ // 闇�瑕佺瓑寰呴〉闈㈠唴鐨勬暟鎹祴鍊煎畬姣�
+ await this.$nextTick()
+ this.$refs.popup.close();
+ },
+ search() {
+ this.getBillList()
+ },
+
+ showPopup() {
+ this.$refs.popup.open();
+ },
+ clickCard(procNo,seqNumber, index) {
+ uni.$emit('HProcNoSelectComplete', {
+ HProcNo:procNo,
+ HSEQNumber:seqNumber
+ })
+ // this.exit()
+ },
+ getBillList() {
+ this.HBillList = []
+ this.length = 0
+ this.page = 0
+ this.curPage = 1
+ CommonUtils.doRequest(
+ "/Web/GetProcNoList", {
+ HInterID: this.HProcExchHInteID,
+ sWhere: 0,
+ UserID: this.userInfo["Czybm"],
+ },
+ (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.length = Array.from(data).length
+ const result = [];
+ for (let i = 0; i < data.length; i += this.size) {
+ result.push(data.slice(i, i + this.size));
+ }
+ this.HBillList = result
+ this.page = result.length
+
+ } else {
+
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ )
+ },
+ },
+ }
+</script>
+
+<style lang="scss">
+ .content {
+ box-sizing: border-box;
+ border-radius: 15rpx 15rpx 0 0;
+ padding: 20rpx 20rpx 40rpx 20rpx;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+
+ .search-condition {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 20rpx;
+
+ .title {
+ width: 5rem;
+ text-align: right;
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ height: auto;
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 24rpx;
+ }
+ }
+ }
+
+ .buttons {
+ display: flex;
+ flex-direction: row;
+ gap: 20rpx;
+ justify-content: flex-end;
+
+ >button {
+ display: inline-flex;
+ width: 4rem;
+ }
+ }
+
+ .options-wrapper {
+ padding: 20rpx;
+ display: grid;
+ grid-template-columns: repeat(1, 1fr);
+ gap: 20rpx;
+
+ >view {
+ margin: 0 !important;
+ box-sizing: border-box;
+
+ }
+
+ .item {
+ .left {
+ display: inline-block;
+ width: 6rem;
+ }
+
+ .right {
+ display: inline-block;
+ }
+ }
+ }
+
+ .uni-card--is-active {
+ background-color: rgba(0, 122, 255, 0.2);
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/gongxuOutSendWork/form.vue b/components/StationOutBillPopup/StationOutBillPopup.vue
similarity index 72%
rename from pages/gongxuOutSendWork/form.vue
rename to components/StationOutBillPopup/StationOutBillPopup.vue
index 27a3014..b8a561b 100644
--- a/pages/gongxuOutSendWork/form.vue
+++ b/components/StationOutBillPopup/StationOutBillPopup.vue
@@ -1,499 +1,413 @@
<template>
<view>
- <view class="form">
- <view class="form-item">
- <view class="title"><text>*</text>鏉″舰鐮�:</view>
- <view class="right" style="width: 380rpx;">
- <input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)" />
- </view>
- <uni-icons type="scan"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" @click="toScanCode"></uni-icons>
- </view>
- <view class="form-item">
- <view class="title">搴忓垪鍙�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSEQName" placeholder="璇烽�夋嫨搴忓垪" v-model="hform.HSEQName"
- @input="HSEQNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>娴佹按鍙�:</view>
- <view class="right" style="width: 380rpx;">
- <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
- @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
- </view>
- <uni-icons type="scan"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" @click="toScanProcNo"></uni-icons>
- </view>
- <view class="form-item">
- <view class="title">宸ュ簭缂栫爜:</view>
- <view class="righton">
- <input disabled v-model="hform.HProcNumber" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏈姤宸ユ暟閲�:</view>
- <view class="righton">
- <input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ユ湭鎶ュ伐鏁伴噺" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍚堟牸鏁伴噺:</view>
- <view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">涓嶈壇鏁伴噺:</view>
- <view class="right">
- <input v-model="hform.HBadCount" placeholder="璇疯緭鍏ヤ笉鑹暟閲�" />
+ <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+ <view class="form">
+ <view class="form-item" v-show="false">
+ <view class="title"><text>*</text>鏉″舰鐮�:</view>
+ <view class="right" style="width: 380rpx;">
+ <input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)" />
+ </view>
+ <uni-icons type="scan"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" @click="toScanCode"></uni-icons>
</view>
- </view>
- <view class="form-item">
- <view class="title">鎶ュ簾鏁伴噺:</view>
- <view class="right">
- <input v-model="hform.HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @input="HSourceNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>宸ヤ綔涓績:</view>
- <view class="right">
- <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨宸ヤ綔涓績" v-model="hform.HCenterName"
- @input="HCenterNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇鐝粍:</view>
- <view class="right">
- <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName"
- @input="HGroupNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
- @input="HEmpNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">澶囨敞:</view>
- <view class="right">
- <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="right">
- <picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
- </picker>
- </view>
- </view>
-
-
-
- <view class="tick-wrapper">
- <view class="form-item">
- <view class="title">宸ユ椂:</view>
- <view class="right">
- <input v-model="hform.HWorkTimes" placeholder="璇疯緭鍏ュ伐鏃�" @blur="HWorkTimesChange" :disabled="hform.HIsTimeFlag!=1"/>
- </view>
- </view>
- <view class="form-item">
- <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
- <label>
- <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
- 鏄惁璁℃椂
- </label>
- </checkbox-group>
- </view>
- </view>
- <view class="form-item">
- <view class="title">寮�宸ユ椂闂�:</view>
- <view class="right">
- <uni-datetime-picker v-model="hform.HRelBeginTime" @change="HRelBeginTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
- <input disabled v-model="hform.HRelBeginTime" placeholder="璇烽�夋嫨寮�宸ユ椂闂�" style="pointer-events: none;"/>
- </uni-datetime-picker>
+ <view class="form-item" v-show="false">
+ <view class="title">搴忓垪鍙�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSEQName" placeholder="璇烽�夋嫨搴忓垪" v-model="hform.HSEQName"
+ @input="HSEQNameChange"></uni-combox>
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title">瀹屽伐鏃堕棿:</view>
- <view class="right">
- <uni-datetime-picker v-model="hform.HRelEndTime" @change="HRelEndTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
- <input disabled v-model="hform.HRelEndTime" placeholder="璇烽�夋嫨瀹屽伐鏃堕棿" />
- </uni-datetime-picker>
+ <view class="form-item" v-show="false">
+ <view class="title"><text>*</text>娴佹按鍙�:</view>
+ <view class="right" style="width: 380rpx;">
+ <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
+ @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
+ </view>
+ <uni-icons type="scan"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" @click="toScanProcNo"></uni-icons>
</view>
- </view>
- <!--
- <view class="title">鏄惁璁℃椂</view>
- <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
- <label>
- <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
- </label>
- </checkbox-group>
- </view> -->
+ <view class="form-item">
+ <view class="title">宸ュ簭缂栫爜:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcNumber" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏈姤宸ユ暟閲�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ユ湭鎶ュ伐鏁伴噺" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍚堟牸鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓嶈壇鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HBadCount" placeholder="璇疯緭鍏ヤ笉鑹暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎶ュ簾鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title"><text>*</text>宸ヤ綔涓績:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨宸ヤ綔涓績" v-model="hform.HCenterName"
+ @input="HCenterNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鐢熶骇鐝粍:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName"
+ @input="HGroupNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
+ @input="HEmpNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="right">
+ <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+ <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ </picker>
+ </view>
+ </view>
- <view class="tab_area"></view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璁㈠崟:</view>
- <view class="righton">
- <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">娴佽浆鍗�:</view>
- <view class="righton">
- <input disabled v-model="hform.HProcExchBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐗╂枡浠ｇ爜:</view>
- <view class="righton">
- <input disabled v-model="hform.HMaterNumber" />
- <!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐗╂枡鍚嶇О:</view>
- <view class="righton">
- <input v-model="hform.HMaterName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="righton">
- <input v-model="hform.HMaterModel" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">娆惧彿:</view>
- <view class="righton">
- <input v-model="hform.HStyleNumber" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁￠噺鍗曚綅:</view>
- <view class="righton">
- <input v-model="hform.鍗曚綅" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">宸ュ簭:</view>
- <!-- <view class="right">
- <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
+
+ <view class="tick-wrapper">
+ <view class="form-item">
+ <view class="title">宸ユ椂:</view>
+ <view class="right">
+ <input v-model="hform.HWorkTimes" placeholder="璇疯緭鍏ュ伐鏃�" @blur="HWorkTimesChange" :disabled="hform.HIsTimeFlag!=1"/>
+ </view>
+ </view>
+ <view class="form-item">
+ <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
+ <label>
+ <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
+ 鏄惁璁℃椂
+ </label>
+ </checkbox-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">寮�宸ユ椂闂�:</view>
+ <view class="right">
+ <uni-datetime-picker v-model="hform.HRelBeginTime" @change="HRelBeginTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
+ <input disabled v-model="hform.HRelBeginTime" placeholder="璇烽�夋嫨寮�宸ユ椂闂�" style="pointer-events: none;"/>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹屽伐鏃堕棿:</view>
+ <view class="right">
+ <uni-datetime-picker v-model="hform.HRelEndTime" @change="HRelEndTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
+ <input disabled v-model="hform.HRelEndTime" placeholder="璇烽�夋嫨瀹屽伐鏃堕棿" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <!--
+ <view class="title">鏄惁璁℃椂</view>
+ <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
+ <label>
+ <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
+ </label>
+ </checkbox-group>
</view> -->
- <view class="righton">
- <input v-model="hform.HProcName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇缁勭粐:</view>
- <view class="righton">
- <input v-model="hform.HPRDOrg" disabled />
- </view>
- </view>
-
+
+ <view class="tab_area"></view>
+
+ <view class="form-item" v-show="false">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item" v-show="false" >
+ <view class="title">鐢熶骇璁㈠崟:</view>
+ <view class="righton">
+ <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">娴佽浆鍗�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcExchBillNo" />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鐗╂枡浠ｇ爜:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HMaterNumber" />
+ <!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鐗╂枡鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HMaterName" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HMaterModel" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">娆惧彿:</view>
+ <view class="righton">
+ <input v-model="hform.HStyleNumber" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">璁￠噺鍗曚綅:</view>
+ <view class="righton">
+ <input v-model="hform.鍗曚綅" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">宸ュ簭:</view>
+ <!-- <view class="right">
+ <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
+ </view> -->
+ <view class="righton">
+ <input v-model="hform.HProcName" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鐢熶骇缁勭粐:</view>
+ <view class="righton">
+ <input v-model="hform.HPRDOrg" disabled />
+ </view>
+ </view>
+
- <!--
- <view class="form-item">
- <view class="title">璁㈠崟鏁伴噺:</view>
- <view class="right">
- <input name="HICMOQty" v-model="hform.HICMOQty" placeholder="璇疯緭鍏ヨ鍗曟暟閲�" />
+ <!--
+ <view class="form-item">
+ <view class="title">璁㈠崟鏁伴噺:</view>
+ <view class="right">
+ <input name="HICMOQty" v-model="hform.HICMOQty" placeholder="璇疯緭鍏ヨ鍗曟暟閲�" />
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title">璁㈠崟璺熻釜鍙�:</view>
- <view class="right">
- <input name="HOrderProcNO" v-model="hform.HOrderProcNO" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" />
+ <view class="form-item">
+ <view class="title">璁㈠崟璺熻釜鍙�:</view>
+ <view class="right">
+ <input name="HOrderProcNO" v-model="hform.HOrderProcNO" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" />
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧浠ｇ爜:</view>
- <view class="right">
- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox>
+ <view class="form-item">
+ <view class="title">浜у搧浠ｇ爜:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox>
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <view class="form-item">
+ <view class="title">浜у搧鍚嶇О:</view>
+ <view class="right">
+ <input v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="right">
- <input v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ <view class="form-item">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="right">
+ <input v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>娴佽浆鍗″彿:</view>
- <view class="right">
- <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ユ祦杞崱鍙�" />
+ <view class="form-item">
+ <view class="title"><text>*</text>娴佽浆鍗″彿:</view>
+ <view class="right">
+ <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ユ祦杞崱鍙�" />
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title">娴佽浆鍗℃暟閲�:</view>
- <view class="right">
- <input v-model="hform.HPlanQty" placeholder="璇疯緭鍏ユ祦杞崱鏁伴噺" />
+ <view class="form-item">
+ <view class="title">娴佽浆鍗℃暟閲�:</view>
+ <view class="right">
+ <input v-model="hform.HPlanQty" placeholder="璇疯緭鍏ユ祦杞崱鏁伴噺" />
+ </view>
</view>
- </view>
-
- <view class="tab_area"></view>
-
- <view class="form-item">
- <view class="title"><text>*</text>褰撳墠宸ュ簭:</view>
- <view class="right">
- <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
+
+ <view class="tab_area"></view>
+
+ <view class="form-item">
+ <view class="title"><text>*</text>褰撳墠宸ュ簭:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
+ </view>
</view>
- </view>
- <view class="form-item">
- <view class="title">妫�楠屽憳:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨妫�楠屽憳" v-model="hform.HQCCheckName" @input="HQCCheckNameChange"></uni-combox>
- </view>
- </view> -->
-
- <view class="tab_area"></view>
-
-
- <view class="form-item">
- <view class="title">鎿嶄綔鍛�2:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName2"
- @input="HEmpName2Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎿嶄綔鍛�3:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName3"
- @input="HEmpName3Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎿嶄綔鍛�4:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName4"
- @input="HEmpName4Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎿嶄綔鍛�5:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName5"
- @input="HEmpName5Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title"></view>
- <!-- <view style="padding-top: 10rpx;" @tap="hform.HLastSubProc = hform.HLastSubProc==true?false:true">
- <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);"/>杞笅閬�
+ <view class="form-item">
+ <view class="title">妫�楠屽憳:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨妫�楠屽憳" v-model="hform.HQCCheckName" @input="HQCCheckNameChange"></uni-combox>
+ </view>
</view> -->
- <view style="padding-top: 10rpx;">
- <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);" />杞笅閬�
- </view>
- </view>
- <!-- <view class="form-item">
- <view class="title">鍑虹珯鏃堕棿:</view>
- <view class="right">
- <uni-datetime-picker v-model="hform.HStationOutTime">
- <input disabled v-model="hform.HStationOutTime" placeholder="璇烽�夋嫨鍑虹珯鏃堕棿" />
- </uni-datetime-picker>
+
+ <view class="tab_area"></view>
+
+
+ <view class="form-item" v-show="false">
+ <view class="title">鎿嶄綔鍛�2:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName2"
+ @input="HEmpName2Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鎿嶄綔鍛�3:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName3"
+ @input="HEmpName3Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鎿嶄綔鍛�4:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName4"
+ @input="HEmpName4Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鎿嶄綔鍛�5:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName5"
+ @input="HEmpName5Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title"></view>
+ <!-- <view style="padding-top: 10rpx;" @tap="hform.HLastSubProc = hform.HLastSubProc==true?false:true">
+ <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);"/>杞笅閬�
+ </view> -->
+ <view style="padding-top: 10rpx;">
+ <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);" />杞笅閬�
+ </view>
+ </view>
+
+
+ <view v-if="showmore" v-show="false">
+ <view class="form-item">
+ <view class="title">璁㈠崟璺熻釜鍙�:</view>
+ <view class="righton">
+ <input v-model="hform.HOrderProcNO" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HCheckDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HDeleteDate" v-model="hform.HDeleteDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+
+
+
+ <view class="other">
+ <view v-if="!showmore" @tap="showmore = true">
+ 灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+ </view>
+ <view v-if="showmore" @tap="showmore = false">
+ 鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+ </view>
+ </view>
+
+
+
+ <!-- <view class="op">
+ <button class="op1" size="mini" plain @tap="huibao">姹囨姤</button>
+ <button class="op2" size="mini" plain @tap="ruku">鍏ュ簱</button>
+ <button class="op3" size="mini" plain @tap="baofei">鎶ュ簾</button>
+ </view> -->
+
+ <view class="bottom-btn">
+ <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
+ <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
+ @tap="check">瀹℃牳</button>
+ <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
+ @tap="abandonCheck">鍙嶅鏍�</button>
+ <!-- <button class="btn-b" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button> -->
</view>
</view>
- <view class="form-item">
- <view class="title">妯＄┐鍙�:</view>
- <view class="right">
- <input v-model="hform.HMouldNum" placeholder="璇疯緭鍏ユā绌村彿" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮2:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName2" @input="HSourceName2Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮3:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName3" @input="HSourceName3Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮4:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName4" @input="HSourceName4Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮5:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName5" @input="HSourceName5Change"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏍哥畻宸ュ簭:</view>
- <view class="right">
- <input v-model="hform.HPayProcID" placeholder="璇疯緭鍏ユ牳绠楀伐搴�" />
- </view>
- </view> -->
-
- <!-- <view class="form-item">
- <view class="title">璁惧娓呭崟:</view>
- <view class="right">
- <input v-model="hform.HSourceNameList" placeholder="璇疯緭鍏ヨ澶囨竻鍗�" />
- </view>
- </view> -->
- <!-- <view class="form-item">
- <view class="title">渚涘簲鍟�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName" @input="HSupNameChange"></uni-combox>
- </view>
- </view> -->
- <!--
- <view class="form-item">
- <view class="title">杩涚珯鏃堕棿:</view>
- <view class="right">
- <uni-datetime-picker v-model="hform.HStationInTime">
- <input disabled v-model="hform.HStationInTime" placeholder="璇烽�夋嫨鎺ユ敹鏃堕棿" />
- </uni-datetime-picker>
- </view>
- </view> -->
-
- <!-- <view class="form-item">
- <view class="title">鎿嶄綔鍛�:</view>
- <view class="right">
- <input v-model="hform.HEmp" placeholder="璇疯緭鍏ユ搷浣滃憳" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">閮ㄩ棬:</view>
- <view class="right">
- <input v-model="hform.HDept" placeholder="璇疯緭鍏ラ儴闂�" />
- </view>
- </view> -->
-
- <!-- <view class="tab_area"></view> -->
-
- <!-- <view class="form-item">
- <view class="title">閫夋嫨鏂囦欢:</view>
- <view class="right">
- 1111
- </view>
- </view> -->
-
- <view v-if="showmore">
- <view class="form-item">
- <view class="title">璁㈠崟璺熻釜鍙�:</view>
- <view class="righton">
- <input v-model="hform.HOrderProcNO" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
- <view class="righton">
- <input v-model="hform.HMaker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟鏃ユ湡:</view>
- <view class="righton">
- <input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
- <input v-else v-model="hform.HMakeDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼浜�:</view>
- <view class="righton">
- <input v-model="hform.HUpDater" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
- <view class="righton">
- <input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
- <input v-else v-model="hform.HUpDateDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
- <view class="righton">
- <input v-model="hform.HChecker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳鏃ユ湡:</view>
- <view class="righton">
- <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
- <input v-else v-model="hform.HCheckDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾浜�:</view>
- <view class="righton">
- <input v-model="hform.HDeleteMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾鏃ユ湡:</view>
- <view class="righton">
- <input v-if="hform.HDeleteDate" v-model="hform.HDeleteDate.substr(0,10)" disabled />
- <input v-else v-model="hform.HDeleteDate" disabled />
- </view>
- </view>
- </view>
-
- <view class="tab_area"></view>
-
- <view class="other">
- <view v-if="!showmore" @tap="showmore = true">
- 灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
- </view>
- <view v-if="showmore" @tap="showmore = false">
- 鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
- </view>
- </view>
-
- <view class="tab_area"></view>
-
- <!-- <view class="op">
- <button class="op1" size="mini" plain @tap="huibao">姹囨姤</button>
- <button class="op2" size="mini" plain @tap="ruku">鍏ュ簱</button>
- <button class="op3" size="mini" plain @tap="baofei">鎶ュ簾</button>
- </view> -->
-
- <view class="bottom-btn">
- <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
- <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
- @tap="check">瀹℃牳</button>
- <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
- @tap="abandonCheck">鍙嶅鏍�</button>
- <flex style="flex: 1;"></flex>
- <button class="btn-b" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- </view>
- </view>
+ </uni-popup>
+ </view>
</template>
<script>
import getDateTime from '@/utils/getdateTime.js';
@@ -502,6 +416,7 @@
} from "@/utils/auth.js";
import { CommonUtils } from '../../utils/common';
export default {
+ name: "BillListPopup_gongxuOut",
data() {
return {
userInfo: getUserInfo(),
@@ -630,7 +545,8 @@
}
}
},
- onLoad(e) {
+
+ mounted(e) {
// this.getEditData('1516','GXCZHB000000001290')
console.log(e, this.userInfo)
// this.hform.HEmpID = this.userInfo.Czybm
@@ -639,22 +555,23 @@
this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d h:i:s')
// this.hform.HDate = getDateTime.dateTimeStr('y-m-d')
// this.hform.HStationOutTime = getDateTime.dateTimeStr('y-m-d h:i:s')
- if (e.linterid) {
- this.btnType = 1
- this.OperationType = 4
- this.linterid = e.linterid
- this.HBillNo = e.HBillNo
- this.getEditData(e.linterid, e.HBillNo)
- } else {
- this.getNewData()
- if(e.HBarCode){
- this.hform.HBarCode=e.HBarCode
- setTimeout(() => {
- this.toInCode(e);
- }, 1000)
- }
+ // if (e.linterid) {
+ // this.btnType = 1
+ // this.OperationType = 4
+ // this.linterid = e.linterid
+ // this.HBillNo = e.HBillNo
+ // this.getEditData(e.linterid, e.HBillNo)
+ // } else {
+ // this.getNewData()
+ // if(e.HBarCode){
+ // this.hform.HBarCode=e.HBarCode
+ // setTimeout(() => {
+ // this.toInCode(e);
+ // }, 1000)
+ // }
- }
+ // }
+ this.getNewData()
this.getHMaterList()
this.getHProcList()
this.getHSupList()
@@ -667,6 +584,21 @@
},
methods: {
+ //鎵撳紑鏃跺姞杞�
+ popupChangeHandler(e) {
+ if (e.show === false) {
+ this.hform.HQty='';
+ this.hform.HBadCount=0;
+ this.hform.HWasterQty=0;
+ this.getNewData()
+ }
+ },
+ //鎵撳紑寮规
+ showPopup(hBarCode) {
+ this.hform.HBarCode=hBarCode;
+ this.toInCode(hBarCode);
+ this.$refs.popup.open();
+ },
//閫変腑鍏ㄩ儴鏂囨湰
selectAllText(e) {
console.log(e.target)
@@ -1192,10 +1124,15 @@
this.setMainHSEQ();
}
} else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
+ if(res.data.Message=="瀛愬簭鍒楃己澶�"){
+ this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
+ }else{
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+
}
},
fail: (res) => {
@@ -1759,27 +1696,31 @@
})
}, 1000)
} else {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧炰笅涓�閬撳伐搴忥紵(鐐瑰嚮鍙栨秷杩斿洖鏂板椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- this.getNextProc()
- // uni.redirectTo({
- // url: '/pages/gongxuOut/form?OperationType=1'
- // })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- // setTimeout(() => {
- // uni.navigateBack();
- // }, 50)
- uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1'
- })
- }
- }
- });
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: res.data.Message + '銆傛槸鍚︾户缁柊澧炰笅涓�閬撳伐搴忥紵(鐐瑰嚮鍙栨秷杩斿洖鏂板椤甸潰)',
+ // success: (res) => {
+ // if (res.confirm) {
+ // console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ // this.getNextProc()
+ // // uni.redirectTo({
+ // // url: '/pages/gongxuOut/form?OperationType=1'
+ // // })
+ // } else if (res.cancel) {
+ // console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ // // setTimeout(() => {
+ // // uni.navigateBack();
+ // // }, 50)
+ // uni.redirectTo({
+ // url: '/pages/gongxuOut/form?OperationType=1'
+ // })
+ // }
+ // }
+ // });
}
} else {
uni.showToast({
@@ -1970,9 +1911,14 @@
<style lang="scss" scoped>
.form {
- width: 668rpx;
- margin: 20rpx auto;
- padding-bottom: 240rpx;
+ box-sizing: border-box;
+ border-radius: 15rpx 15rpx 0 0;
+ padding: 20rpx 20rpx 40rpx 20rpx;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ overflow-y: auto;
}
picker input{
pointer-events: none;
diff --git a/manifest.json b/manifest.json
index e01e636..6709bb4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.99",
- "versionCode" : 199,
+ "versionName" : "2.0.3",
+ "versionCode" : 203,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -18,10 +18,10 @@
},
/* 妯″潡閰嶇疆 */
"modules" : {
- "Barcode" : {},
"Camera" : {},
"Contacts" : {},
- "Bluetooth" : {}
+ "Bluetooth" : {},
+ "Barcode" : {}
},
/* 搴旂敤鍙戝竷淇℃伅 */
"distribute" : {
@@ -59,33 +59,33 @@
},
"icons" : {
"android" : {
- "hdpi" : "unpackage/res/icons/72x72.png",
- "xhdpi" : "unpackage/res/icons/96x96.png",
- "xxhdpi" : "unpackage/res/icons/144x144.png",
- "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ "hdpi" : "",
+ "xhdpi" : "",
+ "xxhdpi" : "",
+ "xxxhdpi" : ""
},
"ios" : {
- "appstore" : "unpackage/res/icons/1024x1024.png",
+ "appstore" : "",
"ipad" : {
- "app" : "unpackage/res/icons/76x76.png",
- "app@2x" : "unpackage/res/icons/152x152.png",
+ "app" : "",
+ "app@2x" : "",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
- "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "proapp@2x" : "",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
- "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight" : "",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
- "app@2x" : "unpackage/res/icons/120x120.png",
- "app@3x" : "unpackage/res/icons/180x180.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "notification@3x" : "unpackage/res/icons/60x60.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "settings@3x" : "unpackage/res/icons/87x87.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png",
- "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ "app@2x" : "",
+ "app@3x" : "",
+ "notification@2x" : "",
+ "notification@3x" : "",
+ "settings@2x" : "",
+ "settings@3x" : "",
+ "spotlight@2x" : "",
+ "spotlight@3x" : ""
}
}
}
diff --git a/pages.json b/pages.json
index b97e612..3807c28 100644
--- a/pages.json
+++ b/pages.json
@@ -189,12 +189,6 @@
}
},
{
- "path": "pages/gongxuOutSendWork/form",
- "style": {
- "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)"
- }
- },
- {
"path": "pages/gongxuOutSendWork/table",
"style": {
"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index 27a3014..d9cc718 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -4,7 +4,7 @@
<view class="form-item">
<view class="title"><text>*</text>鏉″舰鐮�:</view>
<view class="right" style="width: 380rpx;">
- <input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)" />
+ <input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -23,9 +23,12 @@
<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
@blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
</view>
- <uni-icons type="scan"
+ <!-- <uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" @click="toScanProcNo"></uni-icons>
+ size="20" @click="toScanProcNo"></uni-icons> -->
+ <view class="icon-wrapper" >
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
</view>
<view class="form-item">
<view class="title">宸ュ簭缂栫爜:</view>
@@ -488,11 +491,13 @@
@tap="check">瀹℃牳</button>
<button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
@tap="abandonCheck">鍙嶅鏍�</button>
- <flex style="flex: 1;"></flex>
+ <!-- <flex style="flex: 1;"></flex> -->
<button class="btn-b" size="mini" @tap="addNew">鏂板</button>
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
</view>
+ <ProcListPopupVue ref="billList" :HProcExchHBillNo="hform.HProcExchBillNo" :HProcExchHInteID="hform.HProcExchHinteID"
+ ></ProcListPopupVue>
</view>
</template>
<script>
@@ -501,7 +506,9 @@
getUserInfo
} from "@/utils/auth.js";
import { CommonUtils } from '../../utils/common';
+import ProcListPopupVue from '../../components/ProcListPopup/ProcListPopup.vue';
export default {
+ components: { ProcListPopupVue },
data() {
return {
userInfo: getUserInfo(),
@@ -648,10 +655,11 @@
} else {
this.getNewData()
if(e.HBarCode){
+ console.log(e.HBarCode)
this.hform.HBarCode=e.HBarCode
setTimeout(() => {
- this.toInCode(e);
- }, 1000)
+ this.toInCode();
+ }, 500)
}
}
@@ -664,9 +672,30 @@
this.getHCenterList()
this.getDefValByUser()
-
+ uni.$on('HProcNoSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HProcNo)
+ this.hform.HProcNo=e.HProcNo;
+ this.hform.HSEQNumber = e.HSEQNumber;
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ this.$refs.billList.exit()
+ })
},
+ onUnload() {
+ uni.$off('HProcNoSelectComplete')
+ },
methods: {
+ //閫夋嫨宸ュ簭
+ showBillList() {
+ if(this.hform.HProcExchBillNo!=""){
+ this.$refs.billList.showPopup()
+ }else{
+ uni.showToast({
+ title: '璇峰厛鎵弿娴佽浆鍗�',
+ icon: 'none'
+ })
+ }
+
+ },
//閫変腑鍏ㄩ儴鏂囨湰
selectAllText(e) {
console.log(e.target)
@@ -774,7 +803,7 @@
// }
// });
},
- toInCode(e) {
+ toInCode() {
var str = this.hform.HBarCode
if (str.includes('@')) {
const parts = str.split('@');
@@ -1544,7 +1573,10 @@
},
});
},
- getHProcNoData2(HBarCode, HProcNo,HSEQNumber) {
+ getHProcNoData2(HBarCode,HProcNo,HSEQNumber) {
+ if(HProcNo==""){
+ return;
+ }
uni.request({
url: this.serverUrl + '/Cj_StationOutBill/txtHProcNo_KeyDown',
data: {
@@ -1922,15 +1954,19 @@
console.log(1, res);
if (res.data.count == 1) {
let processList = res.data.data
-
+ let self = this;
+ console.log(this.hform)
+ console.log(self.hform)
// 1. 鍏堣繃婊ゅ嚭 HSEQNumber === 'N' 鐨勬暟鎹�
processList = processList.filter(item => item.HSEQNumber === this.hform.HSEQNumber);
//褰撳墠宸ュ簭缂栧彿
- const currentIndex = processList.findIndex(item => item["宸ュ簭鍙�"] === this.hform.HProcNo);
+ const currentIndex = processList.findIndex(item => item["宸ュ簭鍙�"] == this.hform.HProcNo);
// 鑾峰彇涓嬩竴涓伐搴忥紙濡傛灉瀛樺湪锛�
const nextProcess = currentIndex !== -1 && currentIndex < processList.length - 1
? processList[currentIndex + 1] : null;
+ console.log(currentIndex,nextProcess,processList);
+
if(!nextProcess){
uni.showToast({
title: '娌℃湁涓嬩竴閬撳伐搴忓嵆灏嗚烦杞柊澧為〉闈�',
@@ -1969,6 +2005,19 @@
</script>
<style lang="scss" scoped>
+ .icon-wrapper {
+ background-color: #3A78FF;
+ border-radius: 100%;
+ width: 52rpx;
+ height: 52rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
.form {
width: 668rpx;
margin: 20rpx auto;
diff --git a/pages/gongxuOutSendWork/table.vue b/pages/gongxuOutSendWork/table.vue
index 52b4f46..83cf69d 100644
--- a/pages/gongxuOutSendWork/table.vue
+++ b/pages/gongxuOutSendWork/table.vue
@@ -1,7 +1,11 @@
<template>
<view class="content">
<view class="list" v-for="(item,index) in showList" :key="index">
- <uni-card :title="item.浠诲姟鍗�" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <uni-card :title="item.浠诲姟鍗曞彿"
+ :extra="item.鍗曟嵁鍙�"
+ style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index"
+ :id="'card-'+index">
<view class="card-detail">
<view class="detail" v-if="item.宸ュ簭娴佽浆鍗″彿">
<text>娴佽浆鍗″彿锛�</text>{{item.宸ュ簭娴佽浆鍗″彿}}
@@ -15,11 +19,14 @@
<view class="detail" v-if="item.娆惧彿">
<text>娆惧彿锛�</text>{{item.娆惧彿}}
</view>
- <view class="detail" v-if="item.褰撳墠宸ュ簭">
- <text>褰撳墠宸ュ簭锛�</text>{{item.褰撳墠宸ュ簭}}
+ <view class="detail" v-if="item.宸ュ簭鍚嶇О">
+ <text>宸ュ簭鍚嶇О锛�</text>{{item.宸ュ簭鍚嶇О}}
</view>
- <view class="detail" v-if="item.褰撳墠宸ュ簭浠ｇ爜">
- <text>宸ュ簭浠ｇ爜锛�</text>{{item.褰撳墠宸ュ簭浠ｇ爜}}
+ <view class="detail" v-if="item.宸ュ簭浠ｇ爜">
+ <text>宸ュ簭浠ｇ爜锛�</text>{{item.宸ュ簭浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.鍓╀綑鏁伴噺">
+ <text>鍓╀綑鏁伴噺锛�</text>{{item.鍓╀綑鏁伴噺}}
</view>
<view class="detail" v-if="item.鏃ユ湡">
<text>鏃ユ湡锛�</text>{{item.鏃ユ湡.substr(0,10)}}
@@ -32,69 +39,32 @@
<view class="detail" v-if="item.娴佹按鍙�">
<text>娴佹按鍙凤細</text>{{item.娴佹按鍙穧}
</view>
- <view class="detail" v-if="item.鍑虹珯鏁伴噺">
- <text>鍑虹珯鏁伴噺锛�</text>{{item.鍑虹珯鏁伴噺}}
+ <view class="detail" v-if="item.娴佽浆鍗℃暟閲�">
+ <text>娴佽浆鍗℃暟閲忥細</text>{{item.娴佽浆鍗℃暟閲弣}
</view>
- <view class="detail" v-if="item.涓嶈壇鏁伴噺">
- <text>涓嶈壇鏁伴噺锛�</text>{{item.涓嶈壇鏁伴噺}}
+ <view class="detail" v-if="item.鎿嶄綔宸ュ悕绉�">
+ <text>鎿嶄綔宸ワ細</text>{{item.鎿嶄綔宸ュ悕绉皚}
</view>
- <view class="detail" v-if="item.鎶ュ簾鏁伴噺">
- <text>鎶ュ簾鏁伴噺锛�</text>{{item.鎶ュ簾鏁伴噺}}
+ <view class="detail" v-if="item.鎿嶄綔宸ヤ唬鐮�">
+ <text>鎿嶄綔宸ヤ唬鐮侊細</text>{{item.鎿嶄綔宸ヤ唬鐮亇}
</view>
- <view class="detail" v-if="item.鍖呰鏍囪瘑">
- <text>鍖呰鏍囪瘑锛�</text>{{item.鍖呰鏍囪瘑}}
- </view>
- <view class="detail" v-if="item.鍖呰鏍囪瘑浠ｇ爜">
- <text>鍖呰鏍囪瘑浠ｇ爜锛�</text>{{item.鍖呰鏍囪瘑浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.鍑虹珯鏃堕棿">
- <text>鍑虹珯鏃堕棿锛�</text>{{item.鍑虹珯鏃堕棿.substr(0,19)}}
- </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 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 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.LOT鏁伴噺">
- <text>LOT鏁伴噺锛�</text>{{item.LOT鏁伴噺}}
+ <view class="detail" v-if="item.鐝粍浠ｇ爜">
+ <text>鐢熶骇鐝粍浠ｇ爜锛�</text>{{item.鐝粍浠ｇ爜}}
</view>
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>娲惧崟浜猴細</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.淇敼浜�">
- <text>淇敼浜猴細</text>{{item.淇敼浜簘}
- </view>
- <view class="detail" v-if="item.淇敼鏃ユ湡">
- <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.瀹℃牳浜�">
- <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
- </view>
- <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
- <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.鍏抽棴浜�">
- <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
- </view>
- <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
- <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
</view>
<view class="detail" v-if="item.澶囨敞">
<text>澶囨敞锛�</text>{{item.澶囨敞}}
@@ -105,7 +75,7 @@
<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">
+ <view class="part" @tap.stop="showStationOutBill(item,index)">
<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎶ュ伐
</view>
</view>
@@ -113,33 +83,40 @@
<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">
+ <view class="part" @tap.stop="showStationOutBill(item,index)">
<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎶ュ伐
</view>
</view>
</uni-card>
</view>
+ <BillListPopupVue ref="billList"></BillListPopupVue>
<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 style="height: 75vh;"></view>
</view>
</template>
<script>
import { getUserInfo } from "@/utils/auth.js";
+ import BillListPopupVue from '../../components/StationOutBillPopup/StationOutBillPopup.vue';
export default {
data() {
return {
userInfo:getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
- sWhere:'',
+ sWhere:' and 1=1',
listData:[],
showList:[],
showDetail:-1,
page:1,
}
},
+ components: {
+ BillListPopupVue
+ },
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -157,6 +134,19 @@
}, 1000);
},
methods: {
+ //鍑虹珯姹囨姤鏄剧ず
+ showStationOutBill(e,index) {
+ console.log(e);
+ console.log(index);
+ uni.pageScrollTo({
+ //scrollTop: 20,
+ selector:`#card-${index}`,
+ duration: 100,
+ });
+
+ const hBarCode = e.宸ュ簭娴佽浆鍗″彿+"@"+e.宸ュ簭鍙�+"@"+e.搴忓垪鍙�;
+ this.$refs.billList.showPopup(hBarCode);
+ },
getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
@@ -171,17 +161,16 @@
})
return false;
}
- this.sWhere += ` and HEmpID = ${this.userInfo.HEmpID}
- and CONVERT(DATE, 鏃ユ湡) = CONVERT(DATE, GETDATE())`
+ this.sWhere += ` and CONVERT(DATE, 鏃ユ湡) = CONVERT(DATE, GETDATE())`
uni.showLoading({
title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList',
+ url: this.serverUrl + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillListByEmp',
data:{
sWhere: this.sWhere,
user: uni.getStorageSync('HUserName'),
- HBillSubType:'',
+ HEmpID:this.userInfo.HEmpID,
},
success: (res) => {
// console.log(1,res.data.data);
@@ -210,7 +199,16 @@
});
this.sWhere = ``
},
-
+ //閲嶇疆
+ clear(){
+ this.listData = []
+ this.page = 1
+ this.showList = []
+ this.sWhere = ' and 1=1'
+ this.showDetail = -1,
+
+ this.getList()
+ },
}
}
</script>
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 3ac4a53..4cd146d 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -85,6 +85,7 @@
"娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
"瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
"浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
+ "缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/'
},
serverUrlName: '娴欐睙鏅轰簯杩堟��',
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 5fbbe68..a7c0d9d 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -141,7 +141,14 @@
url: '/pages/mujvzhuangtai/mujvzhuangtai',
id: 15,
hidden: true,
- },
+ }, {
+ img: '../../static/icon/icon10.png',
+ text: '鎴戠殑浠诲姟',
+ tip: '绔嬪嵆鏂板',
+ url: '/pages/gongxuOutSendWork/table',
+ id: 16,
+ hidden: false,
+ },
]
// itemData: [{
// // img:'../../static/icon0.png',
--
Gitblit v1.9.1