Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 10 months ago
parent
commit
d49a5434dd
  1. 6
      yxt-as-ui/src/views/purchase/procurement/procurement.vue
  2. 98
      yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
  3. 16
      yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
  4. 12
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
  5. 94
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
  6. 12
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue

6
yxt-as-ui/src/views/purchase/procurement/procurement.vue

@ -31,7 +31,7 @@
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="采购类型">
<el-form-item label="采购方式">
<el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
@ -88,11 +88,11 @@
<el-table-column prop="deptName" label="申请部门" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
<el-table-column prop="purchaseTypeValue" label="采购类型" align="center" width="100" />
<el-table-column prop="purchaseTypeValue" label="采购方式" align="center" width="100" />
<el-table-column prop="purchaseReasonValue" label="采购原因" align="center" width="100" />
<el-table-column prop="payTypeValue" label="付款方式" align="center" width="100" />
<el-table-column prop="supplierName" label="供应商" align="center" min-width="150" />
<el-table-column prop="isInvoicing" label="是否开票" align="center" width="100" />
<el-table-column prop="isInvoicing" label="是否开票" align="center" width="100" />
<el-table-column prop="amountCount" label="采购金额合计" align="center" width="140" />
<el-table-column prop="payableAmount" label="应付金额合计" align="center" width="140" />
</el-table>

98
yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@ -27,11 +27,16 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>采购类型</div>
<div class="span-sty"><span class="icon">*</span>采购方式</div>
<el-form-item prop="purchaseTypeValue">
<el-select class="addinputInfo" v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
<el-select v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 5px" v-model="formobj.operateBrandValue" placeholder="选择经营品牌" @change="operateBrandChange" clearable filterable>
<el-option v-for="item in operateBrand_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
@ -55,13 +60,18 @@
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商</div>
<el-form-item prop="supplierSid">
<el-select class="addinputInfo" v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<el-select v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 5px" v-model="formobj.warehouseTypeValue" placeholder="选择仓库类型" @change="warehouseTypeChange" clearable filterable>
<el-option v-for="item in warehouseType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>是否需要发票</div>
<div class="span-sty"><span class="icon">*</span>是否发票</div>
<el-form-item prop="purchaseBillInvoice.isInvoicing">
<el-radio-group class="addinputInfo" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<el-radio label="1"></el-radio>
@ -117,16 +127,12 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty"><span class="icon">*</span>验货后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
<div class="span-sty">验货后付货款</div>
<el-form-item><span class="addinputInfo">{{ calculateGoodsMoney }}</span></el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty"><span class="icon">*</span>审批通过后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
<div class="span-sty">审批通过后付货款</div>
<el-form-item><span class="addinputInfo">{{ calculateGoodsMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -245,9 +251,11 @@ export default {
index: 0,
accept: '.jpg,.jpeg,.png',
procurementType_list: [],
operateBrand_list: [],
procurementReason_list: [],
paymentMethod_list: [],
supplier_list: [],
warehouseType_list: [],
account_list: [],
formobj: {
sid: '',
@ -288,6 +296,10 @@ export default {
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',
@ -312,14 +324,13 @@ export default {
pmsPurchaseBillDetailList: []
},
rules: {
purchaseTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }],
purchaseTypeValue: [{ required: true, message: '采购方式不能为空', trigger: 'change' }],
purchaseReasonValue: [{ required: true, message: '采购原因不能为空', trigger: 'change' }],
payTypeValue: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
supplierSid: [{ required: true, message: '供应商不能为空', trigger: 'change' }],
'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否需要发票不能为空', trigger: 'change' }],
'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否发票不能为空', trigger: 'change' }],
'purchasePay.isFirstPay': [{ required: true, message: '是否先付货款不能为空', trigger: 'change' }],
'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }],
'purchasePay.goodsMoney': [{ required: true, message: '付货款不能为空', trigger: 'blur' }]
'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }]
}
}
},
@ -348,10 +359,25 @@ export default {
}
return cg
},
//
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
},
//
calculateGoodsMoney() {
let goodsMoney = '0'
if (this.formobj.payTypeValue === '单笔付款') {
if (this.formobj.purchasePay.isFirstPay === '1') {
// =
goodsMoney = this.yfTotal
} else if (this.formobj.purchasePay.isFirstPay === '0') {
// = -
goodsMoney = parseFloat(this.yfTotal) - parseFloat(this.formobj.purchasePay.deposit !== '' ? this.formobj.purchasePay.deposit : '0')
}
}
return goodsMoney
}
},
methods: {
@ -361,6 +387,16 @@ export default {
this.procurementType_list = res.data
}
})
typeValues({ type: 'operateBrand' }).then((res) => {
if (res.success) {
this.operateBrand_list = res.data
}
})
typeValues({ type: 'warehouseType' }).then((res) => {
if (res.success) {
this.warehouseType_list = res.data
}
})
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
@ -441,6 +477,14 @@ export default {
this.formobj.purchaseTypeKey = ''
}
},
operateBrandChange(value) {
const choose = this.operateBrand_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.operateBrandKey = choose[0].dictKey
} else {
this.formobj.operateBrandKey = ''
}
},
purchaseReasonChange(value) {
const choose = this.procurementReason_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
@ -467,6 +511,14 @@ export default {
this.account_list = []
}
},
warehouseTypeChange(value) {
const choose = this.warehouseType_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.warehouseTypeKey = choose[0].dictKey
} else {
this.formobj.warehouseTypeKey = ''
}
},
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)
@ -538,6 +590,7 @@ export default {
if (valid) {
this.submitdisabled = true
this.formobj.payableAmount = this.yfTotal
this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -556,6 +609,7 @@ export default {
if (valid) {
this.submitdisabled = true
this.formobj.payableAmount = this.yfTotal
this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
@ -610,6 +664,10 @@ export default {
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',

16
yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue

@ -25,8 +25,8 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}</span></el-form-item>
<div class="span-sty">采购方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}<span v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 20px">{{ formobj.operateBrandValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
@ -40,10 +40,10 @@
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}<span v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 20px">{{ formobj.warehouseTypeValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<div class="span-sty">是否发票</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -212,6 +212,10 @@ export default {
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',
@ -328,6 +332,10 @@ export default {
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',

12
yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue

@ -28,8 +28,8 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}</span></el-form-item>
<div class="span-sty">采购方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}<span v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 20px">{{ formobj.operateBrandValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
@ -43,10 +43,10 @@
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}<span v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 20px">{{ formobj.warehouseTypeValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<div class="span-sty">是否发票</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -254,6 +254,10 @@ export default {
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',

94
yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@ -26,11 +26,16 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>采购类型</div>
<div class="span-sty"><span class="icon">*</span>采购方式</div>
<el-form-item prop="purchaseTypeValue">
<el-select class="addinputInfo" v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
<el-select v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 5px" v-model="formobj.operateBrandValue" placeholder="选择经营品牌" @change="operateBrandChange" clearable filterable>
<el-option v-for="item in operateBrand_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
@ -54,13 +59,18 @@
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商</div>
<el-form-item prop="supplierSid">
<el-select class="addinputInfo" v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<el-select v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 5px" v-model="formobj.warehouseTypeValue" placeholder="选择仓库类型" @change="warehouseTypeChange" clearable filterable>
<el-option v-for="item in warehouseType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>是否需要发票</div>
<div class="span-sty"><span class="icon">*</span>是否发票</div>
<el-form-item prop="purchaseBillInvoice.isInvoicing">
<el-radio-group class="addinputInfo" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<el-radio label="1"></el-radio>
@ -116,16 +126,12 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty"><span class="icon">*</span>验货后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
<div class="span-sty">验货后付货款</div>
<el-form-item><span class="addinputInfo">{{ calculateGoodsMoney }}</span></el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty"><span class="icon">*</span>审批通过后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
<div class="span-sty">审批通过后付货款</div>
<el-form-item><span class="addinputInfo">{{ calculateGoodsMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -244,9 +250,11 @@ export default {
index: 0,
accept: '.jpg,.jpeg,.png',
procurementType_list: [],
operateBrand_list: [],
procurementReason_list: [],
paymentMethod_list: [],
supplier_list: [],
warehouseType_list: [],
account_list: [],
formobj: {
sid: '',
@ -287,6 +295,10 @@ export default {
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',
@ -311,14 +323,13 @@ export default {
pmsPurchaseBillDetailList: []
},
rules: {
purchaseTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }],
purchaseTypeValue: [{ required: true, message: '采购方式不能为空', trigger: 'change' }],
purchaseReasonValue: [{ required: true, message: '采购原因不能为空', trigger: 'change' }],
payTypeValue: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
supplierSid: [{ required: true, message: '供应商不能为空', trigger: 'change' }],
'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否需要发票不能为空', trigger: 'change' }],
'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否发票不能为空', trigger: 'change' }],
'purchasePay.isFirstPay': [{ required: true, message: '是否先付货款不能为空', trigger: 'change' }],
'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }],
'purchasePay.goodsMoney': [{ required: true, message: '付货款不能为空', trigger: 'blur' }]
'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }]
}
}
},
@ -364,10 +375,25 @@ export default {
}
return cg
},
//
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
},
//
calculateGoodsMoney() {
let goodsMoney = '0'
if (this.formobj.payTypeValue === '单笔付款') {
if (this.formobj.purchasePay.isFirstPay === '1') {
// =
goodsMoney = this.yfTotal
} else if (this.formobj.purchasePay.isFirstPay === '0') {
// = -
goodsMoney = parseFloat(this.yfTotal) - parseFloat(this.formobj.purchasePay.deposit !== '' ? this.formobj.purchasePay.deposit : '0')
}
}
return goodsMoney
}
},
methods: {
@ -377,6 +403,16 @@ export default {
this.procurementType_list = res.data
}
})
typeValues({ type: 'operateBrand' }).then((res) => {
if (res.success) {
this.operateBrand_list = res.data
}
})
typeValues({ type: 'warehouseType' }).then((res) => {
if (res.success) {
this.warehouseType_list = res.data
}
})
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
@ -432,6 +468,14 @@ export default {
this.formobj.purchaseTypeKey = ''
}
},
operateBrandChange(value) {
const choose = this.operateBrand_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.operateBrandKey = choose[0].dictKey
} else {
this.formobj.operateBrandKey = ''
}
},
purchaseReasonChange(value) {
const choose = this.procurementReason_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
@ -458,6 +502,14 @@ export default {
this.account_list = []
}
},
warehouseTypeChange(value) {
const choose = this.warehouseType_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.warehouseTypeKey = choose[0].dictKey
} else {
this.formobj.warehouseTypeKey = ''
}
},
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)
@ -529,6 +581,7 @@ export default {
if (valid) {
this.submitdisabled = true
this.formobj.payableAmount = this.yfTotal
this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -554,6 +607,7 @@ export default {
if (valid) {
this.submitdisabled = true
this.formobj.payableAmount = this.yfTotal
this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })

12
yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue

@ -25,8 +25,8 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}</span></el-form-item>
<div class="span-sty">采购方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}<span v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 20px">{{ formobj.operateBrandValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
@ -40,10 +40,10 @@
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}<span v-show="formobj.purchaseTypeValue == '代理库'" style="margin-left: 20px">{{ formobj.warehouseTypeValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<div class="span-sty">是否发票</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -212,6 +212,10 @@ export default {
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',

Loading…
Cancel
Save