java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
caoyizhong 2 years ago
parent
ff51de6c43 e5217f6d67
commit
20f14f7fda
4 changed files with 155 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 151
      src/views/dashboard/HomePage.vue
  2. 2
      src/views/wastematerials/ProcessWasteMaterialsList.vue
  3. 29
      src/views/wastematerials/ProcessWasteMaterialsLists.vue
  4. 37
      src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue

151
src/views/dashboard/HomePage.vue
Unescape View File

@ -1,17 +1,12 @@
<template> <template>
<div style="height: 760px;"> <div style="height: 740px;">
<div style="height: 100%;"> <div style="height: 100%;">
<div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%"> <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
<!--待办任务--> <!--待办任务-->
<div class="top-div" style="width: 33%;"> <div class="top-div ant-col-md-8">
<a-card class="div-card"> <a-card class="div-card" title="待办" >
<span class="font" style="display: inline-block;height: 10%;">
<i class="el-icon-s-claim" style="font-size: 25px;"></i>待办
<i class="iconfont icon-shenglvehao"></i>
</span>
<div style="width: 100%;height: 100%;" v-show="showDate.noDate"> <div style="width: 100%;height: 100%;" v-show="showDate.noDate">
暂无待办 暂无待办
</div> </div>
@ -20,15 +15,11 @@
<!--用于存放从数据库中查出来的信息并对其进行循环--> <!--用于存放从数据库中查出来的信息并对其进行循环-->
<li v-for="(task,index) in tasks " style="width: 100%;"> <li v-for="(task,index) in tasks " style="width: 100%;">
<!--类型--> <!--类型-->
<span class="mouse" color="#539ee6" style="font-weight: normal; background-color: #539ee6; <a-button class="ant-col-md-4" type="primary" style="width: 80px;height: 25px;">{{task.type}}</a-button>
color: white;border-radius: 4px;width: 20%;text-align: center;display: block;height: 25px;line-height: 25px;"> <span class="ant-col-md-8" :title='task.message' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 50px;line-height: 25px;">
{{task.type}}
</span>
<span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 40%;padding-left: 35px;
display: block;height: 25px;line-height: 25px;">
{{task.message}} {{task.message}}
</span> </span>
<span style="display: block;height: 25px;line-height: 25px;"> <span class="ant-col-md-8" :title='task.time' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 60px;line-height: 25px;">
{{task.time}} {{task.time}}
</span> </span>
</li> </li>
@ -38,50 +29,86 @@
</div> </div>
<!--站内消息--> <!--站内消息-->
<div class="top-div" style="margin: 0 0 0 0.5%;width: 45%;" > <div class="top-div ant-col-md-8" >
<a-card class="div-card" title="站内消息"> <a-card class="div-card" title="站内消息">
</a-card> </a-card>
</div> </div>
<!--登录日志--> <!--登录日志-->
<div class="top-div" style="margin: 0 0 0 0.5%;width: 45%;"> <div class="top-div ant-col-md-8">
<a-card class="div-card"> <a-card class="div-card" title="登录日志">
<span class="font" style="display: inline-block;height: 10%;"><i class="el-icon-s-order" style="font-size: 30px;"></i>登录日志
<i class="iconfont icon-shenglvehao"></i>
</span>
<ul class="ul-li" style="list-style-type:none;padding-left: 0px;"> <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
<!--这里可以用for循环--> <!--这里可以用for循环-->
<!--当一个用户登录后增加一条数据--> <!--当一个用户登录后增加一条数据-->
<li v-for="(loginlog,index) in loginlogs" style="width: 100%;"> <li v-for="(loginlog,index) in loginlogs" style="width: 100%;">
<!--类型--> <!--类型-->
<span class="mouse" color="#539ee6" style="font-weight: normal; background-color: #539ee6; <a-button class="ant-col-md-4" type="primary" style="width: 80px;height: 25px;">{{loginlog.department}}</a-button>
color: white;border-radius: 4px;width: 17%;text-align: center;display: block;height: 25px;line-height: 25px;"> <span class="ant-col-md-8" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 90px;line-height: 25px;">
{{loginlog.department}}
</span>
<span style="width: 40%;padding-left: 45px;margin-left: 35px;
display: block;height: 25px;line-height: 25px;">
{{loginlog.loginName}} {{loginlog.loginName}}
</span> </span>
<span style="display: block;height: 25px;line-height: 25px;"> <span class="ant-col-md-8" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;margin-left: 20px;line-height: 25px;">
{{loginlog.loginTime}} {{loginlog.loginTime}}
</span> </span>
</li> </li>
</ul> </ul>
</a-card> </a-card>
</div> </div>
</div> </div>
<div style="width: 100%;height: 70%;margin-top: 0.5%"> <div class="bottom-div" style="width: 100%;height: 70%;margin-top: 0.5%">
<a-card style="width: 100%;height: 90%;border-radius: 10px;"> <a-card style="width: 100%;height: 90%;border-radius: 10px;" title="全部应用">
<span class="font" style="display: inline-block;height: 10%;">
<i class="el-icon-s-grid" style="font-size: 30px;color: #5cb6ff;cursor: pointer"></i>
<p style="display: inline-block;margin-left: 10px">全部应用</p>
</span>
<ul class="apply-use" style="list-style-type: none;padding: 0px"> <ul class="apply-use" style="list-style-type: none;padding: 0px">
<li> <li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
<span class="text-style">流程管理</span> </li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li> </li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<li @click='processManage' class="ant-col-md-4">
<i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
</li>
<!-- <li @click='materialManage' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">-->
<!-- <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;margin-right: 6%;"></i>物资管理-->
<!-- </li>-->
<!-- <li @click='statisticalAnalysis' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">-->
<!-- <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;margin-right: 6%;"></i>统计分析-->
<!-- </li>-->
<!-- <li @click='dictionaryLibrary' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">-->
<!-- <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;margin-right: 6%;"></i>标准字典库-->
<!-- </li>-->
<!-- <li @click='isystemManage' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">-->
<!-- <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;margin-right: 6%;"></i>系统管理-->
<!-- </li>-->
<!-- <li @click='statisticalTreatment' style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">-->
<!-- <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;margin-right: 6%;"></i>统计报表-->
<!-- </li>-->
</ul> </ul>
</a-card> </a-card>
</div> </div>
@ -132,18 +159,43 @@ export default {
methods: { methods: {
// 跳转地址
processManage(){
this.$router.push('/activiti/applyHome')
},
materialManage(){
this.$router.push('/modules/suppliesstronger')
},
statisticalAnalysis(){
this.$router.push('/statistic_analysis/costStatistic')
},
dictionaryLibrary(){
this.$router.push('/dictionaries/data')
},
isystemManage(){
this.$router.push('/isystem/user')
},
statisticalTreatment(){
this.$router.push('/report/ArchivesStatisticst')
},
// 对待办任务进行查询查看是否有待办数据 // 对待办任务进行查询查看是否有待办数据
searchDoneData(){ searchDoneData(){
// 待添加 // 待添加
}, },
// 判断是否有待办任务数据 // 判断是否有待办任务数据
toBeDoneData(){ toBeDoneData(){
this.tasks[0] = this.tasks = [
{
type: "流程审批",
message: "关于帐外物资的xxxx的审批流程",
time: "2002.20.20 10:10:20"
},
{ {
type: "流程审批", type: "流程审批",
message: "关于帐外物资的xxxx的审批流程", message: "关于帐外物资的xxxx的审批流程",
time: "2002.20.20 10:10:20" time: "2002.20.20 10:10:20"
} }
]
if (this.tasks != null){ if (this.tasks != null){
this.showDate.noDate = false; this.showDate.noDate = false;
this.showDate.showDate = true; this.showDate.showDate = true;
@ -157,6 +209,7 @@ export default {
<style scoped> <style scoped>
@import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css"); @import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
.top-div { .top-div {
height: 100%; height: 100%;
} }
@ -164,6 +217,7 @@ export default {
.div-card { .div-card {
width: 100%; width: 100%;
height: 100%; height: 100%;
font-weight: 200;
border-radius: 5px; border-radius: 5px;
} }
@ -197,21 +251,24 @@ export default {
/*border-radius: 10px;*/ /*border-radius: 10px;*/
} }
.apply-use li{ .apply-use li{
float: left; text-align: center;
width: 15%; margin-top: 20px;
height: 60px;
margin: 40px 0 0 60px;
line-height: 60px;
font-weight: bold;
} }
.mouse:hover { .mouse:hover {
cursor: pointer; cursor: pointer;
} }
.text-style { /deep/.ant-card-body {
margin-left: 20px; padding: 0px 24px 36px 24px;
cursor: pointer; }
/deep/.ant-card-head-title{
font-weight: 600;
}
.bottom-div /deep/.ant-card-head{
border-bottom: 0px;
} }
i:hover { i:hover {

2
src/views/wastematerials/ProcessWasteMaterialsList.vue
Unescape View File

@ -212,7 +212,7 @@
}, },
methods: { methods: {
handleDetail(record){ handleDetail(record){
this.$router.push({name:'src-views-wastematerials-ProcessWasteMaterialsLists',params:{material: record.material}}) this.$router.push({name:'src-views-wastematerials-ProcessWasteMaterialsLists',params:{descriptionId: record.descriptionId}})
}, },
initDictConfig(){ initDictConfig(){
//优先从缓存中读取字典配置 //优先从缓存中读取字典配置

29
src/views/wastematerials/ProcessWasteMaterialsLists.vue
Unescape View File

@ -20,9 +20,9 @@
<a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input> <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24" hidden="hidden"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="物料"> <a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.material" disabled="disabled"></a-input> <a-input placeholder="请输入物料" v-model="queryParam.material" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -40,6 +40,7 @@
<a-range-picker <a-range-picker
style="width: 210px" style="width: 210px"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:value="createProductTime"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
/> />
@ -55,6 +56,7 @@
<a-range-picker <a-range-picker
style="width: 210px" style="width: 210px"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:value = "createInnerTime"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChangeinboundTime" @change="onDateChangeinboundTime"
/> />
@ -69,9 +71,11 @@
</a-form> </a-form>
</div> </div>
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
</div> </div>
<!-- 查询区域-END --> <!-- 查询区域-END -->
@ -147,21 +151,25 @@
}, },
data () { data () {
return { return {
material: this.$route.params.material, descriptionId: this.$route.params.descriptionId,
queryParam:{ queryParam:{
supplier: null, supplier: null,
supplierDescription: null, supplierDescription: null,
materialGroup : null, materialGroup : null,
material : this.$route.params.material, material : null,
materialDescription: null, materialDescription: null,
theirTeam: null, theirTeam: null,
productionDate: null, productionDate: null,
expirationDate: null, expirationDate: null,
inboundTime: null, inboundTime: null,
materialsState: null, materialsState: null,
descriptionId: this.$route.params.descriptionId,
del_flag: 0 del_flag: 0
}, },
createProductTime:[],
createInnerTime:[],
description: '账外物资库管理页面', description: '账外物资库管理页面',
dataSource:[], dataSource:[],
// 表头 // 表头
@ -287,7 +295,7 @@
}, },
watch: { watch: {
$route() { $route() {
this.queryParam.material = this.$route.params.material this.queryParam.descriptionId = this.$route.params.descriptionId
this.loadData() this.loadData()
} }
}, },
@ -298,15 +306,17 @@
}, },
methods: { methods: {
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
this.createProductTime = value;
this.queryParam.productDateBegin=dateString[0]; this.queryParam.productDateBegin=dateString[0];
this.queryParam.productDateEnd=dateString[1]; this.queryParam.productDateEnd=dateString[1];
}, },
onDateChangeinboundTime: function (value, dateString) { onDateChangeinboundTime: function (value, dateString) {
this.createInnerTime = value,
this.queryParam.inboundDateBegin=dateString[0]; this.queryParam.inboundDateBegin=dateString[0];
this.queryParam.inboundDateEnd=dateString[1]; this.queryParam.inboundDateEnd=dateString[1];
}, },
judgeRouterParam(){ judgeRouterParam(){
if (this.$route.params.material == null){ if (this.$route.params.descriptionId == null){
this.$router.go(-1); this.$router.go(-1);
} }
}, },
@ -323,17 +333,20 @@
}); });
}, },
searchReset(){ searchReset(){
this.createProductTime = [],
this.createInnerTime = [],
this.queryParam = { this.queryParam = {
supplier: null, supplier: null,
supplierDescription: null, supplierDescription: null,
materialGroup : null, materialGroup : null,
material : this.$route.params.material, material : null,
materialDescription: null, materialDescription: null,
theirTeam: null, theirTeam: null,
productionDate: null, productionDate: null,
expirationDate: null, expirationDate: null,
inboundTime: null, inboundTime: null,
materialsState: null, materialsState: null,
descriptionId: this.$route.params.descriptionId,
del_flag: 0 del_flag: 0
}, },
getAction(this.url.list,this.queryParam).then((res)=>{ getAction(this.url.list,this.queryParam).then((res)=>{

37
src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue
Unescape View File

@ -4,43 +4,48 @@
<a-form :form="form" slot="detail"> <a-form :form="form" slot="detail">
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="供应商id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplier']" placeholder="请输入供应商" ></a-input> <a-input v-decorator="['supplierId']" placeholder="请输入供应商id" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="供应商描述" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物料组id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplierDescription']" placeholder="请输入供应商描述" ></a-input> <a-input v-decorator="['descriptionId']" placeholder="请输入物料组id" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资编码清单表ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialGroup']" placeholder="请输入物料组" ></a-input> <a-input v-decorator="['merchandiseNewsId']" placeholder="请输入物资编码清单表ID" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="物料" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="库存位置" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['material']" placeholder="请输入物料" ></a-input> <a-input v-decorator="['materialStorageId']" placeholder="请输入库存位置" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="库存仓位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialDescription']" placeholder="请输入物料描述" ></a-input> <a-input v-decorator="['freightSpace']" placeholder="请输入库存仓位" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="所属工作队" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="计量单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['theirTeam']" placeholder="请输入所属工作队" ></a-input> <a-input v-decorator="['materialsUnit']" placeholder="请输入计量单位" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="库存位置" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialStorageId']" placeholder="请输入库存位置" ></a-input> <a-input v-decorator="['number']" placeholder="请输入数量" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="库存仓位" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['freightSpace']" placeholder="请输入库存仓位" ></a-input> <a-input v-decorator="['price']" placeholder="请输入单价" ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['money']" placeholder="请输入金额" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">

Write Preview
Loading…
Cancel
Save