From 79b356d649009f3afdf3df1265ed782ee72d321b Mon Sep 17 00:00:00 2001
From: hedekun <200858424@qq.com>
Date: Sat, 8 Feb 2020 16:34:57 +0800
Subject: [PATCH] d
---
src/views/Assembly/MakeAssemblyPlan/index.vue | 36 +++++++++---
src/views/Assembly/MakeColdWorkPlan/index.vue | 16 ++++--
.../Assembly/MakeElectricalAssembly/index.vue | 16 ++++--
src/views/Assembly/MakePaintPlan/index.vue | 18 +++---
.../SparePartsOutStockRecord/index.vue | 2 +-
.../CreatePreparationBill/index.vue | 32 ++++++++---
.../MaterialArrival/index.vue | 5 +-
.../MaterialManagement/index.vue | 26 +++++++--
.../PurchaseMaterielModify/index.vue | 6 +-
.../CreatePackingList/index.vue | 31 +++++++---
.../ImportChangeParts/specificationData1.vue | 18 +++---
.../ImportParts/UploadExcel/index.vue | 2 +-
.../TechnologyCenter/ImportParts/index.vue | 20 ++++++-
.../ImportParts/specificationData.vue | 30 +++++-----
.../PartDrawingMaintenance/index.vue | 10 ++--
.../AccountingPrice/index.vue | 1 +
.../CreatingProcurementContracts/index.vue | 26 +++++++--
.../CreatingPurchasingMaterials/index.vue | 56 ++++++++++++-------
.../InvoiceSettlementApplication1/index.vue | 46 ++++++++++++---
.../NewArrivalList/index.vue | 34 ++++++++---
.../OfflineProcurement/index.vue | 50 +++++++++++------
.../OutsourcingMaterialsInvoice/index.vue | 32 ++++++++---
.../OutsourcingMaterialsSearch/index.vue | 10 ++--
.../ProcurementContractEnquiry/index.vue | 14 +++--
.../ProjectTotalSearch/index.vue | 5 +-
.../PurchaseContractRequestFund1/index.vue | 40 ++++++++++---
.../RequestOutsourcingMaterials/index.vue | 37 +++++++++---
.../manufacturingPurchaseArrival/index.vue | 21 ++++++-
28 files changed, 464 insertions(+), 176 deletions(-)
diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index 9a581314..b2961110 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -13,8 +13,8 @@
{{ item.name }}
- 增加装配计划
- 删除
+ 增加装配计划
+ 删除
@@ -34,7 +34,7 @@
-
+
{{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
{{ scope.row.机床图号 }}
-
+
{{ scope.row.机床名称 }}
@@ -97,9 +97,13 @@
- 确定
- 编辑
- 取消
+
+
+ 确定
+
+ 取消
+
+
@@ -284,3 +288,21 @@ export default {
+
+
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue
index 100f78cb..3caf25c4 100644
--- a/src/views/Assembly/MakeColdWorkPlan/index.vue
+++ b/src/views/Assembly/MakeColdWorkPlan/index.vue
@@ -13,8 +13,8 @@
{{ item.name }}
- 增加装配计划
- 删除
+ 增加装配计划
+ 删除
@@ -34,7 +34,7 @@
-
+
{{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
- 确定
- 编辑
- 取消
+
+
+ 确定
+
+ 取消
+
+
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue
index 24ac4fe2..41da2ca9 100644
--- a/src/views/Assembly/MakeElectricalAssembly/index.vue
+++ b/src/views/Assembly/MakeElectricalAssembly/index.vue
@@ -13,8 +13,8 @@
{{ item.name }}
- 增加装配计划
- 删除
+ 增加装配计划
+ 删除
@@ -34,7 +34,7 @@
-
+
{{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
- 确定
- 编辑
- 取消
+
+
+ 确定
+
+ 取消
+
+
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue
index 1c0bd113..6e37b7cc 100644
--- a/src/views/Assembly/MakePaintPlan/index.vue
+++ b/src/views/Assembly/MakePaintPlan/index.vue
@@ -13,8 +13,8 @@
{{ item.name }}
- 增加装配计划
- 删除
+ 增加装配计划
+ 删除
@@ -34,7 +34,7 @@
-
+
{{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
{{ scope.row.机床图号 }}
-
+
{{ scope.row.机床名称 }}
@@ -97,9 +97,13 @@
- 确定
- 编辑
- 取消
+
+
+ 确定
+
+ 取消
+
+
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 2f7b7a27..4385f57b 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -40,7 +40,7 @@
type="date"
placeholder="选择日期"/>
- 查询
+ 查询
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index ba2627e9..a0845a67 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -4,7 +4,7 @@
零件图号:
- 查询
+ 查询
查询全部
@@ -13,13 +13,13 @@
分配外购备料
- 分配自家备料
+ 分配自家备料
- 打印自家备料单
+ 打印自家备料单
- 导出
+ 导出
@@ -45,9 +45,9 @@
align="center"/>
- 自家
- 外购
- 未分配
+ 自家
+ 外购
+ 未分配
@@ -315,3 +315,21 @@ export default {
+
+
diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue
index d4dafd3d..e28940e3 100644
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -19,8 +19,8 @@
:value="item.value"/>
- 查询
- 完成
+ 查询
+ 完成
@@ -30,6 +30,7 @@
class="table"
highlight-current-row
border
+ stripe
height="750"
style="width: 100%"
@current-change="getCurrentRow">
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index e4b936b4..cce0a192 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -115,22 +115,23 @@
查询
- 新增
+ 新增
维护物料类别
- 新增供货商
+ 新增供货商
采购部新增物料审核
@@ -1024,3 +1025,20 @@ export default {
width:190px
}
+
diff --git a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
index 1afdf371..31d46ede 100644
--- a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
+++ b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
@@ -47,12 +47,14 @@
同意
不同意
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 3d0db642..f11d35ea 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -10,10 +10,10 @@
:value="item.value"/>
- 新增
+ 新增
- 导出
+ 导出
- 添加主机
+ 添加主机
- 添加备件
+ 添加备件
- 添加文件
+ 添加文件
@@ -1085,3 +1082,21 @@ span{
}
}
+
+
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 7b9fc65f..369eb38a 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -49,8 +49,8 @@
width="50"/>
- 不存在
- 存在
+ 不存在
+ 存在
@@ -58,7 +58,7 @@
{{ scope.row.图号或者型号 }}
-
+
{{ scope.row.名称 }}
@@ -137,8 +137,7 @@
size="mini"
highlight-current-row
height="150"
- border
- stripe>
+ border>
替换
@@ -784,9 +784,9 @@ export default {
.el-table .warning-row {
background: red;
}
- .rgb196{
- background: palevioletred !important;
- }
+ /*.rgb196{*/
+ /* background: palevioletred !important;*/
+ /*}*/
+
+
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 520c9ec6..bb1ce005 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -52,8 +52,8 @@
width="50"/>
- 不存在
- 存在
+ 不存在
+ 存在
@@ -66,7 +66,7 @@
{{ scope.row.名称 }}
-
+
{{ scope.row.材料或者规格 }}
@@ -76,32 +76,32 @@
{{ scope.row.规格 }}
-
+
{{ scope.row.备件数量 }}
-
+
{{ scope.row.装机数量 }}
-
+
{{ scope.row.部件数量 }}
-
+
{{ scope.row.制造商 }}
-
+
{{ scope.row.备注 }}
-
+
{{ scope.row.分类码 }}
@@ -142,8 +142,7 @@
size="mini"
height="530px"
highlight-current-row
- border
- stripe>
+ border>
{{ scope.row.物料名称 }}
@@ -168,7 +167,8 @@
替换
@@ -657,9 +657,9 @@ export default {
+
+
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index b1370518..0b5da0b1 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -4,7 +4,7 @@
- 查询
+ 查询
打回重新分配
@@ -82,22 +82,22 @@
- 查询
- 新增
+ 查询
+ 新增
- 选入
+ 选入
- 保存
+ 保存
- 编辑中
- 已保存
- 已到货
- 已结算
+ 编辑中
+ 已保存
+ 已到货
+ 已结算
@@ -130,22 +130,22 @@
- 导出
+ 导出
-
+
- 打印
+ 打印
- 编辑
+
- 删除
+
@@ -173,12 +173,12 @@
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
-
+
- 未到货
- 已到货
- 已结算
+ 未到货
+ 已到货
+ 已结算
@@ -220,7 +220,7 @@
- 移出
+ 移出
@@ -907,3 +907,21 @@ export default {
top: 5px;
}
+
+
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 78b9a42c..9acc2c18 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -3,13 +3,13 @@
发票号:
- 查询
- 创建
+ 查询
+ 创建
发票结算申请单
-
+
@@ -99,9 +99,17 @@
- 编辑
- 删除
- 提交申请
+
+
+
+
+
+
+
+
+
+
+ 提交申请
@@ -122,7 +130,7 @@
发票结算申请单明细
发票号:
- 追加入库记录
+ 追加入库记录
@@ -166,7 +174,11 @@
- 删除
+
+
+
+
+
@@ -753,3 +765,21 @@ export default {
margin: 0;
}
+
+
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 46cdd120..e0cfcb2c 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -23,8 +23,8 @@
range-separator="~"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
- 查询
- 新增到货单
+ 查询
+ 新增到货单
@@ -32,8 +32,8 @@
- 已结算
- 未结算
+ 已结算
+ 未结算
@@ -54,7 +54,7 @@
到货明细
- 删除
+
@@ -85,7 +85,7 @@
到货单明细
- 导出
+ 导出
@@ -203,7 +201,7 @@
- 取消关联
+
@@ -1261,3 +1259,21 @@ function saveAs(blob, filename = '下载文件.xls') {
color: black;
}
+
+
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index c81b7196..26c100cf 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -22,7 +22,7 @@
零件号:
- 查询
+ 查询
@@ -81,20 +81,20 @@
:label="item.label"
:value="item.value"/>
- 查询
- 创建采购计划单
+ 查询
+ 创建采购计划单
- 选入备料
+ 选入备料
- 未到货
- 已到货
- 已结算
+ 未到货
+ 已到货
+ 已结算
@@ -107,7 +107,7 @@
{{ scope.row.离线采购计划名称 }}
-
+
{{ scope.row.供应商名称 }}
@@ -121,17 +121,17 @@
- 打印单据
+ 打印单据
- 编辑
+
- 删除
+
@@ -150,12 +150,12 @@
-
+
- 未到货
- 已到货
- 已结算
+ 未到货
+ 已到货
+ 已结算
@@ -192,7 +192,7 @@
- 移出
+ 移出
@@ -670,3 +670,21 @@ export default {
margin: 0
}
+
+
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 8592ba4f..ca39e556 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -44,9 +44,9 @@
type="date"
placeholder="选择日期"/>
- 查询
+ 查询
- 新增到票
+ 新增到票
@@ -61,8 +61,8 @@
@row-click="searchTable02">
- 未请款
- 已请款
+ 未请款
+ 已请款
@@ -96,14 +96,13 @@
关联到货单
- 导出
+ 导出
@@ -645,4 +644,21 @@ function saveAs(blob, filename = '下载文件.xls') {
}
}
+
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index ba585e0b..d813d0d0 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -20,8 +20,8 @@
:label="item.label"
:value="item.value"/>
- 查询
- 导出
+ 查询
+ 导出
@@ -44,9 +44,9 @@
align="center"
width="80px">
- 未到
- 已到
- 已结
+ 未到
+ 已到
+ 已结
查询
@@ -40,6 +41,7 @@
:row-class-name="tableRowClassName"
size="mini"
border
+ stripe
style="width: 100%"
height="700px"
highlight-current-row
@@ -59,7 +61,7 @@
{{ scope.row.规定到货时间 }}
-
+
{{ scope.row.供应商名称 }}
@@ -91,8 +93,12 @@
- 打印
- 打回
+ 打印
+
+
+
+
+
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index a3a6022b..25bcce42 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -10,14 +10,15 @@
:value="item.value"/>
查询
-
+
{{ scope.row.项目名称 }}
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index 55a5fe76..dd81c81b 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -23,12 +23,13 @@
:value="item.value"/>
查询
- 新增请款
+ 新增请款
@@ -57,9 +58,9 @@
- 未审批
- 已通过
- 不通过
+ 未审批
+ 已通过
+ 不通过
@@ -69,9 +70,9 @@
- 未操作
- 已同意
- 不同意
+ 未操作
+ 已同意
+ 不同意
@@ -82,7 +83,11 @@
- 取消请款
+
+
+
+
+
@@ -437,3 +442,20 @@ export default {
margin-bottom: 5px;
}
+
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 0790b283..89a2cc18 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -19,14 +19,15 @@
查询
- 请款
+ 请款
@@ -89,9 +90,9 @@
- 未审批
- 已通过
- 不通过
+ 未审批
+ 已通过
+ 不通过
@@ -101,9 +102,9 @@
- 未操作
- 已同意
- 不同意
+ 未操作
+ 已同意
+ 不同意
@@ -135,7 +136,7 @@
-
@@ -213,4 +213,21 @@ export default {
margin-bottom: 5px;
}
+