Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 10 months ago
parent
commit
6d63cfdc39
  1. 7
      yxt-as-ui/src/api/purchase/procurement.js
  2. 111
      yxt-as-ui/src/views/purchase/procurement/procurement.vue
  3. 34
      yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
  4. 16
      yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
  5. 13
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
  6. 31
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
  7. 13
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue

7
yxt-as-ui/src/api/purchase/procurement.js

@ -25,6 +25,13 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
updateManuOrderNum: function(data) {
return request({
url: '/pms/v1/pmspurchasebill/updateManuOrderNum',
method: 'post',
params: data
})
},
deleteBySids: function(data) {
return request({
url: '/pms/v1/pmspurchasebill/delBySids',

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

@ -95,6 +95,7 @@
<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-column prop="manufacturersOrderNumber" label="厂家订单号" align="center" width="160" />
</el-table>
</div>
<!--End 主页面主要部分-->
@ -114,6 +115,47 @@
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
<!-- 维护订单编号 -->
<el-dialog center :visible.sync="dialogVisible" width="60%">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">采购单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">采购方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseReasonValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">厂家订单号</div>
<el-form-item prop="manufacturersOrderNumber"><el-input class="addinputInfo addinputw" v-model="formobj.manufacturersOrderNumber" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
@ -141,6 +183,19 @@ export default {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
dialogVisible: false,
formobj: {
sid: '',
manufacturersOrderNumber: '',
billNo: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: ''
},
rules: {
manufacturersOrderNumber: [{ required: true, message: '厂家订单号不能为空', trigger: 'blur' }]
},
btndisabled: false,
btnList: [
{
@ -157,6 +212,13 @@ export default {
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toMaintain',
btnLabel: '维护厂家订单号'
},
{
type: 'info',
size: 'small',
@ -171,6 +233,7 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
procurementType_list: [],
procurementReason_list: [],
paymentMethod_list: [],
@ -286,6 +349,9 @@ export default {
case 'doDel':
this.doDel()
break
case 'toMaintain':
this.toMaintain()
break
case 'doClose':
this.doClose()
break
@ -296,6 +362,7 @@ export default {
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
@ -397,6 +464,37 @@ export default {
}).catch(() => {
})
},
toMaintain() {
if (this.sids.length === 1) {
this.dialogVisible = true
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.formobj.sid = this.multipleSelection[0].sid
this.formobj.manufacturersOrderNumber = this.multipleSelection[0].manufacturersOrderNumber
this.formobj.billNo = this.multipleSelection[0].billNo
this.formobj.purchaseTypeValue = this.multipleSelection[0].purchaseTypeValue
this.formobj.purchaseReasonValue = this.multipleSelection[0].purchaseReasonValue
this.formobj.payTypeValue = this.multipleSelection[0].payTypeValue
this.formobj.supplierName = this.multipleSelection[0].supplierName
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
return
}
},
handleConfirm() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.updateManuOrderNum({ sid: this.formobj.sid, manufacturersOrderNumber: this.formobj.manufacturersOrderNumber }).then((resp) => {
if (resp.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
}
})
}
})
},
//
resetState() {
this.viewState = 1
@ -409,4 +507,17 @@ export default {
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
</style>

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

@ -98,6 +98,20 @@
<el-form-item><span class="addinputInfo">累计欠款金额()<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.purchaseTypeValue == '代理库'">
<el-col :span="16">
<div class="span-sty">厂家订单类型</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.manufacturersOrderTypeValue" placeholder="请选择" @change="manufacturersOrderTypeChange" clearable filterable>
<el-option v-for="item in manufacturersOrderType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">厂家订单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderNumber }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">备注</div>
@ -256,6 +270,7 @@ export default {
paymentMethod_list: [],
supplier_list: [],
warehouseType_list: [],
manufacturersOrderType_list: [],
account_list: [],
formobj: {
sid: '',
@ -300,6 +315,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
manufacturersOrderTypeValue: '',
manufacturersOrderTypeKey: '',
manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
@ -397,6 +415,11 @@ export default {
this.warehouseType_list = res.data
}
})
typeValues({ type: 'manufacturersOrderType' }).then((res) => {
if (res.success) {
this.manufacturersOrderType_list = res.data
}
})
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
@ -519,6 +542,14 @@ export default {
this.formobj.warehouseTypeKey = ''
}
},
manufacturersOrderTypeChange(value) {
const choose = this.manufacturersOrderType_list.filter((item) => item.dictKey === value)
if (choose !== null && choose.length > 0) {
this.formobj.manufacturersOrderTypeValue = choose[0].dictValue
} else {
this.formobj.manufacturersOrderTypeValue = ''
}
},
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)
@ -668,6 +699,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
manufacturersOrderTypeValue: '',
manufacturersOrderTypeKey: '',
manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',

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

@ -65,6 +65,16 @@
<el-form-item><span class="addinputInfo">累计欠款金额(){{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.purchaseTypeValue == '代理库'">
<el-col :span="16">
<div class="span-sty">厂家订单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">厂家订单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderNumber }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">备注</div>
@ -216,6 +226,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
manufacturersOrderTypeValue: '',
manufacturersOrderTypeKey: '',
manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
@ -336,6 +349,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
manufacturersOrderTypeValue: '',
manufacturersOrderTypeKey: '',
manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',

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

@ -68,6 +68,16 @@
<el-form-item><span class="addinputInfo">累计欠款金额(){{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.purchaseTypeValue == '代理库'">
<el-col :span="16">
<div class="span-sty">厂家订单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">厂家订单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderNumber }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">备注</div>
@ -258,6 +268,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
manufacturersOrderTypeValue: '',
manufacturersOrderTypeKey: '',
manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',

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

@ -97,6 +97,20 @@
<el-form-item><span class="addinputInfo">累计欠款金额()<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.purchaseTypeValue == '代理库'">
<el-col :span="16">
<div class="span-sty">厂家订单类型</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.manufacturersOrderTypeValue" placeholder="请选择" @change="manufacturersOrderTypeChange" clearable filterable>
<el-option v-for="item in manufacturersOrderType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">厂家订单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderNumber }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">备注</div>
@ -255,6 +269,7 @@ export default {
paymentMethod_list: [],
supplier_list: [],
warehouseType_list: [],
manufacturersOrderType_list: [],
account_list: [],
formobj: {
sid: '',
@ -299,6 +314,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
manufacturersOrderTypeValue: '',
manufacturersOrderTypeKey: '',
manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',
@ -413,6 +431,11 @@ export default {
this.warehouseType_list = res.data
}
})
typeValues({ type: 'manufacturersOrderType' }).then((res) => {
if (res.success) {
this.manufacturersOrderType_list = res.data
}
})
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
@ -510,6 +533,14 @@ export default {
this.formobj.warehouseTypeKey = ''
}
},
manufacturersOrderTypeChange(value) {
const choose = this.manufacturersOrderType_list.filter((item) => item.dictKey === value)
if (choose !== null && choose.length > 0) {
this.formobj.manufacturersOrderTypeValue = choose[0].dictValue
} else {
this.formobj.manufacturersOrderTypeValue = ''
}
},
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)

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

@ -65,6 +65,16 @@
<el-form-item><span class="addinputInfo">累计欠款金额(){{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.purchaseTypeValue == '代理库'">
<el-col :span="16">
<div class="span-sty">厂家订单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">厂家订单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturersOrderNumber }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">备注</div>
@ -216,6 +226,9 @@ export default {
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
manufacturersOrderTypeValue: '',
manufacturersOrderTypeKey: '',
manufacturersOrderNumber: '',
purchasePay: {
sid: '',
billSid: '',

Loading…
Cancel
Save