diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js index 24fcfd06..9245b53a 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js @@ -150,4 +150,16 @@ export default { } }) }, + // 查询原料记录 + inventoryList: function(params) { + return request({ + url: '/cyf/rawinventory/inventoryList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeYuanliao/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeYuanliao/index.js new file mode 100644 index 00000000..36e540ff --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeYuanliao/index.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' +let tokens = window.sessionStorage.getItem('tokenValue') +export default { + + // 采购 + // 查询分页列表 + loadLogList: function(params) { + return request({ + url: '/cyf/materialProcurement/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + submit: function(params) { + return request({ + url: '/cyf/materialProcurement/submit', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + + // 新增 + save: function(data) { + return request({ + url: '/cyf/materialProcurement/save', + method: 'post', + data: data + }); + }, + + // 初始化 + procureFetchBySid: function(sid) { + return request({ + url: '/v1/warehouselocation/getWarehouseBySid/' + sid + }) + }, +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/index.vue index 136b7688..831b4b56 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/index.vue @@ -1,177 +1,156 @@ + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureAdd.vue index 2b6e0ba2..34202e78 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureAdd.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureAdd.vue @@ -1,121 +1,231 @@ - diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureInfo.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureInfo.vue index f0a5f29b..4305a65f 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureInfo.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureInfo.vue @@ -2,128 +2,93 @@
-
【查看】采购信息
+
采购信息
+ 提交 + 关闭
- +
采购信息
-
基本信息
+
主体信息
- 库房位置 + 合同编号 - {{temp.address}} - - - - - 省-市-县 - - - - - {{temp.province}} - {{temp.city}} - {{temp.county}} - - - - - - - 库房面积 - - - - - {{temp.squareMeasure}} - - - - - 库房层高 - - - - - {{temp.floorHeight}} - - - - - - - 库房价格 - - - - - {{temp.price}} - - - - - 库房性质 - - - - - {{temp.properties}} - - - - - - - 房源 - - - - - {{temp.housingResources}} + {{formobj.orderNumber}} + - 备注 + 合同日期 - {{temp.remarks}} + {{formobj.contractSigningDate}} + - 联系人 + 供货商名称 - {{temp.contacts}} + {{formobj.supplierName}} + - 联系电话 + 到货日期 - {{temp.telephone}} + {{formobj.arrivalDate}} + + + + + + + + + + + + + + + + +
@@ -133,34 +98,88 @@