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/shebeilvli/table.vue | 439 -
pages/shebeiweixiu/table.vue | 475 -
pages/baoyangjilu/table.vue | 396 -
pages/shebeiweixiu/gz_table.vue | 516 +-
pages/shouliaotongzhi/table.vue | 229 +
pages/index/vers.vue | 280 +
.hbuilderx/launch.json | 36
pages/shebeilvli/form.vue | 523 +--
pages/baoyangjilu/table_son.vue | 190
pages/shebeilvli/table_son.vue | 165
pages/baogong/list.vue | 16
pages/shebeiguanli/list.vue | 165
pages/xiaoshouchuku/table.vue | 4
pages/weiwaigxIn/form.vue | 5
pages/baoyangjihua/table_son.vue | 4
main.js | 3
pages/index/login.vue | 1
pages/yichang/table.vue | 296 -
pages/shebeiguanli/table.vue | 524 +--
pages/shouliaotongzhi/table_son.vue | 299 +
pages/index/index.vue | 21
pages/index/mine.vue | 2
pages/guzhangdengji/table.vue | 459 -
pages/yichang/list.vue | 388 -
pages/weiwaigxOut/form.vue | 5
pages.json | 313 +
pages/gongxuOut/table.vue | 513 +-
pages/baoyangjihua/table.vue | 378 -
pages/weiwaigxIn/table.vue | 430 -
pages/shebeidangan/table.vue | 492 -
pages/weiwaigxOut/table.vue | 620 +--
README.md | 14
pages/gongxuIn/form.vue | 5
static/icon/icon21.png | 0
manifest.json | 9
pages/gongxuIn/table.vue | 481 +-
static/icon/icon_a21.png | 0
pages/baoyangjilu/plan.vue | 280
pages/gongxuOut/form.vue | 1164 +++---
39 files changed, 4,333 insertions(+), 5,807 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 2416144..582561b 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -1,24 +1,16 @@
-{
- // launch.json 閰嶇疆浜嗗惎鍔ㄨ皟璇曟椂鐩稿叧璁剧疆锛宑onfigurations涓嬭妭鐐瑰悕绉板彲涓� app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
- // launchtype椤瑰彲閰嶇疆鍊间负local鎴杛emote, local浠ｈ〃鍓嶇杩炴湰鍦颁簯鍑芥暟锛宺emote浠ｈ〃鍓嶇杩炰簯绔簯鍑芥暟
- "version" : "0.0",
- "configurations" : [
- {
- "app-plus" : {
- "launchtype" : "local"
- },
- "default" : {
- "launchtype" : "local"
- },
- "type" : "uniCloud"
- },
- {
- "openVueDevtools" : true,
- "type" : "uni-app:app-ios"
- },
- {
- "openVueDevtools" : true,
- "type" : "uni-app:app-android"
- }
+{ // launch.json 閰嶇疆浜嗗惎鍔ㄨ皟璇曟椂鐩稿叧璁剧疆锛宑onfigurations涓嬭妭鐐瑰悕绉板彲涓� app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype椤瑰彲閰嶇疆鍊间负local鎴杛emote, local浠ｈ〃鍓嶇杩炴湰鍦颁簯鍑芥暟锛宺emote浠ｈ〃鍓嶇杩炰簯绔簯鍑芥暟
+ "version": "0.0",
+ "configurations": [{
+ "app-plus" :
+ {
+ "launchtype" : "local"
+ },
+ "default" :
+ {
+ "launchtype" : "local"
+ },
+ "type" : "uniCloud"
+ }
]
}
diff --git a/README.md b/README.md
index 314d962..563d394 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,19 @@
鍚庡彴鍦板潃锛�
[](http://47.96.97.237/UI/views/user/login.html)
[](http://47.96.97.237/UI/views/user/login_pda.html)
-
+[git](http://jhz@101.37.171.70:10101/r/~jhz/STUWMS.git)
###淇敼
-git閰嶇疆(鎴戣嚜宸辩殑)
+2025/06/30
+娣诲姞鍔熻兘妯″潡锛氶噰璐叆搴擄紝閲囪喘閫�鏂欙紝閿�鍞嚭搴擄紝閿�鍞��璐�
+娴嬭瘯鏁版嵁锛氶噰璐崟锛圕GDD000200锛夛紝閿�鍞崟(XSDD000084)
+鐗╂枡鏉＄爜锛�101.2100227锛�101.2100228锛�101.2165807锛�101.2329774锛堥敊璇級
+101.2165807锛�101.2100233锛�101.2100229锛�101.2100238
+
+2025/07/07
+娣诲姞鍔熻兘妯″潡锛氳嚜鍔ㄦ洿鏂帮紝鎵撳嵃鏉＄爜
+娴嬭瘯鏁版嵁锛氭敹鏂欓�氱煡鍗�(CGSL000145)
+
+###git閰嶇疆(鎴戣嚜宸辩殑)
[user]
name = qq_41295110
email = qq_41295110@noreply.gitcode.com
diff --git a/main.js b/main.js
index 983fc86..ba432dd 100644
--- a/main.js
+++ b/main.js
@@ -1,6 +1,5 @@
import App from './App'
-import Printer from './plugins/printer'
-Vue.use(Printer);
+
// 鐢熶骇鐜
// Vue.prototype.serverUrl = "https://qqyapi.xinlinsoft.cn/qqy-api";
// 寮�鍙戠幆澧�
diff --git a/manifest.json b/manifest.json
index f5686f4..630d0a1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
{
"name" : "鏅轰簯LMES",
- "appid" : "__UNI__E5BAC6D",
+ "appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.12",
- "versionCode" : 112,
+ "versionName" : "1.0.13",
+ "versionCode" : 113,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -20,7 +20,8 @@
"modules" : {
"Barcode" : {},
"Camera" : {},
- "Contacts" : {}
+ "Contacts" : {},
+ "Bluetooth" : {}
},
/* 搴旂敤鍙戝竷淇℃伅 */
"distribute" : {
diff --git a/pages.json b/pages.json
index b57a5df..7b3defa 100644
--- a/pages.json
+++ b/pages.json
@@ -1,8 +1,8 @@
{
- "pages": [
- //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+ "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/login",
+
"style": {
"navigationBarTitleText": "鐧诲綍",
"navigationStyle": "custom"
@@ -164,8 +164,7 @@
"navigationBarTitleText": "棣栦欢妫�楠屽崟",
"enablePullDownRefresh": true
}
- },
- {
+ },{
"path": "pages/gongxuIn/form",
"style": {
"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
@@ -177,8 +176,7 @@
"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
"enablePullDownRefresh": true
}
- },
- {
+ },{
"path": "pages/gongxuOut/form",
"style": {
"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
@@ -262,171 +260,240 @@
}
},
{
- "path": "pages/labelPrinter/index",
- "style": {
- "navigationBarTitleText": "鏍囩鎵撳嵃"
- }
- },
- {
- "path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
- "style": {
- "navigationBarTitleText": "璁惧杩愯鐘舵��",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/shebeiyunxingzhuangtai/detail",
- "style": {
- "navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
- }
- },
- {
- "path": "pages/mujvzhuangtai/mujvzhuangtai",
- "style": {
- "navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/mujvzhuangtai/detail",
- "style": {
- "navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
- }
- },
- {
- "path": "pages/tiaomachaima/tiaomachaima",
- "style": {
- "navigationBarTitleText": "鏉＄爜鎷嗙爜"
- }
- },
- {
- "path": "pages/wuliaosaoma/wuliaosaoma",
- "style": {
- "navigationBarTitleText": "鐗╂枡娓呭崟"
- }
- },
- {
- "path": "pages/wuliaosaoma/detail",
- "style": {
- "navigationBarTitleText": "鏉＄爜妗ｆ"
- }
- },
- {
"path": "pages/caigouruku/table",
"style": {
- "navigationBarTitleText": "閲囪喘鍏ュ簱",
+ "navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
"enablePullDownRefresh": true
}
},
{
"path": "pages/caigouruku/form",
"style": {
- "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+ "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/caigoutuiliao/table",
"style": {
- "navigationBarTitleText": "閲囪喘閫�鏂�",
+ "navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
"enablePullDownRefresh": true
}
},
{
"path": "pages/caigoutuiliao/form",
"style": {
- "navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+ "navigationBarTitleText": "閲囪喘閫�鏂欏崟",
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/xiaoshouchuku/table",
"style": {
- "navigationBarTitleText": "閿�鍞嚭搴�",
+ "navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
"enablePullDownRefresh": true
}
},
{
"path": "pages/xiaoshouchuku/form",
"style": {
- "navigationBarTitleText": "閿�鍞嚭搴撳崟"
+ "navigationBarTitleText": "閿�鍞嚭搴撳崟",
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/xiaoshoutuihuo/table",
"style": {
- "navigationBarTitleText": "閿�鍞��璐�",
+ "navigationBarTitleText": "閿�鍞��璐у垪琛�",
"enablePullDownRefresh": true
}
},
{
"path": "pages/xiaoshoutuihuo/form",
"style": {
- "navigationBarTitleText": "閿�鍞��璐у崟"
+ "navigationBarTitleText": "閿�鍞��璐у崟",
+ "enablePullDownRefresh": false
}
},
{
- "path": "pages/qitachuku/qitachuku",
+ "path": "pages/shouliaotongzhi/table",
"style": {
- "navigationBarTitleText": "鍏朵粬鍑哄簱",
- "enablePullDownRefresh": true
+ "navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
+ "enablePullDownRefresh": false
}
},
{
- "path": "pages/qitachuku/form",
+ "path": "pages/shouliaotongzhi/table_son",
"style": {
- "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+ "navigationBarTitleText": "鏉＄爜鐢熸垚",
+ "enablePullDownRefresh": false
}
},
{
- "path": "pages/qitaruku/qitaruku",
- "style": {
- "navigationBarTitleText": "鍏朵粬鍏ュ簱",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/qitaruku/form",
- "style": {
- "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
- }
- },
- {
- "path": "pages/tiaomadaying/tiaomadaying",
- "style": {
- "navigationBarTitleText": "鏉ユ枡鏉＄爜鎵撳嵃"
- }
- }
+ "path": "pages/labelPrinter/index",
+ "style": {
+ "navigationBarTitleText": "鏍囩鎵撳嵃"
+ }
+ },
+ {
+ "path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+ "style": {
+ "navigationBarTitleText": "璁惧杩愯鐘舵��",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/shebeiyunxingzhuangtai/detail",
+ "style": {
+ "navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+ }
+ },
+ {
+ "path": "pages/mujvzhuangtai/mujvzhuangtai",
+ "style": {
+ "navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/mujvzhuangtai/detail",
+ "style": {
+ "navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+ }
+ },
+ {
+ "path": "pages/tiaomachaima/tiaomachaima",
+ "style": {
+ "navigationBarTitleText": "鏉＄爜鎷嗙爜"
+ }
+ },
+ {
+ "path": "pages/wuliaosaoma/wuliaosaoma",
+ "style": {
+ "navigationBarTitleText": "鐗╂枡娓呭崟"
+ }
+ },
+ {
+ "path": "pages/wuliaosaoma/detail",
+ "style": {
+ "navigationBarTitleText": "鏉＄爜妗ｆ"
+ }
+ },
+ {
+ "path": "pages/caigouruku/table",
+ "style": {
+ "navigationBarTitleText": "閲囪喘鍏ュ簱",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/caigouruku/form",
+ "style": {
+ "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+ }
+ },
+ {
+ "path": "pages/caigoutuiliao/table",
+ "style": {
+ "navigationBarTitleText": "閲囪喘閫�鏂�",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/caigoutuiliao/form",
+ "style": {
+ "navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+ }
+ },
+ {
+ "path": "pages/xiaoshouchuku/table",
+ "style": {
+ "navigationBarTitleText": "閿�鍞嚭搴�",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/xiaoshouchuku/form",
+ "style": {
+ "navigationBarTitleText": "閿�鍞嚭搴撳崟"
+ }
+ },
+ {
+ "path": "pages/xiaoshoutuihuo/table",
+ "style": {
+ "navigationBarTitleText": "閿�鍞��璐�",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/xiaoshoutuihuo/form",
+ "style": {
+ "navigationBarTitleText": "閿�鍞��璐у崟"
+ }
+ },
+ {
+ "path": "pages/qitachuku/qitachuku",
+ "style": {
+ "navigationBarTitleText": "鍏朵粬鍑哄簱",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/qitachuku/form",
+ "style": {
+ "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+ }
+ },
+ {
+ "path": "pages/qitaruku/qitaruku",
+ "style": {
+ "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/qitaruku/form",
+ "style": {
+ "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+ }
+ },
+ {
+ "path": "pages/tiaomadaying/tiaomadaying",
+ "style": {
+ "navigationBarTitleText": "鏉ユ枡鏉＄爜鎵撳嵃"
+ }
+ }
],
"tabBar": {
- "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
- "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
- "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
- "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
- "list": [{
- "pagePath": "pages/index/index",
- "iconPath": "static/tabBar/home.png",
- "selectedIconPath": "static/tabBar/home-default.png",
- "text": "棣栭〉"
- },
- {
- "pagePath": "pages/index/tab1",
- "iconPath": "static/tabBar/icon1.png",
- "selectedIconPath": "static/tabBar/icon1-default.png",
- "text": "妯″潡鍔熻兘"
- },
- {
- "pagePath": "pages/index/tab2",
- "iconPath": "static/tabBar/icon2.png",
- "selectedIconPath": "static/tabBar/icon2-default.png",
- "text": "鎶ヨ〃涓績"
- },
- {
- "pagePath": "pages/index/mine",
- "iconPath": "static/tabBar/user.png",
- "selectedIconPath": "static/tabBar/user-default.png",
- "text": "鎴戠殑"
- }
- ]
- },
+ "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+ "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+ "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+ "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+ "list": [{
+ "pagePath": "pages/index/index",
+ "iconPath":"static/tabBar/home.png",
+ "selectedIconPath":"static/tabBar/home-default.png",
+ "text": "棣栭〉"
+ },
+ {
+ "pagePath": "pages/index/tab1",
+ "iconPath":"static/tabBar/icon1.png",
+ "selectedIconPath":"static/tabBar/icon1-default.png",
+ "text": "妯″潡鍔熻兘"
+ },
+ {
+ "pagePath": "pages/index/tab2",
+ "iconPath":"static/tabBar/icon2.png",
+ "selectedIconPath":"static/tabBar/icon2-default.png",
+ "text": "鎶ヨ〃涓績"
+ },
+ {
+ "pagePath": "pages/index/mine",
+ "iconPath":"static/tabBar/user.png",
+ "selectedIconPath":"static/tabBar/user-default.png",
+ "text": "鎴戠殑"
+ }]
+ },
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "璁惧绠＄悊",
@@ -434,13 +501,5 @@
"backgroundColor": "#F8F8F8",
"pageOrientation": "default"
},
- "uniIdRouter": {},
- "condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
- "current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
- "list": [{
- "name": "", //妯″紡鍚嶇О
- "path": "", //鍚姩椤甸潰锛屽繀閫�
- "query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
- }]
- }
-}
\ No newline at end of file
+ "uniIdRouter": {}
+}
diff --git a/pages/baogong/list.vue b/pages/baogong/list.vue
index 86f9ac3..aaeedfe 100644
--- a/pages/baogong/list.vue
+++ b/pages/baogong/list.vue
@@ -1,13 +1,7 @@
<template>
<view class="content">
<view class="list" v-for="(item,index) in listData" :key="index">
- <!-- #ifndef MP-WEIXIN -->
<uni-card :title="'宸ュ崟鍙凤細'+item.HICMOBillNo" :extra="'鏃ユ湡锛�'+item.璁″垝鏃ユ湡" style="margin: 10px;" @tap="edit(item)">
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <!-- FIXME: 寰俊灏忕▼搴忔棤娉曡瘑鍒玡xtra鏍囩锛岄渶瑕佸鎵惧叾浠栨柟娉� -->
- <uni-card :title="'宸ュ崟鍙凤細'+item.HICMOBillNo" style="margin: 10px;" @tap="edit(item)">
- <!-- #endif -->
<view class="card-detail">
<view class="detail" v-if="item.HMaterName" style="width: 100%;">
<text>浜у搧鍚嶇О锛�</text>{{item.HMaterName}}
@@ -24,18 +18,12 @@
<view class="detail" v-if="item.HICMOStatus">
<text>褰撳墠鐘舵�侊細</text>{{item.HICMOStatus}}
</view>
-<!-- <view class="detail" v-if="item.棰嗘枡鐘舵��">
+ <view class="detail" v-if="item.棰嗘枡鐘舵��">
<text>棰嗘枡鐘舵�侊細</text>{{item.棰嗘枡鐘舵�亇}
- </view> -->
-
-< <view class="detail" v-if="item['棰嗘枡鐘舵��']" >
- <text>棰嗘枡鐘舵�侊細</text> {{item['棰嗘枡鐘舵��']}}
</view>
-
-
<view class="detail" style="width: 100%;display: flex;align-items: center;">
<text>鐢熶骇杩涘害锛�</text>
- <zui-progress-bar :value="item.percent" :width="220" type="follow-left" />
+ <zui-progress-bar :value="item.percent" :width="220" type="follow-left"/>
</view>
</view>
</uni-card>
diff --git a/pages/baoyangjihua/table.vue b/pages/baoyangjihua/table.vue
index ea0ae0e..bb83e5c 100644
--- a/pages/baoyangjihua/table.vue
+++ b/pages/baoyangjihua/table.vue
@@ -29,21 +29,18 @@
</picker>
</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="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.璁惧浠ｇ爜">
<text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
@@ -89,12 +86,12 @@
<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>
@@ -108,7 +105,7 @@
<text>鎽樿锛�</text>{{item.鎽樿}}
</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>鏀惰捣
@@ -125,7 +122,7 @@
<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="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
<!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
@@ -134,102 +131,8 @@
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <!-- FIXME: 寰俊灏忕▼搴忎腑娌℃湁:extra :title锛岄渶瑕佸彟鎵捐В鍐虫柟妗�,鍙﹀璁块棶灏忕▼搴忎腑鐨勪腑鏂囧璞℃渶濂界敤['瀵硅薄鍚�']鐨勫舰寮� -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['鍐呴儴鍗曟嵁鍙�']">
- <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item['鍐呴儴鍗曟嵁鍙�']}}
- </view>
- <view class="detail" v-if="item['寮�濮嬫棩']">
- <text>寮�濮嬫棩鏈燂細</text>{{item['寮�濮嬫棩鏈�'].substr(0,10)}}
- </view>
- <view class="detail" v-if="item['缁撴潫鏃ユ湡']">
- <text>缁撴潫鏃ユ湡锛�</text>{{item['缁撴潫鏃ユ湡'].substr(0,10)}}
- </view>
- <view class="detail" v-if="item['淇濆吇鍛ㄦ湡']">
- <text>淇濆吇鍛ㄦ湡(鍗曚綅)锛�</text>{{item['淇濆吇鍛ㄦ湡']}}({{item['鍛ㄦ湡鍗曚綅']}})
- </view>
- <view class="detail" v-if="item['澶囨敞']">
- <text>澶囨敞锛�</text>{{item['澶囨敞']}}
- </view>
- </view>
- <view class="card-detail" v-if="showDetail == index">
- <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="detail" v-if="item['婧愬崟绫诲瀷']">
- <text>婧愬崟绫诲瀷锛�</text>{{item['婧愬崟绫诲瀷']}}
- </view>
- <view class="detail" v-if="item.hbilltype">
- <text>hbilltype锛�</text>{{item.hbilltype}}
- </view>
- <view class="detail" v-if="item['鎽樿']">
- <text>鎽樿锛�</text>{{item['鎽樿']}}
- </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="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
- <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
- <!-- #endif -->
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -237,76 +140,74 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HCreateBy: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HCreateBy:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
// console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
- data: {
+ url: this.serverUrl + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -314,267 +215,244 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
- search() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HCreateBy) {
- this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
-
+
this.getList()
},
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/baoyangjihua/form'
+ url:'/pages/baoyangjihua/form'
})
},
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HBillNo: '',
- HCreateBy: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HBillNo:'',
+ HCreateBy:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
+ }
this.getList()
},
- toSon(item) {
+ toSon(item){
uni.navigateTo({
- url: '/pages/baoyangjihua/table_son?hmainid=' + item.hmainid +
- '&璁惧鍚嶇О=' + item.璁惧鍚嶇О +
- '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
+ url:'/pages/baoyangjihua/table_son?hmainid=' + item.hmainid
+ + '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ + '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
})
},
-
+
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/baoyangjihua/form?hmainid=' + item.hmainid
+ url:'/pages/baoyangjihua/form?hmainid=' + item.hmainid
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 +
- '/Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList',
- data: {
+ url: this.serverUrl + '/Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList',
+ 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.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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 130rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/baoyangjihua/table_son.vue b/pages/baoyangjihua/table_son.vue
index f2da82c..c356524 100644
--- a/pages/baoyangjihua/table_son.vue
+++ b/pages/baoyangjihua/table_son.vue
@@ -1,8 +1,8 @@
<template>
<view class="content">
<view class="infoArea">
- <view class="name">{{infoData['璁惧鍚嶇О']}}</view>
- <view class="dm">锛� 浠ｇ爜锛歿{infoData['璁惧浠ｇ爜']}} 锛�</view>
+ <view class="name">{{infoData.璁惧鍚嶇О}}</view>
+ <view class="dm">锛� 浠ｇ爜锛歿{infoData.璁惧浠ｇ爜}} 锛�</view>
<!-- <view class="other">
<view class="half">鍑哄巶缂栧彿: <text>{{infoData.璁惧鍑哄巶缂栧彿}}</text></view>
<view class="half">鍑哄巶鏃ユ湡: <text>{{infoData.璁惧鍑哄巶鏃ユ湡.substr(0,10)}}</text></view>
diff --git a/pages/baoyangjilu/plan.vue b/pages/baoyangjilu/plan.vue
index 819f42a..aa616ea 100644
--- a/pages/baoyangjilu/plan.vue
+++ b/pages/baoyangjilu/plan.vue
@@ -29,94 +29,89 @@
</picker>
</view>
</view>
-
+
<view class="buttons">
<button class="op5" size="mini" type="default" @tap="clear">閲嶇疆</button>
<button class="op3" size="mini" type="default" @tap="search">鏌ヨ</button>
<button class="op4" size="mini" type="default" @tap="close">鍏抽棴</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;"
- @tap="showDetail = showDetail==index?-1:index">
+ <uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
+ <view 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['寮�濮嬫棩鏈�'].substr(0,10)}}
+ <view class="detail" v-if="item.寮�濮嬫棩鏈�">
+ <text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
</view>
- <view class="detail" v-if="item['缁撴潫鏃ユ湡']">
- <text>缁撴潫鏃ユ湡锛�</text>{{item['缁撴潫鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.缁撴潫鏃ユ湡">
+ <text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
</view>
- <view class="detail" v-if="item['淇濆吇鍛ㄦ湡']">
- <text>淇濆吇鍛ㄦ湡(鍗曚綅)锛�</text>{{item['淇濆吇鍛ㄦ湡']}}({{item['鍛ㄦ湡鍗曚綅']}})
+ <view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
+ <text>淇濆吇鍛ㄦ湡(鍗曚綅)锛�</text>{{item.淇濆吇鍛ㄦ湡}}({{item.鍛ㄦ湡鍗曚綅}})
</view>
- <view class="detail" v-if="item['澶囨敞']">
- <text>澶囨敞锛�</text>{{item['澶囨敞']}}
+ <view class="detail" v-if="item.澶囨敞">
+ <text>澶囨敞锛�</text>{{item.澶囨敞}}
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
- <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['鍒跺崟鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
</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['瀹℃牳鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
</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['淇敼鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
</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['鍏抽棴鏃ユ湡'].substr(0,10)}}
+ <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 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.浣滃簾鏃ユ湡.substr(0,10)}}
+ </view> -->
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
- <view class="detail" v-if="item['hbilltype']">
- <text>hbilltype锛�</text>{{item['hbilltype']}}
+ <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.hbilltype">
+ <text>hbilltype锛�</text>{{item.hbilltype}}
+ </view>
+ <view class="detail" v-if="item.鎽樿">
+ <text>鎽樿锛�</text>{{item.鎽樿}}
</view>
</view>
- <!-- #endif -->
-
-
+
<view class="more" v-if="showDetail == 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="choose(item)">
- <uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>閫夊彇璇ユ暟鎹�
+ <uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>閫夊彇璇ユ暟鎹�
</view>
</view>
<view class="more" v-if="showDetail != index">
@@ -124,64 +119,61 @@
<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
</view>
<view class="part" @tap.stop="choose(item)">
- <uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>閫夊彇璇ユ暟鎹�
+ <uni-icons type="checkmarkempty" style="color: #888;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">宸插埌搴�</view>
</view>
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HCreateBy: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HCreateBy:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
},
- sWhere: '',
- listData: [],
- showDetail: -1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showDetail:-1,
+ }
+ },
created() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
- methods: {
- getList() {
+ methods: {
+ getList(){
// console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
- data: {
+ url: this.serverUrl + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
uni.hideLoading()
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -189,69 +181,69 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
- search() {
+ search(){
this.sWhere = ''
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HCreateBy) {
- this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
-
+
this.getList()
},
- clear() {
+ clear(){
this.sWhere = ''
this.showDetail = -1,
- this.hform = {
- HBillNo: '',
- HCreateBy: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
- }
+ this.hform = {
+ HBillNo:'',
+ HCreateBy:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
+ }
this.getList()
},
- choose(item) {
+ choose(item){
console.log(item)
var data = {
- HPlanName: item.鍗曟嵁鍙�,
- HPlanNo: item.hmainid,
+ HPlanName:item.鍗曟嵁鍙�,
+ HPlanNo:item.hmainid,
}
this.$emit('planData', data)
},
- close() {
- this.$emit('close', true)
+ close(){
+ this.$emit('close',true)
},
- }
+ }
}
</script>
<style lang="scss" scoped>
- .content {
+ .content{
width: 100%;
height: 100%;
background-color: #fff;
@@ -262,54 +254,45 @@
left: 0;
z-index: 99;
}
-
- .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;
@@ -318,50 +301,43 @@
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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 130rpx;
font-size: 25rpx;
@@ -369,28 +345,24 @@
}
}
- .op1 {
+ .op1{
border: 1px solid #41a863;
background-color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
background-color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
background-color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
background-color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
background-color: #888;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/baoyangjilu/table.vue b/pages/baoyangjilu/table.vue
index db45386..f22a823 100644
--- a/pages/baoyangjilu/table.vue
+++ b/pages/baoyangjilu/table.vue
@@ -29,27 +29,25 @@
</picker>
</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="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.璁惧浠ｇ爜">
<text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
</view>
- <!-- <view class="detail" v-if="item.鍗曟嵁绫诲瀷">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
- </view> -->
+<!-- <view class="detail" v-if="item.鍗曟嵁绫诲瀷">
+ <text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
+ </view> -->
<view class="detail" v-if="item.鍐呴儴鍗曟嵁鍙�">
<text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.鍐呴儴鍗曟嵁鍙穧}
</view>
@@ -134,6 +132,7 @@
<text>鎽樿锛�</text>{{item.鎽樿}}
</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>鏀惰捣
@@ -150,7 +149,7 @@
<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="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
<!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
@@ -159,128 +158,8 @@
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
- </view>
- <!-- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view> -->
- <view class="detail" v-if="item['鍐呴儴鍗曟嵁鍙�']">
- <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item['鍐呴儴鍗曟嵁鍙�']}}
- </view>
- <view class="detail" v-if="item['淇濆吇璁″垝缂栧彿']">
- <text>淇濆吇璁″垝缂栧彿锛�</text>{{item['淇濆吇璁″垝缂栧彿']}}
- </view>
- <view class="detail" v-if="item['寮�濮嬫棩鏈�']">
- <text>寮�濮嬫棩鏈燂細</text>{{item['寮�濮嬫棩鏈�'].substr(0,10)}}
- </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['璐熻矗浜�']}}
- </view>
- <view class="detail" v-if="item['琛ㄤ綋澶囨敞']">
- <text>琛ㄤ綋澶囨敞锛�</text>{{item['琛ㄤ綋澶囨敞']}}
- </view>
- <view class="detail" v-if="item['鍏宠仈鏁伴噺']">
- <text>鍏宠仈鏁伴噺锛�</text>{{item['鍏宠仈鏁伴噺']}}
- </view>
- <view class="detail" v-if="item['鍏宠仈閲戦']">
- <text>鍏宠仈閲戦锛�</text>{{item['鍏宠仈閲戦']}}
- </view>
- <view class="detail" v-if="item['鍏抽棴绫诲瀷']">
- <text>鍏抽棴绫诲瀷锛�</text>{{item['鍏抽棴绫诲瀷']}}
- </view>
- </view>
- <view class="card-detail" v-if="showDetail == index">
- <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="detail" v-if="item['婧愬崟绫诲瀷']">
- <text>婧愬崟绫诲瀷锛�</text>{{item['婧愬崟绫诲瀷']}}
- </view>
- <view class="detail" v-if="item['hbilltype']">
- <text>hbilltype锛�</text>{{item['hbilltype']}}
- </view>
- <view class="detail" v-if="item['鎽樿']">
- <text>鎽樿锛�</text>{{item['鎽樿']}}
- </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="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
- <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
- <!-- #endif -->
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -288,76 +167,74 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HCreateBy: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HCreateBy:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
- data: {
+ url: this.serverUrl + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -365,267 +242,244 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
- search() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HCreateBy) {
- this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
-
+
this.getList()
},
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/baoyangjilu/form'
+ url:'/pages/baoyangjilu/form'
})
},
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HBillNo: '',
- HCreateBy: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HBillNo:'',
+ HCreateBy:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
+ }
this.getList()
},
- toSon(item) {
+ toSon(item){
uni.navigateTo({
- url: '/pages/baoyangjilu/table_son?HInterID=' + item.hmainid +
- '&璁惧鍚嶇О=' + item.璁惧鍚嶇О +
- '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
+ url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid
+ + '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ + '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜,
})
},
-
+
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/baoyangjilu/form?hmainid=' + item.hmainid
+ url:'/pages/baoyangjilu/form?hmainid=' + item.hmainid
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 +
- '/Sb_EquipMaintainBill/DeltetEquipMaintainBillList',
- data: {
+ url: this.serverUrl + '/Sb_EquipMaintainBill/DeltetEquipMaintainBillList',
+ 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.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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 130rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/baoyangjilu/table_son.vue b/pages/baoyangjilu/table_son.vue
index 63070a6..3831b4f 100644
--- a/pages/baoyangjilu/table_son.vue
+++ b/pages/baoyangjilu/table_son.vue
@@ -1,15 +1,9 @@
<template>
<view class="content">
<view class="infoArea">
- <!-- #ifdef MP-WEIXIN -->
- <view class="name">{{infoData['璁惧鍚嶇О']}}</view>
- <view class="dm">锛� 浠ｇ爜锛歿{infoData['璁惧浠ｇ爜']}} 锛�</view>
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
<view class="name">{{infoData.璁惧鍚嶇О}}</view>
<view class="dm">锛� 浠ｇ爜锛歿{infoData.璁惧浠ｇ爜}} 锛�</view>
- <!-- #endif -->
- <!-- <view class="other">
+<!-- <view class="other">
<view class="half">鍑哄巶缂栧彿: <text>{{infoData.璁惧鍑哄巶缂栧彿}}</text></view>
<view class="half">鍑哄巶鏃ユ湡: <text>{{infoData.璁惧鍑哄巶鏃ユ湡.substr(0,10)}}</text></view>
<view class="half">璁惧缂栫爜: <text v-if="infoData.璁惧缂栫爜 != 'null'">{{infoData.璁惧缂栫爜}}</text></view>
@@ -19,62 +13,53 @@
<view class="all">璁惧瑙勬牸: <text v-if="infoData.璁惧瑙勬牸 != 'null'">{{infoData.璁惧瑙勬牸}}</text></view>
<view class="all">璁惧鍨嬪彿: <text v-if="infoData.璁惧鍨嬪彿 != 'null'">{{infoData.璁惧鍨嬪彿}}</text></view>
</view> -->
-
+
<view class="choose">
<view class="tab" :class="{focus: number == 1}" @tap="number = 1">淇濆吇椤逛俊鎭�</view>
<view class="tab" :class="{focus: number == 2}" @tap="number = 2">閰嶄欢淇℃伅</view>
</view>
</view>
-
+
<view style="width: 100%;height: 200rpx;"></view>
<view v-if="number == 1">
<view class="list" v-for="(item,index) in listData1" :key="index" v-if="listData1[0].HManagerName">
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
- <uni-card :title="item.HMaintainItem" :extra="item.HMaintainItemNumber" style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
- <!-- #endif -->
- <view class="card-detail">
- <view class="detail" v-if="item.HMaintainPart">
- <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
- </view>
- <view class="detail" v-if="item.HManagerName">
- <text>璐熻矗浜猴細</text>{{item.HManagerName}}
- </view>
- <view class="detail" v-if="item.HManagerNumber">
- <text>璐熻矗浜轰唬鐮侊細</text>{{item.HManagerNumber}}
- </view>
- <view class="detail" v-if="item.HRemark">
- <text>澶囨敞锛�</text>{{item.HRemark}}
- </view>
+ <uni-card :title="item.HMaintainItem" :extra="item.HMaintainItemNumber" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.HMaintainPart">
+ <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
</view>
- <view class="card-detail" v-if="showDetail == index">
- <view class="detail">
- <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim?item.HClaim:'鏆傛棤鍏蜂綋瑕佹眰'}}
- </view>
+ <view class="detail" v-if="item.HManagerName">
+ <text>璐熻矗浜猴細</text>{{item.HManagerName}}
</view>
-
- <view class="morea" v-if="showDetail == index">
- <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ <view class="detail" v-if="item.HManagerNumber">
+ <text>璐熻矗浜轰唬鐮侊細</text>{{item.HManagerNumber}}
</view>
- <view class="morea" v-if="showDetail != index">
- <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鏌ョ湅鍏蜂綋瑕佹眰
+ <view class="detail" v-if="item.HRemark">
+ <text>澶囨敞锛�</text>{{item.HRemark}}
</view>
- </uni-card>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail">
+ <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim?item.HClaim:'鏆傛棤鍏蜂綋瑕佹眰'}}
+ </view>
+ </view>
+
+ <view class="morea" v-if="showDetail == index" >
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="morea" v-if="showDetail != index">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅鍏蜂綋瑕佹眰
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData1.length == 0 || !listData1[0].HManagerName">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData1.length != 0 && listData1[0].HManagerName">宸插埌搴�</view>
</view>
<view v-if="number == 2">
<view class="list" v-for="(item,index) in listData2" :key="index" v-if="listData2[0].HManagerName">
- <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
+ <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.HUnitName">
<text>鍗曚綅鍚嶇О锛�</text>{{item.HUnitName}}
@@ -100,7 +85,7 @@
</view>
</uni-card>
</view>
-
+
<view class="over" v-if="listData2.length == 0 || !listData2[0].HManagerName">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData2.length != 0 && listData2[0].HManagerName">宸插埌搴�</view>
</view>
@@ -108,51 +93,47 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- infoData: {},
- number: 1,
- listData1: [],
- listData2: [],
- showDetail: -1,
- }
- },
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ infoData:{},
+ number:1,
+ listData1:[],
+ listData2:[],
+ showDetail:-1,
+ }
+ },
onLoad(e) {
console.log(e)
uni.setNavigationBarTitle({
- title: e['璁惧鍚嶇О']
+ title: e.璁惧鍚嶇О
});
this.infoData = e
this.getList(e.HInterID)
},
- methods: {
- getList(HInterID) {
+ methods: {
+ getList(HInterID){
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
- data: {
- "HInterID": HInterID
- },
- success: (res) => {
- if (res.data.count == 1) {
+ url: this.serverUrl + '/Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
+ data: { "HInterID": HInterID },
+ success: (res) => {
+ if(res.data.count == 1){
this.listData1 = res.data.list[0]
this.listData2 = res.data.list[1]
- console.log(1, this.listData1);
- console.log(2, this.listData2);
+ console.log(1,this.listData1);
+ console.log(2,this.listData2);
uni.hideLoading()
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -160,18 +141,18 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- }
+ }
}
</script>
<style lang="scss" scoped>
- .infoArea {
+ .infoArea{
width: 100%;
padding-top: 20rpx;
background-color: #f0f0f0;
@@ -179,23 +160,20 @@
top: 0;
left: 0;
z-index: 99;
-
- .name {
+ .name{
text-align: center;
font-size: 32rpx;
font-weight: 600;
color: #333;
line-height: 150%;
}
-
- .dm {
+ .dm{
text-align: center;
font-size: 27rpx;
font-weight: 500;
color: #333;
}
-
- .other {
+ .other{
display: flex;
flex-wrap: wrap;
width: 90%;
@@ -203,23 +181,19 @@
margin-top: 12rpx;
font-size: 27rpx;
color: #666;
-
- text {
+ text{
font-size: 28rpx;
color: #333;
margin-left: 10rpx;
}
-
- .half {
+ .half{
width: 50%;
}
-
- .all {
+ .all{
width: 100%;
}
}
-
- .choose {
+ .choose{
height: 70rpx;
margin-top: 20rpx;
padding: 0 30rpx;
@@ -228,15 +202,13 @@
border-radius: 40rpx 40rpx 0 0;
border-bottom: 2px solid #eee;
display: flex;
-
- .tab {
+ .tab{
margin: 0 20rpx;
text-align: center;
font-size: 28rpx;
color: #666;
}
-
- .focus {
+ .focus{
font-size: 30rpx;
color: #333;
font-weight: 600;
@@ -244,49 +216,45 @@
}
}
}
-
- .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;
}
}
-
- .morea {
+
+ .morea{
color: #888;
font-size: 24rpx;
padding-top: 10rpx;
text-align: right;
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/gongxuIn/form.vue b/pages/gongxuIn/form.vue
index 0b3dd15..b44cdb9 100644
--- a/pages/gongxuIn/form.vue
+++ b/pages/gongxuIn/form.vue
@@ -102,12 +102,7 @@
<view class="form-item">
<view class="title">璁￠噺鍗曚綅:</view>
<view class="righton">
- <!-- #ifdef MP-WEIXIN -->
- <input v-model="hform['鍗曚綅']" disabled />
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
<input v-model="hform.鍗曚綅" disabled />
- <!-- #endif -->
</view>
</view>
<view class="form-item">
diff --git a/pages/gongxuIn/table.vue b/pages/gongxuIn/table.vue
index dd4a25c..504c1b3 100644
--- a/pages/gongxuIn/table.vue
+++ b/pages/gongxuIn/table.vue
@@ -81,20 +81,18 @@
鎶樺彔鍏朵粬鏉′欢<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="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.娴佽浆鍗″彿">
<text>娴佽浆鍗″彿锛�</text>{{item.娴佽浆鍗″彿}}
@@ -174,121 +172,35 @@
<text>澶囨敞锛�</text>{{item.澶囨敞}}
</view>
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['娴佽浆鍗″彿']">
- <text>娴佽浆鍗″彿锛�</text>{{item['娴佽浆鍗″彿']}}
- </view>
- <view class="detail" v-if="item['浜у搧鍚嶇О']">
- <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
- </view>
- <view class="detail" v-if="item['浜у搧浠ｇ爜']">
- <text>浜у搧浠ｇ爜锛�</text>{{item['浜у搧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['褰撳墠宸ュ簭']">
- <text>褰撳墠宸ュ簭锛�</text>{{item['褰撳墠宸ュ簭']}}
- </view>
- <view class="detail" v-if="item['褰撳墠宸ュ簭浠ｇ爜']">
- <text>宸ュ簭浠ｇ爜锛�</text>{{item['褰撳墠宸ュ簭浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['鏃ユ湡']">
- <text>鏃ユ湡锛�</text>{{item['鏃ユ湡'].substr(0,10)}}
- </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="card-detail" v-if="showDetail == index">
- <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>
- <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['LOT鏁伴噺']">
- <text>LOT鏁伴噺锛�</text>{{item['LOT鏁伴噺']}}
- </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="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
</view>
- <!-- #endif -->
-
-
- <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="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 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 class="op" v-if="operations == index">
- <!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
+ </view>
+
+ <view class="op" v-if="operations == index">
+<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op1" size="mini" plain @tap.stop="firstCheck(item)">棣栨</button>
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ <button class="op1" size="mini" plain @tap.stop="firstCheck(item)">棣栨</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -296,43 +208,39 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- showmore: false,
- arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
- arrayColName: ['浠诲姟鍗�', '鍗曟嵁鍙�', '娴佽浆鍗″彿', '浜у搧鍚嶇О', '浜у搧浠ｇ爜', '褰撳墠宸ュ簭', '褰撳墠宸ュ簭浠ｇ爜', '鏃ユ湡', '瑙勬牸鍨嬪彿', '鎺ユ敹鏁伴噺', '杩涚珯鏃堕棿', '鎿嶄綔鍛�',
- '鎿嶄綔鍛樹唬鐮�', '鐢熶骇璧勬簮', '鐢熶骇璧勬簮浠ｇ爜', '鐢熶骇鐝粍', '鐢熶骇鐝粍浠ｇ爜', 'LOT鏁伴噺', '鍒跺崟浜�'
- ],
- arrayComparator: ['=', '>=', '>', '<=', '<', '<>', '鍖呭惈', '宸﹀寘鍚�', '鍙冲寘鍚�', '涓嶅寘鍚�'],
- hform: {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HWorkBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ showmore:false,
+ arrayStatus:['鍏ㄩ儴','鏈鏍�','宸插鏍�','宸插叧闂�'],
+ arrayColName:['浠诲姟鍗�','鍗曟嵁鍙�','娴佽浆鍗″彿','浜у搧鍚嶇О','浜у搧浠ｇ爜','褰撳墠宸ュ簭','褰撳墠宸ュ簭浠ｇ爜','鏃ユ湡','瑙勬牸鍨嬪彿','鎺ユ敹鏁伴噺','杩涚珯鏃堕棿','鎿嶄綔鍛�','鎿嶄綔鍛樹唬鐮�','鐢熶骇璧勬簮','鐢熶骇璧勬簮浠ｇ爜','鐢熶骇鐝粍','鐢熶骇鐝粍浠ｇ爜','LOT鏁伴噺','鍒跺崟浜�'],
+ arrayComparator:['=','>=','>','<=','<','<>','鍖呭惈','宸﹀寘鍚�','鍙冲寘鍚�','涓嶅寘鍚�'],
+ hform:{
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HWorkBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -340,46 +248,46 @@
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Cj_StationInBill/get_Display',
- data: {
+ url: this.serverUrl + '/Cj_StationInBill/get_Display',
+ data:{
sWhere: this.sWhere,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
+ success: (res) => {
// console.log(1,res.data.data);
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -387,183 +295,182 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鐘舵��
- HStatusChange(e) {
+ HStatusChange(e){
console.log(e.detail.value)
this.hform.HStatus = this.arrayStatus[e.detail.value]
},
//閫夋嫨鍗曟嵁鏃ユ湡
- 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
},
//杩囨护
- ColNameChange(e) {
+ ColNameChange(e){
// console.log(e.detail.value)
this.hform.ColName = this.arrayColName[e.detail.value]
console.log(this.hform)
},
//鏉′欢
- ComparatorChange(e) {
+ ComparatorChange(e){
// console.log(e.detail.value)
this.hform.Comparator = this.arrayComparator[e.detail.value]
console.log(this.hform)
},
//鎼滅储
- search() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HStatus) {
- if (this.hform.HStatus == '鍏ㄩ儴') {
- this.sWhere += "";
- } else if (this.hform.HStatus == '鏈鏍�') {
- this.sWhere += " and 瀹℃牳浜�=''";
- } else if (this.hform.HStatus == '宸插鏍�') {
- this.sWhere += " and 瀹℃牳浜�<>''";
- } else if (this.hform.HStatus == '宸插叧闂�') {
- this.sWhere += " and 鍏抽棴浜�<>''";
- }
+ if(this.hform.HStatus == '鍏ㄩ儴'){
+ this.sWhere += "";
+ }else if(this.hform.HStatus == '鏈鏍�'){
+ this.sWhere += " and 瀹℃牳浜�=''";
+ }else if(this.hform.HStatus == '宸插鏍�'){
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ }else if(this.hform.HStatus == '宸插叧闂�'){
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ }
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.EndHCreateDate + "'";
}
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HNumber) {
- this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
+ this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
}
if (this.hform.HName) {
- this.sWhere += " and 褰撳墠宸ュ簭 like '%" + this.hform.HName + "%'";
+ this.sWhere += " and 褰撳墠宸ュ簭 like '%" + this.hform.HName + "%'";
}
if (this.hform.HWorkBillNo) {
- this.sWhere += " and 浠诲姟鍗� like '%" + this.hform.HWorkBillNo + "%'";
+ this.sWhere += " and 浠诲姟鍗� like '%" + this.hform.HWorkBillNo + "%'";
}
if (this.hform.HProcExchBillNo) {
- this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+ this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
}
if (this.hform.ColName && this.hform.Comparator) {
- var com = "";
- if (this.hform.Comparator == '鍖呭惈') {
+ var com = "";
+ if(this.hform.Comparator == '鍖呭惈'){
com = "like'%" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '宸﹀寘鍚�') {
+ }else if(this.hform.Comparator == '宸﹀寘鍚�'){
com = "like'%" + this.hform.ColContent + "'";
- } else if (this.hform.Comparator == '鍙冲寘鍚�') {
+ }else if(this.hform.Comparator == '鍙冲寘鍚�'){
com = "like'" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '涓嶅寘鍚�') {
+ }else if(this.hform.Comparator == '涓嶅寘鍚�'){
com = "not like'%" + this.hform.ColContent + "%'";
- } else {
+ }else{
com = "" + this.hform.Comparator + "'" + this.hform.ColContent + "'";
}
-
+
this.sWhere += " and " + this.hform.ColName + " " + com;
}
-
+
this.getList()
},
//鏂板
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/gongxuIn/form'
+ url:'/pages/gongxuIn/form'
})
},
//閲嶇疆
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.showmore = false
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HWorkBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HWorkBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
+ }
this.getList()
},
//棣栨
- firstCheck(item) {
+ firstCheck(item){
console.log(item)
uni.navigateTo({
- url: '/pages/weiwaigxOut/firstCheck?HSouceBillType=3793&HICMOEntryID=0&linterid=' + item
- .HInterID
+ url:'/pages/weiwaigxOut/firstCheck?HSouceBillType=3793&HICMOEntryID=0&linterid=' + item.HInterID
})
},
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/gongxuIn/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/gongxuIn/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 + '/Cj_StationInBill/del_StationInBill',
- data: {
+ url: this.serverUrl + '/Cj_StationInBill/del_StationInBill',
+ data:{
HInterID: item.HInterID,
HDeleteMan: 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.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
},
// //瀹℃牳
@@ -577,42 +484,37 @@
// },
// //鍙嶅鏍�
// antiCheck(item){
-
+
// },
- }
+ }
}
</script>
<style lang="scss" scoped>
- .form {
+ .form{
width: 640rpx;
margin: 20rpx auto;
}
-
- .other {
+ .other{
margin-top: 8rpx;
text-align: center;
font-size: 28rpx;
padding: 4rpx 18rpx;
color: #1890FF;
}
-
- .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;
}
}
-
- .left {
+ .left{
width: 170rpx;
padding: 10rpx 0;
margin-right: 10rpx;
@@ -621,129 +523,110 @@
color: #888;
text-align: center;
}
-
- .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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index 0b59b76..40ac3cc 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -4,21 +4,16 @@
<view class="form-item">
<view class="title"><text>*</text>鏉″舰鐮�:</view>
<view class="right" style="width: 380rpx;">
- <input name="HBarCode" v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�" />
+ <input name="HBarCode" v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�"/>
</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>
+ <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"><text>*</text>娴佹按鍙�:</view>
<view class="right" style="width: 380rpx;">
- <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
- @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
+ <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
</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>
+ <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>
@@ -41,29 +36,25 @@
<view class="form-item">
<view class="title">鐢熶骇璧勬簮:</view>
<view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @input="HSourceNameChange"></uni-combox>
+ <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>
+ <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>
+ <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>
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName" @input="HEmpNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
@@ -80,9 +71,9 @@
</picker>
</view>
</view>
-
+
<view class="tab_area"></view>
-
+
<view class="form-item">
<view class="title">鍗曟嵁鍙�:</view>
<view class="righton">
@@ -123,17 +114,12 @@
<view class="form-item">
<view class="title">璁￠噺鍗曚綅:</view>
<view class="righton">
- <!-- #ifdef MP-WEIXIN -->
- <input v-model="hform['鍗曚綅']" disabled />
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
<input v-model="hform.鍗曚綅" disabled />
- <!-- #endif -->
</view>
</view>
<view class="form-item">
<view class="title">宸ュ簭:</view>
- <!-- <view class="right">
+<!-- <view class="right">
<uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
</view> -->
<view class="righton">
@@ -146,8 +132,8 @@
<input v-model="hform.HPRDOrg" disabled />
</view>
</view>
-
- <!--
+
+<!--
<view class="form-item">
<view class="title">璁㈠崟鏁伴噺:</view>
<view class="right">
@@ -205,9 +191,9 @@
<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">宸ユ椂:</view>
<view class="right">
@@ -217,41 +203,37 @@
<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>
+ <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>
+ <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>
+ <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>
+ <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">
+<!-- <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);" />杞笅閬�
+ <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);"/>杞笅閬�
</view>
</view>
- <!-- <view class="form-item">
+<!-- <view class="form-item">
<view class="title">鍑虹珯鏃堕棿:</view>
<view class="right">
<uni-datetime-picker v-model="hform.HStationOutTime">
@@ -296,19 +278,19 @@
</view>
</view> -->
- <!-- <view class="form-item">
+<!-- <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="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">
@@ -318,7 +300,7 @@
</view>
</view> -->
- <!-- <view class="form-item">
+<!-- <view class="form-item">
<view class="title">鎿嶄綔鍛�:</view>
<view class="right">
<input v-model="hform.HEmp" placeholder="璇疯緭鍏ユ搷浣滃憳" />
@@ -330,16 +312,16 @@
<input v-model="hform.HDept" placeholder="璇疯緭鍏ラ儴闂�" />
</view>
</view> -->
-
+
<!-- <view class="tab_area"></view> -->
-
- <!-- <view class="form-item">
+
+<!-- <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>
@@ -350,59 +332,59 @@
<view class="form-item">
<view class="title">鍒跺崟浜�:</view>
<view class="righton">
- <input v-model="hform.HMaker" disabled />
+ <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 />
+ <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 />
+ <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 />
+ <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 />
+ <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 />
+ <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 />
+ <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 />
+ <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>
@@ -411,10 +393,10 @@
鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
</view>
</view>
-
+
<view class="tab_area"></view>
-
- <!-- <view class="op">
+
+<!-- <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>
@@ -424,10 +406,8 @@
<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 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="showMask = true">鏂板</button> -->
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
@@ -436,82 +416,80 @@
</template>
<script>
import getDateTime from '@/utils/getdateTime.js';
- import {
- getUserInfo
- } from "@/utils/auth.js";
- export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- linterid: '',
- HBillNo: '',
- btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
- FirstEndHProcNo: 0, //榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
+ import { getUserInfo } from "@/utils/auth.js";
+ export default {
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ linterid:'',
+ HBillNo:'',
+ btnType:0,//0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+ FirstEndHProcNo:0,//榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
showmore: false,
-
- arrayHMaterNumber: [], //浜у搧
- HMaterNumberList: [],
- arrayHProcName: [], //宸ュ簭
- HProcNameList: [],
- arrayHSupName: [], //渚涘簲鍟�
- HSupNameList: [],
- arrayHSourceName: [], //鐢熶骇璧勬簮
- HSourceNameList: [],
- arrayHGroupName: [], //鐢熶骇鐝粍
- HGroupNameList: [],
- arrayHEmpName: [], //鎺ユ敹浜�
- HEmpNameList: [],
- arrayHCenterName: [], //宸ヤ綔涓績
- HCenterNameList: [],
-
+
+ arrayHMaterNumber:[],//浜у搧
+ HMaterNumberList:[],
+ arrayHProcName:[],//宸ュ簭
+ HProcNameList:[],
+ arrayHSupName:[],//渚涘簲鍟�
+ HSupNameList:[],
+ arrayHSourceName:[],//鐢熶骇璧勬簮
+ HSourceNameList:[],
+ arrayHGroupName:[],//鐢熶骇鐝粍
+ HGroupNameList:[],
+ arrayHEmpName:[],//鎺ユ敹浜�
+ HEmpNameList:[],
+ arrayHCenterName:[],//宸ヤ綔涓績
+ HCenterNameList:[],
+
isEdit: false,
- hform: {
- HInterID: '',
- HBillNo: '',
- HBarCode: '',
- HProcNo: '',
- HQty: '',
- HPieceQty: '',
- HWasterQty: '',
- HSourceName: '',
- HSourceID: '',
- HCenterName: '',
- HCenterID: '',
- HGroupName: '',
- HGroupID: '',
- HEmpName: '',
- HEmpID: '',
- HRemark: '',
- HDate: getDateTime.dateTimeStr('y-m-d'),
-
- HICMOBillNo: '',
- HProcExchBillNo: '',
- HMaterNumber: '',
- HMaterName: '',
- HMaterID: '',
- HMaterModel: '',
- 鍗曚綅: '',
- HProcName: '',
- HProcID: '',
- HPRDOrg: '',
- HOrderProcNO: '',
-
- HWorkTimes: 0,
- HEmpName2: '',
- HEmpID2: 0,
- HEmpName3: '',
- HEmpID3: 0,
- HEmpName4: '',
- HEmpID4: 0,
- HEmpName5: '',
- HEmpID5: 0,
- HLastSubProc: true,
-
+ hform:{
+ HInterID:'',
+ HBillNo:'',
+ HBarCode:'',
+ HProcNo:'',
+ HQty:'',
+ HPieceQty:'',
+ HWasterQty:'',
+ HSourceName:'',
+ HSourceID:'',
+ HCenterName:'',
+ HCenterID:'',
+ HGroupName:'',
+ HGroupID:'',
+ HEmpName:'',
+ HEmpID:'',
+ HRemark:'',
+ HDate:getDateTime.dateTimeStr('y-m-d'),
+
+ HICMOBillNo:'',
+ HProcExchBillNo:'',
+ HMaterNumber:'',
+ HMaterName:'',
+ HMaterID:'',
+ HMaterModel:'',
+ 鍗曚綅:'',
+ HProcName:'',
+ HProcID:'',
+ HPRDOrg:'',
+ HOrderProcNO:'',
+
+ HWorkTimes:0,
+ HEmpName2:'',
+ HEmpID2:0,
+ HEmpName3:'',
+ HEmpID3:0,
+ HEmpName4:'',
+ HEmpID4:0,
+ HEmpName5:'',
+ HEmpID5:0,
+ HLastSubProc:true,
+
// HICMOInterID:'',
// HICMOQty:'',
- HProcExchHinteID: '',
- lngBillKey: '',
+ HProcExchHinteID:'',
+ lngBillKey:'',
// HPlanQty:'',
// HSupName:'',
// HSupID:'',
@@ -540,37 +518,37 @@
// HMouldNum:'',
// HPayProcID:'',
// HSourceNameList:'',
-
- HMaker: '',
- HMakeDate: '',
- HUpDater: '',
- HUpDateDate: '',
- HChecker: '',
- HCheckDate: '',
+
+ HMaker:'',
+ HMakeDate:'',
+ HUpDater:'',
+ HUpDateDate:'',
+ HChecker:'',
+ HCheckDate:'',
// HCloseMan:'',
// HCloseDate:'',
- HDeleteMan: '',
- HDeleteDate: '',
-
- eventType: 'Add',
+ HDeleteMan:'',
+ HDeleteDate:'',
+
+ eventType:'Add',
}
- }
- },
+ }
+ },
onLoad(e) {
// this.getEditData('1516','GXCZHB000000001290')
- console.log(e, this.userInfo)
+ console.log(e,this.userInfo)
// this.hform.HEmpID = this.userInfo.Czybm
// this.hform.HEmp = uni.getStorageSync('HUserName')
this.hform.HMaker = uni.getStorageSync('HUserName')
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) {
+ if(e.linterid){
this.btnType = 1
this.linterid = e.linterid
this.HBillNo = e.HBillNo
- this.getEditData(e.linterid, e.HBillNo)
- } else {
+ this.getEditData(e.linterid,e.HBillNo)
+ }else{
this.getNewData()
}
this.getHMaterList()
@@ -581,526 +559,504 @@
this.getHEmpList()
this.getHCenterList()
},
- methods: {
+ methods: {
//鎵爜
- toScanCode() {
+ toScanCode(){
// this.hform.HBarCode = 'GXLX00001165'
// this.getHBarCodeData('GXLX00001165')
uni.scanCode({
- onlyFromCamera: true,
- success: (res) => {
- console.log('鏉＄爜鍐呭锛�' + res.result);
+ onlyFromCamera: true,
+ success: (res) => {
+ console.log('鏉＄爜鍐呭锛�' + res.result);
this.hform.HBarCode = res.result
this.getHBarCodeData(res.result)
- }
+ }
});
},
//鎵祦姘村彿
- toScanProcNo() {
+ toScanProcNo(){
uni.scanCode({
- onlyFromCamera: true,
- success: (res) => {
- console.log('鏉＄爜鍐呭锛�' + res.result);
+ onlyFromCamera: true,
+ success: (res) => {
+ console.log('鏉＄爜鍐呭锛�' + res.result);
this.hform.HProcNo = res.result
- this.getHProcNoData(this.hform.HBarCode, res.result)
- }
+ this.getHProcNoData(this.hform.HBarCode,res.result)
+ }
});
},
//鏃ユ湡
- HDateChange(e) {
+ HDateChange(e){
console.log(e.detail.value)
this.hform.HDate = e.detail.value
},
-
+
//鑾峰彇浜у搧鏁版嵁
- getHMaterList() {
+ getHMaterList(){
var Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID')
uni.request({
- url: this.serverUrl + '/Web/GetMaterialList_Json',
- data: {
- sWhere: Value
- },
- success: (res) => {
- if (res.data.count == 1) {
+ url: this.serverUrl + '/Web/GetMaterialList_Json',
+ data: { sWhere: Value },
+ success: (res) => {
+ if(res.data.count == 1){
this.HMaterNumberList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
+ for(var i=0;i<res.data.data.length;i++){
this.arrayHMaterNumber[i] = res.data.data[i].HNumber
}
this.$forceUpdate();
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨浜у搧鏁版嵁
- HMaterNumberChange(e) {
- for (var i = 0; i < this.HMaterNumberList.length; i++) {
- if (this.HMaterNumberList[i].HNumber == e) {
+ HMaterNumberChange(e){
+ for(var i=0;i<this.HMaterNumberList.length;i++){
+ if(this.HMaterNumberList[i].HNumber == e){
this.hform.HMaterName = this.HMaterNumberList[i].HName
this.hform.HMaterID = this.HMaterNumberList[i].HItemID
}
}
},
//宸ュ簭
- getHProcList() {
+ getHProcList(){
uni.request({
- url: this.serverUrl + '/Web/GetProcList_Json',
- data: {
- sWhere: ''
- },
+ url: this.serverUrl + '/Web/GetProcList_Json',
+ data: { sWhere: '' },
success: (res) => {
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.HProcNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
+ for(var i=0;i<res.data.data.length;i++){
this.arrayHProcName[i] = res.data.data[i].宸ュ簭
}
this.$forceUpdate();
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨宸ュ簭
- HProcNameChange(e) {
- for (var i = 0; i < this.HProcNameList.length; i++) {
- if (this.HProcNameList[i].宸ュ簭 == e) {
+ HProcNameChange(e){
+ for(var i=0;i<this.HProcNameList.length;i++){
+ if(this.HProcNameList[i].宸ュ簭 == e){
this.hform.HProcID = this.HProcNameList[i].HItemID
}
}
},
//鑾峰彇渚涘簲鍟嗘暟鎹�
- getHSupList() {
+ getHSupList(){
if (!uni.getStorageSync('OrganizationID')) {
- var HOtherOrgID = 0;
- } else {
+ var HOtherOrgID = 0;
+ }else{
var HOtherOrgID = uni.getStorageSync('OrganizationID')
}
uni.request({
- url: this.serverUrl + '/Web/GetSupplierList_Json',
- data: {
- Supplier: '',
- HOrgID: HOtherOrgID
- },
- success: (res) => {
- if (res.data.count == 1) {
+ url: this.serverUrl + '/Web/GetSupplierList_Json',
+ data: { Supplier: '', HOrgID: HOtherOrgID },
+ success: (res) => {
+ if(res.data.count == 1){
this.HSupNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
+ for(var i=0;i<res.data.data.length;i++){
this.arrayHSupName[i] = res.data.data[i].HName
}
this.$forceUpdate();
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨渚涘簲鍟�
- HSupNameChange(e) {
- for (var i = 0; i < this.HSupNameList.length; i++) {
- if (this.HSupNameList[i].HName == e) {
+ HSupNameChange(e){
+ for(var i=0;i<this.HSupNameList.length;i++){
+ if(this.HSupNameList[i].HName == e){
this.hform.HSupID = this.HSupNameList[i].HItemID
}
}
},
//鐢熶骇璧勬簮
- getHSourceList() {
+ getHSourceList(){
uni.request({
- url: this.serverUrl + '/api/newBill/getSourceList',
- data: {
- sWhere: ''
- },
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: { sWhere: '' },
success: (res) => {
- if (res.data.code == 1) {
+ if(res.data.code == 1){
this.HSourceNameList = res.data.data.Gy_Source
- for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+ for(var i=0;i<res.data.data.Gy_Source.length;i++){
this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
}
this.$forceUpdate();
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鐢熶骇璧勬簮
- HSourceNameChange(e) {
- for (var i = 0; i < this.HSourceNameList.length; i++) {
- if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ HSourceNameChange(e){
+ for(var i=0;i<this.HSourceNameList.length;i++){
+ if(this.HSourceNameList[i].鐢熶骇璧勬簮 == e){
this.hform.HSourceID = this.HSourceNameList[i].HItemID
}
}
},
- HSourceName2Change(e) {
- for (var i = 0; i < this.HSourceNameList.length; i++) {
- if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ HSourceName2Change(e){
+ for(var i=0;i<this.HSourceNameList.length;i++){
+ if(this.HSourceNameList[i].鐢熶骇璧勬簮 == e){
this.hform.HSourceID2 = this.HSourceNameList[i].HItemID
}
}
},
- HSourceName3Change(e) {
- for (var i = 0; i < this.HSourceNameList.length; i++) {
- if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ HSourceName3Change(e){
+ for(var i=0;i<this.HSourceNameList.length;i++){
+ if(this.HSourceNameList[i].鐢熶骇璧勬簮 == e){
this.hform.HSourceID3 = this.HSourceNameList[i].HItemID
}
}
},
- HSourceName4Change(e) {
- for (var i = 0; i < this.HSourceNameList.length; i++) {
- if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ HSourceName4Change(e){
+ for(var i=0;i<this.HSourceNameList.length;i++){
+ if(this.HSourceNameList[i].鐢熶骇璧勬簮 == e){
this.hform.HSourceID4 = this.HSourceNameList[i].HItemID
}
}
},
- HSourceName5Change(e) {
- for (var i = 0; i < this.HSourceNameList.length; i++) {
- if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ HSourceName5Change(e){
+ for(var i=0;i<this.HSourceNameList.length;i++){
+ if(this.HSourceNameList[i].鐢熶骇璧勬簮 == e){
this.hform.HSourceID5 = this.HSourceNameList[i].HItemID
}
}
},
//鐢熶骇鐝粍
- getHGroupList() {
+ getHGroupList(){
uni.request({
- url: this.serverUrl + '/Web/GetProductionTeamList_Json',
- data: {
- sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') + ""
- },
+ url: this.serverUrl + '/Web/GetProductionTeamList_Json',
+ data: { sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') + "" },
success: (res) => {
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.HGroupNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
+ for(var i=0;i<res.data.data.length;i++){
this.arrayHGroupName[i] = res.data.data[i].鐝粍
}
this.$forceUpdate();
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鐢熶骇鐝粍
- HGroupNameChange(e) {
- for (var i = 0; i < this.HGroupNameList.length; i++) {
- if (this.HGroupNameList[i].鐝粍 == e) {
+ HGroupNameChange(e){
+ for(var i=0;i<this.HGroupNameList.length;i++){
+ if(this.HGroupNameList[i].鐝粍 == e){
this.hform.HGroupID = this.HGroupNameList[i].HItemID
}
}
},
//鎿嶄綔鍛樼瓑
- getHEmpList() {
+ getHEmpList(){
uni.request({
- url: this.serverUrl + '/Web/GetEmployeeList_Json',
- data: {
- Employee: '',
- HGroupID: 0
- },
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: { Employee: '',HGroupID:0 },
success: (res) => {
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.HEmpNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
+ for(var i=0;i<res.data.data.length;i++){
this.arrayHEmpName[i] = res.data.data[i].HName
}
this.$forceUpdate();
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鎿嶄綔鍛�
- HEmpNameChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ HEmpNameChange(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
this.hform.HEmpID = this.HEmpNameList[i].HItemID
}
}
},
//閫夋嫨妫�楠屽憳
- HQCCheckNameChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ HQCCheckNameChange(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
this.hform.HQCCheckID = this.HEmpNameList[i].HItemID
}
}
},
//閫夋搷浣滃憳
- HEmpName2Change(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ HEmpName2Change(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
this.hform.HEmpID2 = this.HEmpNameList[i].HItemID
}
}
},
- HEmpName3Change(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ HEmpName3Change(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
this.hform.HEmpID3 = this.HEmpNameList[i].HItemID
}
}
},
- HEmpName4Change(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ HEmpName4Change(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
this.hform.HEmpID4 = this.HEmpNameList[i].HItemID
}
}
},
- HEmpName5Change(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ HEmpName5Change(e){
+ for(var i=0;i<this.HEmpNameList.length;i++){
+ if(this.HEmpNameList[i].HName == e){
this.hform.HEmpID5 = this.HEmpNameList[i].HItemID
}
}
},
//宸ヤ綔涓績
- getHCenterList() {
+ getHCenterList(){
uni.request({
- url: this.serverUrl + '/api/newBill/getWorkCenterList',
- data: {
- sWhere: ''
- },
+ url: this.serverUrl + '/api/newBill/getWorkCenterList',
+ data: { sWhere: '' },
success: (res) => {
- if (res.data.code == 1) {
+ if(res.data.code == 1){
this.HCenterNameList = res.data.data.Gy_Source
- for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+ for(var i=0;i<res.data.data.Gy_Source.length;i++){
this.arrayHCenterName[i] = res.data.data.Gy_Source[i].宸ヤ綔涓績
}
this.$forceUpdate();
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨宸ヤ綔涓績
- HCenterNameChange(e) {
- for (var i = 0; i < this.HCenterNameList.length; i++) {
- if (this.HCenterNameList[i].宸ヤ綔涓績 == e) {
+ HCenterNameChange(e){
+ for(var i=0;i<this.HCenterNameList.length;i++){
+ if(this.HCenterNameList[i].宸ヤ綔涓績 == e){
this.hform.HCenterID = this.HCenterNameList[i].HItemID
}
}
},
//姹囨姤
- huibao() {
+ huibao(){
var datas = {
InterID: this.hform.HInterID,
BillNo: this.hform.HBillNo,
user: uni.getStorageSync('HUserName'),
- OrganizationID: uni.getStorageSync('OrganizationID'),
+ OrganizationID:uni.getStorageSync('OrganizationID'),
}
- console.log('姹囨姤', datas)
+ console.log('姹囨姤',datas)
uni.request({
- url: this.serverUrl + '/Sc_ProcessMangement/SaveICMOReportBill',
- method: 'GET',
+ url: this.serverUrl + '/Sc_ProcessMangement/SaveICMOReportBill',
+ method:'GET',
data: datas,
- success: (res) => {
+ success: (res) => {
console.log(res)
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鍏ュ簱
- ruku() {
+ ruku(){
console.log('ruku')
uni.request({
- url: this.serverUrl + '/Sc_ProcessMangement/SaveProcdutInBill',
- method: 'GET',
- data: {
- BillNo: this.hform.HBillNo
- },
- success: (res) => {
+ url: this.serverUrl + '/Sc_ProcessMangement/SaveProcdutInBill',
+ method:'GET',
+ data: {BillNo: this.hform.HBillNo},
+ success: (res) => {
console.log(res)
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鎶ュ簾
- baofei() {
+ baofei(){
console.log('baofei')
uni.request({
- url: this.serverUrl + '/Sc_ProcessMangement/SaveBFBill',
- method: 'GET',
- data: {
- BillNo: this.hform.HBillNo
- },
- success: (res) => {
+ url: this.serverUrl + '/Sc_ProcessMangement/SaveBFBill',
+ method:'GET',
+ data: {BillNo: this.hform.HBillNo},
+ success: (res) => {
console.log(res)
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//缂栬緫
- ifEdit() {
+ ifEdit(){
//鏄惁缂栬緫
uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/set_ShowBillJudge',
- data: {
+ url: this.serverUrl + '/Cj_StationOutBill/set_ShowBillJudge',
+ data: {
HBillNo: this.HBillNo,
// CurUserName: uni.getStorageSync('HUserName'),
// HInterID: this.linterid,
},
- success: (res) => {
+ success: (res) => {
console.log(res)
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.isEdit = true
this.hform.eventType = 'Modify'
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- getEditData(linterid, HBillNo) {
+ getEditData(linterid,HBillNo){
//涓昏〃
uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/GetStationOutBill',
- data: {
- HInterID: linterid
- },
- success: (res) => {
- console.log(1, res.data.data[0]);
- if (res.data.code == 1) {
+ url: this.serverUrl + '/Cj_StationOutBill/GetStationOutBill',
+ data: { HInterID: linterid },
+ success: (res) => {
+ console.log(1,res.data.data[0]);
+ if(res.data.code == 1){
var data = res.data.data[0]
this.getHBarCodeData(data.HBarCode)
- this.getHProcNoData(data.HBarCode, data.HProcNo)
-
- this.hform.HInterID = data.HInterID
- this.hform.HBillNo = data.HBillNo
- this.hform.HBarCode = data.HBarCode
- this.hform.HProcNo = data.HProcNo
- this.hform.HQty = data.HQty
- this.hform.HPieceQty = data.HPieceQty
- this.hform.HWasterQty = data.HWasterQty
- this.hform.HSourceID = data.HSourceID
- this.hform.HSourceName = data.HSourceName
- this.hform.HGroupID = data.HGroupID
- this.hform.HGroupName = data.HGroupName
- this.hform.HEmpID = data.HEmpID
- this.hform.HEmpName = data.HEmpName
- this.hform.HRemark = data.HRemark
- this.hform.HDate = data.HDate.substr(0, 10)
-
- this.hform.HWorkTimes = data.HWorkTimes
- this.hform.HEmpID2 = data.HEmpID2
- this.hform.HEmpName2 = data.HEmpName2
- this.hform.HEmpID3 = data.HEmpID3
- this.hform.HEmpName3 = data.HEmpName3
- this.hform.HEmpID4 = data.HEmpID4
- this.hform.HEmpName4 = data.HEmpName4
- this.hform.HEmpID5 = data.HEmpID5
- this.hform.HEmpName5 = data.HEmpName5
+ this.getHProcNoData(data.HBarCode,data.HProcNo)
+
+ this.hform.HInterID= data.HInterID
+ this.hform.HBillNo= data.HBillNo
+ this.hform.HBarCode= data.HBarCode
+ this.hform.HProcNo= data.HProcNo
+ this.hform.HQty= data.HQty
+ this.hform.HPieceQty= data.HPieceQty
+ this.hform.HWasterQty= data.HWasterQty
+ this.hform.HSourceID= data.HSourceID
+ this.hform.HSourceName= data.HSourceName
+ this.hform.HGroupID= data.HGroupID
+ this.hform.HGroupName= data.HGroupName
+ this.hform.HEmpID= data.HEmpID
+ this.hform.HEmpName= data.HEmpName
+ this.hform.HRemark= data.HRemark
+ this.hform.HDate= data.HDate.substr(0,10)
+
+ this.hform.HWorkTimes= data.HWorkTimes
+ this.hform.HEmpID2= data.HEmpID2
+ this.hform.HEmpName2= data.HEmpName2
+ this.hform.HEmpID3= data.HEmpID3
+ this.hform.HEmpName3= data.HEmpName3
+ this.hform.HEmpID4= data.HEmpID4
+ this.hform.HEmpName4= data.HEmpName4
+ this.hform.HEmpID5= data.HEmpID5
+ this.hform.HEmpName5= data.HEmpName5
// this.hform.HLastSubProc= data.HLastSubProc
// this.hform.HQCCheckID= data.HQCCheckID
// this.hform.HQCCheckName= data.HQCCheckName
@@ -1110,179 +1066,170 @@
} else {
this.btnType = 2
}
-
- this.hform.HMaker = data.HMaker
- this.hform.HMakeDate = data.HMakeDate
- this.hform.HUpDater = data.HUpDater
- this.hform.HUpDateDate = data.HUpDateDate
- this.hform.HChecker = data.HChecker
- this.hform.HCheckDate = data.HCheckDate
+
+ this.hform.HMaker= data.HMaker
+ this.hform.HMakeDate= data.HMakeDate
+ this.hform.HUpDater= data.HUpDater
+ this.hform.HUpDateDate= data.HUpDateDate
+ this.hform.HChecker= data.HChecker
+ this.hform.HCheckDate= data.HCheckDate
// this.hform.HCloseMan= data.HCloseMan
// this.hform.HCloseDate= data.HCloseDate
- this.hform.HDeleteMan = data.HDeleteMan
- this.hform.HDeleteDate = data.HDeleteDate
- } else {
+ this.hform.HDeleteMan= data.HDeleteMan
+ this.hform.HDeleteDate= data.HDeleteDate
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- getHBarCodeData(HBarCode) {
+ getHBarCodeData(HBarCode){
uni.request({
- url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
- data: {
- HBarCode: HBarCode
- },
- success: (res) => {
- console.log(2, res.data);
- if (res.data.code == 1) {
+ url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
+ data: {HBarCode: HBarCode},
+ success: (res) => {
+ console.log(2,res.data);
+ if(res.data.code == 1){
var data = res.data.data[0]
- this.hform.HICMOInterID = data.hicmointerid
- this.hform.HICMOBillNo = data.浠诲姟鍗曞彿
- this.hform.HMaterID = data.HMaterID
- this.hform.HMaterName = data.浜у搧
- this.hform.HMaterNumber = data.浜у搧浠ｇ爜
- this.hform.HMaterModel = data.瑙勬牸鍨嬪彿
- this.hform.鍗曚綅 = data.鍗曚綅
+ this.hform.HICMOInterID= data.hicmointerid
+ this.hform.HICMOBillNo= data.浠诲姟鍗曞彿
+ this.hform.HMaterID= data.HMaterID
+ this.hform.HMaterName= data.浜у搧
+ this.hform.HMaterNumber= data.浜у搧浠ｇ爜
+ this.hform.HMaterModel= data.瑙勬牸鍨嬪彿
+ this.hform.鍗曚綅= data.鍗曚綅
// this.hform.HPieceQty= data.娴佽浆鍗℃暟閲�
- this.hform.HPlanQty = data.娴佽浆鍗℃暟閲�
- this.hform.HProcExchBillNo = data.鍗曟嵁鍙�
- this.hform.HProcExchHinteID = data.hmainid
- this.hform.HICMOQty = data.浠诲姟鍗曟暟閲�
- this.hform.HOrderProcNO = data.璁㈠崟璺熻釜鍙�
- this.hform.HPRDOrg = data.缁勭粐
- this.hform.lngBillKey = data.hmainid
- } else {
+ this.hform.HPlanQty= data.娴佽浆鍗℃暟閲�
+ this.hform.HProcExchBillNo= data.鍗曟嵁鍙�
+ this.hform.HProcExchHinteID= data.hmainid
+ this.hform.HICMOQty= data.浠诲姟鍗曟暟閲�
+ this.hform.HOrderProcNO= data.璁㈠崟璺熻釜鍙�
+ this.hform.HPRDOrg= data.缁勭粐
+ this.hform.lngBillKey= data.hmainid
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- getHProcNoData(HBarCode, HProcNo) {
+ getHProcNoData(HBarCode,HProcNo){
uni.request({
- url: this.serverUrl + '/Cj_StationInBill/txtHProcNo_KeyDown',
- data: {
- sBillNo: HBarCode,
- sProcNo: HProcNo
- },
- success: (res) => {
- console.log(3, res);
- if (res.data.code == 1) {
+ url: this.serverUrl + '/Cj_StationInBill/txtHProcNo_KeyDown',
+ data: {sBillNo: HBarCode,sProcNo: HProcNo},
+ success: (res) => {
+ console.log(3,res);
+ if(res.data.code == 1){
var data = res.data.data[0]
- this.hform.lngBillSubKey = data.hsubid
- this.hform.HProcName = data.宸ュ簭
- this.hform.HProcID = data.HProcID
- this.hform.HCenterName = data.宸ヤ綔涓績
- this.hform.HCenterID = data.HCenterID
+ this.hform.lngBillSubKey= data.hsubid
+ this.hform.HProcName= data.宸ュ簭
+ this.hform.HProcID= data.HProcID
+ this.hform.HCenterName= data.宸ヤ綔涓績
+ this.hform.HCenterID= data.HCenterID
if (data.棣栭亾宸ュ簭 == "鏄�") {
- this.FirstEndHProcNo = 1
- }
+ this.FirstEndHProcNo = 1
+ }
if (data.鏈亾宸ュ簭 == "鏄�") {
- this.FirstEndHProcNo = 2
+ this.FirstEndHProcNo = 2
}
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鏂板
- getNewData() {
+ getNewData(){
uni.request({
- url: this.serverUrl + '/Web/GetMAXNum',
- data: {
- HBillType: '3791'
- },
- success: (res) => {
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: { HBillType: '3791' },
+ success: (res) => {
console.log(res.data)
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.hform.HInterID = res.data.data[0].HInterID
this.hform.HBillNo = res.data.data[0].HBillNo
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- submit() {
- if (!this.hform.HBarCode) {
+ submit() {
+ if(!this.hform.HBarCode){
+ uni.showToast({
+ title:'璇锋壂鎻忚澶囨潯褰㈢爜',
+ icon:'none'
+ })
+ }else if(!this.hform.HProcNo){
uni.showToast({
- title: '璇锋壂鎻忚澶囨潯褰㈢爜',
- icon: 'none'
+ title:'璇疯緭鍏�/鎵弿娴佹按鍙�',
+ icon:'none'
})
- } else if (!this.hform.HProcNo) {
+ }else if(!this.hform.HEmpName){
uni.showToast({
- title: '璇疯緭鍏�/鎵弿娴佹按鍙�',
- icon: 'none'
+ title:'璇烽�夋嫨鎿嶄綔鍛�',
+ icon:'none'
})
- } else if (!this.hform.HEmpName) {
+ }else if(!this.hform.HCenterName){
uni.showToast({
- title: '璇烽�夋嫨鎿嶄綔鍛�',
- icon: 'none'
+ title:'璇烽�夋嫨宸ヤ綔涓績',
+ icon:'none'
})
- } else if (!this.hform.HCenterName) {
- uni.showToast({
- title: '璇烽�夋嫨宸ヤ綔涓績',
- icon: 'none'
- })
- } else {
- uni.showLoading({
- title: '璇风◢鍊�'
- })
+ }else{
+ uni.showLoading({
+ title:'璇风◢鍊�'
+ })
var sMainStr = JSON.stringify(this.hform);
var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName');
- console.log(sMainSub);
- uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/AddBill',
- method: 'POST',
- dataType: "json",
- data: {
- oMain: sMainSub
- },
- success: (res) => {
- console.log(1, res);
+ console.log(sMainSub);
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/AddBill',
+ method:'POST',
+ dataType:"json",
+ data:{ oMain: sMainSub },
+ success: (res) => {
+ console.log(1,res);
uni.hideLoading()
- if (res.data.count == 1) {
+ if(res.data.count == 1){
// if (uni.getStorageSync('OrganizationID') == 100038) {
// if (this.FirstEndHProcNo == 1) {
// //姹囨姤
@@ -1295,242 +1242,226 @@
// }
// }
let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
+ let prePage = pages[pages.length - 2];
prePage.$vm.getList()
- if (this.isEdit) {
- setTimeout(() => {
+ if(this.isEdit){
+ setTimeout(()=>{
uni.redirectTo({
- url: '/pages/gongxuOut/form?linterid=' + this
- .linterid + '&HBillNo=' + this.linterid
+ url:'/pages/gongxuOut/form?linterid=' + this.linterid + '&HBillNo=' + this.linterid
})
- }, 1000)
- } else {
- setTimeout(() => {
+ },1000)
+ }else{
+ setTimeout(()=>{
uni.navigateBack()
- }, 1000)
+ },1000)
}
- }
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }
- },
+ }
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ }
+ },
//瀹℃牳
- check() {
+ check(){
uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/set_CheckBill',
- method: 'GET',
- dataType: "json",
- data: {
+ url: this.serverUrl + '/Cj_StationOutBill/set_CheckBill',
+ method:'GET',
+ dataType:"json",
+ data:{
CurUserName: uni.getStorageSync('HUserName'),
HInterID: this.linterid,
},
- success: (res) => {
- console.log(1, res);
+ success: (res) => {
+ console.log(1,res);
uni.hideLoading()
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.btnType = 3
let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
+ let prePage = pages[pages.length - 2];
prePage.$vm.getList()
uni.showModal({
- title: '鎿嶄綔鎴愬姛',
- content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜鍙嶅鏍革紝鈥樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
- confirmText: '鏄�',
- cancelText: '鍚�',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮鏄�');
+ title: '鎿嶄綔鎴愬姛',
+ content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜鍙嶅鏍革紝鈥樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
+ confirmText:'鏄�',
+ cancelText:'鍚�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮鏄�');
this.btnType = 3
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍚�');
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍚�');
uni.navigateBack()
- }
- }
+ }
+ }
});
}
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鍙嶅鏍�
- abandonCheck() {
+ abandonCheck(){
uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/set_AbandonCheck',
- method: 'GET',
- dataType: "json",
- data: {
+ url: this.serverUrl + '/Cj_StationOutBill/set_AbandonCheck',
+ method:'GET',
+ dataType:"json",
+ data:{
CurUserName: uni.getStorageSync('HUserName'),
HInterID: this.linterid,
},
- success: (res) => {
- console.log(1, res);
+ success: (res) => {
+ console.log(1,res);
uni.hideLoading()
- if (res.data.count == 1) {
+ if(res.data.count == 1){
let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
+ let prePage = pages[pages.length - 2];
prePage.$vm.getList()
this.btnType = 2
uni.showModal({
- title: '鎿嶄綔鎴愬姛',
- content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜瀹℃牳锛屸�樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
- confirmText: '鏄�',
- cancelText: '鍚�',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮鏄�');
+ title: '鎿嶄綔鎴愬姛',
+ content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜瀹℃牳锛屸�樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
+ confirmText:'鏄�',
+ cancelText:'鍚�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮鏄�');
this.btnType = 2
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍚�');
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍚�');
uni.navigateBack()
- }
- }
+ }
+ }
});
}
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
},
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- goBack() {
+ goBack(){
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.navigateBack()
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
- }
- }
- }
+ }
+ }
+ }
</script>
<style lang="scss" scoped>
- .form {
+ .form{
width: 668rpx;
margin: 20rpx auto;
padding-bottom: 240rpx;
}
-
- .tab_area {
+ .tab_area{
width: 100%;
height: 50rpx;
}
-
- .other {
+ .other{
margin-top: 8rpx;
text-align: center;
font-size: 28rpx;
padding: 4rpx 18rpx;
color: #1890FF;
}
-
- .form-item {
+ .form-item{
display: flex;
align-items: center;
font-size: 30rpx;
padding: 6rpx 0;
-
- .title {
+ .title{
width: 208rpx;
-
- 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;
}
-
- textarea {
+ textarea{
width: 98%;
padding: 8rpx 20rpx;
font-size: 30rpx;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #3a78ff;
color: #3a78ff;
background-color: rgba(58, 120, 255, 0.1);
}
-
- .op2 {
+ .op2{
border: 1px solid #41a863;
color: #41a863;
background-color: rgba(65, 168, 99, 0.1);
}
-
- .op3 {
+ .op3{
border: 1px solid #da0000;
color: #da0000;
background-color: rgba(218, 0, 0, 0.1);
}
}
-
- .bottom-btn {
+ .bottom-btn{
width: 100%;
// height: 120rpx;
position: fixed;
@@ -1539,34 +1470,29 @@
background-color: #fff;
box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
padding: 30rpx 40rpx 40rpx 40rpx;
-
- button {
+ button{
border-radius: 50rpx;
width: 180rpx;
height: 66rpx;
line-height: 66rpx;
font-size: 28rpx;
}
-
- .btn-a {
+ .btn-a{
background-color: #3A78FF;
color: #fff;
}
-
- .btn-b {
+ .btn-b{
background-color: #41a863;
color: #fff;
// margin-left: 30rpx;
}
-
- .btn-c {
+ .btn-c{
background-color: #acacac;
color: #fff;
position: absolute;
right: 120rpx;
}
-
- .btn-d {
+ .btn-d{
background-color: #ff8901;
color: #fff;
// margin-left: 30rpx;
diff --git a/pages/gongxuOut/table.vue b/pages/gongxuOut/table.vue
index 4550968..600a6e3 100644
--- a/pages/gongxuOut/table.vue
+++ b/pages/gongxuOut/table.vue
@@ -74,7 +74,7 @@
</view>
<view class="form-item">
<view class="choose" @tap="hform.checkHWasterQty = hform.checkHWasterQty==1?'':1">
- <radio value="1" :checked="hform.checkHWasterQty == 1" style="transform:scale(0.8);" />鎶ュ簾鏁伴噺涓嶄负0
+ <radio value="1" :checked="hform.checkHWasterQty == 1" style="transform:scale(0.8);"/>鎶ュ簾鏁伴噺涓嶄负0
</view>
</view>
</view>
@@ -86,20 +86,18 @@
鎶樺彔鍏朵粬鏉′欢<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="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.宸ュ簭娴佽浆鍗″彿">
<text>娴佽浆鍗″彿锛�</text>{{item.宸ュ簭娴佽浆鍗″彿}}
@@ -145,7 +143,7 @@
<view class="detail" v-if="item.鍑虹珯鏃堕棿">
<text>鍑虹珯鏃堕棿锛�</text>{{item.鍑虹珯鏃堕棿.substr(0,19)}}
</view>
-
+
<view class="detail" v-if="item.鎿嶄綔鍛�">
<text>鎿嶄綔鍛橈細</text>{{item.鎿嶄綔鍛榼}
</view>
@@ -195,136 +193,35 @@
<text>澶囨敞锛�</text>{{item.澶囨敞}}
</view>
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['宸ュ簭娴佽浆鍗″彿']">
- <text>娴佽浆鍗″彿锛�</text>{{item['宸ュ簭娴佽浆鍗″彿']}}
- </view>
- <view class="detail" v-if="item['浜у搧鍚嶇О']">
- <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
- </view>
- <view class="detail" v-if="item['浜у搧浠ｇ爜']">
- <text>浜у搧浠ｇ爜锛�</text>{{item['浜у搧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['褰撳墠宸ュ簭']">
- <text>褰撳墠宸ュ簭锛�</text>{{item['褰撳墠宸ュ簭']}}
- </view>
- <view class="detail" v-if="item['褰撳墠宸ュ簭浠ｇ爜']">
- <text>宸ュ簭浠ｇ爜锛�</text>{{item['褰撳墠宸ュ簭浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['鏃ユ湡']">
- <text>鏃ユ湡锛�</text>{{item['鏃ユ湡'].substr(0,10)}}
- </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="card-detail" v-if="showDetail == index">
- <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['鍑虹珯鏃堕棿'].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>
- <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['LOT鏁伴噺']">
- <text>LOT鏁伴噺锛�</text>{{item['LOT鏁伴噺']}}
- </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="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
</view>
- <!-- #endif -->
-
- <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="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 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 class="op" v-if="operations == index">
- <!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
+ </view>
+
+ <view class="op" v-if="operations == index">
+<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">宸ュ簭妫�</button>
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">宸ュ簭妫�</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -332,45 +229,40 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- showmore: false,
- arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
- arrayColName: ['浠诲姟鍗�', '鍗曟嵁鍙�', '娴佽浆鍗″彿', '浜у搧鍚嶇О', '浜у搧浠ｇ爜', '褰撳墠宸ュ簭', '褰撳墠宸ュ簭浠ｇ爜', '鏃ユ湡', '瑙勬牸鍨嬪彿', '娴佹按鍙�', '鍑虹珯鏁伴噺', '涓嶈壇鏁伴噺',
- '鎶ュ簾鏁伴噺', '鍖呰鏍囪瘑', '鍖呰鏍囪瘑浠ｇ爜', '鍑虹珯鏃堕棿', '鎿嶄綔鍛�', '鎿嶄綔鍛樹唬鐮�', '鐢熶骇璧勬簮', '鐢熶骇璧勬簮浠ｇ爜', '鐢熶骇鐝粍', '鐢熶骇鐝粍浠ｇ爜', 'LOT鏁伴噺',
- '鍒跺崟浜�'
- ],
- arrayComparator: ['=', '>=', '>', '<=', '<', '<>', '鍖呭惈', '宸﹀寘鍚�', '鍙冲寘鍚�', '涓嶅寘鍚�'],
- hform: {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HWorkBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
- checkHWasterQty: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ showmore:false,
+ arrayStatus:['鍏ㄩ儴','鏈鏍�','宸插鏍�','宸插叧闂�'],
+ arrayColName:['浠诲姟鍗�','鍗曟嵁鍙�','娴佽浆鍗″彿','浜у搧鍚嶇О','浜у搧浠ｇ爜','褰撳墠宸ュ簭','褰撳墠宸ュ簭浠ｇ爜','鏃ユ湡','瑙勬牸鍨嬪彿','娴佹按鍙�','鍑虹珯鏁伴噺','涓嶈壇鏁伴噺','鎶ュ簾鏁伴噺','鍖呰鏍囪瘑','鍖呰鏍囪瘑浠ｇ爜','鍑虹珯鏃堕棿','鎿嶄綔鍛�','鎿嶄綔鍛樹唬鐮�','鐢熶骇璧勬簮','鐢熶骇璧勬簮浠ｇ爜','鐢熶骇鐝粍','鐢熶骇鐝粍浠ｇ爜','LOT鏁伴噺','鍒跺崟浜�'],
+ arrayComparator:['=','>=','>','<=','<','<>','鍖呭惈','宸﹀寘鍚�','鍙冲寘鍚�','涓嶅寘鍚�'],
+ hform:{
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HWorkBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
+ checkHWasterQty:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -378,46 +270,46 @@
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/get_Display',
- data: {
+ url: this.serverUrl + '/Cj_StationOutBill/get_Display',
+ data:{
sWhere: this.sWhere,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
+ success: (res) => {
// console.log(1,res.data.data);
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -425,194 +317,194 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鐘舵��
- HStatusChange(e) {
+ HStatusChange(e){
console.log(e.detail.value)
this.hform.HStatus = this.arrayStatus[e.detail.value]
},
//閫夋嫨鍗曟嵁鏃ユ湡
- 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
},
//閫夋嫨
- radioChange(e) {
+ radioChange(e){
console.log(e)
},
//杩囨护
- ColNameChange(e) {
+ ColNameChange(e){
// console.log(e.detail.value)
this.hform.ColName = this.arrayColName[e.detail.value]
console.log(this.hform)
},
//鏉′欢
- ComparatorChange(e) {
+ ComparatorChange(e){
// console.log(e.detail.value)
this.hform.Comparator = this.arrayComparator[e.detail.value]
console.log(this.hform)
},
//鎼滅储
- search() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HStatus) {
- if (this.hform.HStatus == '鍏ㄩ儴') {
- this.sWhere += "";
- } else if (this.hform.HStatus == '鏈鏍�') {
- this.sWhere += " and 瀹℃牳浜�=''";
- } else if (this.hform.HStatus == '宸插鏍�') {
- this.sWhere += " and 瀹℃牳浜�<>''";
- } else if (this.hform.HStatus == '宸插叧闂�') {
- this.sWhere += " and 鍏抽棴浜�<>''";
- }
+ if(this.hform.HStatus == '鍏ㄩ儴'){
+ this.sWhere += "";
+ }else if(this.hform.HStatus == '鏈鏍�'){
+ this.sWhere += " and 瀹℃牳浜�=''";
+ }else if(this.hform.HStatus == '宸插鏍�'){
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ }else if(this.hform.HStatus == '宸插叧闂�'){
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ }
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + this.hform.EndHCreateDate + "'";
}
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HNumber) {
- this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
+ this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
}
if (this.hform.HName) {
- this.sWhere += " and 褰撳墠宸ュ簭 like '%" + this.hform.HName + "%'";
+ this.sWhere += " and 褰撳墠宸ュ簭 like '%" + this.hform.HName + "%'";
}
if (this.hform.HWorkBillNo) {
- this.sWhere += " and 浠诲姟鍗� like '%" + this.hform.HWorkBillNo + "%'";
+ this.sWhere += " and 浠诲姟鍗� like '%" + this.hform.HWorkBillNo + "%'";
}
if (this.hform.HProcExchBillNo) {
- this.sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+ this.sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
}
if (this.hform.checkHWasterQty) {
- this.sWhere += " and 鎶ュ簾鏁伴噺>0 ";
+ this.sWhere += " and 鎶ュ簾鏁伴噺>0 ";
}
if (this.hform.ColName && this.hform.Comparator) {
- var com = "";
- if (this.hform.Comparator == '鍖呭惈') {
+ var com = "";
+ if(this.hform.Comparator == '鍖呭惈'){
com = "like'%" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '宸﹀寘鍚�') {
+ }else if(this.hform.Comparator == '宸﹀寘鍚�'){
com = "like'%" + this.hform.ColContent + "'";
- } else if (this.hform.Comparator == '鍙冲寘鍚�') {
+ }else if(this.hform.Comparator == '鍙冲寘鍚�'){
com = "like'" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '涓嶅寘鍚�') {
+ }else if(this.hform.Comparator == '涓嶅寘鍚�'){
com = "not like'%" + this.hform.ColContent + "%'";
- } else {
+ }else{
com = "" + this.hform.Comparator + "'" + this.hform.ColContent + "'";
}
-
+
this.sWhere += " and " + this.hform.ColName + " " + com;
}
-
+
this.getList()
},
//鏂板
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/gongxuOut/form'
+ url:'/pages/gongxuOut/form'
})
},
//閲嶇疆
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.showmore = false
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HWorkBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
- checkHWasterQty: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HWorkBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
+ checkHWasterQty:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
+ }
this.getList()
},
//宸ュ簭妫�
- qcCheck(item) {
+ qcCheck(item){
console.log(item)
uni.showToast({
- title: '鏆傛棤璧勬簮',
- icon: "none"
+ title:'鏆傛棤璧勬簮',
+ icon:"none"
})
// uni.navigateTo({
// url:'/pages/weiwaigxOut/firstCheck?HSouceBillType=3793&HICMOEntryID=0&linterid=' + item.HInterID
// })
},
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/gongxuOut/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/gongxuOut/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 + '/Cj_StationOutBill/del_StationOutBill',
- data: {
+ url: this.serverUrl + '/Cj_StationOutBill/del_StationOutBill',
+ data:{
HInterID: item.hmainid,
HDeleteMan: 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.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
},
// //瀹℃牳
@@ -626,48 +518,42 @@
// },
// //鍙嶅鏍�
// antiCheck(item){
-
+
// },
- }
+ }
}
</script>
<style lang="scss" scoped>
- .form {
+ .form{
width: 640rpx;
margin: 20rpx auto;
}
-
- .other {
+ .other{
margin-top: 8rpx;
text-align: center;
font-size: 28rpx;
padding: 4rpx 18rpx;
color: #1890FF;
}
-
- .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;
}
}
-
- .choose {
+ .choose{
padding: 4rpx 16rpx 0 0;
width: 100%;
text-align: right;
}
-
- .left {
+ .left{
width: 170rpx;
padding: 10rpx 0;
margin-right: 10rpx;
@@ -676,129 +562,110 @@
color: #888;
text-align: center;
}
-
- .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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/guzhangdengji/table.vue b/pages/guzhangdengji/table.vue
index 93cea19..9b560ff 100644
--- a/pages/guzhangdengji/table.vue
+++ b/pages/guzhangdengji/table.vue
@@ -39,20 +39,18 @@
<input v-model="hform.ColContent" 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" @tap="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.璁惧浠ｇ爜">
<text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
@@ -162,150 +160,34 @@
<text>琛ㄤ綋澶囨敞锛�</text>{{item.琛ㄤ綋澶囨敞}}
</view>
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['璁惧鍨嬪彿']">
- <text>璁惧鍨嬪彿锛�</text>{{item['璁惧鍨嬪彿']}}
- </view>
- <view class="detail" v-if="item['鏁呴殰绫诲埆浠ｇ爜']">
- <text>鏁呴殰绫诲埆浠ｇ爜锛�</text>{{item['鏁呴殰绫诲埆浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['鏁呴殰绫诲埆']">
- <text>鏁呴殰绫诲埆锛�</text>{{item['鏁呴殰绫诲埆']}}
- </view>
- <view class="detail" v-if="item['鍙戠幇浜轰唬鐮�']">
- <text>鍙戠幇浜轰唬鐮侊細</text>{{item['鍙戠幇浜轰唬鐮�']}}
- </view>
- <view class="detail" v-if="item['鍙戠幇浜�']">
- <text>鍙戠幇浜猴細</text>{{item['鍙戠幇浜�']}}
- </view>
- <view class="detail" v-if="item['璐熻矗浜轰唬鐮�']">
- <text>璐熻矗浜轰唬鐮侊細</text>{{item['璐熻矗浜轰唬鐮�']}}
- </view>
- <view class="detail" v-if="item['璐熻矗浜�']">
- <text>璐熻矗浜猴細</text>{{item['璐熻矗浜�']}}
- </view>
- <view 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="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="card-detail" v-if="showDetail == index">
- <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="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="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
</view>
- <!-- #endif -->
-
-
- <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="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 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 class="op" v-if="operations == index">
- <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
- <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
+ <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -313,86 +195,80 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HDate: '',
- HDate1: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HDate:'',
+ HDate1:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- arrayColName: ['鏃ユ湡', '鍗曟嵁鍙�', '璁惧浠ｇ爜', '璁惧鍚嶇О', '鏁呴殰绫诲埆浠ｇ爜', '鏁呴殰绫诲埆', '鍙戠幇浜轰唬鐮�', '鍙戠幇浜�', '閮ㄩ棬浠ｇ爜', '閮ㄩ棬鍚嶇О', '璐熻矗浜轰唬鐮�',
- '璐熻矗浜�', '鍙戠敓鏃ユ湡', '鏁呴殰鎻忚堪', '琛ㄥご澶囨敞', '鍐呴儴鍗曟嵁鍙�', '鍒跺崟浜�', '鍒跺崟鏃ユ湡', '瀹℃牳浜�', '瀹℃牳鏃ユ湡', '淇敼浜�', '淇敼鏃ユ湡', '鍏抽棴浜�', '鍏抽棴鏃ユ湡',
- '浣滃簾浜�', '浣滃簾鏃ユ湡', '鏁呴殰鍘熷洜浠ｇ爜', '鏁呴殰鍘熷洜鍚嶇О', '鏁呴殰鍘熷洜鎻忚堪', '琛ㄤ綋璐熻矗浜轰唬鐮�', '琛ㄤ綋璐熻矗浜�', '琛屽叧闂汉', '鍏抽棴绫诲瀷', '琛ㄤ綋澶囨敞', '婧愬崟鍗曞彿',
- '婧愬崟绫诲瀷', '鍏宠仈鏁伴噺'
- ],
- arrayComparator: ['=', '>=', '>', '<=', '<', '<>', '鍖呭惈', '宸﹀寘鍚�', '鍙冲寘鍚�', '涓嶅寘鍚�'],
-
- page: 1,
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ arrayColName:['鏃ユ湡','鍗曟嵁鍙�','璁惧浠ｇ爜','璁惧鍚嶇О','鏁呴殰绫诲埆浠ｇ爜','鏁呴殰绫诲埆','鍙戠幇浜轰唬鐮�','鍙戠幇浜�','閮ㄩ棬浠ｇ爜','閮ㄩ棬鍚嶇О','璐熻矗浜轰唬鐮�','璐熻矗浜�','鍙戠敓鏃ユ湡','鏁呴殰鎻忚堪','琛ㄥご澶囨敞','鍐呴儴鍗曟嵁鍙�','鍒跺崟浜�','鍒跺崟鏃ユ湡','瀹℃牳浜�','瀹℃牳鏃ユ湡','淇敼浜�','淇敼鏃ユ湡','鍏抽棴浜�','鍏抽棴鏃ユ湡','浣滃簾浜�','浣滃簾鏃ユ湡','鏁呴殰鍘熷洜浠ｇ爜','鏁呴殰鍘熷洜鍚嶇О','鏁呴殰鍘熷洜鎻忚堪','琛ㄤ綋璐熻矗浜轰唬鐮�','琛ㄤ綋璐熻矗浜�','琛屽叧闂汉','鍏抽棴绫诲瀷','琛ㄤ綋澶囨敞','婧愬崟鍗曞彿','婧愬崟绫诲瀷','鍏宠仈鏁伴噺'],
+ arrayComparator:['=','>=','>','<=','<','<>','鍖呭惈','宸﹀寘鍚�','鍙冲寘鍚�','涓嶅寘鍚�'],
+
+ page:1,
}
- },
+ },
onLoad() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sb_EqpRepairWorkBill/GetEqpConkBookBillList',
- data: {
+ url: this.serverUrl + '/Sb_EqpRepairWorkBill/GetEqpConkBookBillList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -400,170 +276,166 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- HDateChange(e) {
+ HDateChange(e){
console.log(e.detail.value)
this.hform.HDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- HDate1Change(e) {
+ HDate1Change(e){
console.log(e.detail.value)
this.hform.HDate1 = e.detail.value
},
//杩囨护
- ColNameChange(e) {
+ ColNameChange(e){
// console.log(e.detail.value)
this.hform.ColName = this.arrayColName[e.detail.value]
console.log(this.hform)
},
//鏉′欢
- ComparatorChange(e) {
+ ComparatorChange(e){
// console.log(e.detail.value)
this.hform.Comparator = this.arrayComparator[e.detail.value]
console.log(this.hform)
},
-
- search() {
+
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate + "'";
}
if (this.hform.HDate1) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate1 + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate1 + "'";
}
if (this.hform.ColName && this.hform.Comparator) {
- var com = "";
- if (this.hform.Comparator == '鍖呭惈') {
+ var com = "";
+ if(this.hform.Comparator == '鍖呭惈'){
com = "like'%" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '宸﹀寘鍚�') {
+ }else if(this.hform.Comparator == '宸﹀寘鍚�'){
com = "like'%" + this.hform.ColContent + "'";
- } else if (this.hform.Comparator == '鍙冲寘鍚�') {
+ }else if(this.hform.Comparator == '鍙冲寘鍚�'){
com = "like'" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '涓嶅寘鍚�') {
+ }else if(this.hform.Comparator == '涓嶅寘鍚�'){
com = "not like'%" + this.hform.ColContent + "%'";
- } else {
+ }else{
com = "" + this.hform.Comparator + "'" + this.hform.ColContent + "'";
}
-
+
this.sWhere += " and " + this.hform.ColName + " " + com;
}
-
+
this.getList()
},
//鏂板
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/guzhangdengji/form'
+ url:'/pages/guzhangdengji/form'
})
},
//閲嶇疆
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HBillNo: '',
- HDate: '',
- HDate1: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HBillNo:'',
+ HDate:'',
+ HDate1:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
+ }
this.getList()
},
-
+
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/guzhangdengji/form?hmainid=' + item.hmainid
+ url:'/pages/guzhangdengji/form?hmainid=' + item.hmainid
})
},
//鍒犻櫎
- del(item) {
+ del(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
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 + '/Sb_EqpRepairWorkBill/DeltetEqpConkBookBill',
- data: {
+ url: this.serverUrl + '/Sb_EqpRepairWorkBill/DeltetEqpConkBookBill',
+ 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;
}
}
-
- .left {
+ .left{
width: 170rpx;
padding: 10rpx 0;
margin-right: 10rpx;
@@ -572,129 +444,110 @@
color: #888;
text-align: center;
}
-
- .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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9718e18..5fec7b6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -122,48 +122,53 @@
text: '閿�鍞��璐�',
url: '/pages/xiaoshoutuihuo/table',
id: 20,
-
}, {
+ img: '../../static/icon/icon21.png',
+ text: '鏀舵枡閫氱煡鍗�',
+ url: '/pages/shouliaotongzhi/table',
+ id: 21,
+ },
+ {
img: '../../static/icon/icon16.png',
text: '鏍囩鎵撳嵃',
url: '/pages/labelPrinter/index',
- id: 21,
+ id: 22,
},
{
img: '../../static/icon/icon16.png',
text: '璁惧杩愯鐘舵��',
url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
- id: 22,
+ id: 23,
},
{
img: '../../static/icon/icon16.png',
text: '妯″叿杩愯鐘舵��',
url: '/pages/mujvzhuangtai/mujvzhuangtai',
- id: 23,
+ id: 24,
},
{
img: '../../static/icon/icon16.png',
text: '鏉＄爜鎷嗙爜',
url: '/pages/tiaomachaima/tiaomachaima',
- id: 24,
+ id: 25,
},
{
img: '../../static/icon/icon16.png',
text: '鍏朵粬鍏ュ簱',
url: '/pages/qitaruku/qitaruku',
- id: 23,
+ id: 26,
},
{
img: '../../static/icon/icon16.png',
text: '鍏朵粬鍑哄簱',
url: '/pages/qitachuku/qitachuku',
- id: 24,
+ id: 27,
},
{
img: '../../static/icon/icon16.png',
text: '鏉＄爜鎵撳嵃',
url: '/pages/tiaomadaying/tiaomadaying',
- id: 25,
+ id: 28,
}
]
}
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 0ff6c4c..de80376 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -83,6 +83,7 @@
this.HOrgName = logindata.HOrgName
this.Organization = logindata.Organization
this.UserName = logindata.UserName
+ this.PassWord = logindata.PassWord
}
this.getOrganization()
// this.getDataBases()
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 8dfb01e..5e8a582 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -20,6 +20,7 @@
</view>
<view class="btn" @tap="logout">閫� 鍑� 鐧� 褰�</view>
+ <view class="vers">{{vers}}</view>
</view>
</view>
</template>
@@ -31,6 +32,7 @@
return {
userInfo:getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ vers:uni.getStorageSync('vers'),
itemData:[{
img:'../../static/icon00.png',
text:'寰呮垜瀹℃牳',
diff --git a/pages/index/vers.vue b/pages/index/vers.vue
new file mode 100644
index 0000000..9c4f518
--- /dev/null
+++ b/pages/index/vers.vue
@@ -0,0 +1,280 @@
+<template>
+<view class="mains">
+ <view class="hl" v-if="showTc">
+ <view class="mask"></view>
+ <view class="main">
+ <view class="vers">鐗堟湰鍙凤細{{vers}}</view>
+ <view class="download">{{fieldTwo}}</view>
+ <view class="download_btn" v-if="!waitLine" @tap="upOn">绔嬪嵆鍗囩骇</view>
+ <view class="download_line" v-if="waitLine">
+ <progress :percent="loadPercent" stroke-width="20" active="true" active-mode="forwards" activeColor="#4587ff" backgroundColor="#a5c8ff"/>
+ <view style="height: 30px;width: 100%; font-size: 26rpx;font-weight: bold; text-align: center;margin-top: -20px;color: #FFFFFF;">涓嬭浇涓紝璇风◢鍚�...</view>
+ </view>
+ </view>
+ </view>
+</view>
+
+</template>
+<script>
+import { getUserInfo,getToken } from '@/utils/auth';
+export default {
+ data() {
+ return {
+ serverUrl: 'https://api.zj-yonghutong.com',
+ showTc:false,
+ // 鐗堟湰鏇存柊
+ loadPercent:0,
+ waitLine: false,
+ timer:'',
+ fieldTwo:'',
+ vers:'',
+ };
+ },
+ props: {
+
+ },
+ created() {
+ // #ifdef APP-PLUS
+ if(uni.getSystemInfoSync().platform !=='ios'){
+ this.update();
+ }else if(uni.getSystemInfoSync().platform =='ios'){
+ this.updateIOS();
+ }
+ //#endif
+ },
+ methods: {
+ updateIOS() {
+ var _this = this;
+ uni.request({
+ url: 'https://api.zj-yonghutong.com/v1/config/configKeyObject/APPVersionIOS',
+ header: {
+ 'Authorization': 'Bearer ' + getToken(),
+ 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+ },
+ method: 'GET',
+ success: result => {
+ console.log(result)
+ if (result.data.code == 200) {
+ uni.setStorageSync('remarkURL',result.data.data.remark)
+ plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+ console.log(inf)
+ uni.setStorageSync('vers',inf.version)
+ _this.vers = result.data.data.configValue
+ if(result.data.data.configValue > inf.versionCode){ //濡傛灉绾夸笂鐗堟湰澶т簬褰撳墠鐗堟湰
+ var configType = result.data.data.fieldOne //褰撳墠绾夸笂鏈�鏂版暣鍖呯増鏈�
+ _this.fieldTwo = result.data.data.fieldTwo//鏇存柊鍐呭
+ if(configType > inf.versionCode ){//濡傛灉绾夸笂鏈�鏂版暣鍖呯増鏈ぇ浜庡綋鍓嶇増鏈紝鍒欐暣鍖呮洿鏂�
+ _this.showTc = true
+ console.log(555555)
+ }else{//鐑洿鏂�
+ uni.showLoading({
+ title:'鍙戠幇鏂拌祫婧愶紝姝ｅ湪涓嬭浇涓�...',
+ mask:true,
+ })
+ uni.downloadFile({
+ url: 'https://api.zj-yonghutong.com/profile/kangleju.wgt',
+ success: (downloadResult) => {
+ if (downloadResult.statusCode === 200) {
+ uni.hideLoading()
+ plus.runtime.install(downloadResult.tempFilePath, {
+ force: false
+ }, function() {
+ console.log('install success...');
+ plus.runtime.restart();
+ }, function(e) {
+ console.error('install fail...');
+ });
+ }
+ }
+ });
+ }
+ }
+ });
+ }
+ },
+ })
+ },
+ update() {
+ var _this = this;
+ uni.request({
+ url:'https://api.zj-yonghutong.com/v1/config/configKeyObject/APPVersion',
+ header: {
+ 'Authorization': 'Bearer ' + getToken(),
+ // 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+ },
+ method: 'GET',
+ success: result => {
+ if (result.data.code == 200) {
+ // console.log(1111111,result)
+ uni.setStorageSync('remarkURL',result.data.data.remark)
+ plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+ console.log(inf)
+ _this.vers = result.data.data.configValue
+ uni.setStorageSync('vers','V' + inf.version)
+ if(result.data.data.configValue > inf.versionCode){ //濡傛灉绾夸笂鐗堟湰澶т簬褰撳墠鐗堟湰
+ var configType = result.data.data.fieldOne //褰撳墠绾夸笂鏈�鏂版暣鍖呯増鏈�
+ _this.fieldTwo = result.data.data.fieldTwo//鏇存柊鍐呭
+ if(configType > inf.versionCode ){//濡傛灉绾夸笂鏈�鏂版暣鍖呯増鏈ぇ浜庡綋鍓嶇増鏈紝鍒欐暣鍖呮洿鏂�
+ _this.showTc = true
+ console.log(configType,_this.showTc,_this.fieldTwo)
+ }else{
+ uni.showLoading({
+ title:'鍙戠幇鏂拌祫婧愶紝姝ｅ湪涓嬭浇涓�...',
+ mask:true,
+ })
+ uni.downloadFile({
+ url: 'https://api.zj-yonghutong.com/profile/kangleju.wgt',
+ success: (downloadResult) => {
+ if (downloadResult.statusCode === 200) {
+ uni.hideLoading()
+ plus.runtime.install(downloadResult.tempFilePath, {
+ force: false
+ }, function() {
+ console.log('install success...');
+ plus.runtime.restart();
+ }, function(e) {
+ console.error('install fail...');
+ });
+ }
+ }
+ });
+ }
+ }
+ });
+ }
+ },
+ })
+ },
+ upOn(){
+ if(uni.getSystemInfoSync().platform !=='ios'){
+ this.doUpData();
+ this.loadPercent = 0
+ }else if(uni.getSystemInfoSync().platform =='ios'){
+ plus.runtime.openURL(uni.getStorageSync('remarkURL'));
+ }
+ },
+ doUpData() {
+ this.waitLine = true
+ uni.hideTabBar()
+ this.timer = setInterval(() => {
+ if(this.loadPercent<98){
+ this.loadPercent = this.loadPercent + 1
+ }
+ }, 400);
+ uni.downloadFile({//鎵ц涓嬭浇
+ url: uni.getStorageSync('remarkURL'), //涓嬭浇鍦板潃
+ success: downloadResult => {//涓嬭浇鎴愬姛
+ this.loadPercent = 100
+ this.waitLine = false
+ this.showTc = false
+ uni.showTabBar()
+ if (downloadResult.statusCode == 200) {
+ uni.showModal({
+ title: '',
+ content: '涓嬭浇鎴愬姛锛岀‘瀹氱幇鍦ㄩ噸鍚悧锛�',
+ confirmText: '纭畾',
+ cancelText: '鍙栨秷',
+ confirmColor: '#4587ff',
+ success: function(res) {
+ this.waitLine = false
+ if (res.confirm == true) {
+ plus.runtime.install(//瀹夎
+ downloadResult.tempFilePath, {
+ force: true
+ },
+ function(res) {
+ utils.showToast('鏇存柊鎴愬姛锛岄噸鍚腑...');
+ plus.runtime.restart();
+ }
+ );
+ }else{
+ uni.showModal({
+ content:'鏇存柊澶辫触',
+ confirmText:'纭',
+ cancelText:'鍙栨秷',
+ })
+ }
+ }
+ });
+ }else{
+ this.waitLine = false
+ uni.showModal({
+ content: '璇烽噸鏂颁笅杞芥洿鏂�',
+ confirmText:'纭',
+ cancelText:'鍙栨秷',
+ })
+ }
+ },
+ fail: downloadResult => {//涓嬭浇澶辫触
+ this.waitLine = false
+ uni.showModal({
+ content:'璇烽噸鏂颁笅杞芥洿鏂�',
+ confirmText:'纭',
+ cancelText: '鍙栨秷',
+ })
+ }
+ });
+ },
+ }
+};
+</script>
+<style scoped lang="scss">
+.hl{
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100vh;
+ z-index: 9999;
+ .mask{
+ position: absolute;
+ width: 100vw;
+ height: 100vh;
+ background: rgba(#000, .3);
+ }
+ .main{
+ width: 550rpx;
+ height: 730rpx;
+ position: absolute;
+ top: 10vh;
+ left: 100rpx;
+ background-image: url('../../../static/images/newVer.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: cover;
+ .vers{
+ margin: 180rpx 0 0 50rpx;
+ color: #fff;
+ font-size: 38rpx;
+ font-weight: bold;
+ }
+ .download{
+ width: 480rpx;
+ margin: 0 auto;
+ margin-top: 150rpx;
+ font-size: 30rpx;
+ color: #333;
+ }
+ .download_btn{
+ width: 420rpx;
+ height: 68rpx;
+ line-height: 68rpx;
+ position: absolute;
+ left: 80rpx;
+ bottom: 40rpx;
+ border-radius: 40rpx;
+ background-color: #4587ff;
+ text-align: center;
+ color: #fff;
+ font-size: 32rpx;
+ box-shadow: 0 2rpx 2rpx 1rpx #1a3562;
+ }
+ .download_line{
+ width: 80%;
+ position: absolute;
+ bottom: 20rpx;
+ left: 10%;
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git a/pages/shebeidangan/table.vue b/pages/shebeidangan/table.vue
index 01f71cf..854d7e9 100644
--- a/pages/shebeidangan/table.vue
+++ b/pages/shebeidangan/table.vue
@@ -13,20 +13,18 @@
<input v-model="hform.HName" 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" @tap="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.璁惧浠ｇ爜">
<text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
@@ -54,27 +52,27 @@
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item.hmainid">
- <text>hmainid锛�</text>{{item.hmainid}}
- </view> -->
+<!-- <view class="detail" v-if="item.hmainid">
+ <text>hmainid锛�</text>{{item.hmainid}}
+ </view> -->
<view class="detail" v-if="item.鏉″舰鐮�">
<text>鏉＄爜缂栧彿锛�</text>{{item.鏉″舰鐮亇}
</view>
- <!-- <view class="detail" v-if="item.HMaterID">
- <text>HMaterID锛�</text>{{item.HMaterID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMaterID">
+ <text>HMaterID锛�</text>{{item.HMaterID}}
+ </view> -->
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
<text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
- <!-- <view class="detail" v-if="item.HUnitID">
- <text>HUnitID锛�</text>{{item.HUnitID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HUnitID">
+ <text>HUnitID锛�</text>{{item.HUnitID}}
+ </view> -->
<view class="detail" v-if="item.鍗曚綅">
<text>鍗曚綅锛�</text>{{item.鍗曚綅}}
</view>
- <!-- <view class="detail" v-if="item.HDeptID">
- <text>HDeptID锛�</text>{{item.HDeptID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HDeptID">
+ <text>HDeptID锛�</text>{{item.HDeptID}}
+ </view> -->
<view class="detail" v-if="item.浣跨敤閮ㄩ棬">
<text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
</view>
@@ -84,9 +82,9 @@
<view class="detail" v-if="item.浣跨敤璐熻矗浜�">
<text>浣跨敤璐熻矗浜猴細</text>{{item.浣跨敤璐熻矗浜簘}
</view>
- <!-- <view class="detail" v-if="item.HRepairEmpID">
- <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HRepairEmpID">
+ <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
+ </view> -->
<view class="detail" v-if="item.缁存姢璐熻矗浜�">
<text>缁存姢璐熻矗浜猴細</text>{{item.缁存姢璐熻矗浜簘}
</view>
@@ -99,9 +97,9 @@
<view class="detail" v-if="item.杩愯寮�濮嬫棩鏈�">
<text>杩愯寮�濮嬫棩鏈燂細</text>{{item.杩愯寮�濮嬫棩鏈�.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.HEquipFileTypeID">
- <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HEquipFileTypeID">
+ <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
+ </view> -->
<view class="detail" v-if="item.宸ョ▼缂栫爜">
<text>宸ョ▼缂栫爜锛�</text>{{item.宸ョ▼缂栫爜}}
</view>
@@ -111,15 +109,15 @@
<view class="detail" v-if="item.鍝佺墝">
<text>鍝佺墝锛�</text>{{item.鍝佺墝}}
</view>
- <!-- <view class="detail" v-if="item.HSellSupID">
- <text>HSellSupID锛�</text>{{item.HSellSupID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HSellSupID">
+ <text>HSellSupID锛�</text>{{item.HSellSupID}}
+ </view> -->
<view class="detail" v-if="item.渚涘簲鍟�">
<text>渚涘簲鍟嗭細</text>{{item.渚涘簲鍟唥}
</view>
- <!-- <view class="detail" v-if="item.HMakeSupID">
- <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMakeSupID">
+ <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
+ </view> -->
<view class="detail" v-if="item.鍒堕�犲晢">
<text>鍒堕�犲晢锛�</text>{{item.鍒堕�犲晢}}
</view>
@@ -147,187 +145,47 @@
<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.hbilltype">
- <text>hbilltype锛�</text>{{item.hbilltype}}
- </view> -->
+<!-- <view class="detail" v-if="item.hbilltype">
+ <text>hbilltype锛�</text>{{item.hbilltype}}
+ </view> -->
<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
</view>
- <!-- <view class="detail" v-if="item.HMoudType">
- <text>HMoudType锛�</text>{{item.HMoudType}}
- </view>
- <view class="detail" v-if="item.hsubid">
- <text>hsubid锛�</text>{{item.hsubid}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMoudType">
+ <text>HMoudType锛�</text>{{item.HMoudType}}
+ </view>
+ <view class="detail" v-if="item.hsubid">
+ <text>hsubid锛�</text>{{item.hsubid}}
+ </view> -->
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['璁惧鍑哄巶鏃ユ湡']">
- <text>鍑哄巶鏃ユ湡锛�</text>{{item['璁惧鍑哄巶鏃ユ湡'].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['褰撳墠鐘舵��']}}
- </view>
- <view class="detail" v-if="item['鏃ユ湡']">
- <text>鏃ユ湡锛�</text>{{item['鏃ユ湡'].substr(0,10)}}
- </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="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item['hmainid']">
- <text>hmainid锛�</text>{{item['hmainid']}}
- </view> -->
- <view class="detail" v-if="item['鏉″舰鐮�']">
- <text>鏉＄爜缂栧彿锛�</text>{{item['鏉″舰鐮�']}}
- </view>
- <!-- <view class="detail" v-if="item['HMaterID']">
- <text>HMaterID锛�</text>{{item['HMaterID']}}
- </view> -->
- <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
- <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
- </view>
- <!-- <view class="detail" v-if="item['HUnitID']">
- <text>HUnitID锛�</text>{{item['HUnitID']}}
- </view> -->
- <view class="detail" v-if="item['鍗曚綅']">
- <text>鍗曚綅锛�</text>{{item['鍗曚綅']}}
- </view>
- <!-- <view class="detail" v-if="item['HDeptID']">
- <text>HDeptID锛�</text>{{item['HDeptID']}}
- </view> -->
- <view class="detail" v-if="item['浣跨敤閮ㄩ棬']">
- <text>浣跨敤閮ㄩ棬锛�</text>{{item['浣跨敤閮ㄩ棬']}}
- </view>
- <view class="detail" v-if="item['HUseEmpID']">
- <text>HUseEmpID锛�</text>{{item['HUseEmpID']}}
- </view>
- <view class="detail" v-if="item['浣跨敤璐熻矗浜�']">
- <text>浣跨敤璐熻矗浜猴細</text>{{item['浣跨敤璐熻矗浜�']}}
- </view>
- <!-- <view class="detail" v-if="item['HRepairEmpID']">
- <text>HRepairEmpID锛�</text>{{item['HRepairEmpID']}}
- </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['杩愯寮�濮嬫棩鏈�'].substr(0,10)}}
- </view>
- <!-- <view class="detail" v-if="item['HEquipFileTypeID']">
- <text>HEquipFileTypeID锛�</text>{{item['HEquipFileTypeID']}}
- </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['HSellSupID']">
- <text>HSellSupID锛�</text>{{item['HSellSupID']}}
- </view> -->
- <view class="detail" v-if="item['渚涘簲鍟�']">
- <text>渚涘簲鍟嗭細</text>{{item['渚涘簲鍟�']}}
- </view>
- <!-- <view class="detail" v-if="item['HMakeSupID']">
- <text>HMakeSupID锛�</text>{{item['HMakeSupID']}}
- </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['hbilltype']">
- <text>hbilltype锛�</text>{{item['hbilltype']}}
- </view> -->
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view>
- <!-- <view class="detail" v-if="item['HMoudType']">
- <text>HMoudType锛�</text>{{item['HMoudType']}}
- </view>
- <view class="detail" v-if="item['hsubid']">
- <text>hsubid锛�</text>{{item['hsubid']}}
- </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>
- <!-- #endif -->
-
-
- <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="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 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 class="op" v-if="operations == index">
- <!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
+ </view>
+
+ <view class="op" v-if="operations == index">
+<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -335,27 +193,25 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HNumber: '',
- HName: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HNumber:'',
+ HName:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -363,46 +219,46 @@
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
// console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Gy_EquipFileMain/GetList',
- data: {
+ url: this.serverUrl + '/Gy_EquipFileMain/GetList',
+ data:{
sWhere: this.sWhere,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
+ success: (res) => {
// console.log(1,res.data.data);
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -410,105 +266,105 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
//鎼滅储
- search() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HNumber) {
- this.sWhere += " and 璁惧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
+ this.sWhere += " and 璁惧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
}
if (this.hform.HName) {
- this.sWhere += " and 璁惧鍚嶇О like '%" + this.hform.HName + "%'";
+ this.sWhere += " and 璁惧鍚嶇О like '%" + this.hform.HName + "%'";
}
-
+
this.getList()
},
//鏂板
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/shebeidangan/form'
+ url:'/pages/shebeidangan/form'
})
},
//閲嶇疆
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HNumber: '',
- HName: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HNumber:'',
+ HName:'',
+ }
this.getList()
},
-
+
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/shebeidangan/form?hmainid=' + item.hmainid
+ url:'/pages/shebeidangan/form?hmainid=' + item.hmainid
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 + '/Gy_EquipFileMain/Delete_EquipFile',
- data: {
+ url: this.serverUrl + '/Gy_EquipFileMain/Delete_EquipFile',
+ data:{
HItemID: 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.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
},
// //瀹℃牳
@@ -522,155 +378,133 @@
// },
// //鍙嶅鏍�
// antiCheck(item){
-
+
// },
- }
+ }
}
</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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/shebeiguanli/list.vue b/pages/shebeiguanli/list.vue
index de5f0dd..ffd8995 100644
--- a/pages/shebeiguanli/list.vue
+++ b/pages/shebeiguanli/list.vue
@@ -1,21 +1,6 @@
<template>
<view class="content">
<view class="infoArea">
- <!-- #ifdef MP-WEIXIN -->
- <view class="name">{{infoData['璁惧鍚嶇О']}}</view>
- <view class="dm">锛� 浠ｇ爜锛歿{infoData['璁惧浠ｇ爜']}} 锛�</view>
- <view class="other">
- <view class="half">鍑哄巶缂栧彿: <text>{{infoData['璁惧鍑哄巶缂栧彿']}}</text></view>
- <view class="half">鍑哄巶鏃ユ湡: <text>{{infoData['璁惧鍑哄巶鏃ユ湡'].substr(0,10)}}</text></view>
- <view class="half">璁惧缂栫爜: <text v-if="infoData['璁惧缂栫爜']!= 'null'">{{infoData['璁惧缂栫爜']}}</text></view>
- <view class="half">璁惧绫诲瀷: <text v-if="infoData['璁惧绫诲瀷 ']!= 'null'">{{infoData['璁惧绫诲瀷']}}</text></view>
- </view>
- <view class="other" style="margin-top: 0;">
- <view class="all">璁惧瑙勬牸: <text v-if="infoData['璁惧瑙勬牸']!= 'null'">{{infoData['璁惧瑙勬牸']}}</text></view>
- <view class="all">璁惧鍨嬪彿: <text v-if="infoData['璁惧鍨嬪彿']!= 'null'">{{infoData['璁惧鍨嬪彿']}}</text></view>
- </view>
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
<view class="name">{{infoData.璁惧鍚嶇О}}</view>
<view class="dm">锛� 浠ｇ爜锛歿{infoData.璁惧浠ｇ爜}} 锛�</view>
<view class="other">
@@ -28,19 +13,16 @@
<view class="all">璁惧瑙勬牸: <text v-if="infoData.璁惧瑙勬牸 != 'null'">{{infoData.璁惧瑙勬牸}}</text></view>
<view class="all">璁惧鍨嬪彿: <text v-if="infoData.璁惧鍨嬪彿 != 'null'">{{infoData.璁惧鍨嬪彿}}</text></view>
</view>
- <!-- #endif -->
-
+
<view class="choose">
<view class="tab" :class="{focus: number == 1}" @tap="changeTab(1)">鏃ュ父璁板綍</view>
<view class="tab" :class="{focus: number == 2}" @tap="changeTab(2)">缁翠慨璁板綍</view>
</view>
</view>
-
+
<view style="width: 100%;height: 380rpx;"></view>
<view class="list" v-for="(item,index) in listData" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
@@ -55,51 +37,29 @@
<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
</view>
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['鍒跺崟浜�']">
- <text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
- </view>
- <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
- <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡'].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>
- <!-- #endif -->
-
- </uni-card>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
</view>
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- infoData: {},
- number: 1,
- listData: [],
- listData1: [],
- listData2: [],
- showDetail: -1,
- }
- },
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ infoData:{},
+ number:1,
+ listData:[],
+ listData1:[],
+ listData2:[],
+ showDetail:-1,
+ }
+ },
onLoad(e) {
console.log(e)
// e = {
@@ -119,29 +79,27 @@
this.infoData = e
this.getList(e.HInterID)
},
- methods: {
- getList(HInterID) {
+ methods: {
+ getList(HInterID){
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
- data: {
- "HInterID": HInterID
- },
- success: (res) => {
- if (res.data.count == 1) {
+ url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
+ data: { "HInterID": HInterID },
+ success: (res) => {
+ if(res.data.count == 1){
this.listData1 = res.data.list[0]
this.listData2 = res.data.list[1]
this.listData = res.data.list[0]
- console.log(1, this.listData1);
- console.log(2, this.listData2);
+ console.log(1,this.listData1);
+ console.log(2,this.listData2);
uni.hideLoading()
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -149,26 +107,26 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- changeTab(e) {
+ changeTab(e){
this.number = e
- if (e == 1) {
+ if(e==1){
this.listData = this.listData1
- } else {
+ }else{
this.listData = this.listData2
}
}
- }
+ }
}
</script>
<style lang="scss" scoped>
- .infoArea {
+ .infoArea{
width: 100%;
padding-top: 20rpx;
background-color: #f0f0f0;
@@ -176,23 +134,20 @@
top: 0;
left: 0;
z-index: 99;
-
- .name {
+ .name{
text-align: center;
font-size: 32rpx;
font-weight: 600;
color: #333;
line-height: 150%;
}
-
- .dm {
+ .dm{
text-align: center;
font-size: 27rpx;
font-weight: 500;
color: #333;
}
-
- .other {
+ .other{
display: flex;
flex-wrap: wrap;
width: 90%;
@@ -200,23 +155,19 @@
margin-top: 12rpx;
font-size: 27rpx;
color: #666;
-
- text {
+ text{
font-size: 28rpx;
color: #333;
margin-left: 10rpx;
}
-
- .half {
+ .half{
width: 50%;
}
-
- .all {
+ .all{
width: 100%;
}
}
-
- .choose {
+ .choose{
height: 70rpx;
margin-top: 20rpx;
padding: 0 30rpx;
@@ -225,15 +176,13 @@
border-radius: 40rpx 40rpx 0 0;
border-bottom: 2px solid #eee;
display: flex;
-
- .tab {
+ .tab{
margin: 0 20rpx;
text-align: center;
font-size: 28rpx;
color: #666;
}
-
- .focus {
+ .focus{
font-size: 30rpx;
color: #333;
font-weight: 600;
@@ -241,42 +190,38 @@
}
}
}
-
- .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>
diff --git a/pages/shebeiguanli/table.vue b/pages/shebeiguanli/table.vue
index c245d09..2e620aa 100644
--- a/pages/shebeiguanli/table.vue
+++ b/pages/shebeiguanli/table.vue
@@ -14,20 +14,19 @@
</view>
</view>
</view>
-
+
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
+
<view class="tabs">
<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍏ㄩ儴</view>
<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">杩愯</view>
<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">寰呮満</view>
<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鍋滄満</view>
</view>
-
+
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
+
<view class="list" v-for="(item,index) in showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
<uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="toList(item)">
<view class="card-detail">
<view class="detail" v-if="item.璁惧浠ｇ爜">
@@ -56,27 +55,27 @@
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item.hmainid">
- <text>hmainid锛�</text>{{item.hmainid}}
- </view> -->
+<!-- <view class="detail" v-if="item.hmainid">
+ <text>hmainid锛�</text>{{item.hmainid}}
+ </view> -->
<view class="detail" v-if="item.鏉″舰鐮�">
<text>鏉＄爜缂栧彿锛�</text>{{item.鏉″舰鐮亇}
</view>
- <!-- <view class="detail" v-if="item.HMaterID">
- <text>HMaterID锛�</text>{{item.HMaterID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMaterID">
+ <text>HMaterID锛�</text>{{item.HMaterID}}
+ </view> -->
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
<text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
- <!-- <view class="detail" v-if="item.HUnitID">
- <text>HUnitID锛�</text>{{item.HUnitID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HUnitID">
+ <text>HUnitID锛�</text>{{item.HUnitID}}
+ </view> -->
<view class="detail" v-if="item.鍗曚綅">
<text>鍗曚綅锛�</text>{{item.鍗曚綅}}
</view>
- <!-- <view class="detail" v-if="item.HDeptID">
- <text>HDeptID锛�</text>{{item.HDeptID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HDeptID">
+ <text>HDeptID锛�</text>{{item.HDeptID}}
+ </view> -->
<view class="detail" v-if="item.浣跨敤閮ㄩ棬">
<text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
</view>
@@ -86,9 +85,9 @@
<view class="detail" v-if="item.浣跨敤璐熻矗浜�">
<text>浣跨敤璐熻矗浜猴細</text>{{item.浣跨敤璐熻矗浜簘}
</view>
- <!-- <view class="detail" v-if="item.HRepairEmpID">
- <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HRepairEmpID">
+ <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
+ </view> -->
<view class="detail" v-if="item.缁存姢璐熻矗浜�">
<text>缁存姢璐熻矗浜猴細</text>{{item.缁存姢璐熻矗浜簘}
</view>
@@ -101,9 +100,9 @@
<view class="detail" v-if="item.杩愯寮�濮嬫棩鏈�">
<text>杩愯寮�濮嬫棩鏈燂細</text>{{item.杩愯寮�濮嬫棩鏈�.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.HEquipFileTypeID">
- <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HEquipFileTypeID">
+ <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
+ </view> -->
<view class="detail" v-if="item.宸ョ▼缂栫爜">
<text>宸ョ▼缂栫爜锛�</text>{{item.宸ョ▼缂栫爜}}
</view>
@@ -113,15 +112,15 @@
<view class="detail" v-if="item.鍝佺墝">
<text>鍝佺墝锛�</text>{{item.鍝佺墝}}
</view>
- <!-- <view class="detail" v-if="item.HSellSupID">
- <text>HSellSupID锛�</text>{{item.HSellSupID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HSellSupID">
+ <text>HSellSupID锛�</text>{{item.HSellSupID}}
+ </view> -->
<view class="detail" v-if="item.渚涘簲鍟�">
<text>渚涘簲鍟嗭細</text>{{item.渚涘簲鍟唥}
</view>
- <!-- <view class="detail" v-if="item.HMakeSupID">
- <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMakeSupID">
+ <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
+ </view> -->
<view class="detail" v-if="item.鍒堕�犲晢">
<text>鍒堕�犲晢锛�</text>{{item.鍒堕�犲晢}}
</view>
@@ -149,188 +148,48 @@
<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.hbilltype">
- <text>hbilltype锛�</text>{{item.hbilltype}}
- </view> -->
+<!-- <view class="detail" v-if="item.hbilltype">
+ <text>hbilltype锛�</text>{{item.hbilltype}}
+ </view> -->
<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
</view>
- <!-- <view class="detail" v-if="item.HMoudType">
- <text>HMoudType锛�</text>{{item.HMoudType}}
- </view>
- <view class="detail" v-if="item.hsubid">
- <text>hsubid锛�</text>{{item.hsubid}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMoudType">
+ <text>HMoudType锛�</text>{{item.HMoudType}}
+ </view>
+ <view class="detail" v-if="item.hsubid">
+ <text>hsubid锛�</text>{{item.hsubid}}
+ </view> -->
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="toList(item)">
- <view class="card-detail">
- <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['褰撳墠鐘舵��']}}
- </view>
- <view class="detail" v-if="item['鏃ユ湡']">
- <text>鏃ユ湡锛�</text>{{item['鏃ユ湡'].substr(0,10)}}
- </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="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item['hmainid']">
- <text>hmainid锛�</text>{{item['hmainid']}}
- </view> -->
- <view class="detail" v-if="item['鏉″舰鐮�']">
- <text>鏉＄爜缂栧彿锛�</text>{{item['鏉″舰鐮�']}}
- </view>
- <!-- <view class="detail" v-if="item['HMaterID']">
- <text>HMaterID锛�</text>{{item['HMaterID']}}
- </view> -->
- <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
- <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
- </view>
- <!-- <view class="detail" v-if="item['HUnitID']">
- <text>HUnitID锛�</text>{{item['HUnitID']}}
- </view> -->
- <view class="detail" v-if="item['鍗曚綅']">
- <text>鍗曚綅锛�</text>{{item['鍗曚綅']}}
- </view>
- <!-- <view class="detail" v-if="item['HDeptID']">
- <text>HDeptID锛�</text>{{item['HDeptID']}}
- </view> -->
- <view class="detail" v-if="item['浣跨敤閮ㄩ棬']">
- <text>浣跨敤閮ㄩ棬锛�</text>{{item['浣跨敤閮ㄩ棬']}}
- </view>
- <view class="detail" v-if="item['HUseEmpID']">
- <text>HUseEmpID锛�</text>{{item['HUseEmpID']}}
- </view>
- <view class="detail" v-if="item['浣跨敤璐熻矗浜�']">
- <text>浣跨敤璐熻矗浜猴細</text>{{item['浣跨敤璐熻矗浜�']}}
- </view>
- <!-- <view class="detail" v-if="item['HRepairEmpID']">
- <text>HRepairEmpID锛�</text>{{item['HRepairEmpID']}}
- </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['杩愯寮�濮嬫棩鏈�'].substr(0,10)}}
- </view>
- <!-- <view class="detail" v-if="item['HEquipFileTypeID']">
- <text>HEquipFileTypeID锛�</text>{{item['HEquipFileTypeID']}}
- </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['HSellSupID']">
- <text>HSellSupID锛�</text>{{item['HSellSupID']}}
- </view> -->
- <view class="detail" v-if="item['渚涘簲鍟�']">
- <text>渚涘簲鍟嗭細</text>{{item['渚涘簲鍟�']}}
- </view>
- <!-- <view class="detail" v-if="item['HMakeSupID']">
- <text>HMakeSupID锛�</text>{{item['HMakeSupID']}}
- </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['hbilltype']">
- <text>hbilltype锛�</text>{{item['hbilltype']}}
- </view> -->
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view>
- <!-- <view class="detail" v-if="item['HMoudType']">
- <text>HMoudType锛�</text>{{item['HMoudType']}}
- </view>
- <view class="detail" v-if="item['hsubid']">
- <text>hsubid锛�</text>{{item['hsubid']}}
- </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>
- <!-- #endif -->
-
-
- <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="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 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 class="op" v-if="operations == index">
- <button class="op1" size="mini" plain @tap.stop="check(item)">寮�宸�</button>
- <!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹屽伐</button>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <button class="op1" size="mini" plain @tap.stop="check(item)">寮�宸�</button>
+<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹屽伐</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍋滃伐</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">姹囨姤</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">寮傚父鐢宠</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">姹囨姤</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">寮傚父鐢宠</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -338,28 +197,26 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- tabs: 0,
- hform: {
- HNumber: '',
- HName: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ tabs:0,
+ hform:{
+ HNumber:'',
+ HName:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -367,46 +224,46 @@
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
// console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/ReportPlatForm/SearchGetLineBindBillList',
- data: {
+ url: this.serverUrl + '/ReportPlatForm/SearchGetLineBindBillList',
+ data:{
// sWhere: this.sWhere,
HUserName: uni.getStorageSync('HUserName')
},
- success: (res) => {
- console.log(1, res.data.data);
- if (res.data.count == 1) {
+ success: (res) => {
+ console.log(1,res.data.data);
+ if(res.data.count == 1){
this.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -414,118 +271,118 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
//鎼滅储
- search() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HNumber) {
- this.sWhere += " and 璁惧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
+ this.sWhere += " and 璁惧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
}
if (this.hform.HName) {
- this.sWhere += " and 璁惧鍚嶇О like '%" + this.hform.HName + "%'";
+ this.sWhere += " and 璁惧鍚嶇О like '%" + this.hform.HName + "%'";
}
-
+
this.getList()
},
//鏂板
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/shebeidangan/form'
+ url:'/pages/shebeidangan/form'
})
},
//閲嶇疆
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HNumber: '',
- HName: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HNumber:'',
+ HName:'',
+ }
this.getList()
},
//宸ュ崟鍒楄〃
- toList(item) {
+ toList(item){
uni.navigateTo({
- url: './list?HInterID=' + item.hmainid +
- '&璁惧鍚嶇О=' + item.璁惧鍚嶇О +
- '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜 +
- '&璁惧鍑哄巶鏃ユ湡=' + item.璁惧鍑哄巶鏃ユ湡 +
- '&璁惧鍑哄巶缂栧彿=' + item.璁惧鍑哄巶缂栧彿 +
- '&璁惧鍨嬪彿=' + item.璁惧鍨嬪彿 +
- '&璁惧绫诲瀷=' + item.璁惧绫诲瀷 +
- '&璁惧缂栫爜=' + item.璁惧缂栫爜 +
- '&璁惧瑙勬牸=' + item.璁惧瑙勬牸,
+ url:'./list?HInterID=' + item.hmainid
+ + '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ + '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜
+ + '&璁惧鍑哄巶鏃ユ湡=' + item.璁惧鍑哄巶鏃ユ湡
+ + '&璁惧鍑哄巶缂栧彿=' + item.璁惧鍑哄巶缂栧彿
+ + '&璁惧鍨嬪彿=' + item.璁惧鍨嬪彿
+ + '&璁惧绫诲瀷=' + item.璁惧绫诲瀷
+ + '&璁惧缂栫爜=' + item.璁惧缂栫爜
+ + '&璁惧瑙勬牸=' + item.璁惧瑙勬牸,
})
},
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/shebeidangan/form?hmainid=' + item.hmainid
+ url:'/pages/shebeidangan/form?hmainid=' + item.hmainid
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 + '/Gy_EquipFileMain/Delete_EquipFile',
- data: {
+ url: this.serverUrl + '/Gy_EquipFileMain/Delete_EquipFile',
+ data:{
HItemID: 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.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
},
// //瀹℃牳
@@ -539,174 +396,149 @@
// },
// //鍙嶅鏍�
// antiCheck(item){
-
+
// },
- }
+ }
}
</script>
<style lang="scss" scoped>
- .form {
+ .form{
width: 640rpx;
margin: 20rpx auto;
}
-
- .tabs {
+ .tabs{
width: 100%;
display: flex;
-
- view {
+ view{
width: 25%;
font-size: 30rpx;
color: #555;
text-align: center;
padding: 16rpx 0;
}
-
- .on {
+ .on{
color: #3a78ff;
font-weight: bold;
border-bottom: 3px solid #3a78ff;
}
}
-
- .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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/shebeilvli/form.vue b/pages/shebeilvli/form.vue
index addcfab..cf2ed1c 100644
--- a/pages/shebeilvli/form.vue
+++ b/pages/shebeilvli/form.vue
@@ -29,359 +29,215 @@
</picker>
</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">
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
+ <view class="detail" v-if="item.璁惧浠ｇ爜">
+ <text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
</view>
- <view class="detail" v-if="item['璁惧鍑哄巶鏃ユ湡']">
- <text>鍑哄巶鏃ユ湡锛�</text>{{item['璁惧鍑哄巶鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.璁惧鍑哄巶鏃ユ湡">
+ <text>鍑哄巶鏃ユ湡锛�</text>{{item.璁惧鍑哄巶鏃ユ湡.substr(0,10)}}
</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 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['鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鏃ユ湡">
+ <text>鏃ユ湡锛�</text>{{item.鏃ユ湡.substr(0,10)}}
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item.hmainid">
- <text>hmainid锛�</text>{{item.hmainid}}
- </view> -->
- <view class="detail" v-if="item['鏉″舰鐮�']">
- <text>鏉＄爜缂栧彿锛�</text>{{item['鏉″舰鐮�']}}
+<!-- <view class="detail" v-if="item.hmainid">
+ <text>hmainid锛�</text>{{item.hmainid}}
+ </view> -->
+ <view class="detail" v-if="item.鏉″舰鐮�">
+ <text>鏉＄爜缂栧彿锛�</text>{{item.鏉″舰鐮亇}
</view>
- <!-- <view class="detail" v-if="item.HMaterID">
- <text>HMaterID锛�</text>{{item.HMaterID}}
- </view> -->
- <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
- <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
+<!-- <view class="detail" v-if="item.HMaterID">
+ <text>HMaterID锛�</text>{{item.HMaterID}}
+ </view> -->
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
- <!-- <view class="detail" v-if="item.HUnitID">
- <text>HUnitID锛�</text>{{item.HUnitID}}
- </view> -->
- <view class="detail" v-if="item['鍗曚綅']">
- <text>鍗曚綅锛�</text>{{item['鍗曚綅']}}
+<!-- <view class="detail" v-if="item.HUnitID">
+ <text>HUnitID锛�</text>{{item.HUnitID}}
+ </view> -->
+ <view class="detail" v-if="item.鍗曚綅">
+ <text>鍗曚綅锛�</text>{{item.鍗曚綅}}
</view>
- <!-- <view class="detail" v-if="item.HDeptID">
- <text>HDeptID锛�</text>{{item.HDeptID}}
- </view> -->
- <view class="detail" v-if="item['浣跨敤閮ㄩ棬']">
- <text>浣跨敤閮ㄩ棬锛�</text>{{item['浣跨敤閮ㄩ棬']}}
+<!-- <view class="detail" v-if="item.HDeptID">
+ <text>HDeptID锛�</text>{{item.HDeptID}}
+ </view> -->
+ <view class="detail" v-if="item.浣跨敤閮ㄩ棬">
+ <text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
</view>
- <view class="detail" v-if="item['HUseEmpID']">
- <text>HUseEmpID锛�</text>{{item['HUseEmpID']}}
+ <view class="detail" v-if="item.HUseEmpID">
+ <text>HUseEmpID锛�</text>{{item.HUseEmpID}}
</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.HRepairEmpID">
- <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
- </view> -->
- <view class="detail" v-if="item['缁存姢璐熻矗浜�']">
- <text>缁存姢璐熻矗浜猴細</text>{{item['缁存姢璐熻矗浜�']}}
+<!-- <view class="detail" v-if="item.HRepairEmpID">
+ <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
+ </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['瀹夎鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.瀹夎鏃ユ湡">
+ <text>瀹夎鏃ユ湡锛�</text>{{item.瀹夎鏃ユ湡.substr(0,10)}}
</view>
- <view class="detail" v-if="item['杩愯寮�濮嬫棩鏈�']">
- <text>杩愯寮�濮嬫棩鏈燂細</text>{{item['杩愯寮�濮嬫棩鏈�'].substr(0,10)}}
+ <view class="detail" v-if="item.杩愯寮�濮嬫棩鏈�">
+ <text>杩愯寮�濮嬫棩鏈燂細</text>{{item.杩愯寮�濮嬫棩鏈�.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.HEquipFileTypeID">
- <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
- </view> -->
- <view class="detail" v-if="item['宸ョ▼缂栫爜']">
- <text>宸ョ▼缂栫爜锛�</text>{{item['宸ョ▼缂栫爜']}}
+<!-- <view class="detail" v-if="item.HEquipFileTypeID">
+ <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
+ </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 class="detail" v-if="item.鍝佺墝">
+ <text>鍝佺墝锛�</text>{{item.鍝佺墝}}
</view>
- <!-- <view class="detail" v-if="item.HSellSupID">
- <text>HSellSupID锛�</text>{{item.HSellSupID}}
- </view> -->
- <view class="detail" v-if="item['渚涘簲鍟�']">
- <text>渚涘簲鍟嗭細</text>{{item['渚涘簲鍟�']}}
+<!-- <view class="detail" v-if="item.HSellSupID">
+ <text>HSellSupID锛�</text>{{item.HSellSupID}}
+ </view> -->
+ <view class="detail" v-if="item.渚涘簲鍟�">
+ <text>渚涘簲鍟嗭細</text>{{item.渚涘簲鍟唥}
</view>
- <!-- <view class="detail" v-if="item.HMakeSupID">
- <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
- </view> -->
- <view class="detail" v-if="item['鍒堕�犲晢']">
- <text>鍒堕�犲晢锛�</text>{{item['鍒堕�犲晢']}}
+<!-- <view class="detail" v-if="item.HMakeSupID">
+ <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
+ </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['鍒跺崟鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
</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['瀹℃牳鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
</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['淇敼鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
</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['鍏抽棴鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.hbilltype">
- <text>hbilltype锛�</text>{{item.hbilltype}}
- </view> -->
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
+<!-- <view class="detail" v-if="item.hbilltype">
+ <text>hbilltype锛�</text>{{item.hbilltype}}
+ </view> -->
+ <view class="detail" v-if="item.鍗曟嵁绫诲瀷">
+ <text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
</view>
- <!-- <view class="detail" v-if="item.HMoudType">
- <text>HMoudType锛�</text>{{item.HMoudType}}
- </view>
- <view class="detail" v-if="item.hsubid">
- <text>hsubid锛�</text>{{item.hsubid}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMoudType">
+ <text>HMoudType锛�</text>{{item.HMoudType}}
+ </view>
+ <view class="detail" v-if="item.hsubid">
+ <text>hsubid锛�</text>{{item.hsubid}}
+ </view> -->
</view>
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
- <uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item.璁惧浠ｇ爜">
- <text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.璁惧鍑哄巶鏃ユ湡">
- <text>鍑哄巶鏃ユ湡锛�</text>{{item.璁惧鍑哄巶鏃ユ湡.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.褰撳墠鐘舵�亇}
- </view>
- <view class="detail" v-if="item.鏃ユ湡">
- <text>鏃ユ湡锛�</text>{{item.鏃ユ湡.substr(0,10)}}
- </view>
+
+ <view class="more" v-if="showDetail == 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="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item.hmainid">
- <text>hmainid锛�</text>{{item.hmainid}}
- </view> -->
- <view class="detail" v-if="item.鏉″舰鐮�">
- <text>鏉＄爜缂栧彿锛�</text>{{item.鏉″舰鐮亇}
- </view>
- <!-- <view class="detail" v-if="item.HMaterID">
- <text>HMaterID锛�</text>{{item.HMaterID}}
- </view> -->
- <view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
- </view>
- <!-- <view class="detail" v-if="item.HUnitID">
- <text>HUnitID锛�</text>{{item.HUnitID}}
- </view> -->
- <view class="detail" v-if="item.鍗曚綅">
- <text>鍗曚綅锛�</text>{{item.鍗曚綅}}
- </view>
- <!-- <view class="detail" v-if="item.HDeptID">
- <text>HDeptID锛�</text>{{item.HDeptID}}
- </view> -->
- <view class="detail" v-if="item.浣跨敤閮ㄩ棬">
- <text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
- </view>
- <view class="detail" v-if="item.HUseEmpID">
- <text>HUseEmpID锛�</text>{{item.HUseEmpID}}
- </view>
- <view class="detail" v-if="item.浣跨敤璐熻矗浜�">
- <text>浣跨敤璐熻矗浜猴細</text>{{item.浣跨敤璐熻矗浜簘}
- </view>
- <!-- <view class="detail" v-if="item.HRepairEmpID">
- <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
- </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.杩愯寮�濮嬫棩鏈�.substr(0,10)}}
- </view>
- <!-- <view class="detail" v-if="item.HEquipFileTypeID">
- <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
- </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.HSellSupID">
- <text>HSellSupID锛�</text>{{item.HSellSupID}}
- </view> -->
- <view class="detail" v-if="item.渚涘簲鍟�">
- <text>渚涘簲鍟嗭細</text>{{item.渚涘簲鍟唥}
- </view>
- <!-- <view class="detail" v-if="item.HMakeSupID">
- <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
- </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.hbilltype">
- <text>hbilltype锛�</text>{{item.hbilltype}}
- </view> -->
- <view class="detail" v-if="item.鍗曟嵁绫诲瀷">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
- </view>
- <!-- <view class="detail" v-if="item.HMoudType">
- <text>HMoudType锛�</text>{{item.HMoudType}}
- </view>
- <view class="detail" v-if="item.hsubid">
- <text>hsubid锛�</text>{{item.hsubid}}
- </view> -->
+ <view class="part">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅瀛愯〃
</view>
- <!-- #endif -->
-
-
- <view class="more" v-if="showDetail == 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">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鏌ョ湅瀛愯〃
- </view>
+ </view>
+ <view class="more" v-if="showDetail != 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="more" v-if="showDetail != 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">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鏌ョ湅瀛愯〃
- </view>
+ <view class="part">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅瀛愯〃
</view>
- </uni-card>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
</view>
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HEquipType: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HEquipType:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
},
- sWhere: '',
- listData: [],
- showDetail: -1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showDetail:-1,
+ }
+ },
onLoad() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
- methods: {
- getList() {
+ methods: {
+ getList(){
console.log(this.sWhere)
uni.request({
- url: this.serverUrl + '/Gy_EquipFileMain/GetList',
- data: {
+ url: this.serverUrl + '/Gy_EquipFileMain/GetList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -389,170 +245,155 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
-
+
// uni.request({
// url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
// data: { "HInterID": 2 },
// success: (res) => {
// console.log(2,res);
-
+
// }
// });
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
- search() {
+ search(){
this.sWhere = ''
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HEquipType) {
- this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HEquipType + "%'";
+ this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HEquipType + "%'";
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
-
+
this.getList()
},
- clear() {
+ clear(){
this.sWhere = ''
this.hform = {
- HBillNo: '',
- HEquipType: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
+ HBillNo:'',
+ HEquipType:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
}
this.getList()
},
- }
+ }
}
</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>
diff --git a/pages/shebeilvli/table.vue b/pages/shebeilvli/table.vue
index d388a62..f4c34dc 100644
--- a/pages/shebeilvli/table.vue
+++ b/pages/shebeilvli/table.vue
@@ -29,20 +29,18 @@
</picker>
</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.璁惧浠ｇ爜">
<text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
@@ -70,27 +68,27 @@
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item.hmainid">
- <text>hmainid锛�</text>{{item.hmainid}}
- </view> -->
+<!-- <view class="detail" v-if="item.hmainid">
+ <text>hmainid锛�</text>{{item.hmainid}}
+ </view> -->
<view class="detail" v-if="item.鏉″舰鐮�">
<text>鏉＄爜缂栧彿锛�</text>{{item.鏉″舰鐮亇}
</view>
- <!-- <view class="detail" v-if="item.HMaterID">
- <text>HMaterID锛�</text>{{item.HMaterID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMaterID">
+ <text>HMaterID锛�</text>{{item.HMaterID}}
+ </view> -->
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
<text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
- <!-- <view class="detail" v-if="item.HUnitID">
- <text>HUnitID锛�</text>{{item.HUnitID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HUnitID">
+ <text>HUnitID锛�</text>{{item.HUnitID}}
+ </view> -->
<view class="detail" v-if="item.鍗曚綅">
<text>鍗曚綅锛�</text>{{item.鍗曚綅}}
</view>
- <!-- <view class="detail" v-if="item.HDeptID">
- <text>HDeptID锛�</text>{{item.HDeptID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HDeptID">
+ <text>HDeptID锛�</text>{{item.HDeptID}}
+ </view> -->
<view class="detail" v-if="item.浣跨敤閮ㄩ棬">
<text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
</view>
@@ -100,9 +98,9 @@
<view class="detail" v-if="item.浣跨敤璐熻矗浜�">
<text>浣跨敤璐熻矗浜猴細</text>{{item.浣跨敤璐熻矗浜簘}
</view>
- <!-- <view class="detail" v-if="item.HRepairEmpID">
- <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HRepairEmpID">
+ <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
+ </view> -->
<view class="detail" v-if="item.缁存姢璐熻矗浜�">
<text>缁存姢璐熻矗浜猴細</text>{{item.缁存姢璐熻矗浜簘}
</view>
@@ -115,9 +113,9 @@
<view class="detail" v-if="item.杩愯寮�濮嬫棩鏈�">
<text>杩愯寮�濮嬫棩鏈燂細</text>{{item.杩愯寮�濮嬫棩鏈�.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.HEquipFileTypeID">
- <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HEquipFileTypeID">
+ <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
+ </view> -->
<view class="detail" v-if="item.宸ョ▼缂栫爜">
<text>宸ョ▼缂栫爜锛�</text>{{item.宸ョ▼缂栫爜}}
</view>
@@ -127,15 +125,15 @@
<view class="detail" v-if="item.鍝佺墝">
<text>鍝佺墝锛�</text>{{item.鍝佺墝}}
</view>
- <!-- <view class="detail" v-if="item.HSellSupID">
- <text>HSellSupID锛�</text>{{item.HSellSupID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HSellSupID">
+ <text>HSellSupID锛�</text>{{item.HSellSupID}}
+ </view> -->
<view class="detail" v-if="item.渚涘簲鍟�">
<text>渚涘簲鍟嗭細</text>{{item.渚涘簲鍟唥}
</view>
- <!-- <view class="detail" v-if="item.HMakeSupID">
- <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMakeSupID">
+ <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
+ </view> -->
<view class="detail" v-if="item.鍒堕�犲晢">
<text>鍒堕�犲晢锛�</text>{{item.鍒堕�犲晢}}
</view>
@@ -163,179 +161,39 @@
<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
</view>
- <!-- <view class="detail" v-if="item.hbilltype">
- <text>hbilltype锛�</text>{{item.hbilltype}}
- </view> -->
+<!-- <view class="detail" v-if="item.hbilltype">
+ <text>hbilltype锛�</text>{{item.hbilltype}}
+ </view> -->
<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
</view>
- <!-- <view class="detail" v-if="item.HMoudType">
- <text>HMoudType锛�</text>{{item.HMoudType}}
- </view>
- <view class="detail" v-if="item.hsubid">
- <text>hsubid锛�</text>{{item.hsubid}}
- </view> -->
+<!-- <view class="detail" v-if="item.HMoudType">
+ <text>HMoudType锛�</text>{{item.HMoudType}}
+ </view>
+ <view class="detail" v-if="item.hsubid">
+ <text>hsubid锛�</text>{{item.hsubid}}
+ </view> -->
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['璁惧鍑哄巶鏃ユ湡']">
- <text>鍑哄巶鏃ユ湡锛�</text>{{item['璁惧鍑哄巶鏃ユ湡'].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['褰撳墠鐘舵��']}}
- </view>
- <view class="detail" v-if="item['鏃ユ湡']">
- <text>鏃ユ湡锛�</text>{{item['鏃ユ湡'].substr(0,10)}}
- </view>
+
+ <view class="more" v-if="showDetail == 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="card-detail" v-if="showDetail == index">
- <!-- <view class="detail" v-if="item.hmainid">
- <text>hmainid锛�</text>{{item.hmainid}}
- </view> -->
- <view class="detail" v-if="item['鏉″舰鐮�']">
- <text>鏉＄爜缂栧彿锛�</text>{{item['鏉″舰鐮�']}}
- </view>
- <!-- <view class="detail" v-if="item.HMaterID">
- <text>HMaterID锛�</text>{{item.HMaterID}}
- </view> -->
- <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
- <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
- </view>
- <!-- <view class="detail" v-if="item.HUnitID">
- <text>HUnitID锛�</text>{{item.HUnitID}}
- </view> -->
- <view class="detail" v-if="item['鍗曚綅']">
- <text>鍗曚綅锛�</text>{{item['鍗曚綅']}}
- </view>
- <!-- <view class="detail" v-if="item.HDeptID">
- <text>HDeptID锛�</text>{{item.HDeptID}}
- </view> -->
- <view class="detail" v-if="item['浣跨敤閮ㄩ棬']">
- <text>浣跨敤閮ㄩ棬锛�</text>{{item['浣跨敤閮ㄩ棬']}}
- </view>
- <view class="detail" v-if="item['HUseEmpID']">
- <text>HUseEmpID锛�</text>{{item['HUseEmpID']}}
- </view>
- <view class="detail" v-if="item['浣跨敤璐熻矗浜�']">
- <text>浣跨敤璐熻矗浜猴細</text>{{item['浣跨敤璐熻矗浜�']}}
- </view>
- <!-- <view class="detail" v-if="item.HRepairEmpID">
- <text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
- </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['杩愯寮�濮嬫棩鏈�'].substr(0,10)}}
- </view>
- <!-- <view class="detail" v-if="item.HEquipFileTypeID">
- <text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
- </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.HSellSupID">
- <text>HSellSupID锛�</text>{{item.HSellSupID}}
- </view> -->
- <view class="detail" v-if="item['渚涘簲鍟�']">
- <text>渚涘簲鍟嗭細</text>{{item['渚涘簲鍟�']}}
- </view>
- <!-- <view class="detail" v-if="item.HMakeSupID">
- <text>HMakeSupID锛�</text>{{item.HMakeSupID}}
- </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.hbilltype">
- <text>hbilltype锛�</text>{{item.hbilltype}}
- </view> -->
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
- <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view>
- <!-- <view class="detail" v-if="item.HMoudType">
- <text>HMoudType锛�</text>{{item.HMoudType}}
- </view>
- <view class="detail" v-if="item.hsubid">
- <text>hsubid锛�</text>{{item.hsubid}}
- </view> -->
+ <view class="part" @tap.stop="toSon(item)">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅瀛愯〃
</view>
- <!-- #endif -->
-
-
- <view class="more" v-if="showDetail == 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="toSon(item)">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鏌ョ湅瀛愯〃
- </view>
+ </view>
+ <view class="more" v-if="showDetail != 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="more" v-if="showDetail != 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="toSon(item)">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鏌ョ湅瀛愯〃
- </view>
+ <view class="part" @tap.stop="toSon(item)">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅瀛愯〃
</view>
- </uni-card>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -343,75 +201,73 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HEquipType: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HEquipType:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Gy_EquipFileMain/GetList',
- data: {
+ url: this.serverUrl + '/Gy_EquipFileMain/GetList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -419,190 +275,175 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
-
+
// uni.request({
// url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
// data: { "HInterID": 2 },
// success: (res) => {
// console.log(2,res);
-
+
// }
// });
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
- search() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HEquipType) {
- this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HEquipType + "%'";
+ this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HEquipType + "%'";
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
-
+
this.getList()
},
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.sWhere = ''
this.hform = {
- HBillNo: '',
- HEquipType: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
+ HBillNo:'',
+ HEquipType:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
}
this.getList()
},
- toSon(item) {
+ toSon(item){
uni.navigateTo({
- url: '/pages/shebeilvli/table_son?HInterID=' + item.hmainid +
- '&璁惧鍚嶇О=' + item.璁惧鍚嶇О +
- '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜 +
- '&璁惧鍑哄巶鏃ユ湡=' + item.璁惧鍑哄巶鏃ユ湡 +
- '&璁惧鍑哄巶缂栧彿=' + item.璁惧鍑哄巶缂栧彿 +
- '&璁惧鍨嬪彿=' + item.璁惧鍨嬪彿 +
- '&璁惧绫诲瀷=' + item.璁惧绫诲瀷 +
- '&璁惧缂栫爜=' + item.璁惧缂栫爜 +
- '&璁惧瑙勬牸=' + item.璁惧瑙勬牸,
+ url:'/pages/shebeilvli/table_son?HInterID=' + item.hmainid
+ + '&璁惧鍚嶇О=' + item.璁惧鍚嶇О
+ + '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜
+ + '&璁惧鍑哄巶鏃ユ湡=' + item.璁惧鍑哄巶鏃ユ湡
+ + '&璁惧鍑哄巶缂栧彿=' + item.璁惧鍑哄巶缂栧彿
+ + '&璁惧鍨嬪彿=' + item.璁惧鍨嬪彿
+ + '&璁惧绫诲瀷=' + item.璁惧绫诲瀷
+ + '&璁惧缂栫爜=' + item.璁惧缂栫爜
+ + '&璁惧瑙勬牸=' + item.璁惧瑙勬牸,
})
}
- }
+ }
}
</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>
diff --git a/pages/shebeilvli/table_son.vue b/pages/shebeilvli/table_son.vue
index 1d9ffc8..ffd8995 100644
--- a/pages/shebeilvli/table_son.vue
+++ b/pages/shebeilvli/table_son.vue
@@ -1,21 +1,6 @@
<template>
<view class="content">
<view class="infoArea">
- <!-- #ifdef MP-WEIXIN -->
- <view class="name">{{infoData['璁惧鍚嶇О']}}</view>
- <view class="dm">锛� 浠ｇ爜锛歿{infoData['璁惧浠ｇ爜']}} 锛�</view>
- <view class="other">
- <view class="half">鍑哄巶缂栧彿: <text>{{infoData['璁惧鍑哄巶缂栧彿']}}</text></view>
- <view class="half">鍑哄巶鏃ユ湡: <text>{{infoData['璁惧鍑哄巶鏃ユ湡'].substr(0,10)}}</text></view>
- <view class="half">璁惧缂栫爜: <text v-if="infoData['璁惧缂栫爜'] != 'null'">{{infoData['璁惧缂栫爜']}}</text></view>
- <view class="half">璁惧绫诲瀷: <text v-if="infoData['璁惧绫诲瀷'] != 'null'">{{infoData['璁惧绫诲瀷']}}</text></view>
- </view>
- <view class="other" style="margin-top: 0;">
- <view class="all">璁惧瑙勬牸: <text v-if="infoData['璁惧瑙勬牸'] != 'null'">{{infoData['璁惧瑙勬牸']}}</text></view>
- <view class="all">璁惧鍨嬪彿: <text v-if="infoData['璁惧鍨嬪彿'] != 'null'">{{infoData['璁惧鍨嬪彿']}}</text></view>
- </view>
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
<view class="name">{{infoData.璁惧鍚嶇О}}</view>
<view class="dm">锛� 浠ｇ爜锛歿{infoData.璁惧浠ｇ爜}} 锛�</view>
<view class="other">
@@ -28,39 +13,16 @@
<view class="all">璁惧瑙勬牸: <text v-if="infoData.璁惧瑙勬牸 != 'null'">{{infoData.璁惧瑙勬牸}}</text></view>
<view class="all">璁惧鍨嬪彿: <text v-if="infoData.璁惧鍨嬪彿 != 'null'">{{infoData.璁惧鍨嬪彿}}</text></view>
</view>
- <!-- #endif -->
-
-
+
<view class="choose">
<view class="tab" :class="{focus: number == 1}" @tap="changeTab(1)">鏃ュ父璁板綍</view>
<view class="tab" :class="{focus: number == 2}" @tap="changeTab(2)">缁翠慨璁板綍</view>
</view>
</view>
-
+
<view style="width: 100%;height: 380rpx;"></view>
<view class="list" v-for="(item,index) in listData" :key="index">
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['鍒跺崟浜�']">
- <text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
- </view>
- <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
- <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡'].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>
- </uni-card>
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
@@ -76,32 +38,28 @@
</view>
</view>
</uni-card>
- <!-- #endif -->
-
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
</view>
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- infoData: {},
- number: 1,
- listData: [],
- listData1: [],
- listData2: [],
- showDetail: -1,
- }
- },
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ infoData:{},
+ number:1,
+ listData:[],
+ listData1:[],
+ listData2:[],
+ showDetail:-1,
+ }
+ },
onLoad(e) {
console.log(e)
// e = {
@@ -121,29 +79,27 @@
this.infoData = e
this.getList(e.HInterID)
},
- methods: {
- getList(HInterID) {
+ methods: {
+ getList(HInterID){
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
- data: {
- "HInterID": HInterID
- },
- success: (res) => {
- if (res.data.count == 1) {
+ url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
+ data: { "HInterID": HInterID },
+ success: (res) => {
+ if(res.data.count == 1){
this.listData1 = res.data.list[0]
this.listData2 = res.data.list[1]
this.listData = res.data.list[0]
- console.log(1, this.listData1);
- console.log(2, this.listData2);
+ console.log(1,this.listData1);
+ console.log(2,this.listData2);
uni.hideLoading()
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -151,26 +107,26 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
- changeTab(e) {
+ changeTab(e){
this.number = e
- if (e == 1) {
+ if(e==1){
this.listData = this.listData1
- } else {
+ }else{
this.listData = this.listData2
}
}
- }
+ }
}
</script>
<style lang="scss" scoped>
- .infoArea {
+ .infoArea{
width: 100%;
padding-top: 20rpx;
background-color: #f0f0f0;
@@ -178,23 +134,20 @@
top: 0;
left: 0;
z-index: 99;
-
- .name {
+ .name{
text-align: center;
font-size: 32rpx;
font-weight: 600;
color: #333;
line-height: 150%;
}
-
- .dm {
+ .dm{
text-align: center;
font-size: 27rpx;
font-weight: 500;
color: #333;
}
-
- .other {
+ .other{
display: flex;
flex-wrap: wrap;
width: 90%;
@@ -202,23 +155,19 @@
margin-top: 12rpx;
font-size: 27rpx;
color: #666;
-
- text {
+ text{
font-size: 28rpx;
color: #333;
margin-left: 10rpx;
}
-
- .half {
+ .half{
width: 50%;
}
-
- .all {
+ .all{
width: 100%;
}
}
-
- .choose {
+ .choose{
height: 70rpx;
margin-top: 20rpx;
padding: 0 30rpx;
@@ -227,15 +176,13 @@
border-radius: 40rpx 40rpx 0 0;
border-bottom: 2px solid #eee;
display: flex;
-
- .tab {
+ .tab{
margin: 0 20rpx;
text-align: center;
font-size: 28rpx;
color: #666;
}
-
- .focus {
+ .focus{
font-size: 30rpx;
color: #333;
font-weight: 600;
@@ -243,42 +190,38 @@
}
}
}
-
- .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>
diff --git a/pages/shebeiweixiu/gz_table.vue b/pages/shebeiweixiu/gz_table.vue
index d3b43a9..7586084 100644
--- a/pages/shebeiweixiu/gz_table.vue
+++ b/pages/shebeiweixiu/gz_table.vue
@@ -39,326 +39,202 @@
<input v-model="hform.ColContent" placeholder="杈撳叆鍐呭" />
</view>
</view>
-
+
<view class="buttons">
<button class="op5" size="mini" type="default" @tap="clear">閲嶇疆</button>
<button class="op3" size="mini" type="default" @tap="search">鏌ヨ</button>
<button class="op4" size="mini" type="default" @tap="close">鍏抽棴</button>
</view>
</view>
-
+
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
+
<view class="list" v-for="(item,index) in listData" :key="index">
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
+ <view 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 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['鍙戠敓鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍙戠敓鏃ユ湡">
+ <text>鍙戠敓鏃ユ湡锛�</text>{{item.鍙戠敓鏃ユ湡.substr(0,10)}}
</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>
<view class="card-detail" v-if="showDetail == index">
- <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 class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
</view>
- <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
- <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
</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['瀹℃牳鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
</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['淇敼鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
</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['鍏抽棴鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
</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['浣滃簾鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
</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 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 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>
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
- <uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item.璁惧浠ｇ爜">
- <text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.璁惧鍨嬪彿">
- <text>璁惧鍨嬪彿锛�</text>{{item.璁惧鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.鏁呴殰绫诲埆浠ｇ爜">
- <text>鏁呴殰绫诲埆浠ｇ爜锛�</text>{{item.鏁呴殰绫诲埆浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.鏁呴殰绫诲埆">
- <text>鏁呴殰绫诲埆锛�</text>{{item.鏁呴殰绫诲埆}}
- </view>
- <view class="detail" v-if="item.鍙戠幇浜轰唬鐮�">
- <text>鍙戠幇浜轰唬鐮侊細</text>{{item.鍙戠幇浜轰唬鐮亇}
- </view>
- <view class="detail" v-if="item.鍙戠幇浜�">
- <text>鍙戠幇浜猴細</text>{{item.鍙戠幇浜簘}
- </view>
- <view class="detail" v-if="item.璐熻矗浜轰唬鐮�">
- <text>璐熻矗浜轰唬鐮侊細</text>{{item.璐熻矗浜轰唬鐮亇}
- </view>
- <view class="detail" v-if="item.璐熻矗浜�">
- <text>璐熻矗浜猴細</text>{{item.璐熻矗浜簘}
- </view>
- <view 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="more" v-if="showDetail == 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="card-detail" v-if="showDetail == index">
- <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="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="part" @tap.stop="choose(item)">
+ <uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>閫夊彇璇ユ暟鎹�
</view>
- <!-- #endif -->
-
-
- <view class="more" v-if="showDetail == 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="choose(item)">
- <uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>閫夊彇璇ユ暟鎹�
- </view>
+ </view>
+ <view class="more" v-if="showDetail != 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="more" v-if="showDetail != 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="choose(item)">
- <uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>閫夊彇璇ユ暟鎹�
- </view>
+ <view class="part" @tap.stop="choose(item)">
+ <uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>閫夊彇璇ユ暟鎹�
</view>
- </uni-card>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
</view>
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- HDate: '',
- HDate1: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ HDate:'',
+ HDate1:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
},
- sWhere: '',
- listData: [],
- showDetail: -1,
-
- arrayColName: ['鏃ユ湡', '鍗曟嵁鍙�', '璁惧浠ｇ爜', '璁惧鍚嶇О', '鏁呴殰绫诲埆浠ｇ爜', '鏁呴殰绫诲埆', '鍙戠幇浜轰唬鐮�', '鍙戠幇浜�', '閮ㄩ棬浠ｇ爜', '閮ㄩ棬鍚嶇О', '璐熻矗浜轰唬鐮�',
- '璐熻矗浜�', '鍙戠敓鏃ユ湡', '鏁呴殰鎻忚堪', '琛ㄥご澶囨敞', '鍐呴儴鍗曟嵁鍙�', '鍒跺崟浜�', '鍒跺崟鏃ユ湡', '瀹℃牳浜�', '瀹℃牳鏃ユ湡', '淇敼浜�', '淇敼鏃ユ湡', '鍏抽棴浜�', '鍏抽棴鏃ユ湡',
- '浣滃簾浜�', '浣滃簾鏃ユ湡', '鏁呴殰鍘熷洜浠ｇ爜', '鏁呴殰鍘熷洜鍚嶇О', '鏁呴殰鍘熷洜鎻忚堪', '琛ㄤ綋璐熻矗浜轰唬鐮�', '琛ㄤ綋璐熻矗浜�', '琛屽叧闂汉', '鍏抽棴绫诲瀷', '琛ㄤ綋澶囨敞', '婧愬崟鍗曞彿',
- '婧愬崟绫诲瀷', '鍏宠仈鏁伴噺'
- ],
- arrayComparator: ['=', '>=', '>', '<=', '<', '<>', '鍖呭惈', '宸﹀寘鍚�', '鍙冲寘鍚�', '涓嶅寘鍚�']
+ sWhere:'',
+ listData:[],
+ showDetail:-1,
+
+ arrayColName:['鏃ユ湡','鍗曟嵁鍙�','璁惧浠ｇ爜','璁惧鍚嶇О','鏁呴殰绫诲埆浠ｇ爜','鏁呴殰绫诲埆','鍙戠幇浜轰唬鐮�','鍙戠幇浜�','閮ㄩ棬浠ｇ爜','閮ㄩ棬鍚嶇О','璐熻矗浜轰唬鐮�','璐熻矗浜�','鍙戠敓鏃ユ湡','鏁呴殰鎻忚堪','琛ㄥご澶囨敞','鍐呴儴鍗曟嵁鍙�','鍒跺崟浜�','鍒跺崟鏃ユ湡','瀹℃牳浜�','瀹℃牳鏃ユ湡','淇敼浜�','淇敼鏃ユ湡','鍏抽棴浜�','鍏抽棴鏃ユ湡','浣滃簾浜�','浣滃簾鏃ユ湡','鏁呴殰鍘熷洜浠ｇ爜','鏁呴殰鍘熷洜鍚嶇О','鏁呴殰鍘熷洜鎻忚堪','琛ㄤ綋璐熻矗浜轰唬鐮�','琛ㄤ綋璐熻矗浜�','琛屽叧闂汉','鍏抽棴绫诲瀷','琛ㄤ綋澶囨敞','婧愬崟鍗曞彿','婧愬崟绫诲瀷','鍏宠仈鏁伴噺'],
+ arrayComparator:['=','>=','>','<=','<','<>','鍖呭惈','宸﹀寘鍚�','鍙冲寘鍚�','涓嶅寘鍚�']
}
- },
+ },
created() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
- methods: {
- getList() {
+ methods: {
+ getList(){
console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sb_EqpRepairWorkBill/GetEqpConkBookBillList',
- data: {
+ url: this.serverUrl + '/Sb_EqpRepairWorkBill/GetEqpConkBookBillList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
uni.hideLoading()
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -366,100 +242,100 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
//杩囨护
- ColNameChange(e) {
+ ColNameChange(e){
// console.log(e.detail.value)
this.hform.ColName = this.arrayColName[e.detail.value]
console.log(this.hform)
},
//鏉′欢
- ComparatorChange(e) {
+ ComparatorChange(e){
// console.log(e.detail.value)
this.hform.Comparator = this.arrayComparator[e.detail.value]
console.log(this.hform)
},
-
- search() {
+
+ search(){
this.sWhere = ''
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate + "'";
}
if (this.hform.HDate1) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate1 + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HDate1 + "'";
}
if (this.hform.ColName && this.hform.Comparator) {
- var com = "";
- if (this.hform.Comparator == '鍖呭惈') {
+ var com = "";
+ if(this.hform.Comparator == '鍖呭惈'){
com = "like'%" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '宸﹀寘鍚�') {
+ }else if(this.hform.Comparator == '宸﹀寘鍚�'){
com = "like'%" + this.hform.ColContent + "'";
- } else if (this.hform.Comparator == '鍙冲寘鍚�') {
+ }else if(this.hform.Comparator == '鍙冲寘鍚�'){
com = "like'" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '涓嶅寘鍚�') {
+ }else if(this.hform.Comparator == '涓嶅寘鍚�'){
com = "not like'%" + this.hform.ColContent + "%'";
- } else {
+ }else{
com = "" + this.hform.Comparator + "'" + this.hform.ColContent + "'";
}
-
+
this.sWhere += " and " + this.hform.ColName + " " + com;
}
-
+
this.getList()
},
//閲嶇疆
- clear() {
+ clear(){
this.sWhere = ''
this.showDetail = -1,
- this.hform = {
- HBillNo: '',
- HDate: '',
- HDate1: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
- }
+ this.hform = {
+ HBillNo:'',
+ HDate:'',
+ HDate1:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
+ }
this.getList()
},
- choose(item) {
+ choose(item){
console.log(item)
var data = {
- HMainSourceBillNo: item.鍗曟嵁鍙�,
- HMainSourceInterID: item.hmainid,
- HMainSourceEntryID: item.hsubid,
+ HMainSourceBillNo:item.鍗曟嵁鍙�,
+ HMainSourceInterID:item.hmainid,
+ HMainSourceEntryID:item.hsubid,
}
this.$emit('gzData', data)
},
- close() {
- this.$emit('close', true)
+ close(){
+ this.$emit('close',true)
},
- }
+ }
}
</script>
<style lang="scss" scoped>
- .content {
+ .content{
width: 100%;
height: 100%;
background-color: #fff;
@@ -470,28 +346,23 @@
left: 0;
z-index: 99;
}
-
- .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;
}
}
-
- .left {
+ .left{
width: 170rpx;
padding: 10rpx 0;
margin-right: 10rpx;
@@ -500,34 +371,29 @@
color: #888;
text-align: center;
}
-
- .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;
@@ -536,79 +402,69 @@
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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
}
}
-
- .op1 {
+
+ .op1{
border: 1px solid #41a863;
background-color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
background-color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
background-color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
background-color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
background-color: #888;
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/shebeiweixiu/table.vue b/pages/shebeiweixiu/table.vue
index 75fb2bc..b2af521 100644
--- a/pages/shebeiweixiu/table.vue
+++ b/pages/shebeiweixiu/table.vue
@@ -39,20 +39,18 @@
<input v-model="hform.ColContent" 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" @tap="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.璁惧浠ｇ爜">
<text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
@@ -177,164 +175,34 @@
<text>琛ㄤ綋澶囨敞锛�</text>{{item.琛ㄤ綋澶囨敞}}
</view>
</view>
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['璁惧浠ｇ爜']">
- <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['璁惧鍨嬪彿']">
- <text>璁惧鍨嬪彿锛�</text>{{item['璁惧鍨嬪彿']}}
- </view>
- <view class="detail" v-if="item['璁惧瑙勬牸']">
- <text>璁惧瑙勬牸锛�</text>{{item['璁惧瑙勬牸']}}
- </view>
- <view class="detail" v-if="item.HMainSourceBillNo">
- <text>婧愬崟鍗曞彿锛�</text>{{item.HMainSourceBillNo}}
- </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['缁翠慨缁撴潫鏃ユ湡'].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['缁翠慨鍐呭']}}
- </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="card-detail" v-if="showDetail == index">
- <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['瀹為檯缁翠慨宸ユ椂']}}{{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['鍒跺崟鏃ユ湡'].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="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="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
</view>
- <!-- #endif -->
-
- <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="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 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 class="op" v-if="operations == index">
- <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
- <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
+ <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -342,86 +210,80 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- hform: {
- HBillNo: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ hform:{
+ HBillNo:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- arrayColName: ['鏃ユ湡', '鍗曟嵁鍙�', '璁惧浠ｇ爜', '璁惧鍚嶇О', '璁惧瑙勬牸', '璁惧鍨嬪彿', '婧愬崟鍗曞彿', '缁翠慨椤圭洰浠ｇ爜', '缁翠慨椤圭洰', '缁翠慨浜轰唬鐮�', '缁翠慨浜�',
- '閮ㄩ棬浠ｇ爜', '閮ㄩ棬鍚嶇О', '璐熻矗浜轰唬鐮�', '璐熻矗浜�', '缁翠慨寮�濮嬫棩鏈�', '缁翠慨缁撴潫鏃ユ湡', '缁翠慨鍐呭', '鏃堕棿鍗曚綅', '璁″垝缁翠慨宸ユ椂', '瀹為檯缁翠慨宸ユ椂', '缁翠慨瑕佹眰',
- '琛ㄥご澶囨敞', '鍐呴儴鍗曟嵁鍙�', '鍒跺崟浜�', '鍒跺崟鏃ユ湡', '瀹℃牳浜�', '瀹℃牳鏃ユ湡', '淇敼浜�', '淇敼鏃ユ湡', '鍏抽棴浜�', '鍏抽棴鏃ユ湡', '浣滃簾浜�', '浣滃簾鏃ユ湡',
- '琛ㄤ綋缁翠慨椤圭洰浠ｇ爜', '琛ㄤ綋缁翠慨椤圭洰', '琛ㄤ綋缁翠慨瑕佹眰', '琛ㄤ綋璐熻矗浜轰唬鐮�', '琛ㄤ綋璐熻矗浜�', '琛屽叧闂汉', '鍏抽棴绫诲瀷', '琛ㄤ綋澶囨敞', '婧愬崟鍗曞彿', '鍏宠仈鏁伴噺'
- ],
- arrayComparator: ['=', '>=', '>', '<=', '<', '<>', '鍖呭惈', '宸﹀寘鍚�', '鍙冲寘鍚�', '涓嶅寘鍚�'],
-
- page: 1,
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ arrayColName:['鏃ユ湡','鍗曟嵁鍙�','璁惧浠ｇ爜','璁惧鍚嶇О','璁惧瑙勬牸','璁惧鍨嬪彿','婧愬崟鍗曞彿','缁翠慨椤圭洰浠ｇ爜','缁翠慨椤圭洰','缁翠慨浜轰唬鐮�','缁翠慨浜�','閮ㄩ棬浠ｇ爜','閮ㄩ棬鍚嶇О','璐熻矗浜轰唬鐮�','璐熻矗浜�','缁翠慨寮�濮嬫棩鏈�','缁翠慨缁撴潫鏃ユ湡','缁翠慨鍐呭','鏃堕棿鍗曚綅','璁″垝缁翠慨宸ユ椂','瀹為檯缁翠慨宸ユ椂','缁翠慨瑕佹眰','琛ㄥご澶囨敞','鍐呴儴鍗曟嵁鍙�','鍒跺崟浜�','鍒跺崟鏃ユ湡','瀹℃牳浜�','瀹℃牳鏃ユ湡','淇敼浜�','淇敼鏃ユ湡','鍏抽棴浜�','鍏抽棴鏃ユ湡','浣滃簾浜�','浣滃簾鏃ユ湡','琛ㄤ綋缁翠慨椤圭洰浠ｇ爜','琛ㄤ綋缁翠慨椤圭洰','琛ㄤ綋缁翠慨瑕佹眰','琛ㄤ綋璐熻矗浜轰唬鐮�','琛ㄤ綋璐熻矗浜�','琛屽叧闂汉','鍏抽棴绫诲瀷','琛ㄤ綋澶囨敞','婧愬崟鍗曞彿','鍏宠仈鏁伴噺'],
+ arrayComparator:['=','>=','>','<=','<','<>','鍖呭惈','宸﹀寘鍚�','鍙冲寘鍚�','涓嶅寘鍚�'],
+
+ page:1,
}
- },
+ },
onLoad() {
this.getList()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
- data: {
+ url: this.serverUrl + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
+ data:{
sWhere: this.sWhere,
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.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -429,171 +291,167 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e) {
+ BenginHCreateDateChange(e){
console.log(e.detail.value)
this.hform.BenginHCreateDate = e.detail.value
},
//閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e) {
+ EndHCreateDateChange(e){
console.log(e.detail.value)
this.hform.EndHCreateDate = e.detail.value
},
//杩囨护
- ColNameChange(e) {
+ ColNameChange(e){
// console.log(e.detail.value)
this.hform.ColName = this.arrayColName[e.detail.value]
console.log(this.hform)
},
//鏉′欢
- ComparatorChange(e) {
+ ComparatorChange(e){
// console.log(e.detail.value)
this.hform.Comparator = this.arrayComparator[e.detail.value]
console.log(this.hform)
},
-
- search() {
+
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
if (this.hform.ColName && this.hform.Comparator) {
- var com = "";
- if (this.hform.Comparator == '鍖呭惈') {
+ var com = "";
+ if(this.hform.Comparator == '鍖呭惈'){
com = "like'%" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '宸﹀寘鍚�') {
+ }else if(this.hform.Comparator == '宸﹀寘鍚�'){
com = "like'%" + this.hform.ColContent + "'";
- } else if (this.hform.Comparator == '鍙冲寘鍚�') {
+ }else if(this.hform.Comparator == '鍙冲寘鍚�'){
com = "like'" + this.hform.ColContent + "%'";
- } else if (this.hform.Comparator == '涓嶅寘鍚�') {
+ }else if(this.hform.Comparator == '涓嶅寘鍚�'){
com = "not like'%" + this.hform.ColContent + "%'";
- } else {
+ }else{
com = "" + this.hform.Comparator + "'" + this.hform.ColContent + "'";
}
-
- if (this.hform.ColName == '婧愬崟鍗曞彿') {
+
+ if(this.hform.ColName == '婧愬崟鍗曞彿'){
this.sWhere += " and " + 'HMainSourceBillNo' + " " + com;
- } else {
+ }else{
this.sWhere += " and " + this.hform.ColName + " " + com;
}
}
-
+
this.getList()
},
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/shebeiweixiu/form'
+ url:'/pages/shebeiweixiu/form'
})
},
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HBillNo: '',
- BenginHCreateDate: '',
- EndHCreateDate: '',
-
- ColName: '',
- Comparator: '',
- ColContent: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HBillNo:'',
+ BenginHCreateDate:'',
+ EndHCreateDate:'',
+
+ ColName:'',
+ Comparator:'',
+ ColContent:'',
+ }
this.getList()
},
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/shebeiweixiu/form?hmainid=' + item.hmainid
+ url:'/pages/shebeiweixiu/form?hmainid=' + item.hmainid
})
},
//鍒犻櫎
- del(item) {
+ del(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
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 + '/Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill',
- data: {
+ url: this.serverUrl + '/Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill',
+ 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;
}
}
-
- .left {
+ .left{
width: 170rpx;
padding: 10rpx 0;
margin-right: 10rpx;
@@ -602,129 +460,110 @@
color: #888;
text-align: center;
}
-
- .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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/shouliaotongzhi/table.vue b/pages/shouliaotongzhi/table.vue
new file mode 100644
index 0000000..2894430
--- /dev/null
+++ b/pages/shouliaotongzhi/table.vue
@@ -0,0 +1,229 @@
+<template>
+ <view class="content">
+ <view class="form">
+ <view class="form-item">
+ <view class="title"><text>*</text>鏉＄爜:</view>
+ <view class="right" style="width: 380rpx;">
+ <input v-model="HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(HBarCode)"/>
+ </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="righton">
+ <input v-model="baseInfo.HBillNo" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">渚涘簲鍟�:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HSupName" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閮ㄩ棬:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HDeptName" disabled/>
+ </view>
+ </view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="list" v-for="(item,index) in listData" :key="index" @tap="toSon(item)">
+ <uni-card :title="item.鐗╂枡浠ｇ爜" :extra="'No. ' + Number(index+1)" style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail">
+ <text>璁㈠崟鏁伴噺锛�</text>{{item.鏁伴噺}}
+ </view>
+ </view>
+
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0">宸插埌搴�</view>
+ </view>
+</template>
+
+<script>
+ import { getUserInfo } from "@/utils/auth.js";
+ export default {
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ HBarCode:'',
+ baseInfo:{
+ HBillNo:'',
+ HSupName:'',
+ HDeptName:'',
+ HInterID:'',
+ },
+ sWhere:'',
+ listData:[],
+ }
+ },
+ onLoad() {},
+ methods: {
+ //鎵爜
+ toScanCode(){
+ uni.scanCode({
+ onlyFromCamera: true,
+ success: (res) => {
+ console.log('鏉＄爜鍐呭锛�' + res.result);
+ this.HBarCode = res.result
+
+ this.getCode(this.HBarCode)
+ }
+ });
+ },
+ //鎵潯鐮佸鐞�
+ getCode(HBarCode){
+ if(!HBarCode){
+ uni.showToast({
+ title:'鏉＄爜涓嶈兘涓虹┖',
+ icon:'none'
+ })
+ }else{
+ uni.request({
+ url: this.serverUrl + '/Cg_POInStockBill/GetCg_POInStockBill_PDA',
+ data: { HBillno: HBarCode },
+ success: (res) => {
+ console.log('鎵爜杩斿洖',res.data.data);
+ this.HBarCode = ''
+ if(res.data.count == 1){
+ var data = res.data.data
+ this.baseInfo = {
+ HBillNo:data[0].鍗曟嵁鍙�,
+ HSupName:data[0].渚涘簲鍟�,
+ HDeptName:data[0].閮ㄩ棬,
+ HInterID:data[0].hmainid,
+ }
+ this.listData = data
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ }
+ },
+ toSon(item){
+ uni.navigateTo({
+ url:'./table_son?OperationType=1&closeType=1&linterid=' + item.hmainid + '&hsubid=' + item.hsubid
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form{
+ width: 640rpx;
+ margin: 20rpx auto;
+ }
+ .form-item{
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+ .title{
+ width: 180rpx;
+ text{
+ color: red;
+ font-weight: bold;
+ }
+ }
+ .right{
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+ .righton{
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+ input{
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+ .buttons{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ margin-top: 20rpx;
+ button{
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+ .btn-a{
+ background-color: #acacac;
+ color: #fff;
+ }
+ .btn-b{
+ background-color: #41a863;
+ color: #fff;
+ }
+ .btn-c{
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .list{
+ width: 100%;
+ .card-detail{
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+ .detail{
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+ text{
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+ .more{
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+ .part{
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
+
+</style>
diff --git a/pages/shouliaotongzhi/table_son.vue b/pages/shouliaotongzhi/table_son.vue
new file mode 100644
index 0000000..9373453
--- /dev/null
+++ b/pages/shouliaotongzhi/table_son.vue
@@ -0,0 +1,299 @@
+<template>
+ <view class="content">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鏀舵枡鍗曞彿:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HBillNo" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閲囪喘鍗曞彿:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HOrderBillNo" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐗╂枡缂栫爜:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HMaterNumber" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐗╂枡鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HMaterName" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HMaterModel" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏀舵枡鏁伴噺:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HQty" disabled/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">姣忕鏁伴噺:</view>
+ <view class="right">
+ <input v-model="baseInfo.HMinQty" type="number" placeholder="璇疯緭鍏ユ暟閲�" @confirm="getNum()" @blur="getNum()"/>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">绠辨暟:</view>
+ <view class="righton">
+ <input v-model="baseInfo.HBQty" disabled/>
+ </view>
+ </view>
+ <view class="buttons">
+ <button class="btn-b" size="mini" type="default" @tap="getList()">鏉＄爜鐢熸垚</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" @tap="toSon(item)">
+ <uni-card :title="item.鐗╂枡浠ｇ爜" :extra="'No. ' + Number(index+1)" style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail">
+ <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" style="width: 100%;">
+ <text>鏉＄爜缂栧彿锛�</text>{{item.鏉＄爜缂栧彿}}
+ </view>
+ </view>
+
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0">宸插埌搴�</view>
+ </view>
+</template>
+
+<script>
+ import { getUserInfo } from "@/utils/auth.js";
+ export default {
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ OperationType:1,//鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ linterid:'',
+ HEntryID:'',
+ baseInfo:{
+ HBillNo:'',
+ HMainID:'',
+ HSubID:'',
+ HOrderBillNo:'',
+ HMaterID:'',
+ HMaterNumber:'',
+ HMaterName:'',
+ HMaterModel:'',
+ HQty:'',
+ HMinQty:'',
+ HBQty:'',
+ },
+ sWhere:'',
+ listData:[],
+ }
+ },
+ onLoad(e) {
+ this.OperationType = e.OperationType
+ this.linterid = e.linterid
+ this.HEntryID = e.hsubid
+ this.getData()
+ },
+ methods: {
+ getData(){
+ uni.request({
+ url: this.serverUrl + '/Cg_POInStockBill/loadCg_POInStockBill_Push',
+ data: { HInterID: this.linterid, HSubID: this.HEntryID },
+ success: (res) => {
+ if(res.data.count == 1){
+ var data = res.data.data
+ this.baseInfo = {
+ HMainID:data[0].linterid,
+ HSubID:data[0].HEntryID,
+ HBillNo:data[0].鍗曟嵁鍙�,
+ HMaterID:data[0].HMaterID,
+ HMaterNumber:data[0].鐗╂枡浠ｇ爜,
+ HMaterName:data[0].鐗╂枡鍚嶇О,
+ HMaterModel:data[0].瑙勬牸鍨嬪彿,
+ HQty:data[0].鏁伴噺,
+ }
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ getNum(e){
+ if(this.baseInfo.HMinQty && this.baseInfo.HMinQty>0){
+ var a = Number(this.baseInfo.HQty)/Number(this.baseInfo.HMinQty)
+ this.baseInfo.HBQty = Math.ceil(Number(this.baseInfo.HQty)/Number(this.baseInfo.HMinQty))
+ this.$forceUpdate()
+ }else{
+ uni.showToast({
+ title:'璇疯緭鍏ュぇ浜�0鐨勫悎鐞嗘暟閲�',
+ icon:"none"
+ })
+ }
+ },
+ getList(){
+ var sMain = []
+ sMain[0] = this.baseInfo
+ var sMainStr = JSON.stringify(sMain);
+ //鑾峰彇閫夋嫨鐨勭粍缁�
+ var HOrgType = uni.getStorageSync('Organization');
+ //鑾峰彇閫夋嫨鐨勫伐鍘備唬鐮�
+ var CampanyName = "xxx";
+ //鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
+ var HSourceBillType = "鏀舵枡閫氱煡鍗�";
+ //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
+ var HSelectBarCodeType = "鍞竴鏉＄爜";
+ //鑾峰彇褰撳墠鐧诲綍浜哄憳
+ var UserName = uni.getStorageSync('HUserName');
+ var sMainSub = sMainStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName;
+ uni.request({
+ url: this.serverUrl + '/Sc_BarCode/Sub_SaveBill',
+ method:'POST',
+ data: { msg: sMainSub, CampanyName: CampanyName },
+ success: (res) => {
+ if(res.data.count == 1){
+ this.listData = res.data.data
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form{
+ width: 640rpx;
+ margin: 20rpx auto;
+ }
+ .form-item{
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+ .title{
+ width: 180rpx;
+ text{
+ color: red;
+ font-weight: bold;
+ }
+ }
+ .right{
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+ .righton{
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+ input{
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+ .buttons{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ margin-top: 20rpx;
+ button{
+ border-radius: 50rpx;
+ width: 220rpx;
+ 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;
+ }
+ }
+
+ .list{
+ width: 100%;
+ .card-detail{
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+ .detail{
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+ text{
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+ .more{
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+ .part{
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
+
+</style>
diff --git a/pages/weiwaigxIn/form.vue b/pages/weiwaigxIn/form.vue
index 305befd..522f8e7 100644
--- a/pages/weiwaigxIn/form.vue
+++ b/pages/weiwaigxIn/form.vue
@@ -102,12 +102,7 @@
<view class="form-item">
<view class="title">璁￠噺鍗曚綅:</view>
<view class="righton">
- <!-- #ifdef MP-WEIXIN -->
- <input v-model="hform['鍗曚綅']" disabled />
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
<input v-model="hform.鍗曚綅" disabled />
- <!-- #endif -->
</view>
</view>
<view class="form-item">
diff --git a/pages/weiwaigxIn/table.vue b/pages/weiwaigxIn/table.vue
index 0855934..7ad6d91 100644
--- a/pages/weiwaigxIn/table.vue
+++ b/pages/weiwaigxIn/table.vue
@@ -65,20 +65,18 @@
鎶樺彔鍏朵粬鏉′欢<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="creat">鏂板</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 showList" :key="index">
- <!-- #ifndef MP-WEIXIN -->
- <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">
<view class="card-detail">
<view class="detail" v-if="item.娴佽浆鍗″彿">
<text>娴佽浆鍗″彿锛�</text>{{item.娴佽浆鍗″彿}}
@@ -152,114 +150,34 @@
<text>澶囨敞锛�</text>{{item.澶囨敞}}
</view>
</view>
-
- <!-- #endif -->
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item['娴佽浆鍗″彿']">
- <text>娴佽浆鍗″彿锛�</text>{{item['娴佽浆鍗″彿']}}
- </view>
- <view class="detail" v-if="item['璁㈠崟璺熻釜鍙�']">
- <text>璁㈠崟璺熻釜鍙凤細</text>{{item['璁㈠崟璺熻釜鍙�']}}
- </view>
- <view class="detail" v-if="item['浜у搧鍚嶇О']">
- <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
- </view>
- <view class="detail" v-if="item['浜у搧浠ｇ爜']">
- <text>浜у搧浠ｇ爜锛�</text>{{item['浜у搧浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['宸ュ簭']">
- <text>宸ュ簭锛�</text>{{item['宸ュ簭']}}
- </view>
- <view class="detail" v-if="item['宸ュ簭浠ｇ爜']">
- <text>宸ュ簭浠ｇ爜锛�</text>{{item['宸ュ簭浠ｇ爜']}}
- </view>
- <view class="detail" v-if="item['鏃ユ湡']">
- <text>鏃ユ湡锛�</text>{{item['鏃ユ湡'].substr(0,10)}}
- </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="card-detail" v-if="showDetail == index">
- <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,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>
- <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="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
</view>
- <!-- #endif -->
-
- <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="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 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 class="op" v-if="operations == index">
- <!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
+ </view>
+
+ <view class="op" v-if="operations == index">
+<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -267,35 +185,33 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- showmore: false,
- arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
- hform: {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HICMOBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ showmore:false,
+ arrayStatus:['鍏ㄩ儴','鏈鏍�','宸插鏍�','宸插叧闂�'],
+ hform:{
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HICMOBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -303,46 +219,46 @@
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
// console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Cj_StationEntrustInBill/list',
- data: {
+ url: this.serverUrl + '/Cj_StationEntrustInBill/list',
+ data:{
sWhere: this.sWhere,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
- console.log(1, res.data.data);
- if (res.data.count == 1) {
+ success: (res) => {
+ console.log(1,res.data.data);
+ if(res.data.count == 1){
this.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -350,145 +266,144 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鐘舵��
- HStatusChange(e) {
+ HStatusChange(e){
console.log(e.detail.value)
this.hform.HStatus = this.arrayStatus[e.detail.value]
},
//閫夋嫨鍗曟嵁鏃ユ湡
- 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() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HStatus) {
- if (this.hform.HStatus == '鍏ㄩ儴') {
- this.sWhere += "";
- } else if (this.hform.HStatus == '鏈鏍�') {
- this.sWhere += " and 瀹℃牳浜�=''";
- } else if (this.hform.HStatus == '宸插鏍�') {
- this.sWhere += " and 瀹℃牳浜�<>''";
- } else if (this.hform.HStatus == '宸插叧闂�') {
- this.sWhere += " and 鍏抽棴浜�<>''";
- }
+ if(this.hform.HStatus == '鍏ㄩ儴'){
+ this.sWhere += "";
+ }else if(this.hform.HStatus == '鏈鏍�'){
+ this.sWhere += " and 瀹℃牳浜�=''";
+ }else if(this.hform.HStatus == '宸插鏍�'){
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ }else if(this.hform.HStatus == '宸插叧闂�'){
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ }
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HNumber) {
- this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
+ this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
}
if (this.hform.HName) {
- this.sWhere += " and 宸ュ簭 like '%" + this.hform.HName + "%'";
+ this.sWhere += " and 宸ュ簭 like '%" + this.hform.HName + "%'";
}
if (this.hform.HICMOBillNo) {
- this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
+ this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
}
if (this.hform.HProcExchBillNo) {
- this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+ this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
}
-
+
this.getList()
},
//鏂板
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/weiwaigxIn/form'
+ url:'/pages/weiwaigxIn/form'
})
},
//閲嶇疆
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.showmore = false
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HICMOBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HICMOBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
+ }
this.getList()
},
-
+
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/weiwaigxIn/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/weiwaigxIn/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 +
- '/Cj_StationEntrustInBill/del_StationEntrustInBill',
- data: {
+ url: this.serverUrl + '/Cj_StationEntrustInBill/del_StationEntrustInBill',
+ data:{
HInterID: item.HInterID,
HDeleteMan: 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.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
},
// //瀹℃牳
@@ -502,163 +417,140 @@
// },
// //鍙嶅鏍�
// antiCheck(item){
-
+
// },
- }
+ }
}
</script>
<style lang="scss" scoped>
- .form {
+ .form{
width: 640rpx;
margin: 20rpx auto;
}
-
- .other {
+ .other{
margin-top: 8rpx;
text-align: center;
font-size: 28rpx;
padding: 4rpx 18rpx;
color: #1890FF;
}
-
- .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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/weiwaigxOut/form.vue b/pages/weiwaigxOut/form.vue
index 27f8ecd..3a8d426 100644
--- a/pages/weiwaigxOut/form.vue
+++ b/pages/weiwaigxOut/form.vue
@@ -114,12 +114,7 @@
<view class="form-item">
<view class="title">璁￠噺鍗曚綅:</view>
<view class="righton">
- <!-- #ifdef MP-WEIXIN -->
- <input v-model="hform['鍗曚綅']" disabled />
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
<input v-model="hform.鍗曚綅" disabled />
- <!-- #endif -->
</view>
</view>
<view class="form-item">
diff --git a/pages/weiwaigxOut/table.vue b/pages/weiwaigxOut/table.vue
index cc99a60..93014cc 100644
--- a/pages/weiwaigxOut/table.vue
+++ b/pages/weiwaigxOut/table.vue
@@ -65,281 +65,159 @@
鎶樺彔鍏朵粬鏉′欢<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="creat">鏂板</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 showList" :key="index">
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <uni-card :title="item.鐢熶骇璁㈠崟鍙�" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item['閫佽揣鍗曞彿']">
- <text>閫佽揣鍗曞彿锛�</text>{{item['閫佽揣鍗曞彿']}}
+ <view 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 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['鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鏃ユ湡">
+ <text>鏃ユ湡锛�</text>{{item.鏃ユ湡.substr(0,10)}}
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
- <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 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 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['鎺ユ敹鏃堕棿'].substr(0,19)}}
+ <view class="detail" v-if="item.鎺ユ敹鏃堕棿">
+ <text>鎺ユ敹鏃堕棿锛�</text>{{item.鎺ユ敹鏃堕棿.substr(0,19)}}
</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 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 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['鍒跺崟鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
</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['淇敼鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
</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['瀹℃牳鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
</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['鍏抽棴鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
</view>
- <view class="detail" v-if="item['澶囨敞']">
- <text>澶囨敞锛�</text>{{item['澶囨敞']}}
+ <view class="detail" v-if="item.澶囨敞">
+ <text>澶囨敞锛�</text>{{item.澶囨敞}}
</view>
</view>
- <!-- #endif -->
-
- <!-- #ifndef MP-WEIXIN -->
- <uni-card :title="item.鐢熶骇璁㈠崟鍙�" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
- @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <view class="detail" v-if="item.閫佽揣鍗曞彿">
- <text>閫佽揣鍗曞彿锛�</text>{{item.閫佽揣鍗曞彿}}
- </view>
- <view class="detail" v-if="item.璁㈠崟璺熻釜鍙�">
- <text>璁㈠崟璺熻釜鍙凤細</text>{{item.璁㈠崟璺熻釜鍙穧}
- </view>
- <view class="detail" v-if="item.娴佽浆鍗″彿">
- <text>娴佽浆鍗″彿锛�</text>{{item.娴佽浆鍗″彿}}
- </view>
- <view class="detail" v-if="item.浜у搧鍚嶇О">
- <text>浜у搧鍚嶇О锛�</text>{{item.浜у搧鍚嶇О}}
- </view>
- <view class="detail" v-if="item.浜у搧浠ｇ爜">
- <text>浜у搧浠ｇ爜锛�</text>{{item.浜у搧浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.宸ュ簭">
- <text>宸ュ簭锛�</text>{{item.宸ュ簭}}
- </view>
- <view class="detail" v-if="item.宸ュ簭浠ｇ爜">
- <text>宸ュ簭浠ｇ爜锛�</text>{{item.宸ュ簭浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.鏃ユ湡">
- <text>鏃ユ湡锛�</text>{{item.鏃ユ湡.substr(0,10)}}
- </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="card-detail" v-if="showDetail == index">
- <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.鎺ユ敹鏃堕棿.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>
- <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.鍒跺崟鏃ユ湡.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="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
</view>
- <!-- #endif -->
-
-
- <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="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 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 class="op" v-if="operations == index">
- <!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
+ </view>
+
+ <view class="op" v-if="operations == index">
+<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op1" size="mini" plain @tap.stop="firstCheck(item)">棣栨</button>
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
+ <button class="op1" size="mini" plain @tap.stop="firstCheck(item)">棣栨</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -347,35 +225,33 @@
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ import { getUserInfo } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- showmore: false,
- arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
- hform: {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HICMOBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ showmore:false,
+ arrayStatus:['鍏ㄩ儴','鏈鏍�','宸插鏍�','宸插叧闂�'],
+ hform:{
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HICMOBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
},
- sWhere: '',
- listData: [],
- showList: [],
- showDetail: -1,
- operations: -1,
-
- page: 1,
- }
- },
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ operations:-1,
+
+ page:1,
+ }
+ },
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -383,46 +259,46 @@
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page, list) {
+ methods: {
+ getPage(page,list){
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex, eindex)
+ let newList = list.slice(sindex,eindex)
return newList
},
- getList() {
+ getList(){
// console.log(this.sWhere)
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title:'鍔犺浇涓�...'
})
uni.request({
- url: this.serverUrl + '/Cj_StationEntrustOutBill/list',
- data: {
+ url: this.serverUrl + '/Cj_StationEntrustOutBill/list',
+ data:{
sWhere: this.sWhere,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
+ success: (res) => {
// console.log(1,res);
- if (res.data.count == 1) {
+ if(res.data.count == 1){
this.listData = res.data.data
- this.showList = this.getPage(this.page, this.listData)
- setTimeout(() => {
- uni.hideLoading()
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
}, 1000)
- } else {
+ }else{
uni.hideLoading()
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -430,156 +306,155 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
},
//鐘舵��
- HStatusChange(e) {
+ HStatusChange(e){
console.log(e.detail.value)
this.hform.HStatus = this.arrayStatus[e.detail.value]
},
//閫夋嫨鍗曟嵁鏃ユ湡
- 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() {
+ search(){
this.sWhere = ''
this.listData = []
this.page = 1
this.showList = []
-
+
console.log(this.hform)
if (this.hform.HStatus) {
- if (this.hform.HStatus == '鍏ㄩ儴') {
- this.sWhere += "";
- } else if (this.hform.HStatus == '鏈鏍�') {
- this.sWhere += " and 瀹℃牳浜�=''";
- } else if (this.hform.HStatus == '宸插鏍�') {
- this.sWhere += " and 瀹℃牳浜�<>''";
- } else if (this.hform.HStatus == '宸插叧闂�') {
- this.sWhere += " and 鍏抽棴浜�<>''";
- }
+ if(this.hform.HStatus == '鍏ㄩ儴'){
+ this.sWhere += "";
+ }else if(this.hform.HStatus == '鏈鏍�'){
+ this.sWhere += " and 瀹℃牳浜�=''";
+ }else if(this.hform.HStatus == '宸插鏍�'){
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ }else if(this.hform.HStatus == '宸插叧闂�'){
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ }
}
if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
}
if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
}
if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
if (this.hform.HNumber) {
- this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
+ this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
}
if (this.hform.HName) {
- this.sWhere += " and 宸ュ簭 like '%" + this.hform.HName + "%'";
+ this.sWhere += " and 宸ュ簭 like '%" + this.hform.HName + "%'";
}
if (this.hform.HICMOBillNo) {
- this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
+ this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
}
if (this.hform.HProcExchBillNo) {
- this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+ this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
}
-
+
this.getList()
},
//鏂板
- creat() {
+ creat(){
uni.navigateTo({
- url: '/pages/weiwaigxOut/form'
+ url:'/pages/weiwaigxOut/form'
})
},
//閲嶇疆
- clear() {
+ clear(){
this.listData = []
this.page = 1
this.showList = []
-
+
this.showmore = false
this.sWhere = ''
this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
- HICMOBillNo: '',
- HBillNo: '',
- HProcExchBillNo: '',
- HNumber: '',
- HName: '',
- }
+ this.operations = -1,
+ this.hform = {
+ HStatus:'鍏ㄩ儴',
+ HBeginDate:'',
+ HEndDate:'',
+ HICMOBillNo:'',
+ HBillNo:'',
+ HProcExchBillNo:'',
+ HNumber:'',
+ HName:'',
+ }
this.getList()
},
-
+
//棣栨
- firstCheck(item) {
+ firstCheck(item){
console.log(item)
uni.showToast({
- title: '鏆傛棤璧勬簮',
- icon: "none"
+ title:'鏆傛棤璧勬簮',
+ icon:"none"
})
// uni.navigateTo({
// url:'/pages/weiwaigxOut/firstCheck?HSouceBillType=3793&HICMOEntryID=0&linterid=' + item.HInterID
// })
},
//缂栬緫
- edit(item) {
+ edit(item){
console.log(item)
uni.navigateTo({
- url: '/pages/weiwaigxOut/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
+ url:'/pages/weiwaigxOut/form?linterid=' + item.HInterID + '&HBillNo=' + item.鍗曟嵁鍙�
})
},
//鍒犻櫎
- del(item) {
+ del(item){
console.log(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 +
- '/Cj_StationEntrustOutBill/del_StationEntrustOutBill',
- data: {
+ url: this.serverUrl + '/Cj_StationEntrustOutBill/del_StationEntrustOutBill',
+ data:{
HInterID: item.HInterID,
HDeleteMan: 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.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
});
},
// //瀹℃牳
@@ -593,163 +468,140 @@
// },
// //鍙嶅鏍�
// antiCheck(item){
-
+
// },
- }
+ }
}
</script>
<style lang="scss" scoped>
- .form {
+ .form{
width: 640rpx;
margin: 20rpx auto;
}
-
- .other {
+ .other{
margin-top: 8rpx;
text-align: center;
font-size: 28rpx;
padding: 4rpx 18rpx;
color: #1890FF;
}
-
- .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;
}
}
-
- .op {
+ .op{
display: flex;
justify-content: space-around;
margin-top: 20rpx;
-
- button {
+ button{
padding: 0;
width: 130rpx;
font-size: 25rpx;
}
-
- .op1 {
+ .op1{
border: 1px solid #41a863;
color: #41a863;
}
-
- .op2 {
+ .op2{
border: 1px solid #d98d00;
color: #d98d00;
}
-
- .op3 {
+ .op3{
border: 1px solid #3a78ff;
color: #3a78ff;
}
-
- .op4 {
+ .op4{
border: 1px solid #da0000;
color: #da0000;
}
-
- .op5 {
+ .op5{
border: 1px solid #888;
color: #888;
}
}
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/pages/xiaoshouchuku/table.vue b/pages/xiaoshouchuku/table.vue
index 23f5849..16320a5 100644
--- a/pages/xiaoshouchuku/table.vue
+++ b/pages/xiaoshouchuku/table.vue
@@ -111,12 +111,12 @@
userInfo:getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
tabs:0,
- urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+ urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
MvarReportTitle:'閿�鍞嚭搴撳崟缂撳瓨鍒楄〃',
hform:{
HBillNo:'',
HSourceBillNo:'',
- HBillType: 1206,
+ HBillType: 1205,
HMaker: uni.getStorageSync('HUserName'),
HStockOrgID: uni.getStorageSync('OrganizationID'),
},
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>
diff --git a/pages/yichang/table.vue b/pages/yichang/table.vue
index 6a6adf9..b08c9a0 100644
--- a/pages/yichang/table.vue
+++ b/pages/yichang/table.vue
@@ -25,182 +25,128 @@
</picker>
</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">
- <!-- #ifdef MP-WEIXIN -->
- <uni-card style="margin: 10px;">
+ <uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;">
<view class="card-detail">
- <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 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 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['鍒跺崟鏃ユ湡'].substr(0,10)}}
+
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
</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['瀹℃牳鏃ユ湡'].substr(0,10)}}
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
</view>
- <view class="detail" v-if="item['瀹℃牳浜�']">
- <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
</view>
</view>
- <!-- #endif -->
- <!-- #ifndef MP-WEIXIN -->
- <uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" 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.涓婚}}
- </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.鍒跺崟鏃ユ湡.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" @tap="toForm(item)">
- <uni-icons type="pulldown" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>涓嬫帹鍙嶉澶勭悊鍗�
- </view>
+ <view class="part" @tap="toForm(item)">
+ <uni-icons type="pulldown" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>涓嬫帹鍙嶉澶勭悊鍗�
</view>
- </uni-card>
+ </view>
+ </uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
</view>
</template>
<script>
- import {
- getUserInfo
- } from "@/utils/auth.js";
+ 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',
- arrayHStatus: ['鍏ㄩ儴', '宸插弽棣�', '宸茬鍒�', '宸插鐞�', '宸查獙鏀�'],
- arrayHStatusId: ['', '2', '13', '9', '10'],
- hform: {
- HStatus: '',
- HReadFlag: '鍏ㄩ儴',
- HEndDate: getDateTime.dateTimeStr('y-m-d'),
- HBeginDate: this.getEndDate(),
- HSourceID: 0,
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ arrayHStatus:['鍏ㄩ儴','宸插弽棣�','宸茬鍒�','宸插鐞�','宸查獙鏀�'],
+ arrayHStatusId:['','2','13','9','10'],
+ hform:{
+ HStatus:'',
+ HReadFlag:'鍏ㄩ儴',
+ HEndDate:getDateTime.dateTimeStr('y-m-d'),
+ HBeginDate:this.getEndDate(),
+ HSourceID:0,
},
- sWhere: '',
- listData: [],
- }
- },
+ sWhere:'',
+ listData:[],
+ }
+ },
onLoad() {
this.clear()
- console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(() => {
+ setTimeout(()=>{
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getList() {
+ methods: {
+ getList(){
console.log(this.sWhere)
uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
- data: {
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
+ data:{
sWhere: this.hform,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
- console.log(1, res.data.data.h_p_OA_ErrMsgBackSelfQuery);
- if (res.data.count == 1) {
+ success: (res) => {
+ console.log(1,res.data.data.h_p_OA_ErrMsgBackSelfQuery);
+ if(res.data.count == 1){
this.listData = res.data.data.h_p_OA_ErrMsgBackSelfQuery
- } else {
+ }else{
uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ title:res.data.Message,
+ icon:'none'
})
}
},
@@ -208,39 +154,39 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
})
},
});
-
+
// uni.request({
// url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
// data: { "HInterID": 2 },
// success: (res) => {
// console.log(2,res);
-
+
// }
// });
},
//浜嬩欢鐘舵�佹敼鍙�
- HStatusChange(e) {
+ HStatusChange(e){
this.hform.HStatus = this.arrayHStatusID[e.detail.value]
this.hform.HReadFlag = this.arrayHStatus[e.detail.value]
},
//閫夋嫨鍗曟嵁鏃ユ湡
- 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() {
+ search(){
// this.sWhere = ''
-
+
// console.log(this.hform)
// if (this.hform.HBillNo) {
// this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
@@ -254,10 +200,10 @@
// if (this.hform.HEndDate) {
// this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HEndDate + "'";
// }
-
+
this.getList()
},
- getEndDate() {
+ getEndDate(){
let currentDate = new Date();
currentDate.setMonth(currentDate.getMonth() - 1);
let year = currentDate.getFullYear();
@@ -265,139 +211,123 @@
let day = String(currentDate.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
},
- clear() {
+ clear(){
this.sWhere = ''
this.hform = {
- HStatus: '',
- HReadFlag: '鍏ㄩ儴',
- HEndDate: getDateTime.dateTimeStr('y-m-d'),
- HBeginDate: this.getEndDate(),
- HSourceID: 0,
+ HStatus:'',
+ HReadFlag:'鍏ㄩ儴',
+ HEndDate:getDateTime.dateTimeStr('y-m-d'),
+ HBeginDate:this.getEndDate(),
+ HSourceID:0,
}
this.getList()
},
- reads(e) {
+ reads(e){
uni.showModal({
content: e,
showCancel: false
});
},
- toForm(item) {
+ toForm(item){
uni.navigateTo({
- url: './form?OperationType=2&linterid=' + item.HInterID + '&HEntryID=' + item.HEntryID +
- '&HSouceBillType=4502'
+ url:'./form?OperationType=2&linterid=' + item.HInterID + '&HEntryID=' + item.HEntryID + '&HSouceBillType=4502'
})
}
- }
+ }
}
</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>
diff --git a/static/icon/icon21.png b/static/icon/icon21.png
new file mode 100644
index 0000000..beb5af0
--- /dev/null
+++ b/static/icon/icon21.png
Binary files differ
diff --git a/static/icon/icon_a21.png b/static/icon/icon_a21.png
new file mode 100644
index 0000000..d98c0b4
--- /dev/null
+++ b/static/icon/icon_a21.png
Binary files differ
--
Gitblit v1.9.1