mirror of
https://github.com/shawncai/ERP.git
synced 2024-09-20 06:56:07 +08:00
feat(global):涵盖销售模块,分期模块,以及系统模块
feat(global):涵盖销售模块,分期模块,以及系统模块
This commit is contained in:
parent
1d71c3b657
commit
08b88075a7
|
@ -52,6 +52,11 @@
|
|||
<span>{{ scope.row.packageName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('installmentPayList.color')" :resizable="false" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Package.isEffective')" :resizable="false" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.isEffective | isEffectiveFilter }}</span>
|
||||
|
|
|
@ -188,7 +188,7 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('NewEmployeeInformation.regionids')" style="width: 100%;">
|
||||
<el-input v-model="chargeRegions" style="margin-left: 18px;width: 200px" @focus="treechoose"/>
|
||||
<el-input v-model="chargeRegions" style="margin-left: 18px;width: 200px" clearable @focus="treechoose" @clear="clearRegions"/>
|
||||
<my-tree :treecontrol.sync="treecontrol" :supp.sync="supp" @ids2="ids2" @ids="ids" @names="names"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
@ -409,6 +409,10 @@ export default {
|
|||
_that = this
|
||||
},
|
||||
methods: {
|
||||
clearRegions() {
|
||||
this.personalForm.chargeRegions = ''
|
||||
this.chargeRegions = ''
|
||||
},
|
||||
clearrepo() {
|
||||
this.personalForm.repositoryId = ''
|
||||
},
|
||||
|
|
|
@ -58,6 +58,11 @@
|
|||
<span>{{ scope.row.packageName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('installmentPayList.color')" :resizable="false" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Package.isEffective')" :resizable="false" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.isEffective | isEffectiveFilter }}</span>
|
||||
|
|
|
@ -279,7 +279,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
@ -1080,6 +1080,9 @@ export default {
|
|||
if (EnterDetail[i].thisMoney === null || EnterDetail[i].thisMoney === undefined) {
|
||||
EnterDetail[i].thisMoney = 0
|
||||
}
|
||||
if (EnterDetail[i].penalty === null || EnterDetail[i].penalty === undefined) {
|
||||
EnterDetail[i].penalty = 0
|
||||
}
|
||||
}
|
||||
|
||||
const parms2 = JSON.stringify(EnterDetail)
|
||||
|
@ -1136,7 +1139,11 @@ export default {
|
|||
if (EnterDetail[i].thisMoney === null || EnterDetail[i].thisMoney === undefined) {
|
||||
EnterDetail[i].thisMoney = 0
|
||||
}
|
||||
if (EnterDetail[i].penalty === null || EnterDetail[i].penalty === undefined) {
|
||||
EnterDetail[i].penalty = 0
|
||||
}
|
||||
}
|
||||
|
||||
console.log('EnterDetail', EnterDetail)
|
||||
const parms2 = JSON.stringify(EnterDetail)
|
||||
console.log('this.personalForm.couponSupports', this.personalForm.couponSupports)
|
||||
|
|
|
@ -95,6 +95,7 @@
|
|||
<el-form-item :label="$t('Receipt.receiptDate')" prop="payDate" style="width: 100%;">
|
||||
<el-date-picker
|
||||
v-model="personalForm.receiptDate"
|
||||
:picker-options="pickerOptions2"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="margin-left: 18px;width: 200px"/>
|
||||
|
@ -279,6 +280,14 @@ export default {
|
|||
}
|
||||
}
|
||||
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
|
||||
}
|
||||
},
|
||||
personalForm2: {
|
||||
couponSupports: [
|
||||
{
|
||||
|
@ -1073,6 +1082,7 @@ export default {
|
|||
if (this.personalForm.couponSupportOld === null || this.personalForm.couponSupportOld === '' || this.personalForm.couponSupportOld === undefined) {
|
||||
this.personalForm.couponSupportOld = 0
|
||||
}
|
||||
|
||||
if (this.personalForm.customerType === '1') {
|
||||
const EnterDetail = this.$refs.editable.getRecords()
|
||||
if (EnterDetail.length === 0) {
|
||||
|
@ -1083,6 +1093,14 @@ export default {
|
|||
})
|
||||
return false
|
||||
}
|
||||
for (const i in EnterDetail) {
|
||||
if (EnterDetail[i].thisMoney === null || EnterDetail[i].thisMoney === undefined) {
|
||||
EnterDetail[i].thisMoney = 0
|
||||
}
|
||||
if (EnterDetail[i].penalty === null || EnterDetail[i].penalty === undefined) {
|
||||
EnterDetail[i].penalty = 0
|
||||
}
|
||||
}
|
||||
const parms2 = JSON.stringify(EnterDetail)
|
||||
const Data = this.personalForm
|
||||
for (const key in Data) {
|
||||
|
@ -1134,6 +1152,14 @@ export default {
|
|||
})
|
||||
return false
|
||||
}
|
||||
for (const i in EnterDetail) {
|
||||
if (EnterDetail[i].thisMoney === null || EnterDetail[i].thisMoney === undefined) {
|
||||
EnterDetail[i].thisMoney = 0
|
||||
}
|
||||
if (EnterDetail[i].penalty === null || EnterDetail[i].penalty === undefined) {
|
||||
EnterDetail[i].penalty = 0
|
||||
}
|
||||
}
|
||||
const parms2 = JSON.stringify(EnterDetail)
|
||||
console.log('this.personalForm.couponSupports', this.personalForm2.couponSupports)
|
||||
let couponNumbers = ''
|
||||
|
|
|
@ -57,6 +57,11 @@
|
|||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('installmentPayList.color')" :resizable="false" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.color }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('Package.isEffective')" :resizable="false" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.isEffective | isEffectiveFilter }}</span>
|
||||
|
|
|
@ -766,7 +766,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
|
@ -665,7 +665,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
|
@ -617,7 +617,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
|
@ -812,7 +812,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
|
@ -798,7 +798,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
|
@ -741,7 +741,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
|
@ -153,7 +153,7 @@
|
|||
<div ref="fuzhu" class="form-name" >{{ $t('updates.cgddmx') }}</div>
|
||||
<div class="buttons" style="margin-top: 35px;margin-bottom: 10px;">
|
||||
<el-button :disabled="addpro" size="mini" @click="handleAddproduct">{{ $t('Hmodule.tjsp') }}</el-button>
|
||||
<my-detail :control.sync="control" :supp.sync="supp" @product="productdetail"/>
|
||||
<my-detail v-if="reflash" :control.sync="control" :supp.sync="supp" @product="productdetail"/>
|
||||
<el-button :disabled="addsouce" size="mini" style="width: 130px" @click="handleAddSouce">{{ $t('updates.cydzxz') }}</el-button>
|
||||
<my-apply :applycontrol.sync="applycontrol" @apply="apply" @allapplyinfo="allapplyinfo"/>
|
||||
<my-plan :plancontrol.sync="plancontrol" :supp.sync="supp" @plan="plan" @allPlaninfo="allPlaninfo"/>
|
||||
|
@ -421,6 +421,7 @@ export default {
|
|||
return time.getTime() < new Date().getTime() - 8.64e7
|
||||
}
|
||||
},
|
||||
reflash: false,
|
||||
repositorycontrol: false,
|
||||
stockRepositoryId: '',
|
||||
// 控制采购类型,采购部门是否可以编辑
|
||||
|
@ -1429,6 +1430,7 @@ export default {
|
|||
this.IsStockTypeId = false
|
||||
// 控制部门是否可以编辑
|
||||
this.IsDeptId = false
|
||||
this.reflash = false
|
||||
},
|
||||
// 深拷贝
|
||||
deepClone(obj) {
|
||||
|
@ -1438,6 +1440,7 @@ export default {
|
|||
},
|
||||
// 保存操作
|
||||
handlesave() {
|
||||
this.reflash = true
|
||||
this.$refs.personalForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs.editable.validate().then(valid => {
|
||||
|
|
|
@ -152,7 +152,7 @@
|
|||
<div ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">采购订货单明细</div>
|
||||
<div class="buttons" style="margin-top: 35px;margin-bottom: 10px;">
|
||||
<el-button :disabled="addpro" size="mini" @click="handleAddproduct">{{ $t('Hmodule.tjsp') }}</el-button>
|
||||
<my-detail :control.sync="control" :supp.sync="supp" @product="productdetail"/>
|
||||
<my-detail v-if="editVisible" :control.sync="control" :supp.sync="supp" @product="productdetail"/>
|
||||
<el-button :disabled="addsouce" style="width: 130px" @click="handleAddSouce">{{ $t('updates.cydzxz') }}</el-button>
|
||||
<my-apply :applycontrol.sync="applycontrol" @apply="apply" @allapplyinfo="allapplyinfo"/>
|
||||
<my-plan :plancontrol.sync="plancontrol" :supp.sync="supp" @plan="plan" @allPlaninfo="allPlaninfo"/>
|
||||
|
|
|
@ -282,7 +282,7 @@ export default {
|
|||
pickerOptions2: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
|
@ -222,7 +222,7 @@ export default {
|
|||
pickerOptions1: {
|
||||
disabledDate: (time) => {
|
||||
const _now = Date.now()
|
||||
const seven = 130 * 24 * 60 * 60 * 1000
|
||||
const seven = 60 * 24 * 60 * 60 * 1000
|
||||
const sevenDays = _now - seven
|
||||
return time.getTime() > _now || time.getTime() < sevenDays
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue