-
+
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
@@ -612,13 +601,6 @@
-
-
-
-
-
-
-
-
离线合同 |
| GAOJING |
- 合同名称 |
- |
- 供应商 |
- |
- |
+ 合同名称 |
+ |
+ 供应商 |
+ |
+ |
- | 合同编号 |
- |
- 采购员 |
- |
+ 合同编号 |
+ |
+ 采购员 |
+ |
- | 序号 |
- 名称 |
- 规格 |
- 型号 |
- 数量 |
- 单价 |
- 合计 |
- 交货期 |
- 备注 |
+ 序号 |
+ 名称 |
+ 规格 |
+ 型号 |
+ 数量 |
+ 单价 |
+ 合计 |
+ 交货期 |
+ 备注 |
- | 总计 |
-
- |
- |
+ 总计 |
+
+
+
-
@@ -323,7 +306,7 @@ export default {
for (let i = 0; i < length; i++) {
tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData')
- tr[i].innerHTML = `
| | | | | | | | | `
+ tr[i].innerHTML = `
| | | | | | | | | `
$('#tablehead').after(tr[i])
}
let total = 0
@@ -344,10 +327,10 @@ export default {
document.getElementById('contractName').innerHTML = row.离线合同名称
document.getElementById('supplier').innerHTML = row.供应商名称
document.getElementById('buyer').innerHTML = row.采购员
- document.getElementById('total').innerHTML = total
- document.getElementById('remark').innerHTML = row.离线合同备注
+ document.getElementById('total').innerHTML = ''
+ document.getElementById('remark').innerHTML = total + ' 元'
$('#qrCode').html(`
![]()
`)
- this.useqrcode(row.离线合同流水号) // 显示二维码
+ this.useqrcode(row.离线合同编号) // 显示二维码
},
useqrcode(contractNum) { // 二维码
const opts = {
diff --git a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue b/src/views/PurchasingCenter/OfflinePartsQuery/index.vue
index 207b5559..8b1cf674 100644
--- a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue
+++ b/src/views/PurchasingCenter/OfflinePartsQuery/index.vue
@@ -11,8 +11,7 @@
-
-
+
{{ scope.row.名称 }}
@@ -47,27 +46,22 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
-
-
- {{ scope.row.到货金额 }}
-
-
{{ scope.row.离线合同编号 }}
-
+
{{ scope.row.供应商名称 }}
-
+
{{ scope.row.采购员 }}
-
+
{{ scope.row.创建日期 }}
From 8a26539530adc3dcfcf3ee8359d235f38a391e7d Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 7 May 2020 10:39:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PurchasingCenter/SupplierManagement.js | 8 +-
.../SupplierManagement/index.vue | 93 ++++---------------
2 files changed, 20 insertions(+), 81 deletions(-)
diff --git a/src/api/PurchasingCenter/SupplierManagement.js b/src/api/PurchasingCenter/SupplierManagement.js
index e2d4d17c..95c860a3 100644
--- a/src/api/PurchasingCenter/SupplierManagement.js
+++ b/src/api/PurchasingCenter/SupplierManagement.js
@@ -17,7 +17,7 @@ export function searchData(check1, supplierName, check2, businessNature, check3,
})
}
// 增加新的数据
-export function addTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, telephone, fax, deliveryPeriod) {
+export function addTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, telephone, fax, deliveryPeriod, personNumber, Name) {
return request({
url: '',
method: 'post',
@@ -26,12 +26,12 @@ export function addTable(supplierName, businessNature, creationDate, registeredC
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_供应商_增加数据',
- param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&电话号码=' + telephone + '&传真=' + fax + '&货期=' + deliveryPeriod + '&output1=1=int=output'
+ param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&电话号码=' + telephone + '&传真=' + fax + '&货期=' + deliveryPeriod + '&编辑人=' + personNumber + '&编辑人姓名=' + Name + '&output1=1=int=output'
}
})
}
-export function editTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, supplierSerialNumber, fax, deliveryPeriod, telephone) {
+export function editTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, supplierSerialNumber, fax, deliveryPeriod, telephone, personNumber, Name) {
return request({
url: '',
method: 'post',
@@ -40,7 +40,7 @@ export function editTable(supplierName, businessNature, creationDate, registered
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_供应商_修改数据',
- param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&供应商流水号=' + supplierSerialNumber + '&传真=' + fax + '&货期=' + deliveryPeriod + '&电话号码=' + telephone
+ param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&供应商流水号=' + supplierSerialNumber + '&传真=' + fax + '&货期=' + deliveryPeriod + '&电话号码=' + telephone + '&编辑人=' + personNumber + '&编辑人姓名=' + Name
}
})
}
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index ea82e57e..2fdc7622 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -4,67 +4,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
供应商
@@ -72,16 +14,20 @@
-
{{ scope.row.供应商名称 }}
-
+
- {{ scope.row.主要产品 }}
+ {{ scope.row.编辑时间 }}
+
+
+
+
+ {{ scope.row.编辑人姓名 }}
@@ -129,11 +75,6 @@
{{ scope.row.注册资本 }}
-
-
- {{ scope.row.货期 }}
-
-
@@ -204,15 +145,6 @@
-
-
-
-
-
-
-
-
-
import { searchData, addTable, editTable, deleteData, getName, addPerson, editPerson, deletePerson } from '@/api/PurchasingCenter/SupplierManagement'
+import { mapGetters } from 'vuex'
export default {
data() {
@@ -417,6 +350,12 @@ export default {
}
}
},
+ computed: {
+ ...mapGetters([
+ 'name',
+ 'id'
+ ])
+ },
mounted() {
this.fetchData()
},
@@ -469,7 +408,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitAdd_disable = true
- addTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.form.电话号码, this.form.传真, this.form.货期).then(response => {
+ addTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.form.电话号码, this.form.传真, this.form.货期, this.id, this.name).then(response => {
if (Number(response.data.output[0].output1) === 0) {
this.$message.warning('该供应商已存在')
} else if (response.data.result[0].result === '1') {
@@ -511,7 +450,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleEdit_disable = true
- editTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.supplierSerialNumber, this.form.传真, this.form.货期, this.form.电话号码).then(response => {
+ editTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.supplierSerialNumber, this.form.传真, this.form.货期, this.form.电话号码, this.id, this.name).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false
From a4884b8aa5af8fdbdd7b6e1a5216db40cbc8cc8a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 7 May 2020 10:54:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PurchasingCenter/BacklogGoodsAnalysis/index.vue | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
index a3496ec8..e40a22e8 100644
--- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
@@ -65,6 +65,11 @@
{{ scope.row.组号 }}
+
+
+ {{ scope.row.入库时间2 }}
+
+
转为滞货
@@ -101,9 +106,9 @@
{{ scope.row.物料规格 }}
-
+
- {{ scope.row.仓库名称 }}
+ {{ scope.row.转滞货时间 }}
@@ -200,7 +205,7 @@ export default {
this.searchTable1()
},
turnToBacklogGoods(row) {
- this.number = 0
+ this.number = row.可转滞货数量
this.turnToBacklogGoods_diaable = false
this.maxNumber = row.可转滞货数量
this.materialNum = row.物料流水号