朱园亮 / erp-mobile · Commits

Commit ccd503fc7c0033f322bebc13555d0a602e12ae3b

Authored by gesilong
2 parents 8c4c9f6e 7bcf177f

Merge branch 'cjerp-2.0-contract' into publish_cjerp

Inline Side-by-side
Showing 3 changed files with 47 additions and 47 deletions
... ... @@ -214,7 +214,7 @@
214 214 {
215 215 "path": "pages/domestic_trade/index",
216 216 "style": {
217   - "navigationBarTitleText": "内贸合同列表",
  217 + "navigationBarTitleText": "内贸客户资信列表",
218 218 "navigationBarBackgroundColor": "#ffffff",
219 219 "navigationBarTextStyle": "black"
220 220 }
... ... @@ -222,7 +222,7 @@
222 222 {
223 223 "path": "pages/domestic_trade/add",
224 224 "style": {
225   - "navigationBarTitleText": "新增内贸合同",
  225 + "navigationBarTitleText": "新增内贸客户资信",
226 226 "navigationBarBackgroundColor": "#ffffff",
227 227 "navigationBarTextStyle": "black"
228 228 }
... ... @@ -230,7 +230,7 @@
230 230 {
231 231 "path": "pages/domestic_trade/modify",
232 232 "style": {
233   - "navigationBarTitleText": "编辑内贸合同",
  233 + "navigationBarTitleText": "编辑内贸客户资信",
234 234 "navigationBarBackgroundColor": "#ffffff",
235 235 "navigationBarTextStyle": "black"
236 236 }
... ... @@ -238,7 +238,7 @@
238 238 {
239 239 "path": "pages/domestic_trade/detail",
240 240 "style": {
241   - "navigationBarTitleText": "查看内贸合同",
  241 + "navigationBarTitleText": "查看内贸客户资信",
242 242 "navigationBarBackgroundColor": "#ffffff",
243 243 "navigationBarTextStyle": "black"
244 244 }
... ...
... ... @@ -59,11 +59,11 @@
59 59 </template>
60 60 </uni-list-item>
61 61
62   - <uni-list-item title="公司成立时间">
63   - <template v-slot:footer>
64   - <uni-datetime-picker type="date" v-model="form.companyEstablishedTime" />
65   - </template>
66   - </uni-list-item>
  62 + <uni-list-item title="公司成立时间">
  63 + <template v-slot:footer>
  64 + <uni-datetime-picker type="date" v-model="form.companyEstablishedTime" />
  65 + </template>
  66 + </uni-list-item>
67 67
68 68 <uni-list-item title="地址">
69 69 <template v-slot:footer>
... ... @@ -313,11 +313,11 @@
313 313 </template>
314 314 </uni-list-item>
315 315
316   - <uni-list-item title="评审有效期">
317   - <template v-slot:footer>
318   - <uni-datetime-picker type="date" v-model="form.reviewValidUntil" />
319   - </template>
320   - </uni-list-item>
  316 + <uni-list-item title="评审有效期">
  317 + <template v-slot:footer>
  318 + <uni-datetime-picker type="date" v-model="form.reviewValidUntil" />
  319 + </template>
  320 + </uni-list-item>
321 321
322 322 <uni-list-item class="mgb10" title="附件">
323 323 <template v-slot:footer>
... ... @@ -332,12 +332,12 @@
332 332 </view>
333 333 </template>
334 334 </uni-list-item>
335   - </uni-list>
336   - </scroll-view>
  335 + </uni-list>
337 336
338   - <view class="footer">
339   - <button class="btn submit" type="primary" :disabled="submitting" @click="onSubmit">{{ submitting ? '提交中...' : '提交' }}</button>
340   - </view>
  337 + <view class="footer">
  338 + <button class="btn submit" type="primary" :disabled="submitting" @click="onSubmit">{{ submitting ? '提交中...' : '提交' }}</button>
  339 + </view>
  340 + </scroll-view>
341 341
342 342 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
343 343 @confirm="onSheetConfirm" />
... ... @@ -865,19 +865,19 @@ export default {
865 865
866 866 .scroll {
867 867 flex: 1;
868   - padding: 12rpx 0 160rpx;
  868 + padding: 12rpx 0 160rpx;
869 869 }
870 870
871 871 .footer {
872   - position: fixed;
873   - left: 0;
874   - right: 0;
875   - bottom: 0;
  872 + z-index: 2;
  873 + position: fixed;
  874 + left: 0;
  875 + right: 0;
  876 + bottom: 0;
876 877 padding: 32rpx;
877 878 padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
878 879 background: #fff;
879 880 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
880   - z-index: 10;
881 881
882 882 .btn {
883 883 height: 80rpx;
... ...
... ... @@ -59,11 +59,11 @@
59 59 </template>
60 60 </uni-list-item>
61 61
62   - <uni-list-item title="公司成立时间">
63   - <template v-slot:footer>
64   - <uni-datetime-picker type="date" v-model="form.companyEstablishedTime" />
65   - </template>
66   - </uni-list-item>
  62 + <uni-list-item title="公司成立时间">
  63 + <template v-slot:footer>
  64 + <uni-datetime-picker type="date" v-model="form.companyEstablishedTime" />
  65 + </template>
  66 + </uni-list-item>
67 67
68 68 <uni-list-item title="地址">
69 69 <template v-slot:footer>
... ... @@ -313,11 +313,11 @@
313 313 </template>
314 314 </uni-list-item>
315 315
316   - <uni-list-item title="评审有效期">
317   - <template v-slot:footer>
318   - <uni-datetime-picker type="date" v-model="form.reviewValidUntil" />
319   - </template>
320   - </uni-list-item>
  316 + <uni-list-item title="评审有效期">
  317 + <template v-slot:footer>
  318 + <uni-datetime-picker type="date" v-model="form.reviewValidUntil" />
  319 + </template>
  320 + </uni-list-item>
321 321
322 322 <uni-list-item class="mgb10" title="附件">
323 323 <template v-slot:footer>
... ... @@ -332,12 +332,12 @@
332 332 </view>
333 333 </template>
334 334 </uni-list-item>
335   - </uni-list>
336   - </scroll-view>
  335 + </uni-list>
337 336
338   - <view class="footer">
339   - <button class="btn submit" type="primary" :disabled="submitting" @click="onSubmit">{{ submitting ? '保存中...' : '保存' }}</button>
340   - </view>
  337 + <view class="footer">
  338 + <button class="btn submit" type="primary" :disabled="submitting" @click="onSubmit">{{ submitting ? '保存中...' : '保存' }}</button>
  339 + </view>
  340 + </scroll-view>
341 341
342 342 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
343 343 @confirm="onSheetConfirm" />
... ... @@ -677,7 +677,7 @@ export default {
677 677 }
678 678 this.sheet.visible = false
679 679 },
680   - onMultiSheetConfirm({ value }) {
  680 + onMultiSheetConfirm({ value }) {
681 681 const field = this.multiSheet.field
682 682 if (field === 'companyNature') {
683 683 const normalized = this.normalizeCompanyNature(value)
... ... @@ -897,19 +897,19 @@ export default {
897 897
898 898 .scroll {
899 899 flex: 1;
900   - padding: 12rpx 0 160rpx;
  900 + padding: 12rpx 0 160rpx;
901 901 }
902 902
903 903 .footer {
904   - position: fixed;
905   - left: 0;
906   - right: 0;
907   - bottom: 0;
  904 + z-index: 2;
  905 + position: fixed;
  906 + left: 0;
  907 + right: 0;
  908 + bottom: 0;
908 909 padding: 32rpx;
909 910 padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
910 911 background: #fff;
911 912 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
912   - z-index: 10;
913 913
914 914 .btn {
915 915 height: 80rpx;
... ...