From 25100ec3d663fdab00f6dacb9f427b772c2f806f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 14 七月 2025 12:27:54 +0800
Subject: [PATCH] 合并开发文件
---
pages/yichang/list.vue | 388 ++++++++++++++++++-------------------------------------
1 files changed, 129 insertions(+), 259 deletions(-)
diff --git a/pages/yichang/list.vue b/pages/yichang/list.vue
index 5093097..8fabf6e 100644
--- a/pages/yichang/list.vue
+++ b/pages/yichang/list.vue
@@ -23,18 +23,17 @@
<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</view>
</view>
-
+
<view class="buttons">
<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
<!-- <button class="btn-b" size="mini" type="default">鏂板</button> -->
<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
</view>
</view>
-
+
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
+
<view class="list" v-for="(item,index) in listData" :key="index">
- <!-- #ifndef MP-WEIXIN -->
<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;">
<view class="card-detail">
<view class="detail" v-if="item.涓婚">
@@ -52,7 +51,7 @@
<view class="detail" v-if="item.鏄惁瀹屾垚">
<text>鏄惁瀹屾垚锛�</text>{{item.鏄惁瀹屾垚}}
</view>
-
+
<view class="detail" v-if="item.鎺ユ敹閮ㄩ棬">
<text>鎺ユ敹閮ㄩ棬锛�</text>{{item.鎺ユ敹閮ㄩ棬}}
</view>
@@ -61,8 +60,8 @@
</view>
<view class="detail" v-if="item.鎶勯�佷汉">
<text>鎶勯�佷汉锛�</text>{{item.鎶勯�佷汉}}
- </view>
-
+ </view>
+
<view class="detail" v-if="item.绱ф�ョ▼搴�">
<text>绱ф�ョ▼搴︼細</text>{{item.绱ф�ョ▼搴}
</view>
@@ -111,7 +110,7 @@
<view class="detail" v-if="item.琛ㄥご澶囨敞">
<text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
</view>
-
+
<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
</view>
@@ -143,130 +142,20 @@
<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
</view>
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;">
- <view class="card-detail">
- <view class="detail" v-if="item['涓婚']">
- <text>涓婚锛�</text>{{item['涓婚']}}
- </view>
- <view class="detail" v-if="item['寮傚父绫诲瀷']">
- <text>寮傚父绫诲瀷锛�</text>{{item['寮傚父绫诲瀷']}}({{item['寮傚父绫诲瀷浠ｇ爜']}})
- </view>
- <view class="detail" v-if="item['鍙戦�侀儴闂�']">
- <text>鍙戦�侀儴闂細</text>{{item['鍙戦�侀儴闂�']}}
- </view>
- <view class="detail" v-if="item['鍙戦�佷汉']">
- <text>鍙戦�佷汉锛�</text>{{item['鍙戦�佷汉']}}
- </view>
- <view class="detail" v-if="item['鏄惁瀹屾垚']">
- <text>鏄惁瀹屾垚锛�</text>{{item['鏄惁瀹屾垚']}}
- </view>
- <view class="detail" v-if="item['鎺ユ敹閮ㄩ棬']">
- <text>鎺ユ敹閮ㄩ棬锛�</text>{{item['鎺ユ敹閮ㄩ棬']}}
- </view>
- <view class="detail" v-if="item['鎺ユ敹浜�']">
- <text>鎺ユ敹浜猴細</text>{{item['鎺ユ敹浜�']}}
- </view>
- <view class="detail" v-if="item['鎶勯�佷汉']">
- <text>鎶勯�佷汉锛�</text>{{item['鎶勯�佷汉']}}
- </view>
- <view class="detail" v-if="item['绱ф�ョ▼搴�']">
- <text>绱ф�ョ▼搴︼細</text>{{item['绱ф�ョ▼搴�']}}
- </view>
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view>
- <view class="detail" v-if="item['鍗曟嵁鍙风爜']">
- <text>鍗曟嵁鍙风爜锛�</text>{{item['鍗曟嵁鍙风爜']}}
- </view>
- <view class="detail" v-if="item['浜у搧鍚嶇О']">
- <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
- </view>
- <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
- </view>
- <view class="detail" v-if="item['璁惧鍚嶇О']">
- <text>璁惧鍚嶇О锛�</text>{{item['璁惧鍚嶇О']}}
- </view>
- <view class="detail" v-if="item['妯℃不鍏峰悕绉�']">
- <text>妯℃不鍏峰悕绉帮細</text>{{item['妯℃不鍏峰悕绉�']}}
- </view>
- <view class="detail" v-if="item['澶勭悊浜�']">
- <text>澶勭悊浜猴細</text>{{item['澶勭悊浜�']}}({{item['澶勭悊浜轰唬鐮�']}})
- </view>
- <view class="detail" v-if="item['澶勭悊鍐呭']">
- <text>澶勭悊鍐呭锛�</text>{{item['澶勭悊鍐呭']}}
- </view>
- <view class="detail" v-if="item['澶勭悊缁撴灉']">
- <text>澶勭悊缁撴灉锛�</text>{{item['澶勭悊缁撴灉']}}
- </view>
- <view class="detail" v-if="item['澶勭悊鍘熷洜']">
- <text>澶勭悊鍘熷洜锛�</text>{{item['澶勭悊鍘熷洜']}}
- </view>
- <view class="detail" v-if="item['澶勭悊瀹屾垚鏃堕棿']">
- <text>澶勭悊瀹屾垚鏃堕棿锛�</text>{{item['澶勭悊瀹屾垚鏃堕棿'].substr(0,10)}}
- </view>
- <view class="detail" v-if="item['寮傚父鍙嶉鍗曞彿']">
- <text>寮傚父鍙嶉鍗曞彿锛�</text>{{item['寮傚父鍙嶉鍗曞彿']}}
- </view>
- <view class="detail" v-if="item['寮傚父鍙嶉鍗曚富鍐呯爜']">
- <text>寮傚父鍙嶉鍗曚富鍐呯爜锛�</text>{{item['寮傚父鍙嶉鍗曚富鍐呯爜']}}
- </view>
- <view class="detail" v-if="item['寮傚父鍙嶉鍗曞瓙鍐呯爜']">
- <text>寮傚父鍙嶉鍗曞瓙鍐呯爜锛�</text>{{item['寮傚父鍙嶉鍗曞瓙鍐呯爜']}}
- </view>
- <view class="detail" v-if="item['琛ㄥご澶囨敞']">
- <text>琛ㄥご澶囨敞锛�</text>{{item['琛ㄥご澶囨敞']}}
- </view>
- <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
- <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡'].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['鍏抽棴浜�']}}
- </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="more">
+ <view class="part" style="border-right: 1px solid #eee;" @tap="reads(item.鍐呭)">
+ <uni-icons type="bars" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鍐呭
</view>
- <!-- #endif -->
-
- <view class="more">
- <view class="part" style="border-right: 1px solid #eee;" @tap="reads(item.鍐呭)">
- <uni-icons type="bars" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鍐呭
- </view>
- <view class="part" style="border-right: 1px solid #eee;color: #d98d00;" @tap="toCheck(item)">
- <uni-icons type="bars" style="color: #d98d00;margin-right: 10rpx;" size="14"></uni-icons>瀹℃牳
- </view>
- <view class="part" style="color: #da0000;" @tap="toDel(item)">
- <uni-icons type="pulldown" style="color: #da0000;margin-right: 10rpx;"
- size="14"></uni-icons>鍒犻櫎
- </view>
+ <view class="part" style="border-right: 1px solid #eee;color: #d98d00;" @tap="toCheck(item)">
+ <uni-icons type="bars" style="color: #d98d00;margin-right: 10rpx;" size="14"></uni-icons>瀹℃牳
</view>
- </uni-card>
+ <view class="part" style="color: #da0000;" @tap="toDel(item)">
+ <uni-icons type="pulldown" style="color: #da0000;margin-right: 10rpx;" size="14"></uni-icons>鍒犻櫎
+ </view>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length > 0 && loading">鍔犺浇涓�</view>
<view class="over" v-if="listData.length != 0 && !loading">宸插埌搴�</view>
@@ -274,70 +163,68 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
import getDateTime from '@/utils/getdateTime.js';
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HEndDate: getDateTime.dateTimeStr('y-m-d'),
- HBeginDate: this.getEndDate(),
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HEndDate:getDateTime.dateTimeStr('y-m-d'),
+ HBeginDate:this.getEndDate(),
},
- sWhere: '',
- listData: [],
- listDataNew: [],
- page: 1,
- loading: true,
- }
- },
+ sWhere:'',
+ listData:[],
+ listDataNew:[],
+ page:1,
+ loading:true,
+ }
+ },
onLoad() {
uni.showLoading({
- title: '鍔犺浇涓�'
+ title:'鍔犺浇涓�'
})
this.search()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- onReachBottom() {
- if (this.loading == true) {
+ onReachBottom(){
+ if(this.loading == true){
this.page++
this.getList()
}
},
- methods: {
- getList() {
- console.log(this.sWhere, uni.getStorageSync('HUserName'), this.page)
+ methods: {
+ getList(){
+ console.log(this.sWhere,uni.getStorageSync('HUserName'),this.page)
uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackHandleBillListPage',
- data: {
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackHandleBillListPage',
+ data:{
sWhere: this.sWhere,
user: uni.getStorageSync('HUserName'),
- page: this.page,
- size: 20,
+ page:this.page,
+ size:20,
},
- success: (res) => {
- console.log(1, res.data);
+ success: (res) => {
+ console.log(1,res.data);
uni.hideLoading()
- if (res.data.code == 1) {
+ if(res.data.code == 1){
this.listDataNew = res.data.data
- if (this.listDataNew.length < 20) {
+ if(this.listDataNew.length<20){
this.loading = false
}
this.listData = this.listData.concat(this.listDataNew)
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -345,28 +232,28 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- HBeginDateChange(e) {
+ HBeginDateChange(e){
console.log(e.detail.value)
this.hform.HBeginDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- HEndDateChange(e) {
+ HEndDateChange(e){
console.log(e.detail.value)
this.hform.HEndDate = e.detail.value
},
- search() {
- this.sWhere = ''
- this.listData = []
- this.listDataNew = []
- this.page = 1
- this.loading = true
+ search(){
+ this.sWhere=''
+ this.listData=[]
+ this.listDataNew=[]
+ this.page=1
+ this.loading=true
if (this.hform.HBeginDate) {
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
}
@@ -378,7 +265,7 @@
}
this.getList()
},
- getEndDate() {
+ getEndDate(){
let currentDate = new Date();
currentDate.setMonth(currentDate.getMonth() - 1);
let year = currentDate.getFullYear();
@@ -386,210 +273,193 @@
let day = String(currentDate.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
},
- clear() {
+ clear(){
this.sWhere = ''
this.hform = {
- HBillNo: '',
- HEndDate: getDateTime.dateTimeStr('y-m-d'),
- HBeginDate: this.getEndDate(),
+ HBillNo:'',
+ HEndDate:getDateTime.dateTimeStr('y-m-d'),
+ HBeginDate:this.getEndDate(),
}
this.search()
},
- reads(e) {
+ reads(e){
uni.showModal({
content: e,
showCancel: false
});
},
- toCheck(item) {
+ toCheck(item){
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭瀹℃牳?',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ title: '鎻愮ず',
+ content: '鏄惁纭瀹℃牳?',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.request({
- url: this.serverUrl +
- '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackHandleBill',
- data: {
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackHandleBill',
+ data:{
HInterID: item.hmainid,
CurUserName: uni.getStorageSync('HUserName'),
- IsAudit: 0
+ IsAudit:0
},
- success: (res) => {
- console.log(1, res);
- if (res.data.count == 1) {
+ success: (res) => {
+ console.log(1,res);
+ if(res.data.count == 1){
this.clear()
}
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
},
fail: (res) => {
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
},
- toDel(item) {
+ toDel(item){
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.request({
- url: this.serverUrl +
- '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackHandleBill',
- data: {
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackHandleBill',
+ data:{
HInterID: item.hmainid,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
- console.log(1, res);
- if (res.data.count == 1) {
+ success: (res) => {
+ console.log(1,res);
+ if(res.data.count == 1){
this.clear()
}
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
},
fail: (res) => {
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
}
- }
+ }
}
</script>
<style lang="scss" scoped>
- .form {
+ .form{
width: 640rpx;
margin: 20rpx auto;
}
-
- .form-item {
+ .form-item{
display: flex;
align-items: center;
font-size: 28rpx;
padding: 6rpx 0;
-
- .title {
+ .title{
width: 180rpx;
-
- text {
+ text{
color: red;
font-weight: bold;
}
}
-
- .right {
+ .right{
width: 450rpx;
border-radius: 22rpx;
border: 1px solid #acacac;
}
-
- .righton {
+ .righton{
width: 450rpx;
border-radius: 22rpx;
border: 1px solid #e4e4e4;
background-color: #e4e4e4;
}
-
- input {
+ input{
width: 100%;
padding: 8rpx 20rpx;
font-size: 30rpx;
}
}
-
- .buttons {
+ .buttons{
width: 100%;
display: flex;
justify-content: center;
margin-top: 20rpx;
-
- button {
+ button{
border-radius: 50rpx;
width: 180rpx;
height: 66rpx;
line-height: 66rpx;
font-size: 28rpx;
}
-
- .btn-a {
+ .btn-a{
background-color: #acacac;
color: #fff;
}
-
- .btn-b {
+ .btn-b{
background-color: #41a863;
color: #fff;
}
-
- .btn-c {
+ .btn-c{
background-color: #3a78ff;
color: #fff;
}
}
-
- .list {
+
+ .list{
width: 100%;
-
- .card-detail {
+ .card-detail{
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
line-height: 120%;
-
- .detail {
+ .detail{
// width: 50%;
font-size: 26rpx;
margin-bottom: 12rpx;
color: #555;
margin-right: 20rpx;
-
- text {
+ text{
color: #999;
font-size: 26rpx;
}
}
}
-
- .more {
+ .more{
color: #888;
font-size: 24rpx;
display: flex;
border-top: 1px solid #eee;
padding-top: 20rpx;
-
- .part {
+ .part{
width: 50%;
text-align: center;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
--
Gitblit v1.9.1