朱园亮 / erp-mobile · Commits

Commit cbb311aa06ca52e7559fb42b3b3998d8520eef0d

Authored by gesilong
1 parent 2c076879

commit: 修复锁规样式

Inline Side-by-side
Showing 6 changed files with 151 additions and 128 deletions
@@ -129,40 +129,41 @@ @@ -129,40 +129,41 @@
129 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled /> 129 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
130 </template> 130 </template>
131 </uni-list-item> 131 </uni-list-item>
132 - <view class="footer">  
133 - <div class="total">  
134 - <div class="total-text">  
135 - 合计  
136 - </div>  
137 - <div class="total-item">  
138 - <div class="total-item-text">  
139 - 数量  
140 - </div>  
141 - <div class="total-item-price">  
142 - {{ (totalQuantity || 0).toFixed(2) }}kg  
143 - </div>  
144 - </div>  
145 - <!-- <div class="total-item">  
146 - <div class="total-item-text">  
147 - 不含税金额  
148 - </div>  
149 - <div class="total-item-price text-red">  
150 - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}  
151 - </div>  
152 - </div> -->  
153 - <div class="total-item">  
154 - <div class="total-item-text">  
155 - 总金额  
156 - </div>  
157 - <div class="total-item-price text-red">  
158 - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}  
159 - </div>  
160 - </div>  
161 - </div>  
162 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
163 - </view> 132 +
164 </uni-list> 133 </uni-list>
165 </view> 134 </view>
  135 + <view class="footer">
  136 + <div class="total">
  137 + <div class="total-text">
  138 + 合计
  139 + </div>
  140 + <div class="total-item">
  141 + <div class="total-item-text">
  142 + 数量
  143 + </div>
  144 + <div class="total-item-price">
  145 + {{ (totalQuantity || 0).toFixed(2) }}kg
  146 + </div>
  147 + </div>
  148 + <!-- <div class="total-item">
  149 + <div class="total-item-text">
  150 + 不含税金额
  151 + </div>
  152 + <div class="total-item-price text-red">
  153 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  154 + </div>
  155 + </div> -->
  156 + <div class="total-item">
  157 + <div class="total-item-text">
  158 + 总金额
  159 + </div>
  160 + <div class="total-item-price text-red">
  161 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  162 + </div>
  163 + </div>
  164 + </div>
  165 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  166 + </view>
166 </view> 167 </view>
167 </scroll-view> 168 </scroll-view>
168 169
@@ -128,40 +128,41 @@ @@ -128,40 +128,41 @@
128 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled /> 128 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
129 </template> 129 </template>
130 </uni-list-item> 130 </uni-list-item>
131 - <view class="footer">  
132 - <div class="total">  
133 - <div class="total-text">  
134 - 合计  
135 - </div>  
136 - <div class="total-item">  
137 - <div class="total-item-text">  
138 - 数量  
139 - </div>  
140 - <div class="total-item-price">  
141 - {{ (totalQuantity || 0).toFixed(2) }}kg  
142 - </div>  
143 - </div>  
144 - <!-- <div class="total-item">  
145 - <div class="total-item-text">  
146 - 不含税金额  
147 - </div>  
148 - <div class="total-item-price text-red">  
149 - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}  
150 - </div>  
151 - </div> -->  
152 - <div class="total-item">  
153 - <div class="total-item-text">  
154 - 总金额  
155 - </div>  
156 - <div class="total-item-price text-red">  
157 - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}  
158 - </div>  
159 - </div>  
160 - </div>  
161 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
162 - </view> 131 +
163 </uni-list> 132 </uni-list>
164 </view> 133 </view>
  134 + <view class="footer">
  135 + <div class="total">
  136 + <div class="total-text">
  137 + 合计
  138 + </div>
  139 + <div class="total-item">
  140 + <div class="total-item-text">
  141 + 数量
  142 + </div>
  143 + <div class="total-item-price">
  144 + {{ (totalQuantity || 0).toFixed(2) }}kg
  145 + </div>
  146 + </div>
  147 + <!-- <div class="total-item">
  148 + <div class="total-item-text">
  149 + 不含税金额
  150 + </div>
  151 + <div class="total-item-price text-red">
  152 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  153 + </div>
  154 + </div> -->
  155 + <div class="total-item">
  156 + <div class="total-item-text">
  157 + 总金额
  158 + </div>
  159 + <div class="total-item-price text-red">
  160 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  161 + </div>
  162 + </div>
  163 + </div>
  164 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  165 + </view>
165 </view> 166 </view>
166 </scroll-view> 167 </scroll-view>
167 168
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <uni-list> 56 <uni-list>
57 <uni-list-item title="现申请锁规格日期"> 57 <uni-list-item title="现申请锁规格日期">
58 <template v-slot:footer> 58 <template v-slot:footer>
59 - <uni-datetime-picker type="date" v-model="form.specLockDate" /> 59 + <uni-datetime-picker :start="minDate" type="date" v-model="form.specLockDate" />
60 </template> 60 </template>
61 </uni-list-item> 61 </uni-list-item>
62 <uni-list-item title="延迟原因"> 62 <uni-list-item title="延迟原因">
@@ -97,6 +97,16 @@ export default { @@ -97,6 +97,16 @@ export default {
97 form: { specLockDate: '', delayReason: '' } 97 form: { specLockDate: '', delayReason: '' }
98 } 98 }
99 }, 99 },
  100 + computed: {
  101 + minDate() {
  102 + const now = new Date()
  103 + now.setDate(now.getDate() + 1)
  104 + const y = now.getFullYear()
  105 + const m = String(now.getMonth() + 1).padStart(2, '0')
  106 + const d = String(now.getDate()).padStart(2, '0')
  107 + return `${y}-${m}-${d}`
  108 + }
  109 + },
100 onLoad(options) { 110 onLoad(options) {
101 const id = options && options.id ? options.id : '' 111 const id = options && options.id ? options.id : ''
102 this.id = id 112 this.id = id
@@ -121,37 +121,37 @@ @@ -121,37 +121,37 @@
121 </uni-list> 121 </uni-list>
122 </view> 122 </view>
123 <view class="footer"> 123 <view class="footer">
124 - <div class="total">  
125 - <div class="total-text">  
126 - 合计  
127 - </div>  
128 - <div class="total-item">  
129 - <div class="total-item-text">  
130 - 数量  
131 - </div>  
132 - <div class="total-item-price">  
133 - {{ (totalQuantity || 0).toFixed(2) }}kg  
134 - </div>  
135 - </div>  
136 - <div class="total-item">  
137 - <div class="total-item-text">  
138 - 不含税金额  
139 - </div>  
140 - <div class="total-item-price text-red">  
141 - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}  
142 - </div>  
143 - </div>  
144 - <div class="total-item">  
145 - <div class="total-item-text">  
146 - 总金额111  
147 - </div>  
148 - <div class="total-item-price text-red">  
149 - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}  
150 - </div>  
151 - </div> 124 + <div class="total">
  125 + <div class="total-text">
  126 + 合计
  127 + </div>
  128 + <div class="total-item">
  129 + <div class="total-item-text">
  130 + 数量
152 </div> 131 </div>
153 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
154 - </view> 132 + <div class="total-item-price">
  133 + {{ (totalQuantity || 0).toFixed(2) }}kg
  134 + </div>
  135 + </div>
  136 + <div class="total-item">
  137 + <div class="total-item-text">
  138 + 不含税金额
  139 + </div>
  140 + <div class="total-item-price text-red">
  141 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  142 + </div>
  143 + </div>
  144 + <div class="total-item">
  145 + <div class="total-item-text">
  146 + 总金额
  147 + </div>
  148 + <div class="total-item-price text-red">
  149 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  150 + </div>
  151 + </div>
  152 + </div>
  153 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  154 + </view>
155 </view> 155 </view>
156 </scroll-view> 156 </scroll-view>
157 157
@@ -116,40 +116,40 @@ @@ -116,40 +116,40 @@
116 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled /> 116 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
117 </template> 117 </template>
118 </uni-list-item> 118 </uni-list-item>
119 - <view class="footer">  
120 - <div class="total">  
121 - <div class="total-text">  
122 - 合计  
123 - </div>  
124 - <div class="total-item">  
125 - <div class="total-item-text">  
126 - 数量  
127 - </div>  
128 - <div class="total-item-price">  
129 - {{ (totalQuantity || 0).toFixed(2) }}kg  
130 - </div>  
131 - </div>  
132 - <div class="total-item">  
133 - <div class="total-item-text">  
134 - 不含税金额  
135 - </div>  
136 - <div class="total-item-price text-red">  
137 - ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}  
138 - </div>  
139 - </div>  
140 - <div class="total-item">  
141 - <div class="total-item-text">  
142 - 总金额  
143 - </div>  
144 - <div class="total-item-price text-red">  
145 - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}  
146 - </div>  
147 - </div>  
148 - </div>  
149 - <button class="btn submit" type="primary" @click="onSubmit">提交</button>  
150 - </view>  
151 </uni-list> 119 </uni-list>
152 </view> 120 </view>
  121 + <view class="footer">
  122 + <div class="total">
  123 + <div class="total-text">
  124 + 合计
  125 + </div>
  126 + <div class="total-item">
  127 + <div class="total-item-text">
  128 + 数量
  129 + </div>
  130 + <div class="total-item-price">
  131 + {{ (totalQuantity || 0).toFixed(2) }}kg
  132 + </div>
  133 + </div>
  134 + <div class="total-item">
  135 + <div class="total-item-text">
  136 + 不含税金额
  137 + </div>
  138 + <div class="total-item-price text-red">
  139 + ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
  140 + </div>
  141 + </div>
  142 + <div class="total-item">
  143 + <div class="total-item-text">
  144 + 总金额
  145 + </div>
  146 + <div class="total-item-price text-red">
  147 + ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
  148 + </div>
  149 + </div>
  150 + </div>
  151 + <button class="btn submit" type="primary" @click="onSubmit">提交</button>
  152 + </view>
153 </view> 153 </view>
154 </scroll-view> 154 </scroll-view>
155 155
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <uni-list> 56 <uni-list>
57 <uni-list-item title="现申请锁规格日期"> 57 <uni-list-item title="现申请锁规格日期">
58 <template v-slot:footer> 58 <template v-slot:footer>
59 - <uni-datetime-picker type="date" v-model="form.specLockDate" /> 59 + <uni-datetime-picker type="date" :start="minDate" v-model="form.specLockDate" />
60 </template> 60 </template>
61 </uni-list-item> 61 </uni-list-item>
62 <uni-list-item title="延迟原因"> 62 <uni-list-item title="延迟原因">
@@ -97,12 +97,23 @@ export default { @@ -97,12 +97,23 @@ export default {
97 form: { specLockDate: '', delayReason: '' } 97 form: { specLockDate: '', delayReason: '' }
98 } 98 }
99 }, 99 },
  100 + computed: {
  101 + minDate() {
  102 + const now = new Date()
  103 + now.setDate(now.getDate() + 1)
  104 + const y = now.getFullYear()
  105 + const m = String(now.getMonth() + 1).padStart(2, '0')
  106 + const d = String(now.getDate()).padStart(2, '0')
  107 + return `${y}-${m}-${d}`
  108 + }
  109 + },
100 onLoad(options) { 110 onLoad(options) {
101 const id = options && options.id ? options.id : '' 111 const id = options && options.id ? options.id : ''
102 this.id = id 112 this.id = id
103 this.loadDetail() 113 this.loadDetail()
104 }, 114 },
105 methods: { 115 methods: {
  116 +
106 async loadDetail() { 117 async loadDetail() {
107 if (!this.id) return 118 if (!this.id) return
108 try { 119 try {