diff --git a/supervise-risk-ui/src/layout/components/Sidebar/index.vue b/supervise-risk-ui/src/layout/components/Sidebar/index.vue index 0415529c..5bedc8f2 100644 --- a/supervise-risk-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-risk-ui/src/layout/components/Sidebar/index.vue @@ -91,7 +91,7 @@ component: "riskCljl", meta: { icon: "el-icon-menu", - title: "报警消息记录", + title: "报警处理记录", }, name: "/riskCljl/index", path: "/riskCljl/index", @@ -101,7 +101,7 @@ component: "riskBlack", meta: { icon: "el-icon-menu", - title: "黑名单", + title: "异常企业", }, name: "/addRiskBlack/index", path: "/addRiskBlack/index", diff --git a/supervise-risk-ui/src/router/modules/codemenu.js b/supervise-risk-ui/src/router/modules/codemenu.js index ff6a4d1f..13bba240 100644 --- a/supervise-risk-ui/src/router/modules/codemenu.js +++ b/supervise-risk-ui/src/router/modules/codemenu.js @@ -125,14 +125,14 @@ const codemenu = [{ component: Layout, redirect: '/riskCljl/index', meta: { - title: '报警消息记录' + title: '报警处理记录' }, children: [{ path: '/riskCljl/index', component: () => import('@/views/risk/riskCljl.vue'), name: 'riskCljl', meta: { - title: '报警消息记录', + title: '报警处理记录', noCache: true } }] @@ -141,14 +141,14 @@ const codemenu = [{ component: Layout, redirect: '/addRiskBlack/index', meta: { - title: '黑名单' + title: '异常企业' }, children: [{ path: '/addRiskBlack/index', component: () => import('@/views/risk/addRiskBlack.vue'), name: 'riskBlack', meta: { - title: '黑名单', + title: '异常企业', noCache: true } }] diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue index a800b352..b1dc8239 100644 --- a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue +++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue @@ -153,6 +153,7 @@ export default { this.hierarchys= false }, showEdit(row) { + console.log(row); this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -173,8 +174,6 @@ export default { _this.formobj.typeCode = vdata.typeCode _this.formobj.reportTarget = vdata.reportTarget _this.formobj.remarks = vdata.remarks - - _this.selectedOptions = JSON.parse(vdata.typeName); }, getParentsById(list, id) { for (let i in list) { @@ -193,9 +192,6 @@ export default { } }, saveOrUpdate() { - if(this.formobj.sid){ - this.formobj.typeName = JSON.stringify(this.selectedOptions) - } if(this.formobj.reportTarget==='监管公司'){ this.formobj.reportTarget===1 }else if(this.formobj.reportTarget==='贷款支行'){ @@ -250,6 +246,7 @@ export default { this.formobj.levelName = choose[0].name }, handleChange3(value) { + console.log(value); var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid this.formobj.typeSid=getSId var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels; //注意2： 获取label值 @@ -264,7 +261,6 @@ export default { selectedOptions() { if (this.$refs.cascaderAddr) { this.$refs.cascaderAddr.dropDownVisible = false; - console.log(this.$refs.cascaderAddr,'cascader') } } }, diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue index 22a3fbf1..cb4a8e03 100644 --- a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue +++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue @@ -7,8 +7,10 @@ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
- - + + + +
查询 重置 @@ -120,7 +122,10 @@ export default { size: 10, total: 0, params: { - + name:'', + levelName:'', + bigTypeName:'', + typeName:'', } }, multipleSelection: [], @@ -205,7 +210,12 @@ export default { this.loadList() }, resetQuery() { - this.queryParams.params = {} + this.queryParams.params = { + name:'', + levelName:'', + bigTypeName:'', + typeName:'', + } this.queryParams.params.sid = '' // sid this.queryParams.params.name = '' // 登录名 this.dosearch() diff --git a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue index be228a65..7f0ff4ec 100644 --- a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue +++ b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue @@ -1,300 +1,347 @@ diff --git a/supervise-risk-ui/src/views/risk/bjzx.vue b/supervise-risk-ui/src/views/risk/bjzx.vue index 9bff07ad..9f6244fe 100644 --- a/supervise-risk-ui/src/views/risk/bjzx.vue +++ b/supervise-risk-ui/src/views/risk/bjzx.vue @@ -267,10 +267,9 @@ this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) }, - formatDate(cellValue) { - let treatmentTime=cellValue.treatmentTime - if (treatmentTime == null || treatmentTime == "") return ""; - var date = new Date(treatmentTime) + formatDate(row,col,val) { + if (val == null || val == "") return ""; + var date = new Date(val) var year = date.getFullYear() var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() diff --git a/supervise-risk-ui/src/views/risk/riskCljl.vue b/supervise-risk-ui/src/views/risk/riskCljl.vue index 61bc2f27..6bc22fe3 100644 --- a/supervise-risk-ui/src/views/risk/riskCljl.vue +++ b/supervise-risk-ui/src/views/risk/riskCljl.vue @@ -58,7 +58,7 @@ - + @@ -286,10 +286,9 @@ this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) }, - formatDate(cellValue) { - let treatmentTime=cellValue.treatmentTime - if (treatmentTime == null || treatmentTime == "") return ""; - var date = new Date(treatmentTime) + formatDate(row,col,val) { + if (val == null || val == "") return ""; + var date = new Date(val) var year = date.getFullYear() var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() diff --git a/warehousing-system/project_web/src/components/instorehouse/purchase.vue b/warehousing-system/project_web/src/components/instorehouse/purchase.vue index fc934b92..2fc0da6c 100644 --- a/warehousing-system/project_web/src/components/instorehouse/purchase.vue +++ b/warehousing-system/project_web/src/components/instorehouse/purchase.vue @@ -147,10 +147,10 @@ + v-for="(custName,i) in custList" + :key="i" + :label="custName.enterpriseName" + :value="custName.sid"> @@ -316,6 +316,7 @@ export default { productList2: [], supplierList: [], storehouseList: [], + custList: [], selectPurchaseList: [], purchaseForm: { purchaseId: '', @@ -375,6 +376,12 @@ export default { // this.$message({ type: 'success', message: result.msg, showClose: true }) } }, + async getcustListList () { + const { data: result } = await this.$http.post('/crm/v1/enterpriseinformation/list') + if (result.code == 200){ + this.custList = result.data + } + }, addPurchase () { this.$refs.dataForm.validate(async validate => { @@ -583,6 +590,7 @@ export default { this.getProductList() this.getSupplierList() this.getStorehouseList() + this.getcustListList() } } diff --git a/warehousing-system/project_web/src/components/instorehouse/putIn.vue b/warehousing-system/project_web/src/components/instorehouse/putIn.vue index 341c3b9f..224293ff 100644 --- a/warehousing-system/project_web/src/components/instorehouse/putIn.vue +++ b/warehousing-system/project_web/src/components/instorehouse/putIn.vue @@ -2,121 +2,153 @@
入库
-
- - - +
+ + + + v-for="(item,i) in dingdanId" + :key="i" + :label="item.purchaseNo" + :value="item.purchaseNo" + > - - - - + + + + + v-model="inStorehouse.remarks" + > - - 入库 - + 入库