From a88092021b14abc67c2f2e53ce722d609632aeb5 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期二, 23 八月 2022 08:07:36 +0800
Subject: [PATCH] 修改日计划，我的待办，等相应bug
---
pages/new-application-form-data/new-application-form-data.vue | 5
pages/home/home.vue | 16
utils/request.js | 2
pages/login/login.vue | 2
pages/jihua/jihua.vue | 580 ++++++++++++++++++++++++++--------------------------
pages/my-have-todo/my-have-todo.vue | 22 -
pages/the-form-data/the-form-data.vue | 4
api/global.js | 2
pages/my-application/my-application.vue | 2
9 files changed, 315 insertions(+), 320 deletions(-)
diff --git a/api/global.js b/api/global.js
index 0cc2fd4..fddc019 100644
--- a/api/global.js
+++ b/api/global.js
@@ -27,7 +27,7 @@
});
}
-// const baseUrl = 'http://192.168.3.159:9999'
+// const baseUrl = 'http://192.168.0.159:9999'
// const baseUrl = 'https://mx.jzeg.cn:443/app';
const baseUrl = "https://mx.jzeg.cn:9998";
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f52e647..d370212 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -29,7 +29,7 @@
<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
</view>
<view class="">
- <text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
+ <text>瀹℃壒鐜妭锛歿{ item.currTaskName || '' }}</text>
</view>
</view>
<view class="center-content__two center-margin">
@@ -62,7 +62,7 @@
<image src="@/static/home/jindu.png" mode=""></image>
<view>鏌ョ湅杩涘害</view>
</view>
- <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
+ <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2) && (item.procDefId == 'WAY_BILL:4:87504')">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>琛ㄥ崟鏁版嵁</view>
</view>
@@ -70,7 +70,7 @@
<image src="@/static/home/history.png" mode=""></image>
<view>閲嶆柊鐢宠</view>
</view>
- <view @click="editMyApplication(item)" v-if="item.status == 3">
+ <view @click="editMyApplication(item)" v-if="item.status == 3 && item.procDefId == 'WAY_BILL:4:87504'">
<image src="@/static/home/history.png" mode=""></image>
<view>缂栬緫</view>
</view>
@@ -105,10 +105,10 @@
<view class="center-container">
<view class="center-content__one center-margin">
<view class="">
- <text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
+ <text>浠诲姟鍚嶇О锛歿{ item.name || '' }}</text>
</view>
<view class="">
- <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+ <text>鎵�灞炴祦绋嬶細{{ item.processName || '' }}</text>
</view>
</view>
<view class="center-content__two center-margin">
@@ -162,7 +162,7 @@
<text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
</view>
<view>
- <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+ <text>鎵�灞炴祦绋嬶細{{ item.processName || '' }}</text>
</view>
</view>
<view class="center-content__two center-margin">
@@ -175,7 +175,7 @@
</view>
<view class="center-content__three center-margin">
<view class="">
- <text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
+ <text>瀹℃壒鎰忚锛歿{ item.comment || '' }}</text>
</view>
<view class="">
<text>
@@ -198,7 +198,7 @@
<view class="bottom-container">
<!-- 宸插姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)">
+ <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>琛ㄥ崟鏁版嵁</view>
</view>
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index cea9f01..e3c5bf5 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -1,8 +1,6 @@
<template>
<view class="jihua-wrap">
- <view class="qiehuan-box">
- <u-tabs :list="tabList" @click="tabClick"></u-tabs>
- </view>
+ <view class="qiehuan-box"><u-tabs :list="tabList" @click="tabClick"></u-tabs></view>
<view class="jihua-main">
<view class="shaixuan-box">
<u-radio-group v-model="radioValue" @change="groupChange">
@@ -11,66 +9,61 @@
<!-- <u-radio shape="square" label="鏈缃殑璁″垝" name="鏈缃殑璁″垝"></u-radio> -->
</u-radio-group>
</view>
- <div class="main-inside">
+ <view class="main-inside">
<view v-if="isTomJihua == '鍏ㄩ儴'">
- <view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
+ <view class="main-block-box" v-for="(item, index) in fyData" :key="item.id">
<view class="jihua-main-line">
- <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
+ <!-- <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view> -->
+ <view class="name">鏀惰揣鍗曚綅锛歿{ item.customerAddressName || '' }}</view>
</view>
<view class="jihua-main-line">
<view class="main-flex">
- <view>鐓ょ锛歿{ item.coalName || ''}}</view>
- <view>鍓╀綑閲忥細{{ item.executiveSurplus || ''}}</view>
+ <view>鐓ょ锛歿{ item.coalName || '' }}</view>
+ <view>鍓╀綑閲忥細{{ item.executiveSurplus || '' }}</view>
</view>
</view>
<view class="jihua-main-line">
<view class="main-flex">
<view class="carNum-box">
<view>璁″垝杞︽暟锛�</view>
- <u--input
- placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
- border="surround"
- v-model="item.numPlan"
- @change="inputChange"
- ></u--input>
+ <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputChange"></u--input>
</view>
- <view>瀹為檯鍙戣溅鏁帮細{{item.numReal || ''}}</view>
+ <view>瀹為檯鍙戣溅鏁帮細{{ item.numReal || '' }}</view>
</view>
</view>
</view>
<u-button class="xiugai-btn" type="primary" text="鎻愪氦" @click="dataFormSubmit"></u-button>
</view>
<view v-if="isTomJihua == '宸茶缃殑璁″垝'">
- <view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
+ <view class="main-block-box" v-for="(item, index) in fyData" :key="item.id">
<view class="jihua-main-line">
- <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
+ <view class="name">瀹㈡埛鍚嶇О锛歿{ item.customerName || '' }}</view>
</view>
<view class="jihua-main-line">
<view class="main-flex">
- <view>鐓ょ锛歿{item.order.coalName || ''}}</view>
- <view>鍓╀綑閲忥細{{item.order.executiveSurplus || ''}}</view>
+ <view>鐓ょ锛歿{ item.order.coalName || '' }}</view>
+ <view>鍓╀綑閲忥細{{ item.order.executiveSurplus || '' }}</view>
</view>
</view>
<view class="jihua-main-line">
<view class="main-flex">
<view class="carNum-box">
<view>璁″垝杞︽暟锛�</view>
- <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan"
- @change="inputTotalChange(item)"></u--input>
+ <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputTotalChange(item)"></u--input>
</view>
- <view>瀹為檯鍙戣溅鏁帮細{{item.order.numReal || ''}}</view>
+ <view>瀹為檯鍙戣溅鏁帮細{{ item.order.numReal || '' }}</view>
</view>
</view>
</view>
<u-button class="xiugai-btn" type="primary" text="淇敼" @click="getOrderCarNum"></u-button>
</view>
- <!-- <u-empty
+ <!-- <u-empty
v-if="fyData.length == 0"
mode="data"
icon=""
>
</u-empty> -->
- </div>
+ </view>
</view>
<!-- 鑿滃崟鏍� -->
<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
@@ -78,137 +71,144 @@
</template>
<script>
- import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
- export default {
- components: {
- popupMenu
- },
- data() {
- return {
- radioValue: '鍏ㄩ儴',
- tabList: [{
+import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
+export default {
+ components: {
+ popupMenu
+ },
+ data() {
+ return {
+ radioValue: '鍏ㄩ儴',
+ tabList: [
+ {
name: '浠婃棩鍙戣繍璁″垝'
- }, {
- name: '鏄庢棩鍙戣繍璁″垝'
- }],
- carValue: 0,
- fyData: [],
- fyData2: [],
- info: {
- shippingDate: this.todayDate()
},
- isTomJihua: '鍏ㄩ儴',
- editRow:'', //淇敼琛岀殑琛�
- menuShow:false,
+ {
+ name: '鏄庢棩鍙戣繍璁″垝'
+ }
+ ],
+ carValue: 0,
+ fyData: [],
+ fyData2: [],
+ info: {
+ shippingDate: this.todayDate()
+ },
+ isTomJihua: '鍏ㄩ儴',
+ editRow: '', //淇敼琛岀殑琛�
+ menuShow: false
+ };
+ },
+ onShow() {
+ if (this.menuShow == true) {
+ this.$refs.menuRef.menuClick();
+ }
+ this.init();
+ },
+ // 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
+ onNavigationBarButtonTap(e) {
+ // console.log(e);
+ this.$refs.menuRef.menuClick();
+ },
+ methods: {
+ init() {
+ this.fyList();
+ },
+ menushow(e) {
+ this.menuShow = e;
+ },
+ dataFormSubmit() {
+ //鎻愪氦璁㈠崟
+ this.fyData.forEach(e => {
+ e.shippingDate = this.info.shippingDate;
+ if (e.planId && !e.numPlan) {
+ e.numPlan = -1; //鍒犻櫎璁剧疆涓虹┖鐨勮鍒�
+ }
+ let orderId = e.id;
+ e.id = e.planId;
+ e.orderId = orderId;
+ });
+ this.$reqPost('addObj', this.fyData).then(res => {
+ this.$u.toast('娣诲姞鎴愬姛');
+ this.fyList();
+ });
+ },
+ getOrderCarNum() {
+ //淇敼
+ this.$reqPost('setCarNums', this.editRow).then(res => {
+ this.$u.toast('淇敼鎴愬姛');
+ this.xscarshippingdayplan();
+ });
+ },
+ groupChange(n) {
+ console.log(n, 'n================');
+ this.isTomJihua = n;
+ if (n == '宸茶缃殑璁″垝') {
+ this.xscarshippingdayplan();
+ } else {
+ this.fyList();
}
},
- onShow() {
- if(this.menuShow == true){
- this.$refs.menuRef.menuClick()
- }
- this.init()
+ todayDate() {
+ let yes = new Date().getTime();
+ let date = new Date(yes);
+ let y = date.getFullYear();
+ let m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ let d = date.getDate();
+ d = d < 10 ? '0' + d : d;
+ const time = y + '-' + m + '-' + d;
+ console.log('todayDate---------', time);
+ return time;
},
- // 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
- onNavigationBarButtonTap(e) {
- // console.log(e);
- this.$refs.menuRef.menuClick()
+ tomorrowDate() {
+ let yes = new Date().getTime() + 60 * 24 * 60 * 1000;
+ let date = new Date(yes);
+ let y = date.getFullYear();
+ let m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ let d = date.getDate();
+ d = d < 10 ? '0' + d : d;
+ const time = y + '-' + m + '-' + d;
+ console.log('tomorrowDate---------222', time);
+ return time;
},
- methods: {
- init() {
- this.fyList()
- },
- menushow(e){
- this.menuShow = e;
- },
- dataFormSubmit() { //鎻愪氦璁㈠崟
- this.fyData.forEach(e => {
- e.shippingDate = this.info.shippingDate
- if (e.planId && !e.numPlan) {
- e.numPlan = -1; //鍒犻櫎璁剧疆涓虹┖鐨勮鍒�
- }
- let orderId = e.id;
- e.id = e.planId;
- e.orderId = orderId;
- })
- this.$reqPost('addObj', this.fyData).then(res => {
- this.$u.toast('娣诲姞鎴愬姛')
- this.fyList()
- })
- },
- getOrderCarNum() { //淇敼
- this.$reqPost('setCarNums',this.editRow).then(res => {
- this.$u.toast('淇敼鎴愬姛')
- this.xscarshippingdayplan()
- })
- },
- groupChange(n) {
- console.log(n, 'n================')
- this.isTomJihua = n
- if (n == '宸茶缃殑璁″垝') {
- this.xscarshippingdayplan()
- } else {
- this.fyList()
- }
- },
- todayDate() {
- let yes = new Date().getTime()
- let date = new Date(yes)
- let y = date.getFullYear()
- let m = date.getMonth() + 1
- m = m < 10 ? ('0' + m) : m
- let d = date.getDate()
- d = d < 10 ? ('0' + d) : d
- const time = y + '-' + m + '-' + d
- console.log('todayDate---------', time)
- return time
- },
- tomorrowDate() {
- let yes = new Date().getTime() + 60 * 24 * 60 * 1000
- let date = new Date(yes)
- let y = date.getFullYear()
- let m = date.getMonth() + 1
- m = m < 10 ? ('0' + m) : m
- let d = date.getDate()
- d = d < 10 ? ('0' + d) : d
- const time = y + '-' + m + '-' + d
- console.log('tomorrowDate---------222', time)
- return time
- },
-
- fyList() { //鍒楄〃鏌ヨ
- uni.showLoading({
- title: '姝ｅ湪鍔犺浇...'
- });
- let compId = uni.getStorageSync('userInfo').compId
-
- let params = {
- current: 1,
- size: 100,
- status: 2,
- trainType: 1,
- compId: compId
- }
- this.$reqGet('fyList', params).then(res => {
- if (res.code == 0) {
- this.xscarshippingdayplan(res.data);
- }
- })
- },
- xscarshippingdayplan(allList) { //宸茬粡璁剧疆鐨�
- console.log(allList,'allList==========')
- let params = {
- current: 1,
- size: 50,
- shippingDate: this.info.shippingDate
+ fyList() {
+ //鍒楄〃鏌ヨ
+ uni.showLoading({
+ title: '姝ｅ湪鍔犺浇...'
+ });
+ let compId = uni.getStorageSync('userInfo').compId;
+
+ let params = {
+ current: 1,
+ size: 100,
+ status: 2,
+ trainType: 1,
+ compId: compId
+ };
+ this.$reqGet('fyList', params).then(res => {
+ if (res.code == 0) {
+ this.xscarshippingdayplan(res.data);
}
- this.$reqGet('xscarshippingdayplan', params).then(res => {
+ });
+ },
+ xscarshippingdayplan(allList) {
+ //宸茬粡璁剧疆鐨�
+ console.log(allList, 'allList==========');
+ let params = {
+ current: 1,
+ size: 50,
+ shippingDate: this.info.shippingDate
+ };
+ this.$reqGet('xscarshippingdayplan', params)
+ .then(res => {
if (res.code == 0) {
- if(!allList) {
- this.fyData = res.data.records
- console.log(this.fyData,'this.fyData=========11111111')
- }else {
- let l = res.data.records
+ if (!allList) {
+ this.fyData = res.data.records;
+ console.log(this.fyData, 'this.fyData=========11111111');
+ } else {
+ let l = res.data.records;
allList.forEach(e => {
l.forEach(ee => {
if (e.id == ee.orderId) {
@@ -219,188 +219,186 @@
e.carNums = ee.carNums;
}
}
- })
- })
+ });
+ });
this.fyData = allList;
- console.log(this.fyData,'this.fyData=========22222222')
+ console.log(this.fyData, 'this.fyData=========22222222');
}
- console.log(this.fyData,'this.fyData=========333333333')
+ console.log(this.fyData, 'this.fyData=========333333333');
uni.hideLoading();
}
- }).catch(e => {
- uni.hideLoading();
})
- },
- tabClick(item) { //鍒囨崲浠婃棩鍜屾槑鏃�
- console.log(item, 'item==========')
- if (item.index == 1) {
- this.info.shippingDate = this.tomorrowDate()
- if (this.isTomJihua == '宸茶缃殑璁″垝') {
- this.xscarshippingdayplan()
- } else {
- this.fyList()
- }
-
+ .catch(e => {
+ uni.hideLoading();
+ });
+ },
+ tabClick(item) {
+ //鍒囨崲浠婃棩鍜屾槑鏃�
+ console.log(item, 'item==========');
+ if (item.index == 1) {
+ this.info.shippingDate = this.tomorrowDate();
+ if (this.isTomJihua == '宸茶缃殑璁″垝') {
+ this.xscarshippingdayplan();
} else {
- this.info.shippingDate = this.todayDate()
- if (this.isTomJihua == '宸茶缃殑璁″垝') {
- this.xscarshippingdayplan()
- } else {
- this.fyList()
- }
+ this.fyList();
}
-
- },
- inputChange(val) {
- console.log(val)
- },
- inputTotalChange(val) {
- console.log(val,'val2=======val2')
- this.editRow = val
+ } else {
+ this.info.shippingDate = this.todayDate();
+ if (this.isTomJihua == '宸茶缃殑璁″垝') {
+ this.xscarshippingdayplan();
+ } else {
+ this.fyList();
+ }
}
+ },
+ inputChange(val) {
+ console.log(val);
+ },
+ inputTotalChange(val) {
+ console.log(val, 'val2=======val2');
+ this.editRow = val;
}
}
+};
</script>
<style lang="scss" scoped>
- ::v-deep {
- .u-tabs__wrapper__nav {
- padding-left: vww(75.5)
- }
-
- .u-radio__text {
- span {
- font-size: vww(14);
- }
- }
- .u-radio{
- margin-right: vww(10);
- }
- .u-radio__text{
- font-size: vww(14)!important;
- }
- .u-input {
- height: vww(16);
- width: vww(100);
- }
- .u-button{
- position: fixed!important;
- left: 50%;
- bottom: vww(20);
- width: vww(200)!important;
- transform: translateX(-50%);
- border-radius: vww(20);
- z-index: 9999;
- }
- .u-radio-group--row {
- height: 100%;
- width: 100%;
- display: flex;
- justify-content: right;
- }
-
- .u-radio__icon-wrap {
- width: vww(18) !important;
- height: vww(18) !important;
- }
- .u-icon__icon{
- font-size: vww(12)!important;
- line-height: vww(12)!important;
- }
-
+::v-deep {
+ .u-tabs__wrapper__nav {
+ padding-left: vww(75.5);
}
- .qiehuan-box {
+ .u-radio__text {
+ span {
+ font-size: vww(14);
+ }
+ }
+ .u-radio {
+ margin-right: vww(10);
+ }
+ .u-radio__text {
+ font-size: vww(14) !important;
+ }
+ .u-input {
+ height: vww(16);
+ width: vww(100);
+ }
+ .u-button {
+ position: fixed !important;
+ left: 50%;
+ bottom: vww(20);
+ width: vww(200) !important;
+ transform: translateX(-50%);
+ border-radius: vww(20);
+ z-index: 9999;
+ }
+ .u-radio-group--row {
+ height: 100%;
+ width: 100%;
+ display: flex;
+ justify-content: right;
+ }
+
+ .u-radio__icon-wrap {
+ width: vww(18) !important;
+ height: vww(18) !important;
+ }
+ .u-icon__icon {
+ font-size: vww(12) !important;
+ line-height: vww(12) !important;
+ }
+}
+
+.qiehuan-box {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ width: 100%;
+ height:vww(44);
+ // z-index: 1;
+ background-color: #fff;
+}
+
+.jihua-wrap {
+ width: 100%;
+ height: 100%;
+ // overflow-y: auto; // 浼氬紩璧烽敭鐩樺脊鍑洪〉闈㈠竷灞�
+ display: flex;
+ flex-direction: column;
+
+ // .xiugai-btn {
+ // position: absolute;
+ // left: 50%;
+ // bottom: vww(20);
+ // width: vww(200);
+ // transform: translateX(-50%);
+ // border-radius: vww(20);
+ // }
+}
+
+.jihua-main {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ padding: vww(0) vww(10) vww(70) vww(10);
+ box-sizing: border-box;
+ margin-top: vww(44);
+ .main-inside {
+ width: 100%;
+ height: calc(100% - vww(44));
+ }
+
+ .shaixuan-box {
+ height: vww(40);
position: sticky;
- top: 0;
+ top: vww(44);
left: 0;
right: 0;
width: 100%;
- z-index: 1;
+ // z-index: 1;
background-color: #fff;
}
- .jihua-wrap {
- width: 100%;
- height: 100%;
- overflow-y: auto;
- display: flex;
- flex-direction: column;
-
- // .xiugai-btn {
- // position: absolute;
- // left: 50%;
- // bottom: vww(20);
- // width: vww(200);
- // transform: translateX(-50%);
- // border-radius: vww(20);
- // }
- }
-
- .jihua-main {
- display: flex;
- flex-direction: column;
- width: 100%;
- padding: vww(0) vww(10) vww(70) vww(10);
+ .main-block-box {
+ box-shadow: 0px 0px 8px 0px rgba(216, 218, 238, 0.8);
+ height: vww(120);
+ padding: vww(10);
box-sizing: border-box;
-
- .main-inside {
- width: 100%;
- height: calc(100% - vww(44));
+ margin-top: vww(12);
+ border-radius: vww(8);
+ &:first-child {
+ margin-top: vww(5);
}
-
- .shaixuan-box {
- height: vww(40);
- position: sticky;
- top: vww(44);
- left: 0;
- right: 0;
+ .jihua-main-line {
width: 100%;
- z-index: 1;
- background-color: #fff;
- }
+ display: flex;
- .main-block-box {
- box-shadow: 0px 0px 8px 0px rgba(216,218,238,0.80);
- height: vww(120);
- padding: vww(10);
- box-sizing: border-box;
- margin-top: vww(12);
- border-radius: vww(8);
- &:first-child{
- margin-top: vww(5);
+ view {
+ font-size: vww(14);
}
- .jihua-main-line {
+
+ .name {
+ font-weight: 600 !important;
+ }
+
+ .main-flex {
width: 100%;
display: flex;
-
+ justify-content: space-between;
view {
font-size: vww(14);
+ line-height: vww(32);
}
-
- .name {
- font-weight: 600 !important;
- }
-
- .main-flex {
- width: 100%;
+ .carNum-box {
display: flex;
- justify-content: space-between;
- view{
+ view {
font-size: vww(14);
line-height: vww(32);
}
- .carNum-box {
- display: flex;
- view {
- font-size: vww(14);
- line-height: vww(32);
- }
-
- }
}
}
-
}
}
-</style>
+}
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 3781f63..f441335 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -22,8 +22,6 @@
data() {
return {
formData:{
- // username:'dongpang',
- // password:'dongpang!@#'
username:'',
password:''
}
diff --git a/pages/my-application/my-application.vue b/pages/my-application/my-application.vue
index c11508e..2efb3c6 100644
--- a/pages/my-application/my-application.vue
+++ b/pages/my-application/my-application.vue
@@ -94,7 +94,7 @@
<image src="@/static/home/jindu.png" mode=""></image>
<view>鏌ョ湅杩涘害</view>
</view>
- <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
+ <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2 )&& (item.procDefId == 'WAY_BILL:4:87504')">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
diff --git a/pages/my-have-todo/my-have-todo.vue b/pages/my-have-todo/my-have-todo.vue
index 3dffd2c..e6f6b9e 100644
--- a/pages/my-have-todo/my-have-todo.vue
+++ b/pages/my-have-todo/my-have-todo.vue
@@ -59,7 +59,7 @@
</view>
<view class="center-content__three center-margin">
<view class="">
- <text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
+ <text>瀹℃壒鎰忚锛歿{ item.comment == 'undefined' ? '' : item.comment || '' }}</text>
</view>
<view class="">
<text>
@@ -126,9 +126,7 @@
<!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> -->
<!--杩斿洖椤堕儴-->
- <view class="back-top-container">
- <u-back-top :scroll-top="scrollTop"></u-back-top>
- </view>
+ <view class="back-top-container"><u-back-top :scroll-top="scrollTop"></u-back-top></view>
<!-- 鑿滃崟鏍� -->
<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
@@ -594,14 +592,14 @@
}
}
- // 杩斿洖椤堕儴
- .back-top-container{
- .u-transition{
- position:fixed;
- bottom:vww(80)!important;
- right:vww(20)!important;
- }
- }
+ // 杩斿洖椤堕儴
+ .back-top-container {
+ .u-transition {
+ position: fixed;
+ bottom: vww(80) !important;
+ right: vww(20) !important;
+ }
+ }
// 搴曢儴
.bottomTabbar {
diff --git a/pages/new-application-form-data/new-application-form-data.vue b/pages/new-application-form-data/new-application-form-data.vue
index d7f1b5a..cb85960 100644
--- a/pages/new-application-form-data/new-application-form-data.vue
+++ b/pages/new-application-form-data/new-application-form-data.vue
@@ -725,7 +725,7 @@
quant: null,
remark: '',
startDate: '',
- type: '澶栭攢'
+ type: ''
},
accountDetails: {},
// 鏃堕棿
@@ -1230,7 +1230,6 @@
}
this.selectContractShow = true;
-
} else {
this.$refs.formRef
.validate()
@@ -1343,6 +1342,7 @@
this.newFormData.contractName = e.contractName;
this.newFormData.contractNum = e.num;
this.newFormData.contractId = e.id;
+ this.newFormData.type = e.type;
this.selectContractShow = false;
// 浠锋牸鍙傛暟璧嬪��
@@ -1607,6 +1607,7 @@
if (this.editApplicationIndex != null) {
this.newFormData.contractOrders[this.editApplicationIndex] = this.addContractFormdata;
} else {
+ this.addContractFormdata.type = this.newFormData.type
this.newFormData.contractOrders.push(this.addContractFormdata);
console.log('娣诲姞瀛愯鍗�', this.addContractFormdata);
}
diff --git a/pages/the-form-data/the-form-data.vue b/pages/the-form-data/the-form-data.vue
index 5dfdd99..6ae4c07 100644
--- a/pages/the-form-data/the-form-data.vue
+++ b/pages/the-form-data/the-form-data.vue
@@ -108,7 +108,7 @@
<view class="cardList-container">
<view class="cardList_item">
鏀惰揣浜猴細
- <text>{{ item.customerName }}</text>
+ <text>{{ item.customerAddressName }}</text>
</view>
<view class="cardList_item">
<view class="">
@@ -128,7 +128,7 @@
</view>
<view class="">
杩愯緭锛�
- <text>{{ item.trainType == 1 ? '璺繍' : '鍦伴攢' }}</text>
+ <text>{{ item.trainType == 1 ? '鍦伴攢' : '璺繍' }}</text>
</view>
</view>
<view class="cardList_item">
diff --git a/utils/request.js b/utils/request.js
index abe7958..451dd24 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -82,7 +82,7 @@
500: responseError
}
-// let BaseUrl = 'http://192.168.3.159:9999';
+// let BaseUrl = 'http://192.168.0.159:9999';
// const BaseUrl = 'https://mx.jzeg.cn:443/app';
const BaseUrl = "https://mx.jzeg.cn:9998";
--
Gitblit v1.9.1