Commit 5267635f authored by 李超鹏's avatar 李超鹏

页面调整

parent 9b561256
...@@ -2371,7 +2371,7 @@ ...@@ -2371,7 +2371,7 @@
}, },
"babel-plugin-transform-remove-console": { "babel-plugin-transform-remove-console": {
"version": "6.9.4", "version": "6.9.4",
"resolved": "https://registry.npm.taobao.org/babel-plugin-transform-remove-console/download/babel-plugin-transform-remove-console-6.9.4.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
"integrity": "sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=", "integrity": "sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=",
"dev": true "dev": true
}, },
...@@ -8236,6 +8236,11 @@ ...@@ -8236,6 +8236,11 @@
"minimist": "^1.2.5" "minimist": "^1.2.5"
} }
}, },
"moment": {
"version": "2.29.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
},
"move-concurrently": { "move-concurrently": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
"less-plugin-functions": "^1.0.0", "less-plugin-functions": "^1.0.0",
"lib-flexible": "^0.3.2", "lib-flexible": "^0.3.2",
"mint-ui": "^2.2.13", "mint-ui": "^2.2.13",
"moment": "^2.29.1",
"register-service-worker": "^1.7.1", "register-service-worker": "^1.7.1",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-router": "^3.1.6", "vue-router": "^3.1.6",
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
</template> </template>
<script> <script>
var moment = require('moment')
export default { export default {
name: 'XhDate', name: 'XhDate',
data() { data() {
...@@ -51,18 +52,10 @@ export default { ...@@ -51,18 +52,10 @@ export default {
this.$refs.picker.open() this.$refs.picker.open()
}, },
getName(value) { getName(value) {
let result = ''
if (!value) { if (!value) {
return '' return ''
} }
const settings = this.item.settings || [] return moment().format('YYYY/MM/DD')
console.log(settings, 'settings')
const resultArr = settings.filter(item => {
return item.value === value
})
result = resultArr.length > 0 && resultArr[0].label
console.log(result, 'result')
return result
}, },
cancel() { cancel() {
this.popupVisible = false this.popupVisible = false
......
...@@ -60,7 +60,9 @@ export default { ...@@ -60,7 +60,9 @@ export default {
}, },
watch: { watch: {
'item.value'() {
this.value = this.item.value
}
}, },
methods: { methods: {
getName(value) { getName(value) {
......
...@@ -180,12 +180,6 @@ const installData = [{ ...@@ -180,12 +180,6 @@ const installData = [{
inputType: 'select', inputType: 'select',
required: true, required: true,
settings: [{ label: '安装完成', value: '01' }, { label: '需要再次安装', value: '02' }, { label: '不安装', value: '03' }] settings: [{ label: '安装完成', value: '01' }, { label: '需要再次安装', value: '02' }, { label: '不安装', value: '03' }]
}, {
fieldName: 'receiptFlg',
label: '是否需要收款',
inputType: 'select',
required: true,
settings: [{ label: '否', value: 'N' }, { label: '是', value: 'Y' }] // Y paymentMethodsType= 03 N paymentMethodsType=''
}, { }, {
fieldName: 'actualPaid', fieldName: 'actualPaid',
label: '收款金额', label: '收款金额',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment