diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index ea17dc07..0538d1d9 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -75,6 +75,18 @@ export function getExport2(num) {
}
})
}
+// 使用库存
+export function changeNum(num, num1, num2, num3, num4) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_离线采购_占用数量_插入',
+ param: `物料流水号=${num}&使用库存数=${num1}&机床流水号=${num2}&组件零件流水号=${num3}&数量=${num4}`
+ }
+ })
+}
// 查询分配后的标准件和外购件
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
return request({
diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
new file mode 100644
index 00000000..4f16735a
--- /dev/null
+++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询供应商
+export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_供应商_查询数据_根据条件',
+ param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
+ }
+ })
+}
+// 查询备料
+export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '备料管理_外购备料_综合查询数据',
+ param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 2cb92ad8..2954d36b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,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:8002/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index e966b67b..c1da8bed 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -174,12 +174,18 @@
- {{ scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
+ {{ Number(scope.row.零件类型) === 1 ? scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) : scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
-
+
- {{ Number(scope.row.货位存量) }}
+ {{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }}
+
+
+
+
+ -
+
@@ -1086,7 +1092,7 @@
+
+