diff --git a/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js b/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js
deleted file mode 100644
index 1d84328a..00000000
--- a/src/api/WorkshopProcurement/PurchaseMaterialPreparationQuery.js
+++ /dev/null
@@ -1,14 +0,0 @@
-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
- }
- })
-}
diff --git a/src/utils/request.js b/src/utils/request.js
index 4d73841f..14923715 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,10 +23,10 @@ export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
-export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
-export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
+export const MESUploadFile = `http://192.168.0.110:8002/submit/MESUploadFile.ashx`
+export const MESDownloadFile = `http://192.168.0.110:8002/submit/MESDownloadFile.ashx`
const service = axios.create({
- baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
index c94526c6..a139c335 100644
--- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
+++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
@@ -27,6 +27,18 @@
查询
+
+ 图纸批量导入
+
{
this.suffix = data.data
+ console.log(this.suffix, 11111)
if (data.data.length > 0) {
if (this.operationType === '1') {
data.data.map(item => {
@@ -326,6 +348,40 @@ export default {
}
}
})
+ // } else {
+ // await request({
+ // url: '',
+ // method: 'post',
+ // data: {
+ // type: '3',
+ // name: `select * from ${this.tableName} where 是否启用 = 1 and num = ${value}`
+ // }
+ // }).then(data => {
+ // this.suffix = data.data
+ // if (data.data.length > 0) {
+ // if (this.operationType === '1') {
+ // data.data.map(item => {
+ // this.hadFile.push({
+ // url: `${MESDownloadFile}?id=${item.uid}.${item.suffix}&name=${item.name}.${item.suffix}`,
+ // name: `${item.name}.${item.suffix}`,
+ // suffix: item.suffix,
+ // id: item.uid
+ // })
+ // })
+ // } else if (this.operationType === '0') {
+ // const server = `${MESDownloadFile}`.split('/')
+ // data.data.map(item => {
+ // this.hadFile.push({
+ // url: `http://${server[2]}/webpage/part/${item.uid}.${item.suffix}`,
+ // name: `${item.name}.${item.suffix}`,
+ // suffix: item.suffix,
+ // id: item.uid
+ // })
+ // })
+ // }
+ // }
+ // })
+ // }
}
},
async deleteFileData(id) {
diff --git a/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue b/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue
deleted file mode 100644
index b5fd26d4..00000000
--- a/src/views/WorkshopProcurement/PurchaseMaterialPreparationQuery/index.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
- 供应商
-
-
-
- 零件图号
-
- 备料
-
-
-
- 结算
-
-
-
- 删除
-
-
-
-
-
- 未到
- 已到
-
-
-
-
- {{ scope.row.物料名称 }}
-
-
-
-
- {{ scope.row.物料型号 }}
-
-
-
-
- {{ scope.row.物料规格 }}
-
-
-
-
- {{ scope.row.供货商 }}
-
-
-
-
- {{ scope.row.参考价格 }}
-
-
-
-
- {{ scope.row.当前库存量 }}
-
-
-
-
- {{ scope.row.到货件数 }}
-
-
-
-
- {{ scope.row.到货时间 }}
-
-
-
-
- {{ scope.row.结算 }}
-
-
-
-
- {{ scope.row.结算时间 }}
-
-
-
-
-
-
-
-
-
-
-
-
-