diff --git a/supervise-enterprise-ui/src/views/NewList/needMoney.vue b/supervise-enterprise-ui/src/views/NewList/needMoney.vue index 39b4a932..3ebb07b0 100644 --- a/supervise-enterprise-ui/src/views/NewList/needMoney.vue +++ b/supervise-enterprise-ui/src/views/NewList/needMoney.vue @@ -34,7 +34,12 @@
- 用款金额{{"\xa0\xa0\xa0"}} + 用款金额{{"\xa0\xa0\xa0"}} + +
+
+ 回款凭证{{"\xa0\xa0\xa0"}} +
注:客户发起发起申请，首先监管审核，再银行审核通过后，客户在审核结果表里打印纸质申请表盖章并提交给监管、银行各一份。 @@ -103,6 +108,9 @@ export default { } }, + AllList(){ + console.log(66); + }, doClose() { this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) @@ -143,4 +151,15 @@ export default { display: flex; justify-content: space-between; } + .all{ + width: 100px; + height: 25px; + font-size: 14px; + background-color: #fff; + border: 1px solid #71717186; + border-radius: 8px; + } + .all:hover{ + border: 1px solid #717171 + } diff --git a/supervise-organizational-ui/.env.development b/supervise-organizational-ui/.env.development index 01c78fbe..d08634fb 100644 --- a/supervise-organizational-ui/.env.development +++ b/supervise-organizational-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://192.168.3.173:8112" +VUE_APP_URL = "http://192.168.1.193:8112" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/supervise-organizational-ui/src/api/system/departments/departments.js b/supervise-organizational-ui/src/api/system/departments/departments.js index bc377a68..9184e33f 100644 --- a/supervise-organizational-ui/src/api/system/departments/departments.js +++ b/supervise-organizational-ui/src/api/system/departments/departments.js @@ -123,3 +123,14 @@ export function getQrCode(data) { } }) } +// 查看二维码 +export function loginDetails() { + return request({ + baseURL: '/api', + url: '/portal/v1/sysuser/loginDetails', + method: 'post', + headers: { + 'Content-Type': 'application/json' + } + }) +} diff --git a/supervise-organizational-ui/src/layout/components/Sidebar/index.vue b/supervise-organizational-ui/src/layout/components/Sidebar/index.vue index 5dbacda4..924e0b0c 100644 --- a/supervise-organizational-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-organizational-ui/src/layout/components/Sidebar/index.vue @@ -77,12 +77,12 @@ methods: { // 获取用户信息 postHuoquyonghu() { - var token = getStorage() - loginDetails(token).then((response) => { - console.log('resss', response) - if (response.code === '200') { - this.YongHuid = response.data - this.params.userSid = this.YongHuid.sid + // var token = getStorage() + // loginDetails(token).then((response) => { + // console.log('resss', response) + // if (response.code === '200') { + // this.YongHuid = response.data + // this.params.userSid = this.YongHuid.sid getrolemenus(this.params).then((res) => { const userRoles = this.resRouter(res.data) userRoles.push({ @@ -92,8 +92,8 @@ }) return userRoles }) - } - }) + // } + // }) }, resRouter(menus) { // 递归，将后台传来数组 diff --git a/supervise-organizational-ui/src/main.js b/supervise-organizational-ui/src/main.js index 61b8dbca..868034f3 100644 --- a/supervise-organizational-ui/src/main.js +++ b/supervise-organizational-ui/src/main.js @@ -23,12 +23,12 @@ Vue.use(ElementUI) // import '@/permission' //权限控制 -Vue.prototype.$userInfo = null // 用户信息 +Vue.prototype.$ = null // 用户信息 Vue.component('Pagination', Pagination) Vue.component('tab-search', tabsearch) Vue.component('eimage', eimage) Vue.prototype.moment = moment -Vue.filter('dateFormat', function(dateStr, pattern = 'YYYY-MM-DD') { +Vue.filter('dateFormat', function (dateStr, pattern = 'YYYY-MM-DD') { return moment(dateStr).format(pattern) }) Vue.use(Print) // 注册 diff --git a/supervise-organizational-ui/src/store/getters.js b/supervise-organizational-ui/src/store/getters.js index eb3a1200..ad61bd62 100644 --- a/supervise-organizational-ui/src/store/getters.js +++ b/supervise-organizational-ui/src/store/getters.js @@ -1,4 +1,4 @@ const getters = { - orgSid: state => state.user.orgSid + orgSid: state => state.user } export default getters diff --git a/supervise-organizational-ui/src/views/organizational/zzgl.vue b/supervise-organizational-ui/src/views/organizational/zzgl.vue index 0ae852ea..f5438e1e 100644 --- a/supervise-organizational-ui/src/views/organizational/zzgl.vue +++ b/supervise-organizational-ui/src/views/organizational/zzgl.vue @@ -290,10 +290,12 @@ import { pageList, postOrgtree, putOrgtree, - selectBySid + selectBySid, + loginDetails } from '@/api/system/departments/departments.js' import { typeValues } from '@/api/system/roleAdminister/index' import Position from '@/components/amap/amap.vue' +import store from '@/store' export default { components: { Position }, @@ -363,6 +365,7 @@ export default { mounted() { this.getOrgTree() this.init() + window.sessionStorage.setItem('userSid', "427a2fb0-60c5-409f-bea4-4eb441041ae6"); }, methods: { init() { @@ -408,8 +411,10 @@ export default { this.getPageList(this.page) }, handleNodeClick(data) { + // console.log(this.$store.getters); + var datas = sessionStorage.getItem('userSid'); this.isshow = 'table' - this.page.params.organizationSid = this.$store.getters.userInfo.orgSid + this.page.params.organizationSid = datas this.page.params.psid = data.sid || 0 this.getPageList(this.page) @@ -433,7 +438,7 @@ export default { this.form.fgStaffName = '' this.form.fgStaffSid = '' } - this.form.organizationSid = this.$store.getters.userInfo.orgSid + this.form.organizationSid = this.page.params.organizationSid // this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join() if (this.form.sid) { // console.log(this.form) @@ -469,7 +474,7 @@ export default { this.fgStaffSid = [] this.form = Object.assign({}, this.formBackup) this.form.psid = data.sid || 0 - this.form.organizationSid = this.$store.getters.userInfo.orgSid + this.form.organizationSid = this.page.params.organizationSid this.form.address = data.orgAddress || data.address this.form.dlxx = data.gisInfo || data.dlxx this.getStaff(data.sid) diff --git a/warehousing-system/project_web_ui/src/layout/components/Sidebar/index.vue b/warehousing-system/project_web_ui/src/layout/components/Sidebar/index.vue index 36d518dd..8c373b76 100644 --- a/warehousing-system/project_web_ui/src/layout/components/Sidebar/index.vue +++ b/warehousing-system/project_web_ui/src/layout/components/Sidebar/index.vue @@ -160,59 +160,59 @@ ] }, - { - alwaysShow: true, - component: "storehouseManage", - meta: { - icon: "el-icon-menu", - title: "库内管理", - }, - name: "/storehouseManage", - path: "/storehouseManage", - children: [ - { - alwaysShow: true, - component: "shelves", - meta: { - icon: "el-icon-help", - title: "上架", - }, - name: "/storehouseManage/shelves", - path: "/storehouseManage/shelves", - }, - { - alwaysShow: true, - component: "shelvesManage", - meta: { - icon: "el-icon-help", - title: "上架管理", - }, - name: "/storehouseManage/shelvesManage", - path: "/storehouseManage/shelvesManage", - }, - { - alwaysShow: true, - component: "remove", - meta: { - icon: "el-icon-help", - title: "移库", - }, - name: "/storehouseManage/remove", - path: "/storehouseManage/remove", - }, - { - alwaysShow: true, - component: "removeManagement", - meta: { - icon: "el-icon-help", - title: "移库管理", - }, - name: "/storehouseManage/removeManagement", - path: "/storehouseManage/removeManagement", - }, - ] + // { + // alwaysShow: true, + // component: "storehouseManage", + // meta: { + // icon: "el-icon-menu", + // title: "库内管理", + // }, + // name: "/storehouseManage", + // path: "/storehouseManage", + // children: [ + // { + // alwaysShow: true, + // component: "shelves", + // meta: { + // icon: "el-icon-help", + // title: "上架", + // }, + // name: "/storehouseManage/shelves", + // path: "/storehouseManage/shelves", + // }, + // { + // alwaysShow: true, + // component: "shelvesManage", + // meta: { + // icon: "el-icon-help", + // title: "上架管理", + // }, + // name: "/storehouseManage/shelvesManage", + // path: "/storehouseManage/shelvesManage", + // }, + // { + // alwaysShow: true, + // component: "remove", + // meta: { + // icon: "el-icon-help", + // title: "移库", + // }, + // name: "/storehouseManage/remove", + // path: "/storehouseManage/remove", + // }, + // { + // alwaysShow: true, + // component: "removeManagement", + // meta: { + // icon: "el-icon-help", + // title: "移库管理", + // }, + // name: "/storehouseManage/removeManagement", + // path: "/storehouseManage/removeManagement", + // }, + // ] - }, + // }, { alwaysShow: true, component: "stockList", diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue index 776143f6..f94f2b09 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue @@ -18,7 +18,7 @@
条码： - 自动 + 随机
商品名： @@ -30,19 +30,19 @@
价值： - +
净重： - +
毛重： - +
有效天数： - +
备注： @@ -133,6 +133,38 @@ var nowstr = now.getTime() this.locationForm.barCode = 'P' + now.getTime() }, + limitInput1(value, index) { + this.locationForm.value = + ("" + value) // 第一步：转成字符串 + .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉 + .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字 + .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全 + .match(/^\d*(\.?\d{0,4})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数 + }, + limitInput2(value, index) { + this.locationForm.netWeight = + ("" + value) // 第一步：转成字符串 + .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉 + .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字 + .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全 + .match(/^\d*(\.?\d{0,4})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数 + }, + limitInput3(value, index) { + this.locationForm.roughWeight = + ("" + value) // 第一步：转成字符串 + .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉 + .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字 + .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全 + .match(/^\d*(\.?\d{0,4})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数 + }, + limitInput4(value, index) { + this.locationForm.effectiveDays = + ("" + value) // 第一步：转成字符串 + .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉 + .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字 + .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全 + .match(/^\d*(\d{0,0})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数 + }, } } diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue index 7d0635dc..1ab028c9 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue @@ -90,11 +90,15 @@ this.handleReturn('true') }, async addProduct () { - const { data: result } = await this.$http.post('/supplier/addSupplier', this.locationForm) + if(this.locationForm.name!=''){ + const { data: result } = await this.$http.post('/supplier/addSupplier', this.locationForm) if (result.status !== 200) return this.$message.error('添加供应商失败') this.$message.success('成功添加供应商') this.handleReturn('true') - }, + }else{ + this.$message.error('供应商名称不能为空') + } + } } } diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue index 60feb517..20d77faf 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue @@ -8,7 +8,7 @@
- +
@@ -125,7 +125,7 @@ export default { size: 10, current: 1, params: { - simpleName:'' + name:'' }, }, btnList: [ @@ -172,7 +172,7 @@ export default { size: 10, current: 1, params: { - simpleName:'' + name:'' }, } this.getStorehouseList() diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue index 32884269..ead71b71 100644 --- a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue @@ -12,7 +12,7 @@
- +
主体信息
@@ -33,7 +33,7 @@ - + @@ -65,7 +65,7 @@ - + - + @@ -113,7 +113,7 @@ - + @@ -225,17 +225,20 @@ selectPurchaseList: [], activeNames: ['1'], rules: { - product: [ - { required: true, message: '请输入商品名', trigger: 'blur' } + purchaseDate: [ + { required: true, message: '请选择订单日期', trigger: 'blur' } + ], + custId: [ + { required: true, message: '请选择供货单位', trigger: 'blur' } ], - supplier: [ - { required: true, message: '请输入供应商', trigger: 'blur' } + purchasePerson: [ + { required: true, message: '请输入采购申请人', trigger: 'blur' } ], - count: [ - { required: true, message: '请输入商品数量', trigger: 'blur' } + storehouseId: [ + { required: true, message: '请选择入库单位', trigger: 'blur' } ], - storehouse: [ - { required: true, message: '请输入所属仓库', trigger: 'blur' } + proName: [ + { required: true, message: '请选择质物品名称', trigger: 'blur' } ] } }; diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue index d09ce175..c24429cb 100644 --- a/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue +++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue @@ -8,8 +8,8 @@ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
- - + +
@@ -22,20 +22,20 @@ style="width: 100%" border> diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue index bfeff89a..0b2f8aa1 100644 --- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue @@ -12,7 +12,7 @@
- +
主体信息
@@ -34,7 +34,7 @@ - + @@ -49,7 +49,7 @@ - + - + @@ -79,7 +79,7 @@ - + - + @@ -223,17 +223,20 @@ selectPurchaseList: [], activeNames: ['1'], rules: { - product: [ - { required: true, message: '请输入商品名', trigger: 'blur' } + applicationDate: [ + { required: true, message: '请选择订单日期', trigger: 'blur' } + ], + custerSid: [ + { required: true, message: '请选择供货单位', trigger: 'blur' } ], - supplier: [ - { required: true, message: '请输入供应商', trigger: 'blur' } + creatorName: [ + { required: true, message: '请输入采购申请人', trigger: 'blur' } ], - count: [ - { required: true, message: '请输入商品数量', trigger: 'blur' } + storeHouseSid: [ + { required: true, message: '请选择出库仓库', trigger: 'blur' } ], - storehouse: [ - { required: true, message: '请输入所属仓库', trigger: 'blur' } + outDate: [ + { required: true, message: '请选择出库日期', trigger: 'blur' } ] }, f1Value:{ diff --git a/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue b/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue index 98b7cab1..d5270d0c 100644 --- a/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue +++ b/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue @@ -212,6 +212,8 @@ export default { const { data: result } = await this.$http.get('/purchase/getProductList') if (result.status !== 200) return this.$message.error('获取商品列表失败') this.productList = result.data + console.log(this.productList); + console.log(this.queryInfo); }, doClose() { this.$store.dispatch('tagsView/delView', this.$route)