zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

styleAdjust

This commit is contained in:
shijing 2022-02-18 10:51:10 +08:00
parent e2493b0eee
commit ffb7b6ece2
8 changed files with 837 additions and 838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hb_client/src/api/hrm.js
View File

@ -13,3 +13,10 @@ export function clockRecord(data) {
data
})
}
export function getEmployee(data) {
return request({
url: '/hrm/employee/',
method: 'get',
data
})
}

13
hb_client/src/views/bigScreen/index.vue
View File

@ -98,6 +98,7 @@
import center from './center'
import bottomLeft from './bottomLeft'
import bottomRight from './bottomRight'
import { getPlanGantt } from "@/api/srm";
export default {
mixins: [ drawMixin ],
@ -108,6 +109,7 @@
dateDay: null,
dateYear: null,
dateWeek: null,
planGanttList:[],
weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
}
},
@ -122,6 +124,7 @@
mounted() {
this.timeFn();
this.cancelLoading();
this.getPageData();
let bigHeight = document.getElementsByClassName('host-body')[0].clientHeight;
let firstHeight = document.getElementById('firstLine').clientHeight;
let secondHeight = document.getElementsByClassName('jc-between')[0].clientHeight;
@ -139,6 +142,16 @@
this.dateWeek = this.weekday[new Date().getDay()]
}, 1000)
},
getPageData(){
let that = this;
getPlanGantt({Authorization:'big_screen'}).then(res => {
if (res.code === 200) {
this.planGanttList = res.data.results;
} else {
that.$message.error(res.msg);
}
})
},
cancelLoading() {
setTimeout(() => {
this.loading = false

10
hb_client/src/views/dashboard/index.vue
View File

@ -240,7 +240,8 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="部门" prop="dept_name">
<el-table-column label="部门" prop="dept_">
<template slot-scope="scope">{{scope.row.dept_.name}}</template>
</el-table-column>
</el-table>
</div>
@ -338,7 +339,8 @@
<script>
import echarts from 'echarts'
import {mapGetters} from 'vuex';
import {getUserList} from "@/api/user";
// import {getUserList} from "@/api/user";
import {getEmployee} from "@/api/hrm";
import {getMaterialList} from "@/api/mtm";
import {getProductionplanList} from "@/api/pm";
import {getmaterialbatchList} from "@/api/inm";
@ -586,7 +588,7 @@
let that = this;
that.listLoadingUser = true;
that.userPage =1;
getUserList({page: that.userPage, page_size: that.userPageSize, fields: 'id,name,dept_name,is_atwork'}).then((response) => {
getEmployee({page: that.userPage, page_size: that.userPageSize}).then((response) => {
if (response.data) {
that.userList = response.data.results;
that.userTotal = response.data.count;
@ -600,7 +602,7 @@
let that = this;
that.listLoadingUser = true;
that.userPage = val;
getUserList({page: val, page_size: that.userPageSize, fields: 'id,name,dept_name,is_atwork'}).then((response) => {
getEmployee({page: val, page_size: that.userPageSize, fields: 'id,name,dept_name,is_atwork'}).then((response) => {
if (response.data) {
that.userList = response.data.results;
that.userTotal = response.data.count;

27
hb_client/src/views/mtm/process.vue
View File

@ -1,11 +1,10 @@
<template>
<div class="app-container">
<el-card>
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增工序</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">
新增工序
</el-button>
</div>
</el-card>
<el-card style="margin-top: 2px">
@ -32,7 +31,7 @@
<el-table-column label="生产车间">
<template slot-scope="scope" v-if="scope.row.workshop_">{{ scope.row.workshop_.name }}</template>
</el-table-column>
<el-table-column align="center" label="指导书">
<el-table-column align="center" label="指导书" show-overflow-tooltip min-width="110">
<template slot-scope="scope" v-if="scope.row.instruction_">
<el-link :href="scope.row.instruction_.path">{{scope.row.instruction_.name}}</el-link>
</template>
@ -46,25 +45,26 @@
width="220px"
>
<template slot-scope="scope">
<el-link
type="primary"
@click="handleAdd(scope)"
>添加子工序</el-link
>
添加子工序
</el-link>
<el-link
v-if="checkPermission(['process_update'])"
type="primary"
@click="handleEdit(scope)"
>编辑</el-link
>
编辑
</el-link>
<el-link
v-if="checkPermission(['process_delete'])"
type="danger"
@click="handleDelete(scope)"
>删除</el-link
>
删除
</el-link>
</template>
</el-table-column>
</el-table>
@ -125,7 +125,6 @@
<el-button size="small" type="primary">上传文件</el-button>
</el-upload>
</el-form-item>
</el-form>
<div style="text-align: right">
<el-button type="danger" @click="dialogVisible = false">取消</el-button>
@ -195,7 +194,6 @@ export default {
created() {
this.getList();
this.getOrgAll();
},
methods: {
checkPermission,
@ -231,13 +229,10 @@ export default {
this.process.instruction = null;
},
//添加子工序
handleAdd(scope)
{
handleAdd(scope) {
this.$router.push({name: "Step", params: {id: scope.row.id},})
},
handleFilter() {
this.listQuery.page = 1;
this.getList();

30
hb_client/src/views/pm/plan.vue
View File

@ -114,60 +114,50 @@
stripe
style="width: 100%"
height="250"
>
<el-table-column type="index" width="50"/>
<el-table-column label="订单编号" width="110">
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="客户名称" width="110">
<el-table-column label="客户名称" show-overflow-tooltip min-width="110">
<template slot-scope="scope" show-overflow-tooltip>{{ scope.row.customer_.name }}</template>
</el-table-column>
<el-table-column label="合同编号" width="110">
<el-table-column label="合同编号" show-overflow-tooltip min-width="110">
<template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.number }}</template>
</el-table-column>
<el-table-column label="合同名称" show-overflow-tooltip width="110">
<el-table-column label="合同名称" show-overflow-tooltip min-width="110">
<template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.name }}</template>
</el-table-column>
<el-table-column label="所需产品" show-overflow-tooltip width="150">
<el-table-column label="所需产品" show-overflow-tooltip min-width="150">
<template slot-scope="scope">{{ scope.row.product_.name }}</template>
</el-table-column>
<el-table-column label="产品型号" width="110">
<template slot-scope="scope">{{ scope.row.product_.specification }}</template>
</el-table-column>
<el-table-column label="产品数量" width="110">
<el-table-column label="产品数量">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column label="已派数量" width="110">
<el-table-column label="已派数量">
<template slot-scope="scope">{{ scope.row.planed_count }}</template>
</el-table-column>
<el-table-column label="交货日期" width="110">
<el-table-column label="交货日期" width="100">
<template slot-scope="scope">{{ scope.row.delivery_date }}</template>
</el-table-column>
<el-table-column label="创建时间">
<el-table-column label="创建时间" show-overflow-tooltip min-width="110">
<template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
fixed="right"
width="100px"
width="80px"
>
<template slot-scope="scope">
<el-link type="primary"
v-if="checkPermission(['warehouse_update'])"
@click="handleclick(scope)"
>排产
</el-link
>
</el-link>
</template>
</el-table-column>
</el-table>

10
hb_client/src/views/statistics/materialStatistics.vue
View File

@ -9,14 +9,14 @@
<Echart
:options="pieOptions"
id="pieChart"
height="400px"
height="45vh"
></Echart>
</el-card>
</el-col>
<el-col :span="16">
<el-card>
<div class="chartsTitle">废料原因统计</div>
<div id="barChart" style="width:100%;height: 400px;"></div>
<div id="barChart" style="width:100%;height: 45vh"></div>
</el-card>
</el-col>
</el-row>
@ -56,7 +56,7 @@
:id="chartId1"
:options="barOptions"
:className="chartsName"
height="400px"
height="45vh"
width="600px"
>
</charts>
@ -69,7 +69,7 @@
:id="chartId2"
:options="barOptions"
:className="chartsName"
height="400px"
height="45vh"
width="600px"
>
</charts>
@ -111,7 +111,7 @@
:id="chartId3"
:options="barOptions"
:className="chartsName"
height="400px"
height="45vh"
>
</charts>
</el-card>

10
hb_client/src/views/statistics/progressStatistics.vue
View File

@ -7,7 +7,7 @@
<Echart
:options="pieOptions"
id="pieChart"
height="400px"
height="45vh"
></Echart>
</el-card>
</el-col>
@ -18,7 +18,7 @@
:id="chartId1"
:options="barOptions"
:className="chartsName"
height="400px"
height="45vh"
width="100%"
>
</charts>
@ -31,7 +31,7 @@
:id="chartId2"
:options="barOptions1"
:className="chartsName"
height="400px"
height="45vh"
width="100%"
>
</charts>
@ -55,10 +55,10 @@
>
<el-table-column type="index" width="50" />
<el-table-column label="订单编号" width="160" show-overflow-tooltip>
<el-table-column label="订单编号" width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="产品名称" width="200" show-overflow-tooltip>
<el-table-column label="产品名称" width="160" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.product_.name }}</template>
</el-table-column>
<el-table-column label="产品数量">

244
hb_client/src/views/wpm/worktask.vue
View File

@ -18,91 +18,95 @@
@current-change="handleCurrentChange"
>
<el-table-column type="index" width="50"/>
<el-table-column label="子计划编号" width="100">
<el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="产品名称">
<template slot-scope="scope">{{
scope.row.plan_product_.name
}}</template>
<el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.plan_product_.name}}
</template>
</el-table-column>
<el-table-column label="产品型号">
<template slot-scope="scope">{{
scope.row.product_.specification
}}</template>
<template slot-scope="scope">
{{scope.row.product_.specification}}
</template>
</el-table-column>
<el-table-column label="生产主产品" width="140">
<template slot-scope="scope">{{
scope.row.product_.name
}}</template>
<el-table-column label="生产主产品" min-width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.product_.name}}
</template>
</el-table-column>
<el-table-column label="名称">
<template slot-scope="scope">{{
scope.row.subproduction_.name
}}</template>
<el-table-column label="名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.subproduction_.name}}
</template>
</el-table-column>
<el-table-column label="生产车间">
<template slot-scope="scope">{{
scope.row.workshop_.name
}}</template>
<el-table-column label="生产车间" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.workshop_.name}}
</template>
</el-table-column>
<el-table-column label="子工序" width="160">
<el-table-column label="子工序" min-width="160">
<template slot-scope="scope" v-if="scope.row.steps">
<el-tag
v-for="item in scope.row.steps"
:key="item.number"
:label="item.name"
:value="item.number"
>{{ item.name }}</el-tag
>
{{ item.name }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="开工时间">
<el-table-column label="开工时间" width="100">
<template slot-scope="scope">{{ scope.row.start_date }}</template>
</el-table-column>
<el-table-column label="完工时间">
<el-table-column label="完工时间" width="100">
<template slot-scope="scope">{{ scope.row.end_date }}</template>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
{{ state_[scope.row.state] }}</template
>
{{ state_[scope.row.state] }}
</template>
</el-table-column>
<el-table-column label="领料状态" width="100">
<el-table-column label="领料状态" width="80">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
<el-tag v-else>已领料</el-tag>
</template>
</el-table-column>
<el-table-column label="计划/生产/合格">
<template slot-scope="scope"
>{{ scope.row.count }}/{{ scope.row.count_real }}/{{
scope.row.count_ok
}}</template
>
<template slot-scope="scope">
{{ scope.row.count }}/{{ scope.row.count_real }}/{{scope.row.count_ok}}
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="130px">
<el-table-column
align="center"
label="操作"
width="80px"
fixed="right"
>
<template slot-scope="scope">
<el-link
type="success"
v-if="scope.row.is_picked == false"
@click="handleNeed(scope)"
>领料</el-link
>
领料
</el-link>
<el-link
type="success"
v-if="scope.row.is_picked"
@click="handleNeed(scope)"
>继续领料</el-link
>
<el-link type="primary" @click="handlepick(scope)"
>领半成品</el-link
继续领料
</el-link>
<el-link
type="primary"
@click="handlepick(scope)"
>
领半成品
</el-link>
</template>
</el-table-column>
</el-table>
@ -127,79 +131,74 @@
:label="item.name"
:value="item.number"
@click="handlework(item)"
>{{ item.name }}</el-button
>
{{ item.name }}
</el-button>
<el-button
type="primary"
@click="handleScrapbcp()"
id="scrap"
style="float: right; display: none"
>报废</el-button
>
报废
</el-button>
<el-badge :value="count" class="item" style="float:right">
<el-button
type="primary"
@click="handleAll()"
>显示全部</el-button
>
显示全部
</el-button>
</el-badge>
<el-table
:data="wproductData"
@selection-change="handleSelectionChange"
border
fit
stripe
style="width: 100%"
max-height="300"
:data="wproductData"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column type="index" width="50"/>
<el-table-column label="子计划编号" width="100">
<template slot-scope="scope">{{
scope.row.subproduction_plan_.number
}}</template>
<el-table-column label="子计划编号" width="100" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.number }}</template>>
<template slot-scope="scope">
{{scope.row.subproduction_plan_.number}}
</template>
</el-table-column>
<el-table-column label="玻璃编号">
<template slot-scope="scope">{{ scope.row.number }}</template>
<el-table-column label="玻璃编号" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.number }}
</template>
</el-table-column>
<el-table-column label="玻璃状态">
<template slot-scope="scope">{{
scope.row.material_.name
}}</template>
<el-table-column label="玻璃状态" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.material_.name}}
</template>
</el-table-column>
<el-table-column label="所在子工序">
<template slot-scope="scope">{{
scope.row.step_.name
}}</template>
<el-table-column label="所在子工序" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.step_.name}}
</template>
</el-table-column>
<el-table-column label="进行状态">
<template slot-scope="scope">{{
actstate_[scope.row.act_state]
}}</template>
<el-table-column label="进行状态" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{actstate_[scope.row.act_state]}}
</template>
</el-table-column>
<el-table-column label="不合格标记">
<el-table-column label="不合格标记" width="100">
<template slot-scope="scope">
{{ ng_sign_[scope.row.ng_sign] }}
</template>
</el-table-column>
<el-table-column label="更新时间">
<template slot-scope="scope">{{
scope.row.update_time
}}</template>
<el-table-column label="更新时间" width="160">
<template slot-scope="scope">
{{scope.row.update_time}}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col :span="12">
<el-card class="box-card">
@ -215,20 +214,20 @@
max-height="300"
>
<el-table-column type="index" width="50"/>
<el-table-column label="子计划编号" width="100">
<template slot-scope="scope">{{
scope.row.subproduction_plan_.number
}}</template>
<el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.subproduction_plan_.number }}
</template>
</el-table-column>
<el-table-column label="物料名称">
<template slot-scope="scope">{{
scope.row.material_.name
}}</template>
<el-table-column label="物料名称" min-width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.material_.name}}
</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{
scope.row.material_.unit
}}</template>
<template slot-scope="scope">
{{scope.row.material_.unit}}
</template>
</el-table-column>
<el-table-column label="物料批次">
<template slot-scope="scope">{{ scope.row.batch }}</template>
@ -293,8 +292,9 @@
<el-link
v-if="checkPermission(['material_update'])"
@click="handleReceive(scope)"
>领半成品</el-link
>
领半成品
</el-link>
</template>
</el-table-column>
</el-table>
@ -303,7 +303,6 @@
<el-button type="primary" @click="bcpllSubmit">确 定</el-button>
</div>
</el-dialog>
<el-dialog
title="半成品列表"
:close-on-click-modal="false"
@ -320,15 +319,12 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="50"/>
<el-table-column label="玻璃编号">
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="玻璃状态">
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="子计划编号">
<template slot-scope="scope">{{ scope.row.subproduction_plan_.number }}</template>
</el-table-column>
@ -341,7 +337,6 @@
<el-button type="primary" @click="wproductSubmit">确 定</el-button>
</div>
</el-dialog>
<el-dialog
:visible.sync="dialogVisiblenw"
:close-on-click-modal="false"
@ -381,8 +376,9 @@
style="float: right; padding: 3px 0"
@click="handlePick"
type="text"
>确认领料</el-button
>
确认领料
</el-button>
</div>
<template>
<el-table
@ -400,8 +396,8 @@
<el-table-column label="输入领料数量" width="140px">
<template slot-scope="scope">
<el-form
:model="scope.row"
v-if="scope.row.material_.type != 2"
:model="scope.row"
widht="100px"
>
<el-form-item size="mini">
@ -415,7 +411,6 @@
</el-form>
</template>
</el-table-column>
<el-table-column prop="count_pick" label="已领物料数量">
</el-table-column>
<el-table-column prop="material_.specification" label="物料规格">
@ -427,8 +422,9 @@
<el-link
v-if="scope.row.material_.type == 2"
@click="handlewproduct(scope)"
>选择半成品</el-link
>
选择半成品
</el-link>
</template>
</el-table-column>
</el-table>
@ -454,18 +450,15 @@
<el-table-column label="玻璃编号">
<template slot-scope="scope">{{ scope.row.number}}</template>
</el-table-column>
<el-table-column label="半成品批次">
<template slot-scope="scope">{{ scope.row.batch}}</template>
</el-table-column>
<el-table-column label="玻璃状态">
<template slot-scope="scope">{{ scope.row.material_.name}}</template>
</el-table-column>
<el-table-column label="所在仓库">
<template slot-scope="scope">{{
scope.row.warehouse_.name
}}</template>
<template slot-scope="scope">{{scope.row.warehouse_.name}}
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
@ -499,7 +492,6 @@
<el-card class="box-card" v-if="showPrise1 && values === 0">
<div slot="header" class="clearfix">
<span>消耗物料表</span>
<el-table :data="input" border style="width: 100%">
<el-table-column
prop="subproduction_plan"
@ -556,7 +548,6 @@
width="180"
>
</el-table-column>
<el-table-column
prop="count_output"
label="产出数量"
@ -589,18 +580,19 @@
</el-form-item>
</el-form>
<el-button style="margin-top: 12px" @click="next" v-if="values == 0"
>下一步</el-button
>
下一步
</el-button>
</el-card>
<el-card
class="box-card"
v-for="(itemf, $index) in otherforms"
:key="$index"
class="box-card"
>
<el-form
v-if="values === $index + 1"
label-width="80px"
label-position="right"
v-if="values === $index + 1"
>
<el-row v-for="(item, $index) in itemf.form_fields" :key="$index">
<el-form-item
@ -614,9 +606,9 @@
:label="item.field_name"
>
<el-input
v-model="item.sort"
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
@ -624,9 +616,9 @@
:label="item.field_name"
>
<el-input
v-model="item.sort"
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
@ -660,8 +652,8 @@
:label="item.field_name"
>
<el-select
style="width: 100%"
v-model="item.sort"
style="width: 100%"
placeholder="请选择"
>
<el-option
@ -695,32 +687,32 @@
</el-row>
</el-form>
<el-button
v-if="values == $index + 2"
style="margin-top: 12px"
@click="next"
v-if="values == $index + 2"
>下一步</el-button
>
>下一步
</el-button>
<el-button
style="margin-top: 12px"
@click="prev"
v-if="values == $index + 1"
>上一步</el-button
>
>上一步
</el-button>
</el-card>
<div style="text-align: right; position: sticky">
<el-button type="danger" @click="dialogVisiblework = false"
>取消</el-button
<el-button
type="danger"
@click="dialogVisiblework = false"
>
取消
</el-button>
<el-button type="primary" @click="submint()">确认</el-button>
</div>
</el-dialog>
</div>
</template>
<style>
.item {
margin-right: 20px;
}
</style>