From 12ef895481038a7bec06a2c6cb47748a6353e848 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:35:04 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/views/xtsy/index.vue | 30 +-
src/views/scgl/gdplgb.vue | 31 ++
vue.config.js | 4
package.json | 1
src/api/bbgl.js | 18 +
src/views/kb/zhkbc.vue | 30 +-
src/views/kb/zhkb.vue | 30 +-
src/router/index.js | 36 ++
src/views/bbgl/scjd.vue | 527 +++++++++++++++++++++++++++++++++++++++++++
9 files changed, 648 insertions(+), 59 deletions(-)
diff --git a/package.json b/package.json
index 36a86fc..31acf60 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
"qrcodejs2": "0.0.2",
"vue": "2.6.10",
"vue-easy-print": "0.0.8",
+ "vue-count-to": "^1.0.13",
"vue-print-nb": "^1.7.5",
"vue-router": "3.0.6",
"vuedraggable": "^2.24.3",
diff --git a/src/api/bbgl.js b/src/api/bbgl.js
index c7cad01..2844e5a 100644
--- a/src/api/bbgl.js
+++ b/src/api/bbgl.js
@@ -106,3 +106,21 @@
params: data
})
}
+
+// 鐢熶骇杩涘害鎶ヨ〃鏌ヨ
+export function ProductionScheduleReportSearch(data) {
+ return request({
+ url: 'ReportManager/ProductionScheduleReportSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
+export function ProductionScheduleReportExcelSearch(data) {
+ return request({
+ url: 'ReportManager/ProductionScheduleReportExcelSearch',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 8fa53a3..ad3e580 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -429,13 +429,13 @@
name: 'SCDDCancel',
code: '1070',
component: () => import('@/views/scgl/scdd'),
- meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
+ meta: { code: '1070', title: '鐢熶骇璁㈠崟', icon: '', keepAlive: true }
}, {
path: 'gd',
name: 'GDCancel',
code: '1071',
component: () => import('@/views/scgl/gd'),
- meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+ meta: { code: '1071', title: '宸ュ崟', icon: '', keepAlive: true }
}, {
path: 'gdpg',
name: 'GDPDCancel',
@@ -453,7 +453,7 @@
name: 'GDPLGBCancel',
code: '1074',
component: () => import('@/views/scgl/gdplgb'),
- meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
+ meta: { code: '1074', title: '宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
}, {
path: 'xgbg',
name: 'XGBGCancel',
@@ -534,6 +534,13 @@
meta: { code: '1008', title: '鎶ヨ〃绠＄悊', icon: 'bbgl' },
alwaysShow: true,
children: [
+ {
+ path: 'produceSchedule',
+ name: 'produceScheduleCancel',
+ code: '1098',
+ component: () => import('@/views/bbgl/scjd'),
+ meta: { code: '1098', title: '鐢熶骇杩涘害鎶ヨ〃', icon: '', keepAlive: true }
+ },
{
path: 'bzgztj',
name: 'BZGZTJCancel',
@@ -697,9 +704,9 @@
path: '/orderManager',
component: Layout,
redirect: '/orderManager/erpProduceOrder',
- name: '鐢熶骇绠＄悊',
+ name: '璁㈠崟绠＄悊',
code: '2004',
- meta: { code: '2004', title: '鐢熶骇绠＄悊', icon: 'production' },
+ meta: { code: '2004', title: '璁㈠崟绠＄悊', icon: 'production' },
alwaysShow: true,
children: [
{
@@ -707,7 +714,7 @@
name: 'produceOrderCancel',
code: '1070',
component: () => import('@/views/scgl/scdd'),
- meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
+ meta: { code: '1070', title: '鐢熶骇璁㈠崟', icon: '', keepAlive: true }
}
]
},
@@ -862,6 +869,13 @@
code: '1095',
component: () => import('@/views/bbgl/wxmx'),
meta: { code: '1095', title: '缁翠慨鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+ },
+ {
+ path: 'produceSchedule',
+ name: 'produceScheduleCancel',
+ code: '1098',
+ component: () => import('@/views/bbgl/scjd'),
+ meta: { code: '1098', title: '鐢熶骇杩涘害鎶ヨ〃', icon: '', keepAlive: true }
}
// {
// path: 'installationLampList',
@@ -1000,14 +1014,14 @@
name: 'workOrderCancel',
code: '1071',
component: () => import('@/views/scgl/gd'),
- meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+ meta: { code: '1071', title: '宸ュ崟', icon: '', keepAlive: true }
},
{
path: 'workOrderBatchClose',
name: 'workOrderBatchCloseCancel',
code: '1074',
component: () => import('@/views/scgl/gdplgb'),
- meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
+ meta: { code: '1074', title: '宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
},
{
path: 'updateWorkOrder',
@@ -1168,14 +1182,14 @@
]
},
- // 18.鍏跺畠ERP闆嗘垚
+ // 18.鍏跺畠闆嗘垚
{
path: '/otherErp',
component: Layout,
redirect: '/otherErp/InventoryList',
- name: '鍏跺畠ERP闆嗘垚',
+ name: '鍏跺畠闆嗘垚',
code: '2018',
- meta: { code: '2018', title: '鍏跺畠ERP闆嗘垚', icon: 'erpjc' },
+ meta: { code: '2018', title: '鍏跺畠闆嗘垚', icon: 'erpjc' },
alwaysShow: true,
children: [
{
diff --git a/src/views/bbgl/scjd.vue b/src/views/bbgl/scjd.vue
new file mode 100644
index 0000000..827966b
--- /dev/null
+++ b/src/views/bbgl/scjd.vue
@@ -0,0 +1,527 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ <!-- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
+ <el-select v-model="form.status" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in statusArr"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
+ <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸ヨ壓璺嚎鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.routename" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
+ <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍗曟嵁鏃ユ湡" style="display: flex;align-items: center">
+ <el-date-picker
+ v-model="form.lm_date"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ </el-form-item>
+ </div>
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍗曟嵁鏃ユ湡"
+ width="105"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="status"
+ label="宸ュ崟鐘舵��"
+ width="105"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栧彿"
+ min-width="150"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="105"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ min-width="150"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partpesc"
+ label="浜у搧瑙勬牸"
+ width="105"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partpesc">{{ row.partpesc }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="route_code"
+ label="宸ヨ壓璺嚎缂栫爜"
+ width="130"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="route_name"
+ label="宸ヨ壓璺嚎鍚嶇О"
+ width="130"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="105"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="concat_name"
+ label="鐢熶骇杩涘害"
+ width="521"
+ sortable="custom"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div style="width: 900px;display: flex;overflow-x: auto;overflow-y: hidden">
+ <div
+ v-for="item in row.concat_name.split(',')"
+ :key="item+row.wo_code"
+ style="display: flex;align-items: center;padding:0px 0px 10px 0px;"
+ >
+ <!-- padding:0px 0px 10px 0px;-->
+
+ <div style="position: relative;display: flex;flex-direction: column;width: 80px;text-align: center;align-items: center;margin-left: 5px">
+ <div style="width: 80px;">{{ item.split('/')[0] }}</div>
+ <el-progress
+ :text-inside="true"
+ :stroke-width="20"
+ color="#2FD04F"
+ define-back-color="rgba(144,147,153,0.5)"
+ :percentage="parseFloat((parseFloat(item.split('/')[1])*100/parseFloat(row.plan_qty)).toFixed(2))"
+ style="width: 80px;margin: 0 2px"
+ />
+
+ <div style="position: absolute;top:22px;">{{ parseFloat(item.split('/')[1]) }}/{{ row.plan_qty }}</div>
+
+ </div>
+
+ </div>
+ </div>
+
+ </template>
+ </el-table-column>
+
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="120"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
+ <!-- <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
+ <!-- </el-tooltip>-->
+ <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
+ <!-- <i class="el-icon-delete" @click="del(row)" />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getProductionScheduleReportSearch"
+ />
+ </div>
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { handleDatetime } from '@/utils/global'
+import { ProductionScheduleReportExcelSearch, ProductionScheduleReportSearch } from '@/api/bbgl'
+
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ status: '', // 宸ュ崟鐘舵��
+ wocode: '', // 宸ュ崟缂栧彿
+ routecode: '', // 宸ヨ壓璺嚎缂栫爜
+ routename: '', // 宸ヨ壓璺嚎鍚嶇О
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 瑙勬牸鍨嬪彿
+ lm_date: '', // 鍗曟嵁鏃ユ湡
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ statusArr: [
+ { label: '鏈紑濮�', value: 'NOSTART' },
+ { label: '鎵ц涓�', value: 'START' },
+ { label: '宸插畬鎴�', value: 'CLOSED' }
+ ],
+
+ total: 10,
+ tableData: []
+
+ }
+ },
+
+ created() {
+ this.getProductionScheduleReportSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getProductionScheduleReportSearch() {
+ let tempDate = this.form.lm_date
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ const data = {
+ status: this.form.status,
+ wocode: this.form.wocode,
+ routecode: this.form.routecode,
+ routename: this.form.routename,
+ partcode: this.form.partcode,
+ partname: this.form.partname,
+ partspec: this.form.partspec,
+ lm_date: tempDate,
+ prop: this.form.prop,
+ order: this.form.order,
+ page: this.form.page,
+ rows: this.form.rows
+ }
+
+ const res = await ProductionScheduleReportSearch(data)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ // 瀵煎嚭
+ async download() {
+ let tempDate = this.form.lm_date
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ const data = {
+ status: this.form.status,
+ wocode: this.form.wocode,
+ routecode: this.form.routecode,
+ routename: this.form.routename,
+ partcode: this.form.partcode,
+ partname: this.form.partname,
+ partspec: this.form.partspec,
+ lm_date: tempDate
+ }
+
+ const { data: res } = await ProductionScheduleReportExcelSearch(data)
+ window.location.href = res
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getProductionScheduleReportSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getProductionScheduleReportSearch()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.status = ''
+ this.form.wocode = ''
+ this.form.routecode = ''
+ this.form.routename = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.lm_date = ''
+ this.getProductionScheduleReportSearch()
+ },
+
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 255
+ this.$refs.tableDataRef.doLayout()
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+ }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+
+::v-deep .el-range__icon {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+ font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
+
+::v-deep .el-progress-bar__innerText{
+ display: none !important;
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 88f0067..d329be0 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -183,7 +183,7 @@
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="150"
+ width="295"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -215,20 +215,20 @@
label="瀹屽伐鏁伴噺"
width="85"
/>
- <el-table-column
- prop="ng_qty"
- label="涓嶈壇鏁伴噺"
- width="85"
- />
- <el-table-column
- prop="wcl"
- label="瀹屾垚鐜�"
- width="60"
- >
- <template slot-scope="{row}">
- <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="ng_qty"-->
+ <!-- label="涓嶈壇鏁伴噺"-->
+ <!-- width="85"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="wcl"-->
+ <!-- label="瀹屾垚鐜�"-->
+ <!-- width="60"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="planstartdate"
label="棰勮寮�濮�"
diff --git a/src/views/kb/zhkbc.vue b/src/views/kb/zhkbc.vue
index db6d63f..0db554e 100644
--- a/src/views/kb/zhkbc.vue
+++ b/src/views/kb/zhkbc.vue
@@ -178,7 +178,7 @@
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="150"
+ width="295"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -210,20 +210,20 @@
label="瀹屽伐鏁伴噺"
width="85"
/>
- <el-table-column
- prop="ng_qty"
- label="涓嶈壇鏁伴噺"
- width="85"
- />
- <el-table-column
- prop="wcl"
- label="瀹屾垚鐜�"
- width="60"
- >
- <template slot-scope="{row}">
- <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="ng_qty"-->
+ <!-- label="涓嶈壇鏁伴噺"-->
+ <!-- width="85"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="wcl"-->
+ <!-- label="瀹屾垚鐜�"-->
+ <!-- width="60"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="planstartdate"
label="棰勮寮�濮�"
diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
index 1464540..317b62f 100644
--- a/src/views/scgl/gdplgb.vue
+++ b/src/views/scgl/gdplgb.vue
@@ -16,7 +16,21 @@
>
<div class="elForm">
<el-form-item label="宸ュ崟鐘舵��" label-width="70px" style=" display: flex;">
- <el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-select
+ v-model="form.mesorderstus"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="erporderstusChange"
+ >
+ <el-option
+ v-for="item in erporderstusArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
@@ -388,7 +402,16 @@
],
total: 10,
tableData: [],
-
+ erporderstusArr: [
+ { code: 'NEW', name: '鏂板伐鍗�' },
+ // { code: 'CREATING', name: '鎵ц涓�' },
+ // { code: 'CREATED', name: '宸插叧闂�' }
+ { code: 'ALLO', name: '宸叉淳鍙�' },
+ { code: 'START', name: '寮�宸�' },
+ { code: 'CLOSED', name: '瀹屽伐' }
+ // { code: 'NOSCHED', name: '寰呮帓绋�' },
+ // { code: 'SCHED', name: '宸叉帓绋�' }
+ ],
multipleSelection: [],
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
@@ -417,6 +440,10 @@
this.tableData = res.data
this.total = res.count
},
+ // 璁㈠崟鐘舵�佹敼鍙樻椂
+ erporderstusChange(val) {
+ this.form.mesorderstus = val
+ },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index bb38e4d..7feae1c 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -11,15 +11,15 @@
<div class="top_card_content_flex">
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩鐧诲綍</div>
- <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">15/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">10/
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop01" class="barTop" style="width: 100%;" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩鐧诲綍</div>
- <div class="content_end1">18/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <div class="content_end1">12/
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop02" class="barTop" style="width: 92%;" />
@@ -33,15 +33,15 @@
<div class="top_card_content_flex">
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩娲昏穬</div>
- <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">15/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">10/
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop03" class="barTop" style="width: 100%;" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩娲昏穬</div>
- <div class="content_end1">18/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <div class="content_end1">12/
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop04" class="barTop" style="width: 92%;" />
@@ -55,15 +55,15 @@
<div class="top_card_content_flex">
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩娲昏穬</div>
- <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">15/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">10/
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop05" class="barTop" style="width:100%;" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩娲昏穬</div>
- <div class="content_end1">18/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <div class="content_end1">12/
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop06" class="barTop" style="width: 92%;" />
@@ -78,14 +78,14 @@
<div class="content" style="width: 84%">
<div class="content_title1">浠婃棩娲昏穬</div>
<div class="content_end1" :style="{color:`rgb(${barTopColor04[0]})`}">0/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop07" class="barTop" style="width: 92%;" />
<div class="content" style="width: 84%">
<div class="content_title1">鏄ㄦ棩娲昏穬</div>
<div class="content_end1">0/
- <countTo :start-val="0" :end-val="37" :duration="3000" />
+ <countTo :start-val="0" :end-val="21" :duration="3000" />
</div>
</div>
<div id="barTop08" class="barTop" style="width: 92%;" />
@@ -123,9 +123,11 @@
<script>
import { bar01, barTop, line01, loadEcharts } from '@/utils/myEcharts'
+import countTo from 'vue-count-to'
export default {
name: 'Index',
+ components: { countTo },
data() {
return {
isIpad: false,
diff --git a/vue.config.js b/vue.config.js
index b810e3b..9ad2980 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -51,8 +51,8 @@
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
- target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑) (鏈笂浜�)
- // target: 'http://3up6ju.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑) (涓婁簯)
+ // target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑) (鏈笂浜�)
+ target: 'http://fcfnhp.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑) (涓婁簯)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3