朱园亮 / erp-mobile · Commits

Commit 1b7cf04a029b5bcdc9f75dcdc69fb04fdadd284d

Authored by gesilong
2 parents 3c7ffa88 e6326c17

Merge branch 'cjerp-contract-1.0' into test_cjerp

Inline Side-by-side
Showing 7 changed files with 266 additions and 14 deletions
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <view class="page"> 2 <view class="page">
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <uni-list> 4 <uni-list>
5 - <uni-list-item title="编号"> 5 + <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
  6 + <template v-slot:body>
  7 + <view class="item-title"><text class="required">*</text><text>编号</text></view>
  8 + </template>
6 <template v-slot:footer> 9 <template v-slot:footer>
7 - <uni-easyinput v-model="form.code" :inputBorder="false" disabled /> 10 + <view class="serial-number-row">
  11 + <text class="readonly-text value-code">{{ form.code }}</text>
  12 + <button class="generate-btn" @click="initCode">点此生成</button>
  13 + </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 16
@@ -931,6 +937,22 @@ export default { @@ -931,6 +937,22 @@ export default {
931 color: rgba(0, 0, 0, 0.9) !important; 937 color: rgba(0, 0, 0, 0.9) !important;
932 } 938 }
933 } 939 }
  940 +
  941 + .serial-number-row {
  942 + display: flex;
  943 + align-items: center;
  944 +
  945 + .generate-btn {
  946 + margin-left: 24rpx;
  947 + height: 48rpx;
  948 + line-height: 48rpx;
  949 + padding: 0 24rpx;
  950 + font-size: 24rpx;
  951 + border-radius: 8rpx;
  952 + background: $theme-primary;
  953 + color: #fff;
  954 + }
  955 + }
934 } 956 }
935 957
936 &.mgb10 { 958 &.mgb10 {
@@ -938,4 +960,18 @@ export default { @@ -938,4 +960,18 @@ export default {
938 } 960 }
939 } 961 }
940 } 962 }
  963 +
  964 +.readonly-text {
  965 + color: rgba(0, 0, 0, 0.9);
  966 + font-size: 32rpx;
  967 + line-height: 48rpx;
  968 + text-align: right;
  969 + white-space: pre-wrap;
  970 + word-break: break-all;
  971 +}
  972 +
  973 +.value-code {
  974 + width: 260rpx;
  975 + text-align: left;
  976 +}
941 </style> 977 </style>
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <view class="page"> 2 <view class="page">
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <uni-list> 4 <uni-list>
5 - <uni-list-item title="编号"> 5 + <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
  6 + <template v-slot:body>
  7 + <view class="item-title"><text class="required">*</text><text>编号</text></view>
  8 + </template>
6 <template v-slot:footer> 9 <template v-slot:footer>
7 - <uni-easyinput v-model="form.code" :inputBorder="false" disabled /> 10 + <view class="serial-number-row">
  11 + <text class="readonly-text value-code">{{ form.code }}</text>
  12 + <button class="generate-btn" @click="initCode">点此生成</button>
  13 + </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 16
@@ -933,6 +939,22 @@ export default { @@ -933,6 +939,22 @@ export default {
933 color: rgba(0, 0, 0, 0.9) !important; 939 color: rgba(0, 0, 0, 0.9) !important;
934 } 940 }
935 } 941 }
  942 +
  943 + .serial-number-row {
  944 + display: flex;
  945 + align-items: center;
  946 +
  947 + .generate-btn {
  948 + margin-left: 24rpx;
  949 + height: 48rpx;
  950 + line-height: 48rpx;
  951 + padding: 0 24rpx;
  952 + font-size: 24rpx;
  953 + border-radius: 8rpx;
  954 + background: $theme-primary;
  955 + color: #fff;
  956 + }
  957 + }
936 } 958 }
937 959
938 &.mgb10 { 960 &.mgb10 {
@@ -940,4 +962,18 @@ export default { @@ -940,4 +962,18 @@ export default {
940 } 962 }
941 } 963 }
942 } 964 }
  965 +
  966 +.readonly-text {
  967 + color: rgba(0, 0, 0, 0.9);
  968 + font-size: 32rpx;
  969 + line-height: 48rpx;
  970 + text-align: right;
  971 + white-space: pre-wrap;
  972 + word-break: break-all;
  973 +}
  974 +
  975 +.value-code {
  976 + width: 260rpx;
  977 + text-align: left;
  978 +}
943 </style> 979 </style>
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <view class="page"> 2 <view class="page">
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <uni-list> 4 <uni-list>
5 - <uni-list-item title="编号"> 5 + <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
  6 + <template v-slot:body>
  7 + <view class="item-title"><text class="required">*</text><text>编号</text></view>
  8 + </template>
6 <template v-slot:footer> 9 <template v-slot:footer>
7 - <uni-easyinput v-model="form.code" :inputBorder="false" disabled /> 10 + <view class="serial-number-row">
  11 + <text class="readonly-text value-code">{{ form.code }}</text>
  12 + <button class="generate-btn" @click="initCode">点此生成</button>
  13 + </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 16
@@ -932,6 +938,22 @@ export default { @@ -932,6 +938,22 @@ export default {
932 color: rgba(0, 0, 0, 0.9) !important; 938 color: rgba(0, 0, 0, 0.9) !important;
933 } 939 }
934 } 940 }
  941 +
  942 + .serial-number-row {
  943 + display: flex;
  944 + align-items: center;
  945 +
  946 + .generate-btn {
  947 + margin-left: 24rpx;
  948 + height: 48rpx;
  949 + line-height: 48rpx;
  950 + padding: 0 24rpx;
  951 + font-size: 24rpx;
  952 + border-radius: 8rpx;
  953 + background: $theme-primary;
  954 + color: #fff;
  955 + }
  956 + }
935 } 957 }
936 958
937 &.mgb10 { 959 &.mgb10 {
@@ -939,4 +961,18 @@ export default { @@ -939,4 +961,18 @@ export default {
939 } 961 }
940 } 962 }
941 } 963 }
  964 +
  965 +.readonly-text {
  966 + color: rgba(0, 0, 0, 0.9);
  967 + font-size: 32rpx;
  968 + line-height: 48rpx;
  969 + text-align: right;
  970 + white-space: pre-wrap;
  971 + word-break: break-all;
  972 +}
  973 +
  974 +.value-code {
  975 + width: 260rpx;
  976 + text-align: left;
  977 +}
942 </style> 978 </style>
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <view class="page"> 2 <view class="page">
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <uni-list> 4 <uni-list>
5 - <uni-list-item title="编号"> 5 + <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
  6 + <template v-slot:body>
  7 + <view class="item-title"><text class="required">*</text><text>编号</text></view>
  8 + </template>
6 <template v-slot:footer> 9 <template v-slot:footer>
7 - <uni-easyinput v-model="form.code" :inputBorder="false" disabled /> 10 + <view class="serial-number-row">
  11 + <text class="readonly-text value-code">{{ form.code }}</text>
  12 + <button class="generate-btn" @click="initCode">点此生成</button>
  13 + </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 16
@@ -982,6 +988,22 @@ export default { @@ -982,6 +988,22 @@ export default {
982 color: rgba(0, 0, 0, 0.9) !important; 988 color: rgba(0, 0, 0, 0.9) !important;
983 } 989 }
984 } 990 }
  991 +
  992 + .serial-number-row {
  993 + display: flex;
  994 + align-items: center;
  995 +
  996 + .generate-btn {
  997 + margin-left: 24rpx;
  998 + height: 48rpx;
  999 + line-height: 48rpx;
  1000 + padding: 0 24rpx;
  1001 + font-size: 24rpx;
  1002 + border-radius: 8rpx;
  1003 + background: $theme-primary;
  1004 + color: #fff;
  1005 + }
  1006 + }
985 } 1007 }
986 1008
987 &.mgb10 { 1009 &.mgb10 {
@@ -989,4 +1011,18 @@ export default { @@ -989,4 +1011,18 @@ export default {
989 } 1011 }
990 } 1012 }
991 } 1013 }
  1014 +
  1015 +.readonly-text {
  1016 + color: rgba(0, 0, 0, 0.9);
  1017 + font-size: 32rpx;
  1018 + line-height: 48rpx;
  1019 + text-align: right;
  1020 + white-space: pre-wrap;
  1021 + word-break: break-all;
  1022 +}
  1023 +
  1024 +.value-code {
  1025 + width: 260rpx;
  1026 + text-align: left;
  1027 +}
992 </style> 1028 </style>
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <view class="page"> 2 <view class="page">
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <uni-list> 4 <uni-list>
5 - <uni-list-item title="编号"> 5 + <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
  6 + <template v-slot:body>
  7 + <view class="item-title"><text class="required">*</text><text>编号</text></view>
  8 + </template>
6 <template v-slot:footer> 9 <template v-slot:footer>
7 - <uni-easyinput v-model="form.code" :inputBorder="false" disabled /> 10 + <view class="serial-number-row">
  11 + <text class="readonly-text value-code">{{ form.code }}</text>
  12 + <button class="generate-btn" @click="initCode">点此生成</button>
  13 + </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 16
@@ -952,6 +958,22 @@ export default { @@ -952,6 +958,22 @@ export default {
952 color: rgba(0, 0, 0, 0.9) !important; 958 color: rgba(0, 0, 0, 0.9) !important;
953 } 959 }
954 } 960 }
  961 +
  962 + .serial-number-row {
  963 + display: flex;
  964 + align-items: center;
  965 +
  966 + .generate-btn {
  967 + margin-left: 24rpx;
  968 + height: 48rpx;
  969 + line-height: 48rpx;
  970 + padding: 0 24rpx;
  971 + font-size: 24rpx;
  972 + border-radius: 8rpx;
  973 + background: $theme-primary;
  974 + color: #fff;
  975 + }
  976 + }
955 } 977 }
956 978
957 &.mgb10 { 979 &.mgb10 {
@@ -959,4 +981,18 @@ export default { @@ -959,4 +981,18 @@ export default {
959 } 981 }
960 } 982 }
961 } 983 }
  984 +
  985 +.readonly-text {
  986 + color: rgba(0, 0, 0, 0.9);
  987 + font-size: 32rpx;
  988 + line-height: 48rpx;
  989 + text-align: right;
  990 + white-space: pre-wrap;
  991 + word-break: break-all;
  992 +}
  993 +
  994 +.value-code {
  995 + width: 260rpx;
  996 + text-align: left;
  997 +}
962 </style> 998 </style>
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <view class="page"> 2 <view class="page">
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <uni-list> 4 <uni-list>
5 - <uni-list-item title="编号"> 5 + <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
  6 + <template v-slot:body>
  7 + <view class="item-title"><text class="required">*</text><text>编号</text></view>
  8 + </template>
6 <template v-slot:footer> 9 <template v-slot:footer>
7 - <uni-easyinput v-model="form.code" :inputBorder="false" disabled /> 10 + <view class="serial-number-row">
  11 + <text class="readonly-text value-code">{{ form.code }}</text>
  12 + <button class="generate-btn" @click="initCode">点此生成</button>
  13 + </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 16
@@ -951,6 +957,22 @@ export default { @@ -951,6 +957,22 @@ export default {
951 color: rgba(0, 0, 0, 0.9) !important; 957 color: rgba(0, 0, 0, 0.9) !important;
952 } 958 }
953 } 959 }
  960 +
  961 + .serial-number-row {
  962 + display: flex;
  963 + align-items: center;
  964 +
  965 + .generate-btn {
  966 + margin-left: 24rpx;
  967 + height: 48rpx;
  968 + line-height: 48rpx;
  969 + padding: 0 24rpx;
  970 + font-size: 24rpx;
  971 + border-radius: 8rpx;
  972 + background: $theme-primary;
  973 + color: #fff;
  974 + }
  975 + }
954 } 976 }
955 977
956 &.mgb10 { 978 &.mgb10 {
@@ -958,4 +980,18 @@ export default { @@ -958,4 +980,18 @@ export default {
958 } 980 }
959 } 981 }
960 } 982 }
  983 +
  984 +.readonly-text {
  985 + color: rgba(0, 0, 0, 0.9);
  986 + font-size: 32rpx;
  987 + line-height: 48rpx;
  988 + text-align: right;
  989 + white-space: pre-wrap;
  990 + word-break: break-all;
  991 +}
  992 +
  993 +.value-code {
  994 + width: 260rpx;
  995 + text-align: left;
  996 +}
961 </style> 997 </style>
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <view class="page"> 2 <view class="page">
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <uni-list> 4 <uni-list>
5 - <uni-list-item title="编号"> 5 + <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
  6 + <template v-slot:body>
  7 + <view class="item-title"><text class="required">*</text><text>编号</text></view>
  8 + </template>
6 <template v-slot:footer> 9 <template v-slot:footer>
7 - <uni-easyinput v-model="form.code" :inputBorder="false" disabled /> 10 + <view class="serial-number-row">
  11 + <text class="readonly-text value-code">{{ form.code }}</text>
  12 + <button class="generate-btn" @click="initCode">点此生成</button>
  13 + </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 16
@@ -956,6 +962,22 @@ export default { @@ -956,6 +962,22 @@ export default {
956 color: rgba(0, 0, 0, 0.9) !important; 962 color: rgba(0, 0, 0, 0.9) !important;
957 } 963 }
958 } 964 }
  965 +
  966 + .serial-number-row {
  967 + display: flex;
  968 + align-items: center;
  969 +
  970 + .generate-btn {
  971 + margin-left: 24rpx;
  972 + height: 48rpx;
  973 + line-height: 48rpx;
  974 + padding: 0 24rpx;
  975 + font-size: 24rpx;
  976 + border-radius: 8rpx;
  977 + background: $theme-primary;
  978 + color: #fff;
  979 + }
  980 + }
959 } 981 }
960 982
961 &.mgb10 { 983 &.mgb10 {
@@ -963,4 +985,18 @@ export default { @@ -963,4 +985,18 @@ export default {
963 } 985 }
964 } 986 }
965 } 987 }
  988 +
  989 +.readonly-text {
  990 + color: rgba(0, 0, 0, 0.9);
  991 + font-size: 32rpx;
  992 + line-height: 48rpx;
  993 + text-align: right;
  994 + white-space: pre-wrap;
  995 + word-break: break-all;
  996 +}
  997 +
  998 +.value-code {
  999 + width: 260rpx;
  1000 + text-align: left;
  1001 +}
966 </style> 1002 </style>