From f72cb16fa088bb88793fd4bc191eb9d258a35a2c Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 6 Feb 2020 12:01:50 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=AA=E6=94=B9=E4=BA=86=E4=BB=93?=
=?UTF-8?q?=E5=BA=93=E8=B4=A7=E4=BD=8D=E7=AE=A1=E7=90=86=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E6=A1=86=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Inventory/InventoryManagement/index.vue | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index b18e0f50..79c95e6f 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -421,14 +421,18 @@ export default {
// 编辑
handleEdit(index, row, formName) {
this.temp = 2
- this.dialogFormVisible = true
this.form.WarehouseNumber = row.仓库编号
this.form.WarehouseName = row.仓库名称
this.form.WarehouseDescription = row.仓库描述
this.form.Address = row.地址
- this.form.ContactpeopleValue = row.人员编号
+ if (this.role !== '15') {
+ this.form.ContactpeopleValue = this.Contactpeople[0].value
+ } else {
+ this.form.ContactpeopleValue = parseInt(row.人员编号)
+ }
this.form.Note = row.备注
this.HouseNumber = row.仓库流水号
+ this.dialogFormVisible = true
},
// 执行修改
chaEdit() {
From 72797e4b7038d9a20f6fb049d52c0cd904c84945 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 6 Feb 2020 12:23:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
=?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CreatePurchaseContract/index.vue | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 159e251a..06eefe6a 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -149,13 +149,13 @@
- {{ content }}
+
-
-
-
+
+
+
-
+
@@ -421,7 +421,7 @@ export default {
},
submitTotal() { // 确定合同总额
// this.$refs.tinymce.destroyTinymce()
- this.$refs.tinymce.initTinymce()
+ // this.$refs.tinymce.initTinymce()
document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
@@ -778,7 +778,7 @@ export default {
document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
- this.$refs.tinymce.initTinymce()
+ // this.$refs.tinymce.initTinymce()
setTimeout(() => {
this.$refs.tinymce.setContent(this.contentNew)
}, 1000)
From b284fd5cef054469f737f4f24611b300522e30d2 Mon Sep 17 00:00:00 2001
From: "liulujia@meswork.com"
Date: Thu, 6 Feb 2020 14:39:55 +0800
Subject: [PATCH 3/5] 20200206LLJV1
---
.../SparePartsOutStockRecord/index.vue | 3 ++-
.../CreatingPurchasingMaterials/index.vue | 10 +++++++++-
.../NewArrivalList/index.vue | 13 ++++++++-----
.../OutsourcingMaterialsInvoice/index.vue | 18 +++++++++---------
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 63e5c46a..2f7b7a27 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -127,12 +127,13 @@ export default {
} else {
this.ordername = ''
}
- console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
+ console.log(this.ordername, 9990999, this.order)
+
this.selecttable()
},
initProject() {
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 454bd399..b1370518 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -228,7 +228,7 @@
-
+
@@ -610,6 +610,14 @@ export default {
this.form2.计划完成日期 = ''
this.dialogVisible2 = true
},
+ closedialog() {
+ this.form2.采购计划流水号 = ''
+ this.form2.采购单名称 = ''
+ this.form2.supplierNameValue = ''
+ this.form2.计划完成日期 = ''
+ this.form2.供应商名称 = ''
+ this.form2.计划完成日期 = ''
+ },
submitAddPurchaseOrder() { // 新建采购单
this.$refs['form2'].validate((valid) => {
if (valid) {
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index eede78fb..46cdd120 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -36,7 +36,7 @@
未结算
-
+
{{ scope.row.供应商名称 }}
@@ -46,12 +46,12 @@
{{ scope.row.日期.split(' ')[0] }}
-
+
{{ scope.row.到货单编号 }}
-
+
到货明细
删除
@@ -550,11 +550,11 @@ export default {
planTypes: [
{
value: 0,
- label: '采购计划'
+ label: '备料采购计划'
},
{
value: 1,
- label: '离线采购计划'
+ label: '备料（离线）采购计划'
}
],
arrest: [],
@@ -761,6 +761,9 @@ export default {
} else {
sums[index] = 'N/A'
}
+ } else if (index === 3) {
+ sums[index] = 'KG'
+ return
} else if (index === 4) {
sums[index] = '总金额：'
return
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 49d42f0f..8592ba4f 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -121,7 +121,7 @@
:disabled="Number(scope.row.是否请款)===1"
type="text"
size="mini"
- icon="el-icon-delete"
+ icon="el-icon-right"
style="margin-left: 20px"
@click="deleteTable1(scope.row)"/>
@@ -142,7 +142,7 @@
-