@@ -62,14 +62,14 @@
:dataSource="materialTable.dataSource"
:maxHeight="300"
:rowNumber="false"
- :rowSelection="true"
- :actionButton="true"
- :dragSort="true"
+ :rowSelection="rowCanEdit"
+ :actionButton="rowCanEdit"
+ :dragSort="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
-
+
扫码录入
@@ -80,7 +80,7 @@
收起扫码
-
+
@@ -229,6 +229,7 @@
operTimeStr: '',
prefixNo: 'XSCK',
fileList:[],
+ rowCanEdit: true,
model: {},
labelCol: {
xs: { span: 24 },
@@ -304,6 +305,8 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
+ this.rowCanEdit = true
+ this.materialTable.columns[1].type = FormTypes.popupJsh
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -388,68 +391,46 @@
this.$refs.linkBillList.show('其它', '销售订单', '客户', "1,3")
this.$refs.linkBillList.title = "选择销售订单"
},
- linkBillListOk(selectBillRows) {
+ linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, remark) {
+ this.rowCanEdit = false
+ this.materialTable.columns[1].type = FormTypes.normal
this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1)
- if(selectBillRows && selectBillRows.length>0) {
- let record = selectBillRows[0]
- this.$nextTick(() => {
- this.form.setFieldsValue({
- 'organId': record.organId,
- 'linkNumber': record.number,
- 'remark': record.remark,
- 'discount': record.discount
- })
- });
- // 加载子表数据
- let params = {
- headerId: record.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ if(selectBillDetailRows && selectBillDetailRows.length>0) {
+ let listEx = []
+ let allTaxLastMoney = 0
+ for(let j=0; j0) {
+ info.operNumber = info.preNumber - info.finishNumber
+ info.allPrice = info.operNumber * info.unitPrice-0
+ let taxRate = info.taxRate-0
+ info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
+ info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
+ }
+ allTaxLastMoney += info.taxLastMoney
+ listEx.push(info)
+ this.changeColumnShow(info)
+ }
+ this.materialTable.dataSource = listEx
+ ///给优惠后金额重新赋值
+ if(allTaxLastMoney) {
+ let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+ let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
+ this.$nextTick(() => {
+ this.form.setFieldsValue({
+ 'organId': organId,
+ 'linkNumber': linkNumber,
+ 'discount': discount,
+ 'discountMoney': discountMoney,
+ 'discountLastMoney': discountLastMoney,
+ 'changeAmount': discountLastMoney,
+ 'remark': remark
+ })
+ })
}
- this.requestSubTableDataEx(this.url.detailList, params, this.materialTable);
}
},
- /** 查询某个tab的数据,给明细里面的价税合计赋值 */
- requestSubTableDataEx(url, params, tab, success) {
- tab.loading = true
- getAction(url, params).then(res => {
- if(res && res.code === 200){
- let list = res.data.rows
- let listEx = []
- let allTaxLastMoney = 0
- for(let j=0; j0) {
- info.operNumber = info.preNumber - info.finishNumber
- info.allPrice = info.operNumber * info.unitPrice-0
- let taxRate = info.taxRate-0
- info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
- info.taxLastMoney = info.allPrice + info.taxMoney
- }
- allTaxLastMoney += info.taxLastMoney
- listEx.push(info)
- this.changeColumnShow(info)
- }
- tab.dataSource = listEx
- //给优惠后金额重新赋值
- if(allTaxLastMoney) {
- let discount = this.form.getFieldValue('discount')-0
- let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
- let discountLastMoney = allTaxLastMoney - discountMoney
- this.$nextTick(() => {
- this.form.setFieldsValue({
- 'discountMoney': discountMoney,
- 'discountLastMoney': discountLastMoney,
- 'changeAmount': discountLastMoney
- })
- });
- }
- typeof success === 'function' ? success(res) : ''
- }
- }).finally(() => {
- tab.loading = false
- })
- }
}
}
diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue
index 9b22e7b3..c3fc01cc 100644
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -37,6 +37,10 @@
（如果启用则单据支持负库存，批次商品除外）
+
+
+ （如果启用则根据销售订单来定制采购订单，进货后再发给客户）
+
@@ -68,6 +72,7 @@
depotFlagSwitch: false, //仓库权限状态
customerFlagSwitch: false, //客户权限状态
minusStockFlagSwitch: false, //负库存状态
+ purchaseBySaleFlagSwitch: false, //以销定购状态
isReadOnly: false,
labelCol: {
xs: { span: 24 },
@@ -110,6 +115,9 @@
onMinusStockChange(checked) {
this.model.minusStockFlag = checked?'1':'0'
},
+ onPurchaseBySaleChange(checked) {
+ this.model.purchaseBySaleFlag = checked?'1':'0'
+ },
init () {
let param = {
search: {"companyName":""},
@@ -124,7 +132,8 @@
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'companyName', 'companyContacts', 'companyAddress',
- 'companyTel', 'companyFax', 'companyPostCode', 'saleAgreement', 'depotFlag', 'customerFlag', 'minusStockFlag'))
+ 'companyTel', 'companyFax', 'companyPostCode', 'saleAgreement', 'depotFlag', 'customerFlag',
+ 'minusStockFlag', 'purchaseBySaleFlag'))
autoJumpNextInput('systemConfigModal')
});
if(record.id) {
@@ -137,6 +146,9 @@
if (record.minusStockFlag != null) {
this.minusStockFlagSwitch = record.minusStockFlag == '1' ? true : false;
}
+ if (record.purchaseBySaleFlag != null) {
+ this.purchaseBySaleFlagSwitch = record.purchaseBySaleFlag == '1' ? true : false;
+ }
}
} else {
this.$message.info(res.data);
@@ -174,6 +186,7 @@
this.depotFlagSwitch = false
this.customerFlagSwitch = false
this.minusStockFlagSwitch = false
+ this.purchaseBySaleFlagSwitch = false
}
}
}