mirror of
https://github.com/shawncai/ERP.git
synced 2024-09-20 06:56:07 +08:00
feat: 修改员工收款单创建时间问题
feat: 修改员工收款单创建时间问题
This commit is contained in:
parent
9ca6d91859
commit
3c85316c80
|
@ -4,6 +4,7 @@
|
|||
[![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php)
|
||||
### 重大操作
|
||||
```
|
||||
deploy-cli-service deploy --mode dev
|
||||
安装插件步骤出错后操作
|
||||
- npm install -g cnpm --registry=https://registry.npm.taobao.org 安装cnmp
|
||||
- cnpm install node-sass 安装node-sass
|
||||
|
|
|
@ -40,6 +40,18 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('inventoryAlarm.createTime')" prop="createDate" style="width: 100%;">
|
||||
|
||||
<el-date-picker
|
||||
v-model="personalForm.createDate"
|
||||
:picker-options="pickerOptions2"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="margin-left: 18px;width: 200px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
|
@ -135,7 +147,23 @@ export default {
|
|||
callback()
|
||||
}
|
||||
}
|
||||
|
||||
const validatePass4 = (rule, value, callback) => {
|
||||
if (this.personalForm.createDate === undefined || this.personalForm.createDate === null || this.personalForm.createDate === '') {
|
||||
callback(new Error('please select createDate'))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
return {
|
||||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
},
|
||||
diffcontrol: false,
|
||||
receiptcontrol: false,
|
||||
|
||||
|
@ -161,6 +189,9 @@ export default {
|
|||
],
|
||||
sourceType: [
|
||||
{ required: true, message: 'please select sourceType', trigger: 'blur' }
|
||||
],
|
||||
createDate: [
|
||||
{ required: true, validator: validatePass4, trigger: 'change' }
|
||||
]
|
||||
},
|
||||
customercontrol: false,
|
||||
|
|
|
@ -140,6 +140,11 @@
|
|||
<span>{{ scope.row.sourceType | sourceTypeFilter }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('inventoryAlarm.createTime')" :resizable="false" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createDate }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('LogisticsCar.sourcenumber')" :resizable="false" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.sourceNumber }}</span>
|
||||
|
|
|
@ -40,6 +40,17 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item :label="$t('inventoryAlarm.createTime')" prop="createDate" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||
<el-date-picker
|
||||
v-model="personalForm.createDate"
|
||||
:picker-options="pickerOptions2"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="width: 200px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
|
@ -131,7 +142,22 @@ export default {
|
|||
callback()
|
||||
}
|
||||
}
|
||||
const validatePass4 = (rule, value, callback) => {
|
||||
if (this.personalForm.createDate === undefined || this.personalForm.createDate === null || this.personalForm.createDate === '') {
|
||||
callback(new Error('please select createDate'))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
return {
|
||||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
},
|
||||
receiptcontrol: false,
|
||||
diffcontrol: false,
|
||||
countcontrol: false,
|
||||
|
@ -144,7 +170,9 @@ export default {
|
|||
sourceType: '1',
|
||||
createPersonId: this.$store.getters.userId,
|
||||
repositoryId: this.$store.getters.repositoryId,
|
||||
regionId: this.$store.getters.regionId
|
||||
regionId: this.$store.getters.regionId,
|
||||
createDate: null
|
||||
|
||||
},
|
||||
personalrules: {
|
||||
handlePersonId: [
|
||||
|
@ -158,6 +186,9 @@ export default {
|
|||
],
|
||||
sourceType: [
|
||||
{ required: true, message: 'please select sourceType', trigger: 'blur' }
|
||||
],
|
||||
createDate: [
|
||||
{ required: true, validator: validatePass4, trigger: 'change' }
|
||||
]
|
||||
},
|
||||
customercontrol: false,
|
||||
|
@ -179,7 +210,26 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getdatatime()
|
||||
},
|
||||
methods: {
|
||||
// 默认显示今天
|
||||
getdatatime() { // 默认显示今天
|
||||
var date = new Date()
|
||||
var seperator1 = '-'
|
||||
var year = date.getFullYear()
|
||||
var month = date.getMonth() + 1
|
||||
var strDate = date.getDate()
|
||||
if (month >= 1 && month <= 9) {
|
||||
month = '0' + month
|
||||
}
|
||||
if (strDate >= 0 && strDate <= 9) {
|
||||
strDate = '0' + strDate
|
||||
}
|
||||
var currentdate = year + seperator1 + month + seperator1 + strDate
|
||||
this.personalForm.createDate = currentdate
|
||||
},
|
||||
inventoryData(val) {
|
||||
console.log('val', val)
|
||||
this.personalForm.sourceNumber = val.receiptNumber
|
||||
|
@ -281,7 +331,9 @@ export default {
|
|||
createPersonId: this.$store.getters.userId,
|
||||
repositoryId: this.$store.getters.repositoryId,
|
||||
regionId: this.$store.getters.regionId,
|
||||
sourceType: '1'
|
||||
sourceType: '1',
|
||||
createDate: null
|
||||
|
||||
}
|
||||
this.handlePersonId = ''
|
||||
this.handleRepositryId = ''
|
||||
|
|
|
@ -145,6 +145,11 @@
|
|||
<span>{{ scope.row.sourceNumber }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('inventoryAlarm.createTime')" :resizable="false" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createDate }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('public.judgeStat')" :resizable="false" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.judgeStat | judgeStatFilter }}</span>
|
||||
|
|
|
@ -44,6 +44,17 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item :label="$t('inventoryAlarm.createTime')" prop="createDate" style="margin-left: 18px;width: 100%;margin-bottom: 0">
|
||||
<el-date-picker
|
||||
v-model="personalForm.createDate"
|
||||
:picker-options="pickerOptions2"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="width: 200px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
|
@ -143,7 +154,22 @@ export default {
|
|||
callback()
|
||||
}
|
||||
}
|
||||
const validatePass4 = (rule, value, callback) => {
|
||||
if (this.personalForm.createDate === undefined || this.personalForm.createDate === null || this.personalForm.createDate === '') {
|
||||
callback(new Error('please select createDate'))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
return {
|
||||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
},
|
||||
diffcontrol: false,
|
||||
countcontrol: false,
|
||||
damageControl: false,
|
||||
|
@ -154,7 +180,8 @@ export default {
|
|||
personalForm: {
|
||||
createPersonId: this.$store.getters.userId,
|
||||
repositoryId: this.$store.getters.repositoryId,
|
||||
regionId: this.$store.getters.regionId
|
||||
regionId: this.$store.getters.regionId,
|
||||
createDate: null
|
||||
},
|
||||
personalrules: {
|
||||
handlePersonId: [
|
||||
|
@ -168,6 +195,9 @@ export default {
|
|||
],
|
||||
sourceType: [
|
||||
{ required: true, message: 'please select sourceType', trigger: 'blur' }
|
||||
],
|
||||
createDate: [
|
||||
{ required: true, validator: validatePass4, trigger: 'change' }
|
||||
]
|
||||
},
|
||||
customercontrol: false,
|
||||
|
@ -189,7 +219,26 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getdatatime()
|
||||
},
|
||||
methods: {
|
||||
// 默认显示今天
|
||||
getdatatime() { // 默认显示今天
|
||||
var date = new Date()
|
||||
var seperator1 = '-'
|
||||
var year = date.getFullYear()
|
||||
var month = date.getMonth() + 1
|
||||
var strDate = date.getDate()
|
||||
if (month >= 1 && month <= 9) {
|
||||
month = '0' + month
|
||||
}
|
||||
if (strDate >= 0 && strDate <= 9) {
|
||||
strDate = '0' + strDate
|
||||
}
|
||||
var currentdate = year + seperator1 + month + seperator1 + strDate
|
||||
this.personalForm.createDate = currentdate
|
||||
},
|
||||
diffData(val) {
|
||||
console.log('val3', val)
|
||||
this.personalForm.sourceNumber = val.moveNumber
|
||||
|
@ -275,7 +324,9 @@ export default {
|
|||
this.personalForm = {
|
||||
createPersonId: this.$store.getters.userId,
|
||||
repositoryId: this.$store.getters.repositoryId,
|
||||
regionId: this.$store.getters.regionId
|
||||
regionId: this.$store.getters.regionId,
|
||||
createDate: null
|
||||
|
||||
}
|
||||
this.handlePersonId = ''
|
||||
this.handleRepositryId = ''
|
||||
|
|
|
@ -44,6 +44,18 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('inventoryAlarm.createTime')" prop="createDate" style="width: 100%;">
|
||||
|
||||
<el-date-picker
|
||||
v-model="personalForm.createDate"
|
||||
:picker-options="pickerOptions2"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="margin-left: 18px;width: 200px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
|
@ -151,7 +163,24 @@ export default {
|
|||
callback()
|
||||
}
|
||||
}
|
||||
|
||||
const validatePass4 = (rule, value, callback) => {
|
||||
if (this.personalForm.createDate === undefined || this.personalForm.createDate === null || this.personalForm.createDate === '') {
|
||||
callback(new Error('please select createDate'))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
},
|
||||
diffcontrol: false,
|
||||
|
||||
// 弹窗组件的控制
|
||||
|
@ -176,6 +205,9 @@ export default {
|
|||
],
|
||||
sourceType: [
|
||||
{ required: true, message: 'please select sourceType', trigger: 'blur' }
|
||||
],
|
||||
createDate: [
|
||||
{ required: true, validator: validatePass4, trigger: 'change' }
|
||||
]
|
||||
},
|
||||
customercontrol: false,
|
||||
|
|
|
@ -3019,7 +3019,8 @@ export default {
|
|||
})
|
||||
const battery1 = needbatterycategorys[0].productClassfyVos
|
||||
const battery2 = needbatterycategorys[1].productClassfyVos
|
||||
const batterycategorys = [...battery1, ...battery2]
|
||||
const battery3 = needbatterycategorys[2].productClassfyVos
|
||||
const batterycategorys = [...battery1, ...battery2, ...battery3]
|
||||
const batterycategorysdetail = batterycategorys.map(item => {
|
||||
return item.id
|
||||
})
|
||||
|
|
|
@ -268,7 +268,8 @@ export default {
|
|||
console.log('res', res)
|
||||
const bttery1 = res.data.data.content[0].productClassfyVos
|
||||
const bttery2 = res.data.data.content[1].productClassfyVos
|
||||
this.batterylistdata = [...bttery1, ...bttery2]
|
||||
const bttery3 = res.data.data.content[2].productClassfyVos
|
||||
this.batterylistdata = [...bttery1, ...bttery2, ...bttery3]
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue