朱园亮 / erp-mobile · Commits

Commit 8c1172c2ede5664e6ce5d9850ebc2bbe7349f180

Authored by gesilong
2 parents 9f425b55 7bcf177f

Merge branch 'cjerp-2.0-contract' into test_cjerp

Inline Side-by-side
Showing 3 changed files with 47 additions and 47 deletions
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 { 214 {
215 "path": "pages/domestic_trade/index", 215 "path": "pages/domestic_trade/index",
216 "style": { 216 "style": {
217 - "navigationBarTitleText": "内贸合同列表", 217 + "navigationBarTitleText": "内贸客户资信列表",
218 "navigationBarBackgroundColor": "#ffffff", 218 "navigationBarBackgroundColor": "#ffffff",
219 "navigationBarTextStyle": "black" 219 "navigationBarTextStyle": "black"
220 } 220 }
@@ -222,7 +222,7 @@ @@ -222,7 +222,7 @@
222 { 222 {
223 "path": "pages/domestic_trade/add", 223 "path": "pages/domestic_trade/add",
224 "style": { 224 "style": {
225 - "navigationBarTitleText": "新增内贸合同", 225 + "navigationBarTitleText": "新增内贸客户资信",
226 "navigationBarBackgroundColor": "#ffffff", 226 "navigationBarBackgroundColor": "#ffffff",
227 "navigationBarTextStyle": "black" 227 "navigationBarTextStyle": "black"
228 } 228 }
@@ -230,7 +230,7 @@ @@ -230,7 +230,7 @@
230 { 230 {
231 "path": "pages/domestic_trade/modify", 231 "path": "pages/domestic_trade/modify",
232 "style": { 232 "style": {
233 - "navigationBarTitleText": "编辑内贸合同", 233 + "navigationBarTitleText": "编辑内贸客户资信",
234 "navigationBarBackgroundColor": "#ffffff", 234 "navigationBarBackgroundColor": "#ffffff",
235 "navigationBarTextStyle": "black" 235 "navigationBarTextStyle": "black"
236 } 236 }
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 { 238 {
239 "path": "pages/domestic_trade/detail", 239 "path": "pages/domestic_trade/detail",
240 "style": { 240 "style": {
241 - "navigationBarTitleText": "查看内贸合同", 241 + "navigationBarTitleText": "查看内贸客户资信",
242 "navigationBarBackgroundColor": "#ffffff", 242 "navigationBarBackgroundColor": "#ffffff",
243 "navigationBarTextStyle": "black" 243 "navigationBarTextStyle": "black"
244 } 244 }
@@ -59,11 +59,11 @@ @@ -59,11 +59,11 @@
59 </template> 59 </template>
60 </uni-list-item> 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 <uni-list-item title="地址"> 68 <uni-list-item title="地址">
69 <template v-slot:footer> 69 <template v-slot:footer>
@@ -313,11 +313,11 @@ @@ -313,11 +313,11 @@
313 </template> 313 </template>
314 </uni-list-item> 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 <uni-list-item class="mgb10" title="附件"> 322 <uni-list-item class="mgb10" title="附件">
323 <template v-slot:footer> 323 <template v-slot:footer>
@@ -332,12 +332,12 @@ @@ -332,12 +332,12 @@
332 </view> 332 </view>
333 </template> 333 </template>
334 </uni-list-item> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 342 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
343 @confirm="onSheetConfirm" /> 343 @confirm="onSheetConfirm" />
@@ -865,19 +865,19 @@ export default { @@ -865,19 +865,19 @@ export default {
865 865
866 .scroll { 866 .scroll {
867 flex: 1; 867 flex: 1;
868 - padding: 12rpx 0 160rpx; 868 + padding: 12rpx 0 160rpx;
869 } 869 }
870 870
871 .footer { 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 padding: 32rpx; 877 padding: 32rpx;
877 padding-bottom: calc(32rpx + env(safe-area-inset-bottom)); 878 padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
878 background: #fff; 879 background: #fff;
879 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06); 880 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
880 - z-index: 10;  
881 881
882 .btn { 882 .btn {
883 height: 80rpx; 883 height: 80rpx;
@@ -59,11 +59,11 @@ @@ -59,11 +59,11 @@
59 </template> 59 </template>
60 </uni-list-item> 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 <uni-list-item title="地址"> 68 <uni-list-item title="地址">
69 <template v-slot:footer> 69 <template v-slot:footer>
@@ -313,11 +313,11 @@ @@ -313,11 +313,11 @@
313 </template> 313 </template>
314 </uni-list-item> 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 <uni-list-item class="mgb10" title="附件"> 322 <uni-list-item class="mgb10" title="附件">
323 <template v-slot:footer> 323 <template v-slot:footer>
@@ -332,12 +332,12 @@ @@ -332,12 +332,12 @@
332 </view> 332 </view>
333 </template> 333 </template>
334 </uni-list-item> 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 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 342 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
343 @confirm="onSheetConfirm" /> 343 @confirm="onSheetConfirm" />
@@ -677,7 +677,7 @@ export default { @@ -677,7 +677,7 @@ export default {
677 } 677 }
678 this.sheet.visible = false 678 this.sheet.visible = false
679 }, 679 },
680 - onMultiSheetConfirm({ value }) { 680 + onMultiSheetConfirm({ value }) {
681 const field = this.multiSheet.field 681 const field = this.multiSheet.field
682 if (field === 'companyNature') { 682 if (field === 'companyNature') {
683 const normalized = this.normalizeCompanyNature(value) 683 const normalized = this.normalizeCompanyNature(value)
@@ -897,19 +897,19 @@ export default { @@ -897,19 +897,19 @@ export default {
897 897
898 .scroll { 898 .scroll {
899 flex: 1; 899 flex: 1;
900 - padding: 12rpx 0 160rpx; 900 + padding: 12rpx 0 160rpx;
901 } 901 }
902 902
903 .footer { 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 padding: 32rpx; 909 padding: 32rpx;
909 padding-bottom: calc(32rpx + env(safe-area-inset-bottom)); 910 padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
910 background: #fff; 911 background: #fff;
911 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06); 912 box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
912 - z-index: 10;  
913 913
914 .btn { 914 .btn {
915 height: 80rpx; 915 height: 80rpx;