From 631d7e345da5ff57055c9a4787a088749baa79d9 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 24 十月 2024 09:57:15 +0800
Subject: [PATCH] 1.沣沣 模具模块优化
---
pages/mjgl/mjby2.vue | 5 +++++
pages/mjgl/mjrk2.vue | 5 +++++
pages/scgl/scbg.vue | 14 +++++++-------
pages/wwgl/wxfl.vue | 6 +++---
main.js | 8 ++++----
pages/wwgl/wxsl.vue | 6 +++---
pages/mjgl/mjsj2.vue | 5 +++++
pages/mjgl/mjdj2.vue | 5 +++++
pages/mjgl/wxsq2.vue | 2 +-
9 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/main.js b/main.js
index 27006c2..90e595b 100644
--- a/main.js
+++ b/main.js
@@ -18,12 +18,12 @@
...App
})
-Vue.prototype.$appVersion = 'v1.0.2' //APP褰撳墠鐗堟湰
+Vue.prototype.$appVersion = 'v1.0.3' //APP褰撳墠鐗堟湰
// Vue.prototype.$baseUrl = 'http://121.196.36.24:8021/api' //鏈湴浜у搧 宸ㄥ姏鐨勬暟鎹簱
// Vue.prototype.$baseUrl = 'http://122.227.18.22:8000/api' //鏈湴浜у搧 宸ㄧ珛闃叉姢锛堝鎴峰湴鍧�锛�
-// Vue.prototype.$baseUrl = 'http://121.196.36.24:8032/api' //鍦ｆ玻椤圭洰
-// Vue.prototype.$baseUrl = 'http://121.196.36.24:8019/api' //鍦ｆ玻
-Vue.prototype.$baseUrl = 'http://192.168.2.254:8000/api' //鍦ｆ玻椤圭洰 瀹㈡埛鐜板満瀹為檯鏈嶅姟鍣╥p
+// Vue.prototype.$baseUrl = 'http://121.196.36.24:8019/api' //
+Vue.prototype.$baseUrl = 'http://121.196.36.24:8032/api' //鍦ｆ玻椤圭洰
+// Vue.prototype.$baseUrl = 'http://192.168.2.254:8000/api' //鍦ｆ玻椤圭洰 瀹㈡埛鐜板満瀹為檯鏈嶅姟鍣╥p
Vue.prototype.$companyType = 'B' //浼佷笟绫诲瀷锛堥」鐩被鍨嬶級 A锛氬法鍔涳紝B锛氬湥娌ｏ紝銆丅: 浜у搧
// A: http://121.196.36.24:8021/api http://122.227.18.22:8000/api
diff --git a/pages/mjgl/mjby2.vue b/pages/mjgl/mjby2.vue
index d9b1ec0..7712cd2 100644
--- a/pages/mjgl/mjby2.vue
+++ b/pages/mjgl/mjby2.vue
@@ -369,4 +369,9 @@
::v-deep .uicon-arrow-left>span {
display: block;
}
+
+ ::v-deep .u-action-sheet {
+ height: 800rpx;
+ overflow-y: auto;
+ }
</style>
\ No newline at end of file
diff --git a/pages/mjgl/mjdj2.vue b/pages/mjgl/mjdj2.vue
index 03b6388..9462b71 100644
--- a/pages/mjgl/mjdj2.vue
+++ b/pages/mjgl/mjdj2.vue
@@ -370,4 +370,9 @@
::v-deep .uicon-arrow-left>span {
display: block;
}
+
+ ::v-deep .u-action-sheet {
+ height: 800rpx;
+ overflow-y: auto;
+ }
</style>
\ No newline at end of file
diff --git a/pages/mjgl/mjrk2.vue b/pages/mjgl/mjrk2.vue
index 68c1a05..d9fdc86 100644
--- a/pages/mjgl/mjrk2.vue
+++ b/pages/mjgl/mjrk2.vue
@@ -410,4 +410,9 @@
overflow: auto;
max-height: 50vh;
}
+
+ ::v-deep .u-action-sheet {
+ height: 800rpx;
+ overflow-y: auto;
+ }
</style>
\ No newline at end of file
diff --git a/pages/mjgl/mjsj2.vue b/pages/mjgl/mjsj2.vue
index 928a459..6bba6e2 100644
--- a/pages/mjgl/mjsj2.vue
+++ b/pages/mjgl/mjsj2.vue
@@ -292,4 +292,9 @@
::v-deep .uicon-arrow-left>span {
display: block;
}
+
+ ::v-deep .u-action-sheet {
+ height: 800rpx;
+ overflow-y: auto;
+ }
</style>
\ No newline at end of file
diff --git a/pages/mjgl/wxsq2.vue b/pages/mjgl/wxsq2.vue
index aec6647..710485b 100644
--- a/pages/mjgl/wxsq2.vue
+++ b/pages/mjgl/wxsq2.vue
@@ -363,7 +363,7 @@
faultdescr: this.descMessage,
}
- // console.log(JSON.stringify(formData))
+ console.log(JSON.stringify(formData))
this.isDisabledSubmitButton = true
uni.uploadFile({
url: this.$baseUrl + '/MouldManager/MaintainScanMouldApplySave',
diff --git a/pages/scgl/scbg.vue b/pages/scgl/scbg.vue
index 2bebed9..f97185d 100644
--- a/pages/scgl/scbg.vue
+++ b/pages/scgl/scbg.vue
@@ -43,12 +43,12 @@
<u-collapse style="max-height: 590px;overflow: auto;">
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
<u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
v-for="item in collapseArr" :key="item.ordercode">
- <view style="position: absolute;width: 200rpx;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
+ <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
{{item.partname}} {{item.partspec}}
</view>
@@ -128,8 +128,8 @@
<!-- closeIconPos='top-left' closeOnClickOverlay closeable='true' -->
<u-popup :show="popupShow" mode="right" @close="popupClose" @open="popupOpen">
<view style="margin: 120px 10px 20px;" class="flex_column">
-
- <!-- <view style="display: flex;">
+ <!--
+ <view style="display: flex;">
<view>
鍗曟嵁绫诲瀷锛�
</view>
@@ -162,7 +162,7 @@
- <!-- <view class="head" style="margin-top: 10px;">
+ <view class="head" style="margin-top: 10px;">
<view class="head_block" style="height: 80rpx; display: flex;justify-content: space-around;">
<u-button :plain='today' style="width: 70px;height: 25px;" @click="dateChange('today')"
type="primary" shape="circle" text="浠婃棩">
@@ -186,9 +186,9 @@
<u-button type="info" icon='calendar' iconColor="#0659FF" size="" @click="calendarClick"
:text="calendarRange">
</u-button>
- </view> -->
+ </view>
- <!-- <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" /> -->
+ <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" />
</view>
</u-popup>
diff --git a/pages/wwgl/wxfl.vue b/pages/wwgl/wxfl.vue
index cd367b7..e05dec1 100644
--- a/pages/wwgl/wxfl.vue
+++ b/pages/wwgl/wxfl.vue
@@ -162,7 +162,7 @@
- <!-- <view class="head" style="margin-top: 10px;">
+ <view class="head" style="margin-top: 10px;">
<view class="head_block" style="height: 80rpx; display: flex;justify-content: space-around;">
<u-button :plain='today' style="width: 70px;height: 25px;" @click="dateChange('today')"
type="primary" shape="circle" text="浠婃棩">
@@ -186,9 +186,9 @@
<u-button type="info" icon='calendar' iconColor="#0659FF" size="" @click="calendarClick"
:text="calendarRange">
</u-button>
- </view> -->
+ </view>
- <!-- <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" /> -->
+ <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" />
</view>
</u-popup>
diff --git a/pages/wwgl/wxsl.vue b/pages/wwgl/wxsl.vue
index 734ff04..a3aaf06 100644
--- a/pages/wwgl/wxsl.vue
+++ b/pages/wwgl/wxsl.vue
@@ -162,7 +162,7 @@
- <!-- <view class="head" style="margin-top: 10px;">
+ <view class="head" style="margin-top: 10px;">
<view class="head_block" style="height: 80rpx; display: flex;justify-content: space-around;">
<u-button :plain='today' style="width: 70px;height: 25px;" @click="dateChange('today')"
type="primary" shape="circle" text="浠婃棩">
@@ -186,9 +186,9 @@
<u-button type="info" icon='calendar' iconColor="#0659FF" size="" @click="calendarClick"
:text="calendarRange">
</u-button>
- </view> -->
+ </view>
- <!-- <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" /> -->
+ <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" />
</view>
</u-popup>
--
Gitblit v1.9.3