diff --git a/supervise-enterprise-ui/.env.development b/supervise-enterprise-ui/.env.development index 7f387f4d..367aa4ca 100644 --- a/supervise-enterprise-ui/.env.development +++ b/supervise-enterprise-ui/.env.development @@ -2,8 +2,8 @@ ENV = 'development' # base api -VUE_APP_BASE_API = '/api/service' +VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://8.130.39.13:8112" -VUE_APP_URL = "http://192.168.1.193:8112" +VUE_APP_URL = "http://supervise.yxtsoft.com" diff --git a/supervise-enterprise-ui/src/api/Yjsq/index.js b/supervise-enterprise-ui/src/api/Yjsq/index.js new file mode 100644 index 00000000..9b079119 --- /dev/null +++ b/supervise-enterprise-ui/src/api/Yjsq/index.js @@ -0,0 +1,77 @@ +import request from '@/utils/request' +// 入库导入的记录 +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/enterprisecentre/v1/sealrecord/listPage', + method: 'post', + data: params + }) + }, + // 保存列表 + sealrecordSave: function(data) { + return request({ + url: '/enterprisecentre/v1/sealrecord/save', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 提交列表 + sealrecordSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/sealrecord/submit', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存列表 + sealrecordSave: function(data) { + return request({ + url: '/enterprisecentre/v1/sealrecord/save', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 根据SID获取一条记录 + fetchDetailsBySid: function(sid) { + return request({ + url: '/enterprisecentre/v1/sealrecord/fetchDetailsBySid/' + sid, + method: 'get', + }) + }, + // 根据SID获取一条记录 + delBySids: function(data) { + return request({ + url: '/enterprisecentre/v1/sealrecord/delBySids', + method: 'post', + data: data, + }) + }, + // 根据SID获取一条记录 + complete: function(data) { + return request({ + url: '/enterprisecentre/v1/sealrecord/complete', + method: 'post', + data: data, + }) + }, + // 根据SID获取一条记录 + upload: function(data) { + return request({ + url: '/enterprisecentre/v1/sealrecord/upload', + method: 'post', + data: data, + }) + }, +} diff --git a/supervise-enterprise-ui/src/api/portal/Upload.js b/supervise-enterprise-ui/src/api/portal/Upload.js index 0a5d1ebe..875d964c 100644 --- a/supervise-enterprise-ui/src/api/portal/Upload.js +++ b/supervise-enterprise-ui/src/api/portal/Upload.js @@ -4,7 +4,7 @@ import qs from 'qs' const base = process.env.VUE_APP_URL // 文件上传接口 -export const uploadFile = '/api/customer/file/upload' +export const uploadFile = 'http://supervise.yxtsoft.com/enterprisecentre/v1/sealrecord/upload' // export const uploadFile = process.env.VUE_APP_BASE_API + '/customer/file/upload' @@ -28,3 +28,11 @@ export function deleteFilesOss(data) { // headers: { 'Content-Type': 'multipart/form-data' } }) } +// 移除图片 +export function upload(data) { + return request({ + url: '/enterprisecentre/v1/sealrecord/upload', + method: 'post', + data:data, + }) +} \ No newline at end of file diff --git a/supervise-enterprise-ui/src/components/uploadFile/upload_picture.vue b/supervise-enterprise-ui/src/components/uploadFile/upload_picture.vue index fbdfe60f..29771376 100644 --- a/supervise-enterprise-ui/src/components/uploadFile/upload_picture.vue +++ b/supervise-enterprise-ui/src/components/uploadFile/upload_picture.vue @@ -54,6 +54,12 @@ export default { uploadData: { type: Object, default: {} + }, + MinetList: { + type: Array, + default: function () { + return [] + } } }, data() { diff --git a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue index 9b059661..7d08cc44 100644 --- a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue +++ b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue @@ -5,6 +5,7 @@
{{title}}
保存 + 提交 关闭
@@ -22,45 +23,42 @@ - - - + {{ projectName }} - 审批编号 + 申请日期 - + - + + - 申请人 + 审批编号 - - 用印人 + 申请人 - @@ -68,14 +66,13 @@ - 申请日期 + 用印人 - + - - + @@ -85,13 +82,25 @@ - + + + 使用日期 + + + + + + + + 用印文件名称 @@ -99,20 +108,29 @@ - + + 用印文件(附件) - + - + @@ -125,16 +143,14 @@ -
- - 公章 - 法人章 - 财务章 - 发票章 - 营业执照 - 开发许可证 - -
+ + + + + + + +
@@ -159,71 +175,77 @@ + + \ No newline at end of file diff --git a/supervise-enterprise-ui/src/views/Yjsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/index.vue index 1b79abcb..447db210 100644 --- a/supervise-enterprise-ui/src/views/Yjsq/index.vue +++ b/supervise-enterprise-ui/src/views/Yjsq/index.vue @@ -22,7 +22,7 @@
印鉴使用列表
- + @@ -30,36 +30,40 @@ 查看 - - - + + + + + +
-
- + \ No newline at end of file diff --git a/supervise-enterprise-ui/src/views/Yjsq/upluad.vue b/supervise-enterprise-ui/src/views/Yjsq/upluad.vue new file mode 100644 index 00000000..405b4dd1 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Yjsq/upluad.vue @@ -0,0 +1,233 @@ + + + + + + \ No newline at end of file diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue index f49bcd4c..10f8d38b 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue @@ -663,6 +663,7 @@ export default { } }, backDatas(value) { + console.log(value); const aa = [] if (value.length > 0 && value != null && value != undefined) { for (var i = 0; i < value.length; i++) { @@ -670,7 +671,7 @@ export default { } } this.form.pics = aa - + console.log(this.form.pics); }, backData(value) { this.form.picUrl = value[0].response.data