diff --git a/src/utils/request.js b/src/utils/request.js
index 0965402e..25262f70 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -24,7 +24,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
- baseURL: `http://192.168.0.110:8005/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index 836fe674..5aea5212 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -30,6 +30,7 @@
:label="item.label"
:value="item.value"/>
+ 上传总图
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 2c0ba72c..6b5e21ce 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -127,21 +127,21 @@
-
+
-
+
-
+
+
+
+
+
+
-
-
-
-
-
@@ -156,7 +156,7 @@
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
-
+
{{ scope.row.物料零件编码 }}
@@ -199,7 +199,7 @@
-
+
物料移出采购计划
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index bb688095..c5ec62e6 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -41,11 +41,11 @@
{{ scope.row.备注 }}
-
+
- 添加到货明细
+ 添加到货明细
@@ -82,7 +82,6 @@
highlight-current-row
stripe
style="margin: 3px 0"
- height="200px"
size="mini"
@row-click="searchTable6">
@@ -111,11 +110,11 @@
{{ scope.row.金额 }}
-
+
- 关联备料材料
+ 关联备料材料
@@ -141,7 +140,6 @@
highlight-current-row
stripe
style="margin: 3px 0"
- height="300px"
size="mini">
@@ -168,9 +166,9 @@
{{ scope.row.成品尺寸 }}
-
+
-
+
@@ -193,11 +191,11 @@
{{ scope.row.备注 }}
-
+
-
+ 取消关联
@@ -540,9 +538,9 @@ export default {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
- return Number(prev) + Number(curr)
+ return parseInt((Number(prev) + Number(curr)) * 100) / 100
} else {
- return Number(prev)
+ return parseInt(Number(prev) * 100) / 100
}
}, 0)
sums[index]
@@ -558,9 +556,9 @@ export default {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
- return Number(prev) + Number(curr)
+ return parseInt((Number(prev) + Number(curr)) * 100) / 100
} else {
- return Number(prev)
+ return parseInt(Number(prev) * 100) / 100
}
}, 0)
sums[index] += ' 元'
@@ -581,8 +579,8 @@ export default {
})
},
save(index, row) {
- this.allWeight = row.批次数量 * row.单件重量
- this.ALLMoney = this.allWeight * this.单价
+ this.allWeight = parseInt(row.批次数量 * row.单件重量 * 100) / 100
+ this.ALLMoney = parseInt(this.allWeight * this.单价 * 100) / 100
saveWeight(row.采购计划明细流水号, row.单件重量, this.allWeight, this.ALLMoney).then(response => {
console.log(response)
if (response.data[0].result === '1') {
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index ee9fddc0..46fbeae6 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -97,18 +97,19 @@
{{ scope.row.备注 }}
-
+
-
+
关联到货单
-
+
-
+
@@ -292,6 +293,7 @@ export default {
},
created() {
this.fetchData()
+ this.searchTable1()
},
methods: {
fetchData() {