Browse Source

6.27

master
fengdong777 2 years ago
parent
commit
23b1fd61b9
  1. 4
      supervise-risk-ui/src/layout/components/Sidebar/index.vue
  2. 8
      supervise-risk-ui/src/router/modules/codemenu.js
  3. 8
      supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
  4. 18
      supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue
  5. 601
      supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
  6. 7
      supervise-risk-ui/src/views/risk/bjzx.vue
  7. 9
      supervise-risk-ui/src/views/risk/riskCljl.vue
  8. 16
      warehousing-system/project_web/src/components/instorehouse/purchase.vue
  9. 196
      warehousing-system/project_web/src/components/instorehouse/putIn.vue

4
supervise-risk-ui/src/layout/components/Sidebar/index.vue

@ -91,7 +91,7 @@
component: "riskCljl", component: "riskCljl",
meta: { meta: {
icon: "el-icon-menu", icon: "el-icon-menu",
title: "报警消息记录", title: "报警处理记录",
}, },
name: "/riskCljl/index", name: "/riskCljl/index",
path: "/riskCljl/index", path: "/riskCljl/index",
@ -101,7 +101,7 @@
component: "riskBlack", component: "riskBlack",
meta: { meta: {
icon: "el-icon-menu", icon: "el-icon-menu",
title: "黑名单", title: "异常企业",
}, },
name: "/addRiskBlack/index", name: "/addRiskBlack/index",
path: "/addRiskBlack/index", path: "/addRiskBlack/index",

8
supervise-risk-ui/src/router/modules/codemenu.js

@ -125,14 +125,14 @@ const codemenu = [{
component: Layout, component: Layout,
redirect: '/riskCljl/index', redirect: '/riskCljl/index',
meta: { meta: {
title: '报警消息记录' title: '报警处理记录'
}, },
children: [{ children: [{
path: '/riskCljl/index', path: '/riskCljl/index',
component: () => import('@/views/risk/riskCljl.vue'), component: () => import('@/views/risk/riskCljl.vue'),
name: 'riskCljl', name: 'riskCljl',
meta: { meta: {
title: '报警消息记录', title: '报警处理记录',
noCache: true noCache: true
} }
}] }]
@ -141,14 +141,14 @@ const codemenu = [{
component: Layout, component: Layout,
redirect: '/addRiskBlack/index', redirect: '/addRiskBlack/index',
meta: { meta: {
title: '黑名单' title: '异常企业'
}, },
children: [{ children: [{
path: '/addRiskBlack/index', path: '/addRiskBlack/index',
component: () => import('@/views/risk/addRiskBlack.vue'), component: () => import('@/views/risk/addRiskBlack.vue'),
name: 'riskBlack', name: 'riskBlack',
meta: { meta: {
title: '黑名单', title: '异常企业',
noCache: true noCache: true
} }
}] }]

8
supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue

@ -153,6 +153,7 @@ export default {
this.hierarchys= false this.hierarchys= false
}, },
showEdit(row) { showEdit(row) {
console.log(row);
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
@ -173,8 +174,6 @@ export default {
_this.formobj.typeCode = vdata.typeCode _this.formobj.typeCode = vdata.typeCode
_this.formobj.reportTarget = vdata.reportTarget _this.formobj.reportTarget = vdata.reportTarget
_this.formobj.remarks = vdata.remarks _this.formobj.remarks = vdata.remarks
_this.selectedOptions = JSON.parse(vdata.typeName);
}, },
getParentsById(list, id) { getParentsById(list, id) {
for (let i in list) { for (let i in list) {
@ -193,9 +192,6 @@ export default {
} }
}, },
saveOrUpdate() { saveOrUpdate() {
if(this.formobj.sid){
this.formobj.typeName = JSON.stringify(this.selectedOptions)
}
if(this.formobj.reportTarget==='监管公司'){ if(this.formobj.reportTarget==='监管公司'){
this.formobj.reportTarget===1 this.formobj.reportTarget===1
}else if(this.formobj.reportTarget==='贷款支行'){ }else if(this.formobj.reportTarget==='贷款支行'){
@ -250,6 +246,7 @@ export default {
this.formobj.levelName = choose[0].name this.formobj.levelName = choose[0].name
}, },
handleChange3(value) { handleChange3(value) {
console.log(value);
var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid
this.formobj.typeSid=getSId this.formobj.typeSid=getSId
var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels; //2 label var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels; //2 label
@ -264,7 +261,6 @@ export default {
selectedOptions() { selectedOptions() {
if (this.$refs.cascaderAddr) { if (this.$refs.cascaderAddr) {
this.$refs.cascaderAddr.dropDownVisible = false; this.$refs.cascaderAddr.dropDownVisible = false;
console.log(this.$refs.cascaderAddr,'cascader')
} }
} }
}, },

18
supervise-risk-ui/src/views/risk/RiskManage/RiskIndex.vue

@ -7,8 +7,10 @@
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button> <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="queryParams" :model="queryParams.params" :inline="true" class="tab-header"> <el-form ref="queryParams" :model="queryParams.params" :inline="true" class="tab-header">
<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item> <el-form-item label="指标名称"><el-input v-model="queryParams.params.name" placeholder="请输入指标名称" clearable /></el-form-item>
<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item> <el-form-item label="风险等级"><el-input v-model="queryParams.params.levelName" placeholder="请输入风险等级" clearable /></el-form-item>
<el-form-item label="风险类别"><el-input v-model="queryParams.params.bigTypeName" placeholder="请输入风险类别" clearable /></el-form-item>
<el-form-item label="风险小类"><el-input v-model="queryParams.params.typeName" placeholder="请输入风险小类" clearable /></el-form-item>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@ -120,7 +122,10 @@ export default {
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
name:'',
levelName:'',
bigTypeName:'',
typeName:'',
} }
}, },
multipleSelection: [], multipleSelection: [],
@ -205,7 +210,12 @@ export default {
this.loadList() this.loadList()
}, },
resetQuery() { resetQuery() {
this.queryParams.params = {} this.queryParams.params = {
name:'',
levelName:'',
bigTypeName:'',
typeName:'',
}
this.queryParams.params.sid = '' // sid this.queryParams.params.sid = '' // sid
this.queryParams.params.name = '' // this.queryParams.params.name = '' //
this.dosearch() this.dosearch()

601
supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue

@ -1,300 +1,347 @@
<template> <template>
<div> <div>
<!-- 标题按钮部分开始 --> <!-- 标题按钮部分开始 -->
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 --> <!-- 标题 -->
<div>{{ viewTitle }}</div> <div>{{ viewTitle }}</div>
<!-- start 添加修改按钮 --> <!-- start 添加修改按钮 -->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button> <el-button
<el-button type="info" size="small" @click="handleReturn()">返回</el-button> type="primary"
</div> size="small"
<!-- end 添加修改按钮 --> :disabled="submitdisabled"
<!-- end 详情按钮 --> @click="saveOrUpdate"
</div> >保存</el-button
<!-- 标题按钮部分结束 --> >
<!-- Start 新增修改部分 --> <el-button type="info" size="small" @click="handleReturn()"
<div class="listconadd"> >返回</el-button
<el-form ref="form_obj"> >
<el-card class="box-card"> </div>
<div class="wlInfo"><span>风险类别</span></div> <!-- end 添加修改按钮 -->
<div class="item"> <!-- end 详情按钮 -->
<span class="item_text">类别名称</span> </div>
<el-input v-model="formobj.name" placeholder="类别名称" class="item_input" clearable /> <!-- 标题按钮部分结束 -->
</div> <!-- Start 新增修改部分 -->
<div class="item"> <div class="listconadd">
<span class="item_text">类别编号</span> <el-form ref="form_obj">
<el-input v-model="formobj.code" placeholder="类别编号" class="item_input" clearable /> <el-card class="box-card">
</div> <div class="wlInfo"><span>风险类别</span></div>
<div class="item">
<span class="item_text">类别名称</span>
<el-input
v-model="formobj.name"
placeholder="类别名称"
class="item_input"
clearable
/>
</div>
<div class="item">
<span class="item_text">类别编号</span>
<el-input
v-model="formobj.code"
placeholder="类别编号"
class="item_input"
clearable
/>
</div>
<div class="item"> <div class="item">
<span class="item_text">分类说明</span> <span class="item_text">分类说明</span>
<el-input v-model="formobj.content" placeholder="分类说明" class="item_input" clearable /> <el-input
</div> v-model="formobj.content"
<div class="item"> placeholder="分类说明"
<span class="item_text">层级</span> class="item_input"
<div class="info-sex"> clearable
<el-radio v-model="formobj.hierarchy" :disabled="hierarchys" @input="hierarchy($event)" :label="1">一级</el-radio> />
<el-radio v-model="formobj.hierarchy" :disabled="hierarchys" @input="hierarchy($event)" :label="2">二级</el-radio> </div>
</div> <div class="item">
<!-- <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable /> --> <span class="item_text">层级</span>
</div> <div class="info-sex">
<div class="item" v-show="viewState == 2" > <el-radio
<span class="item_text">上级名称</span> v-model="formobj.hierarchy"
<el-select :disabled="hierarchys"
v-model="formobj.parentName" @input="hierarchy($event)"
class="item_input" :label="1"
placeholder="请选择上级名称" >一级</el-radio
@change="getType" >
> <el-radio
<el-option v-model="formobj.hierarchy"
v-for="(item, i) in arrList" :disabled="hierarchys"
:key="i" @input="hierarchy($event)"
:label="item.name" :label="2"
:value="item.sid" >二级</el-radio
/> >
</el-select> </div>
</div> <!-- <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable /> -->
<div class="item" style="height: 110px;"> </div>
<span class="item_text">备注信息</span> <div class="item" v-show="viewState == 2">
<el-input type="textarea" <span class="item_text">上级名称</span>
:autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks" class="item_input" placeholder="备注信息" /> <el-select
</div> v-model="formobj.parentName"
</el-card> class="item_input"
</el-form> placeholder="请选择上级名称"
</div> @change="getType"
<!-- End 添加修改部分 --> >
</div> <el-option
v-for="(item, i) in arrList"
:key="i"
:label="item.name"
:value="item.sid"
/>
</el-select>
</div>
<div class="item" style="height: 110px">
<span class="item_text">备注信息</span>
<el-input
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
v-model="formobj.remarks"
class="item_input"
placeholder="备注信息"
/>
</div>
</el-card>
</el-form>
</div>
<!-- End 添加修改部分 -->
</div>
</template> </template>
<script> <script>
import req from '@/api/Risk/index' import req from "@/api/Risk/index";
export default { export default {
name: 'DispatchStandardsAdd', name: "DispatchStandardsAdd",
data() { data() {
return { return {
submitdisabled: false, submitdisabled: false,
viewTitle: '', viewTitle: "",
viewState: 1, viewState: 1,
arrLists: [], arrLists: [],
arrList: [], arrList: [],
hierarchys: false, hierarchys: false,
formobj: { formobj: {
name: '', name: "",
code: '', code: "",
content: '', content: "",
hierarchy: 1, hierarchy: 1,
parentSid: '', parentSid: "",
parentName: '', parentName: "",
remarks: '' , remarks: "",
sid:'' sid: "",
},
rules: {
name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '风险等级代码不能为空', trigger: 'blur' }],
content: [{ required: true, message: '分类说明不能为空', trigger: 'blur' }],
reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }],
},
}
},
created() {},
methods: {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj.sid = ''
this.formobj.name= '',
this.formobj.code= '',
this.formobj.content= '',
this.formobj.hierarchy= 1,
this.formobj.parentSid= ''
this.formobj.parentName= ''
this.formobj.remarks= ''
this.viewState=1
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【新增】风险等级'
this.hierarchys=false
this.formobj.hierarchy= 1
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【修改】风险等级'
const _this = this
const vdata = row
_this.hierarchys=true
_this.formobj.id = vdata.id
_this.formobj.sid = vdata.sid
_this.formobj.name = vdata.name
_this.formobj.code = vdata.code
_this.formobj.content = vdata.content
_this.formobj.hierarchy = vdata.hierarchy
_this.formobj.parentName = vdata.parentName
_this.formobj.parentSid = vdata.parentSid
_this.formobj.remarks = vdata.remarks
if(vdata.hierarchy==1){
_this.viewState=1
}else{
_this.viewState=2
}
},
saveOrUpdate() {
req
.saveRiskType(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
} else {
// resp.code
}
})
.catch(() => {
})
},
superior(){
req
.selectRiskTypeFirst()
.then(resp => {
if(resp.code==200){
this.arrLists=resp.data
for (var i = 0; i < this.arrLists.length; i++) {
let item = {
name: this.arrLists[i].name,
sid: this.arrLists[i].sid,
}
this.arrList.push(item)
}
}
})
},
hierarchy(e){
if(e==2){
this.viewState=2
this.arrList=[]
this.superior()
}else{
this.viewState=1
this.sid=null
this.parentSid=null
this.parentName=null
this.arrList=[]
}
},
getType(value) {
const choose = this.arrLists.filter((item) => item.sid === value)
this.formobj.parentName = choose[0].name
this.formobj.parentSid = value
console.log( this.formobj.parentSid);
}, },
} rules: {
} name: [
{ required: true, message: "风险等级名称不能为空", trigger: "blur" },
],
code: [
{ required: true, message: "风险等级代码不能为空", trigger: "blur" },
],
content: [
{ required: true, message: "分类说明不能为空", trigger: "blur" },
],
reportTarget: [
{ required: true, message: "报送单位不能为空", trigger: "blur" },
],
},
};
},
created() {},
methods: {
handleReturn(isreload) {
if (isreload === "true") this.$emit("reloadlist");
this.formobj.sid = "";
(this.formobj.name = ""),
(this.formobj.code = ""),
(this.formobj.content = ""),
(this.formobj.hierarchy = 1),
(this.formobj.parentSid = "");
this.formobj.parentName = "";
this.formobj.remarks = "";
this.viewState = 1;
this.$refs["form_obj"].resetFields();
this.$emit("doback");
this.arrList = [];
},
showAdd() {
this.$nextTick(() => {
this.$refs["form_obj"].clearValidate();
});
this.viewTitle = "【新增】风险等级";
this.hierarchys = false;
this.formobj.hierarchy = 1;
},
showEdit(row) {
this.$nextTick(() => {
this.$refs["form_obj"].clearValidate();
});
this.viewTitle = "【修改】风险等级";
const _this = this;
const vdata = row;
_this.hierarchys = true;
this.superior();
_this.formobj.id = vdata.id;
_this.formobj.sid = vdata.sid;
_this.formobj.name = vdata.name;
_this.formobj.code = vdata.code;
_this.formobj.content = vdata.content;
_this.formobj.hierarchy = vdata.hierarchy;
_this.formobj.parentName = vdata.parentName;
_this.formobj.parentSid = vdata.parentSid;
_this.formobj.remarks = vdata.remarks;
if (vdata.hierarchy == 1) {
_this.viewState = 1;
} else {
_this.viewState = 2;
}
},
saveOrUpdate() {
req
.saveRiskType(this.formobj)
.then((resp) => {
if (resp.success) {
this.$message({
showClose: true,
type: "success",
message: resp.msg,
});
this.handleReturn("true");
} else {
// resp.code
}
})
.catch(() => {});
},
superior() {
req.selectRiskTypeFirst().then((resp) => {
if (resp.code == 200) {
this.arrLists = resp.data;
for (var i = 0; i < this.arrLists.length; i++) {
let item = {
name: this.arrLists[i].name,
sid: this.arrLists[i].sid,
};
this.arrList.push(item);
}
}
});
},
hierarchy(e) {
if (e == 2) {
this.viewState = 2;
this.arrList = [];
this.superior();
} else {
this.viewState = 1;
this.sid = null;
this.parentSid = null;
this.parentName = null;
this.arrList = [];
}
},
getType(value) {
const choose = this.arrLists.filter((item) => item.sid === value);
this.formobj.parentName = choose[0].name;
this.formobj.parentSid = value;
console.log(this.formobj.parentSid);
},
},
};
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.box-card { .box-card {
margin-left: 60px; margin-left: 60px;
margin-right: 60px; margin-right: 60px;
min-width: 70%; min-width: 70%;
margin-top: 20px; margin-top: 20px;
padding-bottom: 50px; padding-bottom: 50px;
.item {
display: flex;
flex-direction: row;
align-items: center;
margin-top: 15px;
height: 40px;
line-height: 40px;
.item_text { .item {
flex: 0.8; display: flex;
font-size: 18px; flex-direction: row;
text-align: right; align-items: center;
} margin-top: 15px;
height: 40px;
line-height: 40px;
.item_input { .item_text {
flex: 4; flex: 0.8;
font-size: 16px; font-size: 18px;
margin-left: 10px; text-align: right;
margin-right: 80px; }
}
.item_left_input { .item_input {
width: 20%; flex: 4;
} font-size: 16px;
margin-left: 10px;
margin-right: 80px;
}
.item_left_text { .item_left_input {
height: 30px; width: 20%;
margin-left: 20px; }
line-height: 30px;
color: #018AD2;
padding: 0px 15px;
border: 1.5px solid #018AD2;
border-radius: 5px;
} .item_left_text {
height: 30px;
margin-left: 20px;
line-height: 30px;
color: #018ad2;
padding: 0px 15px;
border: 1.5px solid #018ad2;
border-radius: 5px;
}
.item_right { .item_right {
flex: 1; flex: 1;
justify-items: center; justify-items: center;
.item_right_list_text { .item_right_list_text {
font-size: 16px; font-size: 16px;
} }
.item_right_list_delect { .item_right_list_delect {
color: #5E94FF; color: #5e94ff;
margin-left: 20px; margin-left: 20px;
font-size: 16px; font-size: 16px;
text-decoration: underline; text-decoration: underline;
}
} }
.info-sex {
flex: 4;
font-size: 16px;
margin-left: 10px;
margin-right: 80px;
::v-deep.el-radio__input.is-checked .el-radio__inner {
border-color: #48d18a;
background-color: #fff;
}
::v-deep.el-radio__input.is-checked + .el-radio__label {
color: #424346;
}
::v-deep.el-radio__input.is-checked .el-radio__inner:after {
transform: rotate(45deg) scaleY(1);
}
::v-deep.el-radio__label {
color: #80838a;
}
::v-deep.el-radio__inner::after {
box-sizing: content-box;
content: "";
border: 1px solid #48d18a;
border-left: 0;
border-top: 0;
height: 7px;
left: 4px;
position: absolute;
top: 1px;
transform: rotate(45deg) scaleY(0);
width: 3px;
transition: transform 0.15s ease-in 0.05s;
transform-origin: center;
border-radius: unset;
background-color: transparent;
} }
} .info-sex {
flex: 4;
font-size: 16px;
margin-left: 10px;
margin-right: 80px;
::v-deep.el-radio__input.is-checked .el-radio__inner {
border-color: #48d18a;
background-color: #fff;
}
::v-deep.el-radio__input.is-checked + .el-radio__label {
color: #424346;
}
::v-deep.el-radio__input.is-checked .el-radio__inner:after {
transform: rotate(45deg) scaleY(1);
}
::v-deep.el-radio__label {
color: #80838a;
}
::v-deep.el-radio__inner::after {
box-sizing: content-box;
content: "";
border: 1px solid #48d18a;
border-left: 0;
border-top: 0;
height: 7px;
left: 4px;
position: absolute;
top: 1px;
transform: rotate(45deg) scaleY(0);
width: 3px;
transition: transform 0.15s ease-in 0.05s;
transform-origin: center;
border-radius: unset;
background-color: transparent;
}
} }
} }
}
</style> </style>

7
supervise-risk-ui/src/views/risk/bjzx.vue

@ -267,10 +267,9 @@
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
}, },
formatDate(cellValue) { formatDate(row,col,val) {
let treatmentTime=cellValue.treatmentTime if (val == null || val == "") return "";
if (treatmentTime == null || treatmentTime == "") return ""; var date = new Date(val)
var date = new Date(treatmentTime)
var year = date.getFullYear() var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()

9
supervise-risk-ui/src/views/risk/riskCljl.vue

@ -58,7 +58,7 @@
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="treatmentContent" width="120" label="处理内容" align="center" /> <el-table-column prop="treatmentContent" width="120" label="处理内容" align="center" />
<el-table-column prop="positionName" width="180" label="风险处理位置名称" align="center" /> <el-table-column prop="positionName" width="180" label="风险处理位置名称" align="center" />
<el-table-column prop="triggerTime" width="160" label="风险触发时间" align="center" /> <el-table-column prop="triggerTime" width="160" :formatter="formatDate" label="风险触发时间" align="center" />
<el-table-column prop="typeName" width="150" label="风险类别名称" align="center" /> <el-table-column prop="typeName" width="150" label="风险类别名称" align="center" />
<el-table-column prop="treatmentTime" width="150" :formatter="formatDate" label="处理时间" align="center"/> <el-table-column prop="treatmentTime" width="150" :formatter="formatDate" label="处理时间" align="center"/>
<el-table-column prop="userName" label="处理人姓名" width="120" align="center" /> <el-table-column prop="userName" label="处理人姓名" width="120" align="center" />
@ -286,10 +286,9 @@
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
}, },
formatDate(cellValue) { formatDate(row,col,val) {
let treatmentTime=cellValue.treatmentTime if (val == null || val == "") return "";
if (treatmentTime == null || treatmentTime == "") return ""; var date = new Date(val)
var date = new Date(treatmentTime)
var year = date.getFullYear() var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()

16
warehousing-system/project_web/src/components/instorehouse/purchase.vue

@ -147,10 +147,10 @@
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-select v-model="purchaseForm.custName" placeholder="请选择" > <el-select v-model="purchaseForm.custName" placeholder="请选择" >
<el-option <el-option
v-for="custName in storehouseList" v-for="(custName,i) in custList"
:key="custName.name" :key="i"
:label="custName.name" :label="custName.enterpriseName"
:value="custName.name"> :value="custName.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -316,6 +316,7 @@ export default {
productList2: [], productList2: [],
supplierList: [], supplierList: [],
storehouseList: [], storehouseList: [],
custList: [],
selectPurchaseList: [], selectPurchaseList: [],
purchaseForm: { purchaseForm: {
purchaseId: '', purchaseId: '',
@ -375,6 +376,12 @@ export default {
// this.$message({ type: 'success', message: result.msg, showClose: true }) // 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 () { addPurchase () {
this.$refs.dataForm.validate(async validate => { this.$refs.dataForm.validate(async validate => {
@ -583,6 +590,7 @@ export default {
this.getProductList() this.getProductList()
this.getSupplierList() this.getSupplierList()
this.getStorehouseList() this.getStorehouseList()
this.getcustListList()
} }
} }
</script> </script>

196
warehousing-system/project_web/src/components/instorehouse/putIn.vue

@ -2,121 +2,153 @@
<el-card class="box-card"> <el-card class="box-card">
<div>入库</div> <div>入库</div>
<el-divider></el-divider> <el-divider></el-divider>
<div class="form"> <div class="form">
<el-form class="demo-ruleForm" label-width="220px" :rules="rules" ref="onPutInRuleForm" :model="inStorehouse"> <el-form
<el-form-item label="订单编号:" prop="receivingId" > class="demo-ruleForm"
<el-select v-model="inStorehouse.receivingId" placeholder="请选择" clearable @change="getOptions"> label-width="220px"
:rules="rules"
ref="onPutInRuleForm"
:model="inStorehouse"
>
<el-form-item label="订单编号:" prop="receivingId">
<el-select
v-model="inStorehouse.receivingId"
placeholder="请选择"
clearable
@change="getOptions"
>
<el-option <el-option
v-for="item in queryInfo.receivingIdList" v-for="(item,i) in dingdanId"
:key="item" :key="i"
:label="item" :label="item.purchaseNo"
:value="item" :value="item.purchaseNo"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="货位编号:" prop="locationId"> <el-form-item label="货位编号:" prop="locationId">
<el-select v-model="inStorehouse.locationId" placeholder="请选择入库区货位" clearable @change="getOptions"> <el-select
<el-option v-model="inStorehouse.locationId"
v-for="item in queryInfo.locationIdList" placeholder="请选择入库区货位"
:key="item" clearable
:label="item" @change="getOptions"
:value="item" >
> <el-option
</el-option> v-for="(item,i) in huoweiId"
</el-select> :key="i"
:label="item.locationId"
:value="item.locationId"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注:" prop="remarks"> <el-form-item label="备注:" prop="remarks">
<el-input <el-input
type="textarea" type="textarea"
autosize autosize
placeholder="请输入备注" placeholder="请输入备注"
v-model="inStorehouse.remarks"> v-model="inStorehouse.remarks"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-button type="primary" icon="el-icon-plus" class="btm" @click="addInStorehouse">入库</el-button> <el-button
type="primary"
icon="el-icon-plus"
class="btm"
@click="addInStorehouse"
>入库</el-button
>
</div> </div>
</el-card> </el-card>
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
user: '', user: "",
queryInfo: { dingdanId: {},
receivingIdList: '', huoweiId: {},
locationIdList: ''
},
inStorehouse: { inStorehouse: {
inStorehouseId: '', inStorehouseId: "",
receivingId: '', receivingId: "",
locationId: '', locationId: "",
remarks: '', remarks: "",
createPerson: '', createPerson: "",
checkPerson: '', checkPerson: "",
status: '' status: "",
},
queryInfos: {
total: 0,
current: 1,
size: 100,
params: {
purchaseNo:''
}
},
queryPamas: {
query: '',
pageNum: 1,
pageSize: 10
}, },
rules: { rules: {
receivingId: [ receivingId: [
{ required: true, message: '请输入条码', trigger: 'blur' } { required: true, message: "请输入条码", trigger: "blur" },
], ],
locationId: [ locationId: [
{ required: true, message: '请输入源货位编码', trigger: 'blur' } { required: true, message: "请输入源货位编码", trigger: "blur" },
] ],
} },
} };
}, },
methods: { methods: {
async getOptions () { async getOptions() {
const { data: result } = await this.$http.get('/putIn/getQuery', { params: this.inStorehouse }) const { data: result } = await this.$http.post('/purchasenew/listPage', { params: this.queryInfos })
// if(result.status === 201) return this.$message.error("") const { data: datas } = await this.$http.get('/location/list', { params: this.queryPamas })
this.queryInfo.receivingIdList = result.data.receivingIdList this.dingdanId = result.data.records;
this.queryInfo.locationIdList = result.data.locationIdList this.huoweiId = datas.data.rows;
if (result.data.locationIdList.length === 0 & this.inStorehouse.receivingId.length !== 0) return this.$message.error('没有对应出库中的入库区货位')
}, },
addInStorehouse () { addInStorehouse() {
this.$refs.onPutInRuleForm.validate(async validate => { this.$refs.onPutInRuleForm.validate(async (validate) => {
if (!validate) return this.$message.error('请输入必填项') if (!validate) return this.$message.error("请输入必填项");
this.inStorehouse.status = '待审核' this.inStorehouse.status = "待审核";
this.inStorehouse.createPerson = this.user this.inStorehouse.createPerson = this.user;
const now = new Date() const now = new Date();
this.inStorehouse.inStorehouseId = 'IN' + now.getTime() this.inStorehouse.inStorehouseId = "IN" + now.getTime();
// const { data: result } = await this.$http.post('/putIn/addInStorehouse', this.inStorehouse) // const { data: result } = await this.$http.post('/putIn/addInStorehouse', this.inStorehouse)
const { data: result } = await this.$http.post('/input/addInStorehouse', this.inStorehouse) const { data: result } = await this.$http.post(
if (result.status === 201) return this.$message.error('入库失败') "/input/addInStorehouse",
this.$message.success(result.data) this.inStorehouse
this.$refs.onPutInRuleForm.resetFields() );
}) if (result.status === 201) return this.$message.error("入库失败");
} this.$message.success(result.data);
this.$refs.onPutInRuleForm.resetFields();
});
},
}, },
mounted () { mounted() {
this.getOptions() this.getOptions();
this.user = window.sessionStorage.getItem('token').substr(32) // this.user = window.sessionStorage.getItem("token").substr(32);
} },
} };
</script> </script>
<style> <style>
.box-card{ .box-card {
height: 95%; height: 95%;
width: 95%; width: 95%;
}
} .form {
.form{ position: absolute;
position: absolute; top: 40%;
top: 40%; left: 35%;
left: 35%; /* right: 20%; */
/* right: 20%; */ }
} .btm {
.btm{ /* align-items: center; */
/* align-items: center; */ position: absolute;
position: absolute; left: 60%;
left: 60%; }
}
</style> </style>

Loading…
Cancel
Save