diff --git a/supervise-customer-ui/.env.development b/supervise-customer-ui/.env.development
index 75976752..96a7c40f 100644
--- a/supervise-customer-ui/.env.development
+++ b/supervise-customer-ui/.env.development
@@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api/service'
## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://8.130.39.13:8112"
-VUE_APP_URL = "http://192.168.3.173:8112"
+VUE_APP_URL = "http://127.0.0.1:8112"
diff --git a/supervise-customer-ui/.env.production b/supervise-customer-ui/.env.production
index c4d0fd79..811f3444 100644
--- a/supervise-customer-ui/.env.production
+++ b/supervise-customer-ui/.env.production
@@ -2,7 +2,7 @@
ENV = 'production'
# base api
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = '/api/service'
## 配置 正式接口地址
VUE_APP_URL = "http://120.46.131.15:8111"
diff --git a/supervise-customer-ui/package.json b/supervise-customer-ui/package.json
index 99af34b3..b7226334 100644
--- a/supervise-customer-ui/package.json
+++ b/supervise-customer-ui/package.json
@@ -17,7 +17,7 @@
"axios": "^0.24.0",
"bpmn-js": "^9.2.2",
"core-js": "^2.6.12",
- "echarts": "^5.4.1",
+ "echarts": "^5.4.2",
"ejs": "^2.7.4",
"element-ui": "2.13.2",
"js-cookie": "2.2.0",
diff --git a/supervise-customer-ui/src/api/supervise/purchaserequisition.js b/supervise-customer-ui/src/api/supervise/purchaserequisition.js
index 130dad8d..4a16785a 100644
--- a/supervise-customer-ui/src/api/supervise/purchaserequisition.js
+++ b/supervise-customer-ui/src/api/supervise/purchaserequisition.js
@@ -55,5 +55,19 @@ export default {
method: 'post',
data: params
})
+ },
+ // 检测供应商信息状态
+ checkSupplier: function(sid) {
+ return request({
+ baseURL:'/api/customer',
+ url: '/v1/purchaserequisition/checkSupplier/' + sid
+ })
+ },
+ // 检测供应商信息状态
+ updatePurchaseStateSucess: function(sid) {
+ return request({
+ baseURL:'/api/customer',
+ url: '/v1/purchaserequisition/updatePurchaseStateSucess/' + sid
+ })
}
}
diff --git a/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js b/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js
index 0107d253..83d7ec93 100644
--- a/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js
+++ b/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js
@@ -55,5 +55,19 @@ export default {
method: 'post',
data: params
})
+ },
+ // 通过mainsid查询订单内的商品列表
+ listByMainSid: function(sid) {
+ return request({
+ baseURL:'/api/customer',
+ url: '/v1/purchaserequisitionpro/listByMainSid/' + sid
+ })
+ },
+ // 通过mainsid检查商品状态
+ checkByMainSid: function(sid) {
+ return request({
+ baseURL:'/api/customer',
+ url: '/v1/purchaserequisitionpro/checkByMainSid/' + sid
+ })
}
}
diff --git a/supervise-customer-ui/src/router/modules/codemenu.js b/supervise-customer-ui/src/router/modules/codemenu.js
index fd8a2b1f..c715b7ae 100644
--- a/supervise-customer-ui/src/router/modules/codemenu.js
+++ b/supervise-customer-ui/src/router/modules/codemenu.js
@@ -302,5 +302,21 @@ const codemenu = [{
noCache: true
}
}, ]
+}, {
+ path: '/purchaserequisition',
+ component: Layout,
+ redirect: '/purchaserequisition/uploadxlsx',
+ meta: {
+ title: '采购订单管理'
+ },
+ children: [{
+ path: '/purchaserequisition/uploadxlsx',
+ component: () => import('@/views/purchaserequisition/uploadxlsx/index.vue'),
+ name: 'purchaserequisitionUploadxlsx',
+ meta: {
+ title: '上传采购订单',
+ noCache: true
+ }
+ }]
}]
export default codemenu
diff --git a/supervise-customer-ui/src/views/kucun/xssjgl/index.vue b/supervise-customer-ui/src/views/kucun/xssjgl/index.vue
index 1b636101..29c2ce4e 100644
--- a/supervise-customer-ui/src/views/kucun/xssjgl/index.vue
+++ b/supervise-customer-ui/src/views/kucun/xssjgl/index.vue
@@ -81,7 +81,8 @@
共导入数据：{{ currentLog.allNum }} 条；符合监管条件的数据：{{ currentLog.validNum }} 条；用时：{{ currentLog.durations }} 毫秒。
- 下载销售报表文件
+ 下载销售报表文件
+ 下载烟草分销数据文件
@@ -250,7 +251,11 @@ export default {
},
doDownloadHz() {
window.open(this.currentLog.fileUrl, '_blank')
- this.dialogClose()
+ // this.dialogClose()
+ },
+ doDownloadHzYc() {
+ window.open(this.currentLog.remarks, '_blank')
+ // this.dialogClose()
},
downExcel(row) {
if (row.fileUrl) {
diff --git a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
index 6808567d..223ecc31 100644
--- a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
+++ b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue
@@ -6,6 +6,23 @@
{{ viewTitle }}
+
下载Excel示例表样
+
+
+ 上传采购订单excel文件
+
+
关闭
-
-
- 采购订单excel文件上传
- 下载Excel示例表样
-
-
-
-
-
- 选取文件
- 上传到服务器
-
-
-
-
- 上传采购订单的Excel文件，文件名以订单号开头，类似《90002303240037石家庄朋硕家居用品有限公司.xls》。
-
-
-
+
-
+
- 订单编号
-
+ 订单编号
+
{{ formobj.code }}
- 填单人
-
+ 填单人
+
{{ formobj.buyerName }}
+ 填单时间
+
+
+ {{ formobj.purchaseDate }}
+
+
- 供货单位
-
+ 供货单位
+
{{ formobj.supplierName }}
- 仓位
-
+ 仓位
+
{{ formobj.warehousePosition }}
+ 到货日期
+
+
+ {{ formobj.arrivalDate }}
+
+
- 采购员
-
+ 采购员
+
{{ formobj.buyerName }}
- 入库单位
-
+ 入库单位
+
{{ formobj.purchasingDeptName }}
-
-
- 要货单位
-
+ 单据到效期
+
- {{ formobj.purchasingDeptName }}
-
-
- 入库仓位
-
-
- {{ formobj.warehousePosition }}
+ {{ formobj.expiryDate }}
- 填单日期
-
+ 要货单位
+
- {{ formobj.purchaseDate }}
-
-
- 到货日期
-
-
- {{ formobj.arrivalDate }}
+ {{ formobj.purchasingDeptName }}
-
-
- 单据到效期
-
+ 入库仓位
+
- {{ formobj.expiryDate }}
+ {{ formobj.warehousePosition }}
- 完成状态
-
+ 完成状态
+
{{ formobj.completionStatus }}
@@ -142,108 +124,17 @@
合计金额:{{ amountInTotal }}
- 供应商信息检测
+
{{ supplierCheckMsg }}
+
+
+
+
+
+
+
+
+
+
+
商品信息检测
重新检测
- 商品信息检测
+
{{ proCheckMsg }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+