diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue index 594b0dcc..9118d9ec 100644 --- a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue +++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue @@ -24,7 +24,7 @@
指标名称： - +
风险程度： @@ -140,6 +140,7 @@ export default { this.formobj.typeSid='', this.formobj.remarks='', this.formobj.reportTarget='', + this.selectedOptions=[], this.$refs['form_obj'].resetFields() this.$emit('doback') @@ -171,9 +172,30 @@ export default { _this.formobj.typeSid = vdata.typeSid _this.formobj.typeCode = vdata.typeCode _this.formobj.reportTarget = vdata.reportTarget - _this.formobj.remarks = vdata.remarks + _this.formobj.remarks = vdata.remarks + + _this.selectedOptions = JSON.parse(vdata.typeName); }, + getParentsById(list, id) { + for (let i in list) { + if (list[i].no == id) {//这里的no根据你的需求可进行改变 + //查询到就返回该数组对象的value + return [list[i].no]; + } + if (list[i].children) { + let node = this.getParentsById(list[i].children, id); + if (node !== undefined) { + //查询到把父节把父节点加到数组前面 + node.unshift(list[i].no); + return node; + } + } + } + }, 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==='贷款支行'){ @@ -217,15 +239,15 @@ export default { .selectType() .then(resp => { if(resp.code==200){ - this.options=resp.data + this.options=resp.data } }) }, getType(value) { const choose = this.arrLists.filter((item) => item.sid === value) - this.formobj.levelName = value + this.formobj.levelSid = value this.formobj.levelCode = choose[0].code - this.formobj.levelSid = choose[0].sid + this.formobj.levelName = choose[0].name }, handleChange3(value) { var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue index c542232b..22a3fbf1 100644 --- a/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue +++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue @@ -32,7 +32,7 @@ - + diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskSetAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskSetAdd.vue index 12aaadc0..5ea5b104 100644 --- a/supervise-risk-ui/src/views/risk/RiskManage/RiskSetAdd.vue +++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskSetAdd.vue @@ -67,6 +67,7 @@ export default { submitdisabled: false, viewTitle: '', formobj: { + sid:'', name: '', // 风险等级名称 code: '', // 风险等级代码 handlingMethod: '', // 处理方式 @@ -121,17 +122,15 @@ export default { _this.formobj.reportTarget= '贷款支行' } else if (vdata.reportTarget === 3) { _this.formobj.reportTarget= '总行' - }else{ - _this.formobj.reportTarget= '' - } + } _this.formobj.remarks = vdata.remarks }, saveOrUpdate() { - if(this.formobj.reportTarget === '监管公司'){ - this.formobj.reportTarget= 1 - } else if(this.formobj.reportTarget === '贷款支行') { + if(this.formobj.reportTarget === '监管公司' || this.formobj.reportTarget===1){ + this.formobj.reportTarget= 1 + } else if(this.formobj.reportTarget === '贷款支行' || this.formobj.reportTarget===2) { this.formobj.reportTarget= 2 - } else if (this.formobj.reportTarget ==='总行') { + } else if (this.formobj.reportTarget ==='总行' || this.formobj.reportTarget===3) { this.formobj.reportTarget= 3 }else{ this.formobj.reportTarget= '' diff --git a/warehousing-system/project_web/src/components/initial_value/storehouse.vue b/warehousing-system/project_web/src/components/initial_value/storehouse.vue index df105572..d8a0033e 100644 --- a/warehousing-system/project_web/src/components/initial_value/storehouse.vue +++ b/warehousing-system/project_web/src/components/initial_value/storehouse.vue @@ -3,240 +3,375 @@ - - + + - 新增 + 新增 - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - - *客户名称： - + + + + + *客户名称： + - - - - - + + + + + - + - - *仓库名称： - + + *仓库名称： + - - - - - + + + + + - - - *仓库简称： - + + + *仓库简称： + - - + + - - *仓库编码： - + + *仓库编码： + - - - - + + + - - - *所属地：    - - - - + + + *所属地：    + + + + - + - - + + - + - - + + - - - + + + - - - *详细地址： - + + + *详细地址： + - - - - *库房面积： - + + + + *库房面积： + - - + + - - *库房高度： - + + *库房高度： + - - + + - - *月租金： - + + *月租金： + - - - + + + - - - *库房性质名称： - + + + *库房性质名称： + - - + + - + - - *房源： - + + *房源： + - - + + - - *联系人姓名： - + + *联系人姓名： + - - + + - - *联系人电话： - + + *联系人电话： + - - - + + + - - - *附件： - + + + *附件： + - + - 点击上传 + ref="upload" + class="upload-demo" + accept=".xls" + :action="updateAction" + :file-list="fileList" + :on-progress="handleProgress" + :on-success="handleSuccess" + :multiple="false" + :show-file-list="false" + :before-remove="beforeRemove" + :limit="1" + > + 点击上传 - - - - -
- 取 消 - 确 定 -
- + + + +
+ 取 消 + 确 定 +
+
diff --git a/warehousing-system/project_web/src/components/instorehouse/purchase.vue b/warehousing-system/project_web/src/components/instorehouse/purchase.vue index 8b4aa0ce..fc934b92 100644 --- a/warehousing-system/project_web/src/components/instorehouse/purchase.vue +++ b/warehousing-system/project_web/src/components/instorehouse/purchase.vue @@ -385,25 +385,27 @@ export default { this.getPurchaseList() this.addPurchaseDialogVisible = false this.$message({ type: 'success', message: result.msg, showClose: true }) + this.clearList() } - this.purchaseForm={ - purchaseId: '', - product: '', - barCode: '', - purchaseDate:'', - purchaseNo:'', - supplier: '', - storehouseName:'', - supplierName:'', - count: '', - storehouse: '', - status: '', - products:[] + }) + }, + clearList(){ + this.purchaseForm={ + purchaseId: '', + product: '', + barCode: '', + purchaseDate:'', + purchaseNo:'', + supplier: '', + storehouseName:'', + supplierName:'', + count: '', + storehouse: '', + status: '', + products:[] } - }) }, - async getProductList () { const { data: result } = await this.$http.get('/purchase/getProductList', { params: { name: this.purchaseForm.product } }) if (result.status !== 200) return this.$message.error('获取商品列表失败') @@ -412,6 +414,7 @@ export default { }, openAddPurchaseDialog () { + this.clearList() this.addPurchaseDialogVisible = true var now = new Date() this.purchaseForm.purchaseNo = 'IP' + now.getTime() diff --git a/warehousing-system/project_web/src/main.js b/warehousing-system/project_web/src/main.js index 3976adf1..09b6fc27 100644 --- a/warehousing-system/project_web/src/main.js +++ b/warehousing-system/project_web/src/main.js @@ -16,7 +16,7 @@ import 'quill/dist/quill.bubble.css' // for bubble theme import axios from 'axios' /* 设定axios的请求根目录 */ -axios.defaults.baseURL = 'http://8.130.39.13:9050/' +axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/' //axios.defaults.baseURL = 'http://127.0.0.1:9050/' // axios.defaults.baseURL = 'http://192.168.3.183:9050/' // axios.defaults.baseURL = 'http://manage.jt.com/'