From ed2117c738eedd3143d3b2ad6b0d40b2116afcf6 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:44:49 +0800
Subject: [PATCH] 首页/物品分发/物品报废
---
admin-web/src/styles/styles.scss | 1
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 10
admin-web/src/views/login/index.vue | 4
admin-web/src/views/dashboard/components/LBJETJ.vue | 54 +-
admin-web/src/views/departmentitem/itemdis/distribution/detail.vue | 93 ++-
/dev/null | 80 ---
admin-web/src/styles/sidebar.scss | 3
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue | 2
admin-web/src/views/dashboard/components/XYZC.vue | 200 ++------
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 115 +++-
admin-web/src/views/dashboard/components/LBSLTJ.vue | 52 +-
admin-web/src/views/departmentitem/itemdis/distribution/edit.vue | 85 +--
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 98 +---
admin-web/src/views/dashboard/index.vue | 431 ++++++++------------
14 files changed, 483 insertions(+), 745 deletions(-)
diff --git a/admin-web/src/styles/sidebar.scss b/admin-web/src/styles/sidebar.scss
index 2aa3f4e..6c04be0 100644
--- a/admin-web/src/styles/sidebar.scss
+++ b/admin-web/src/styles/sidebar.scss
@@ -67,7 +67,6 @@
.submenu-title-noDropdown,
.el-submenu__title {
&:hover {
- // background-color: rgba(0, 0, 0, 0.06) !important;
}
}
.is-active {
@@ -75,7 +74,7 @@
font-weight: 500;
}
.is-active > .el-submenu__title {
- // color: $base-menu-color-active ;
+
}
& .nest-menu .el-submenu > .el-submenu__title,
diff --git a/admin-web/src/styles/styles.scss b/admin-web/src/styles/styles.scss
index ea3f18d..0229071 100644
--- a/admin-web/src/styles/styles.scss
+++ b/admin-web/src/styles/styles.scss
@@ -128,7 +128,6 @@
.divBox {
padding: 20px;
- // padding: 0 20px 20px;
box-sizing: border-box;
.el-pagination {
display: flex;
diff --git a/admin-web/src/views/dashboard/components/GDLX.vue b/admin-web/src/views/dashboard/components/LBJETJ.vue
similarity index 67%
copy from admin-web/src/views/dashboard/components/GDLX.vue
copy to admin-web/src/views/dashboard/components/LBJETJ.vue
index 1d2eda7..36d2057 100644
--- a/admin-web/src/views/dashboard/components/GDLX.vue
+++ b/admin-web/src/views/dashboard/components/LBJETJ.vue
@@ -1,14 +1,19 @@
<template>
<div style="width: 100%">
- <div id="main3" />
- <p style="text-align: center;font-size: 16px;font-weight: 600">宸ュ崟绫诲瀷</p>
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span class="font-18 font-bold">绫诲埆閲戦缁熻</span>
+ </div>
+ <div id="LBJETJ" style="height: 300px"/>
+ </el-card>
</div>
</template>
<script>
import * as echarts from 'echarts';
+import * as dash from "@/api/dashboard/dash";
export default {
- name: 'GDLX',
+ name: 'LBSLTJ',
props: {
activeId: {
type: String,
@@ -21,15 +26,10 @@
options: {},
};
},
- mounted() {
+ mounted(){
this.getCenterLine();
- // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
- window.addEventListener('resize', () => {
- this.changeWidth();
- });
},
methods: {
-
getCenterLine() {
// getCenterLine({
// id: this.activeId,
@@ -39,8 +39,12 @@
// endDay: this.value2 ? this.value2[1] : null
// }).then(res => {
// const data = res.data
- var chartDom = document.getElementById('main3');
+ var chartDom = document.getElementById('LBJETJ');
this.myChart = echarts.init(chartDom);
+ // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
+ window.addEventListener('resize', () => {
+ this.changeWidth();
+ });
this.options = {
color: [ '#1877FF','#5EDEA5','#F7BE12','#55C6E1','#ED653B'],
tooltip: {
@@ -49,27 +53,17 @@
type: 'shadow',
},
},
-
- // toolbox: {
- // show: true,
- // orient: 'vertical',
- // left: 'right',
- // top: 'center',
- // feature: {
- // mark: { show: true },
- // dataView: { show: true, readOnly: false },
- // magicType: { show: true, type: ['line', 'bar', 'stack'] },
- // restore: { show: true },
- // saveAsImage: { show: true },
- // },
- // },
-
+ legend: {
+ orient: 'vertical',
+ right: 0,
+ top: 60,
+ bottom: 20,
+ },
series: [
{
name: 'Access From',
type: 'pie',
- radius: ['40%','65%'],
minAngle: 2, // 鏈�灏忕殑鎵囧尯瑙掑害锛�0~360锛夛紝鐢ㄤ簬闃叉鏌愪釜鍊艰繃灏忓鑷存墖鍖哄お灏忓奖鍝嶄氦浜�
avoidLabelOverlap: true, // 鏄惁鍚敤闃叉鏍囩閲嶅彔绛栫暐
itemStyle: {
@@ -88,9 +82,9 @@
}
},
data: [
- { value: 1048, name: '璁″垝宸ュ崟' },
- { value: 735, name: '鏁呴殰宸ュ崟' },
- { value: 580, name: '鏃ュ父宸ュ崟' },
+ { value: 100, name: '绛夌骇涓�' },
+ { value: 100, name: '绛夌骇浜�' },
+ { value: 100, name: '绛夌骇涓�' },
]
}]
@@ -104,7 +98,7 @@
};
</script>
<style lang="scss" scoped>
-#main3 {
+#main2 {
width: 100%;
height: 300px;
}
diff --git a/admin-web/src/views/dashboard/components/GDLX.vue b/admin-web/src/views/dashboard/components/LBSLTJ.vue
similarity index 67%
rename from admin-web/src/views/dashboard/components/GDLX.vue
rename to admin-web/src/views/dashboard/components/LBSLTJ.vue
index 1d2eda7..92717d0 100644
--- a/admin-web/src/views/dashboard/components/GDLX.vue
+++ b/admin-web/src/views/dashboard/components/LBSLTJ.vue
@@ -1,14 +1,19 @@
<template>
<div style="width: 100%">
- <div id="main3" />
- <p style="text-align: center;font-size: 16px;font-weight: 600">宸ュ崟绫诲瀷</p>
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span class="font-18 font-bold">绫诲埆鏁伴噺缁熻</span>
+ </div>
+ <div id="LBSLTJ" style="height: 300px"/>
+ </el-card>
</div>
</template>
<script>
import * as echarts from 'echarts';
+import * as dash from "@/api/dashboard/dash";
export default {
- name: 'GDLX',
+ name: 'LBSLTJ',
props: {
activeId: {
type: String,
@@ -23,13 +28,8 @@
},
mounted() {
this.getCenterLine();
- // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
- window.addEventListener('resize', () => {
- this.changeWidth();
- });
},
methods: {
-
getCenterLine() {
// getCenterLine({
// id: this.activeId,
@@ -39,8 +39,12 @@
// endDay: this.value2 ? this.value2[1] : null
// }).then(res => {
// const data = res.data
- var chartDom = document.getElementById('main3');
+ var chartDom = document.getElementById('LBSLTJ');
this.myChart = echarts.init(chartDom);
+ // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
+ window.addEventListener('resize', () => {
+ this.changeWidth();
+ });
this.options = {
color: [ '#1877FF','#5EDEA5','#F7BE12','#55C6E1','#ED653B'],
tooltip: {
@@ -49,27 +53,17 @@
type: 'shadow',
},
},
-
- // toolbox: {
- // show: true,
- // orient: 'vertical',
- // left: 'right',
- // top: 'center',
- // feature: {
- // mark: { show: true },
- // dataView: { show: true, readOnly: false },
- // magicType: { show: true, type: ['line', 'bar', 'stack'] },
- // restore: { show: true },
- // saveAsImage: { show: true },
- // },
- // },
-
+ legend: {
+ orient: 'vertical',
+ right: 0,
+ top: 60,
+ bottom: 20,
+ },
series: [
{
name: 'Access From',
type: 'pie',
- radius: ['40%','65%'],
minAngle: 2, // 鏈�灏忕殑鎵囧尯瑙掑害锛�0~360锛夛紝鐢ㄤ簬闃叉鏌愪釜鍊艰繃灏忓鑷存墖鍖哄お灏忓奖鍝嶄氦浜�
avoidLabelOverlap: true, // 鏄惁鍚敤闃叉鏍囩閲嶅彔绛栫暐
itemStyle: {
@@ -88,9 +82,9 @@
}
},
data: [
- { value: 1048, name: '璁″垝宸ュ崟' },
- { value: 735, name: '鏁呴殰宸ュ崟' },
- { value: 580, name: '鏃ュ父宸ュ崟' },
+ { value: 100, name: '绛夌骇涓�' },
+ { value: 100, name: '绛夌骇浜�' },
+ { value: 100, name: '绛夌骇涓�' },
]
}]
@@ -104,7 +98,7 @@
};
</script>
<style lang="scss" scoped>
-#main3 {
+#main2 {
width: 100%;
height: 300px;
}
diff --git a/admin-web/src/views/dashboard/components/SJDJ.vue b/admin-web/src/views/dashboard/components/SJDJ.vue
deleted file mode 100644
index 6ea0f91..0000000
--- a/admin-web/src/views/dashboard/components/SJDJ.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
- <div style="width: 100%">
- <div id="main2" />
- <p style="text-align: center;font-size: 16px;font-weight: 600">浜嬩欢绛夌骇</p>
- </div>
-</template>
-<script>
-import * as echarts from 'echarts';
-import * as dash from "@/api/dashboard/dash";
-
-export default {
- name: 'SJDJ',
- props: {
- activeId: {
- type: String,
- default: '',
- },
- },
- data() {
- return {
- myChart: null,
- options: {},
- };
- },
- mounted() {
- this.getCenterLine();
- // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
- window.addEventListener('resize', () => {
- this.changeWidth();
- });
- this.getData();
- },
- methods: {
- getData(){
- //鑾峰彇椤圭洰鏁版嵁
- dash.getLVNum().then(res => {
- if (res) {
- this.projectInfo = res
- // 浜嬩欢鏁伴噺
- this.options.series[0].data = this.projectInfo
- this.myChart.setOption(this.options)
- }
- })
- },
- getCenterLine() {
- // getCenterLine({
- // id: this.activeId,
- // weekFlag: this.weekFlag,
- // monthFlag: this.monthFlag,
- // startDay: this.value2 ? this.value2[0] : null,
- // endDay: this.value2 ? this.value2[1] : null
- // }).then(res => {
- // const data = res.data
- var chartDom = document.getElementById('main2');
- this.myChart = echarts.init(chartDom);
- this.options = {
- color: [ '#1877FF','#5EDEA5','#F7BE12','#55C6E1','#ED653B'],
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow',
- },
- },
-
- // toolbox: {
- // show: true,
- // orient: 'vertical',
- // left: 'right',
- // top: 'center',
- // feature: {
- // mark: { show: true },
- // dataView: { show: true, readOnly: false },
- // magicType: { show: true, type: ['line', 'bar', 'stack'] },
- // restore: { show: true },
- // saveAsImage: { show: true },
- // },
- // },
-
- series: [
- {
-
- name: 'Access From',
- type: 'pie',
- radius: ['40%','65%'],
- minAngle: 2, // 鏈�灏忕殑鎵囧尯瑙掑害锛�0~360锛夛紝鐢ㄤ簬闃叉鏌愪釜鍊艰繃灏忓鑷存墖鍖哄お灏忓奖鍝嶄氦浜�
- avoidLabelOverlap: true, // 鏄惁鍚敤闃叉鏍囩閲嶅彔绛栫暐
- itemStyle: {
- normal: {
- label: {
- show: true,
- formatter(param) {
- // correct the percentage
- return param.name + '\n' + ' ' + param.percent.toFixed(1) + '%';
- }
- },
- labelLine: {
- show: true,
- length: 0.01
- }
- }
- },
- data: [
- { value: 100, name: '绛夌骇涓�' },
- { value: 100, name: '绛夌骇浜�' },
- { value: 100, name: '绛夌骇涓�' },
-
- ]
- }]
- };
- this.options && this.myChart.setOption(this.options);
- },
- changeWidth() {
- this.myChart.resize();
- },
- },
-};
-</script>
-<style lang="scss" scoped>
-#main2 {
- width: 100%;
- height: 300px;
-}
-
-.box-card {
- margin-top: 10px;
- width: 100%;
- border-radius: 10px;
- border: none;
- .card-title-right {
- display: flex;
- align-items: center;
- align-self: flex-end;
- float: right;
- }
-}
-</style>
diff --git a/admin-web/src/views/dashboard/components/SJGDZB.vue b/admin-web/src/views/dashboard/components/SJGDZB.vue
deleted file mode 100644
index 7a367b1..0000000
--- a/admin-web/src/views/dashboard/components/SJGDZB.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
- <div style="width: 100%">
- <div id="main4" />
- <p style="text-align: center;font-size: 16px;font-weight: 600">浜嬩欢宸ュ崟鍗犳瘮</p>
- </div>
-</template>
-<script>
-import * as echarts from 'echarts';
-import * as dash from "@/api/dashboard/dash";
-
-export default {
- name: 'SJGDZB',
- props: {
- activeId: {
- type: String,
- default: '',
- },
- },
- data() {
- return {
- myChart: null,
- options: {},
- };
- },
- mounted() {
- this.getCenterLine();
- // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
- window.addEventListener('resize', () => {
- this.changeWidth();
- });
- this.getData();
- },
- methods: {
- getData(){
- //鑾峰彇椤圭洰鏁版嵁
- dash.getEventType().then(res => {
- if (res) {
- this.projectInfo = res
- // 浜嬩欢鏁伴噺
- this.options.series[0].data = this.projectInfo
- this.myChart.setOption(this.options)
- }
- })
- },
- getCenterLine() {
- // getCenterLine({
- // id: this.activeId,
- // weekFlag: this.weekFlag,
- // monthFlag: this.monthFlag,
- // startDay: this.value2 ? this.value2[0] : null,
- // endDay: this.value2 ? this.value2[1] : null
- // }).then(res => {
- // const data = res.data
- var chartDom = document.getElementById('main4');
- this.myChart = echarts.init(chartDom);
- this.options = {
- color: [ '#1877FF','#5EDEA5','#F7BE12','#55C6E1','#ED653B'],
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow',
- },
- },
-
- // toolbox: {
- // show: true,
- // orient: 'vertical',
- // left: 'right',
- // top: 'center',
- // feature: {
- // mark: { show: true },
- // dataView: { show: true, readOnly: false },
- // magicType: { show: true, type: ['line', 'bar', 'stack'] },
- // restore: { show: true },
- // saveAsImage: { show: true },
- // },
- // },
-
- series: [
- {
-
- name: 'Access From',
- type: 'pie',
- radius: ['40%','65%'],
- minAngle: 2, // 鏈�灏忕殑鎵囧尯瑙掑害锛�0~360锛夛紝鐢ㄤ簬闃叉鏌愪釜鍊艰繃灏忓鑷存墖鍖哄お灏忓奖鍝嶄氦浜�
- avoidLabelOverlap: true, // 鏄惁鍚敤闃叉鏍囩閲嶅彔绛栫暐
- itemStyle: {
- normal: {
- label: {
- show: true,
- formatter(param) {
- // correct the percentage
- return param.name + '\n' + ' ' + param.percent.toFixed(1) + '%';
- }
- },
- labelLine: {
- show: true,
- length: 0.01
- }
- }
- },
- data: [
- { value: 1048, name: '鍜ㄨ' },
- { value: 735, name: '鍛婅' },
- { value: 580, name: '鏁呴殰' },
- { value: 580, name: '鏈嶅姟璇锋眰' },
- { value: 580, name: '鐢冲憡' },
-
-
- ]
- }]
- };
- this.options && this.myChart.setOption(this.options);
- },
- changeWidth() {
- this.myChart.resize();
- },
- },
-};
-</script>
-<style lang="scss" scoped>
-#main4 {
- width: 100%;
- height: 300px;
-}
-
-.box-card {
- margin-top: 10px;
- width: 100%;
- border-radius: 10px;
- border: none;
- .card-title-right {
- display: flex;
- align-items: center;
- align-self: flex-end;
- float: right;
- }
-}
-</style>
diff --git a/admin-web/src/views/dashboard/components/XMGZD.vue b/admin-web/src/views/dashboard/components/XMGZD.vue
deleted file mode 100644
index 0151ea9..0000000
--- a/admin-web/src/views/dashboard/components/XMGZD.vue
+++ /dev/null
@@ -1,261 +0,0 @@
-<template>
- <div style="width: 100%">
- <el-card class="box-card">
- <div slot="header" class="clearfix">
- <span style="font-weight: 600; font-size: 20px">椤圭洰宸ヤ綔鍗曠粺璁�</span>
- <div class="card-title-right">
- <div :style="{ color: weekFlag ? '#378cff' : '' }" @click="changeDate(1)">杩�7澶�</div>
- <div :style="{ color: monthFlag ? '#378cff' : '' }" style="margin: 0 30px 0 10px" @click="changeDate(2)">
- 杩�30澶�
- </div>
- <el-date-picker
- v-model="value2"
- type="daterange"
- :picker-options="pickerOptions"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- align="right"
- value-format="yyyyMMdd"
- />
- <el-button type="primary" style="margin-left: 10px" @click="searchOnClick">鎼滅储</el-button>
- </div>
- </div>
- <div id="main" />
- </el-card>
- </div>
-</template>
-<script>
-import * as echarts from 'echarts';
-import * as dash from '@/api/dashboard/dash';
-
-export default {
- name: 'XMGZD',
- props: {
- activeId: {
- type: String,
- default: '',
- },
- },
- data() {
- return {
- pickerOptions: {
- shortcuts: [
- {
- text: '鏈�杩戜竴鍛�',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit('pick', [start, end]);
- },
- },
- {
- text: '鏈�杩戜竴涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
- picker.$emit('pick', [start, end]);
- },
- },
- {
- text: '鏈�杩戜笁涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
- picker.$emit('pick', [start, end]);
- },
- },
- ],
- },
- value2: '',
- myChart: null,
- weekFlag: 1, // 杩戜竷澶�
- monthFlag: null, // 杩�30澶�
- options: {},
- };
- },
- mounted() {
- this.getCenterLine();
- // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
- window.addEventListener('resize', () => {
- this.changeWidth();
- });
- this.getProjectInfo();
- },
- created() {},
- methods: {
- changeDate(type) {
- if (type == 1) {
- this.monthFlag = null;
- if (this.weekFlag) {
- this.weekFlag = null;
- } else {
- this.weekFlag = 1;
- }
- if (this.weekFlag) {
- this.monthFlag = null;
- this.value2 = [];
- }
- this.searchByTime();
- }
- if (type == 2) {
- this.weekFlag = null;
- if (this.monthFlag) {
- this.monthFlag = null;
- } else {
- this.monthFlag = 1;
- }
- if (this.monthFlag) {
- this.weekFlag = null;
- this.value2 = [];
- }
- this.searchByTime();
- }
- },
- searchOnClick() {
- this.monthFlag = null;
- this.weekFlag = null;
- this.searchByTime();
- },
- getProjectInfo() {
- //鑾峰彇椤圭洰鏁版嵁
- dash.getNumByProject().then((res) => {
- if (res) {
- this.projectInfo = res;
- this.options.xAxis[0].data = this.projectInfo.projjectName;
- // 浜嬩欢鏁伴噺
- this.options.series[0].data = this.projectInfo.eventNum;
- // 宸ュ崟鏁伴噺
- this.options.series[1].data = this.projectInfo.workNum;
- this.myChart.setOption(this.options);
- }
- });
- },
- searchByTime() {
- var param = {};
- if (this.value2 != null && this.value2.length > 0) {
- param.begin = this.value2[0];
- param.end = this.value2[1];
- }
-
- if (this.weekFlag != null) {
- param.weekFlag = this.weekFlag;
- }
- if (this.monthFlag != null) {
- param.monthFlag = this.monthFlag;
- }
- dash.getNumByProject(param).then((res) => {
- if (res) {
- this.projectInfo = res;
- this.options.xAxis[0].data = this.projectInfo.projjectName;
- // 浜嬩欢鏁伴噺
- this.options.series[0].data = this.projectInfo.eventNum;
- // 宸ュ崟鏁伴噺
- this.options.series[1].data = this.projectInfo.workNum;
- this.myChart.setOption(this.options);
- }
- });
- },
- getCenterLine() {
- // getCenterLine({
- // id: this.activeId,
- // weekFlag: this.weekFlag,
- // monthFlag: this.monthFlag,
- // startDay: this.value2 ? this.value2[0] : null,
- // endDay: this.value2 ? this.value2[1] : null
- // }).then(res => {
- // const data = res.data
- var chartDom = document.getElementById('main');
- this.myChart = echarts.init(chartDom);
- this.options = {
- color: ['#5EDEA5', '#1877FF'],
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow',
- },
- },
- legend: {
- data: ['闂宸ュ崟', '浜嬩欢宸ュ崟'],
- },
- toolbox: {
- show: true,
- orient: 'vertical',
- left: 'right',
- top: 'center',
- feature: {
- mark: { show: true },
- dataView: { show: true, readOnly: false },
- magicType: { show: true, type: ['line', 'bar', 'stack'] },
- restore: { show: true },
- saveAsImage: { show: true },
- },
- },
- xAxis: [
- {
- type: 'category',
- axisTick: { show: false },
- data: ['棰勭畻涓�浣撳寲骞冲彴', '涓�鍗￠�氱郴缁�', '棰勭畻涓�浣撳寲骞冲彴', '涓�鍗￠�氱郴缁�'],
- },
- ],
- yAxis: [
- {
- type: 'value',
- },
- ],
- series: [
- {
- name: '浜嬩欢宸ュ崟',
- type: 'bar',
- barWidth: 20,
- barGap: 0,
- emphasis: {
- focus: 'series',
- },
- data: [320, 332, 301, 334],
- },
- {
- name: '闂宸ュ崟',
- type: 'bar',
- barWidth: 20,
-
- emphasis: {
- focus: 'series',
- },
- data: [220, 182, 191, 234],
- },
- ],
- };
-
- this.options && this.myChart.setOption(this.options);
- // });
- },
- changeWidth() {
- this.myChart.resize();
- },
- },
-};
-</script>
-<style lang="scss" scoped>
-#main {
- width: 100%;
- height: 400px;
-}
-
-.box-card {
- margin-top: 10px;
- width: 100%;
- border-radius: 10px;
- border: none;
-
- .card-title-right {
- display: flex;
- align-items: center;
- align-self: flex-end;
- float: right;
- }
-}
-</style>
diff --git a/admin-web/src/views/dashboard/components/XYZC.vue b/admin-web/src/views/dashboard/components/XYZC.vue
index 5066119..89be963 100644
--- a/admin-web/src/views/dashboard/components/XYZC.vue
+++ b/admin-web/src/views/dashboard/components/XYZC.vue
@@ -2,26 +2,9 @@
<div style="width: 100%">
<el-card class="box-card">
<div slot="header" class="clearfix">
- <span style="font-weight: 600; font-size: 20px">鍝嶅簲鏀寔绫荤粺璁�</span>
- <div class="card-title-right">
- <div :style="{ color: weekFlag ? '#378cff' : '' }" @click="changeDate(1)">杩�7澶�</div>
- <div :style="{ color: monthFlag ? '#378cff' : '' }" style="margin: 0 30px 0 10px" @click="changeDate(2)">
- 杩�30澶�
- </div>
- <el-date-picker
- v-model="value2"
- type="daterange"
- :picker-options="pickerOptions"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- align="right"
- value-format="yyyyMMdd"
- />
- <el-button type="primary" style="margin-left: 10px" @click="getCenterLine">鎼滅储</el-button>
- </div>
+ <span class="font-18 font-bold">璧勪骇澧為暱/鎶ュ簾缁熻鍥撅紙鏁伴噺锛�</span>
</div>
- <div id="main1" />
+ <div id="ZCZZ" />
</el-card>
</div>
</template>
@@ -38,93 +21,22 @@
},
data() {
return {
- pickerOptions: {
- shortcuts: [
- {
- text: '鏈�杩戜竴鍛�',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit('pick', [start, end]);
- },
- },
- {
- text: '鏈�杩戜竴涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
- picker.$emit('pick', [start, end]);
- },
- },
- {
- text: '鏈�杩戜笁涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
- picker.$emit('pick', [start, end]);
- },
- },
- ],
- },
- value2: '',
myChart: null,
- weekFlag: 1, // 杩戜竷澶�
- monthFlag: null, // 杩�30澶�
options: {},
};
},
mounted() {
this.getCenterLine();
- // 鐩戝惉灞忓箷瀹藉害鍙樺寲锛氬綋娴忚鍣ㄥ彂鐢焤esize浜嬩欢鐨勬椂鍊欙紝瑙﹀彂echart鐨剅esize浜嬩欢锛岄噸缁榗anvas
- window.addEventListener('resize', () => {
- this.changeWidth();
- });
},
methods: {
- changeDate(type) {
- if (type == 1) {
- this.monthFlag = null;
- if (this.weekFlag) {
- this.weekFlag = null;
- } else {
- this.weekFlag = 1;
- }
- if (this.weekFlag) {
- this.monthFlag = null;
- this.value2 = [];
- }
- this.getCenterLine();
- }
- if (type == 2) {
- this.weekFlag = null;
- if (this.monthFlag) {
- this.monthFlag = null;
- } else {
- this.monthFlag = 1;
- }
- if (this.monthFlag) {
- this.weekFlag = null;
- this.value2 = [];
- }
- this.getCenterLine();
- }
- },
getCenterLine() {
- // getCenterLine({
- // id: this.activeId,
- // weekFlag: this.weekFlag,
- // monthFlag: this.monthFlag,
- // startDay: this.value2 ? this.value2[0] : null,
- // endDay: this.value2 ? this.value2[1] : null
- // }).then(res => {
- // const data = res.data
- var chartDom = document.getElementById('main1');
+ var chartDom = document.getElementById('ZCZZ');
this.myChart = echarts.init(chartDom);
+ window.addEventListener('resize', () => {
+ this.changeWidth();
+ });
this.options = {
- color: ['#ED653B', '#1877FF'],
+ color: ['#5BE1FD', '#FFD15C'],
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -132,39 +44,21 @@
},
},
legend: {
- data: ['鍝嶅簲閫熷害', '澶勭悊閫熷害'],
+ data: ['璧勪骇澧為暱', '璧勪骇鎶ュ簾'],
},
toolbox: {
- show: true,
- orient: 'vertical',
- left: 'right',
- top: 'center',
- feature: {
- mark: { show: true },
- dataView: { show: true, readOnly: false },
- magicType: { show: true, type: ['line', 'bar', 'stack'] },
- restore: { show: true },
- saveAsImage: { show: true },
- },
+ show: false
+ },
+ grid: {
+ left: '30',
+ right: '30',
+ bottom: '30px'
},
xAxis: [
{
type: 'category',
axisTick: { show: false },
- data: [
- '12-01',
- '12-02',
- '12-03',
- '12-04',
- '12-05',
- '12-06',
- '12-07',
- '12-08',
- '12-09',
- '12-10',
- '12-11',
- '12-12',
- ],
+ data: ['1鏈�','2鏈�','3鏈�','4鏈�','5鏈�','6鏈�','7鏈�','8鏈�','9鏈�','10鏈�','11鏈�','12鏈�'],
},
],
yAxis: [
@@ -172,27 +66,9 @@
type: 'value',
},
],
- dataZoom: [
- {
- orient: 'horizontal',
-
- show: true, //鎺у埗婊氬姩鏉℃樉绀洪殣钘�
-
- realtime: true, //鎷栧姩婊氬姩鏉℃椂鏄惁鍔ㄦ�佺殑鏇存柊鍥捐〃鏁版嵁
-
- height: 15, //婊氬姩鏉￠珮搴�
-
- start: 0, //婊氬姩鏉″紑濮嬩綅缃紙鍏�100绛変唤锛�
- //
- // end: 30, //婊氬姩鏉＄粨鏉熶綅缃�
- bottom: '4%',
- zoomLock: true, //鎺у埗闈㈡澘鏄惁杩涜缂╂斁
- }
- ],
-
series: [
{
- name: '鍝嶅簲閫熷害',
+ name: '璧勪骇澧為暱',
type: 'line',
barGap: 0,
smooth: true,
@@ -200,21 +76,57 @@
focus: 'series',
},
data: [320, 332, 301, 334, 320, 332, 301, 334, 320, 332, 301, 334],
+ lineStyle: {
+ width: 2, // 澶栬竟绾垮搴�
+ color: '#5BE1FD'// 澶栬竟绾块鑹�
+ },
+ areaStyle: {// 鍖哄煙濉厖娓愬彉棰滆壊
+ color: {
+ type: 'linear',
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0, color: 'rgba(91, 225, 253, .6)' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1, color: 'rgba(91, 225, 253, 0)' // 100% 澶勭殑棰滆壊
+ }],
+ global: false // 缂虹渷涓� false
+ }
+ }
},
{
- name: '澶勭悊閫熷害',
+ name: '璧勪骇鎶ュ簾',
type: 'line',
smooth: true,
emphasis: {
focus: 'series',
},
data: [220, 182, 191, 234, 220, 182, 191, 234, 220, 182, 191, 234],
+ lineStyle: {
+ width: 2, // 澶栬竟绾垮搴�
+ color: '#FFD15C'// 澶栬竟绾块鑹�
+ },
+ areaStyle: {// 鍖哄煙濉厖娓愬彉棰滆壊
+ color: {
+ type: 'linear',
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0, color: 'rgba(255, 209, 92, .6)' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1, color: 'rgba(255, 209, 92, 0)' // 100% 澶勭殑棰滆壊
+ }],
+ global: false // 缂虹渷涓� false
+ }
+ }
},
],
};
-
this.options && this.myChart.setOption(this.options);
- // });
},
changeWidth() {
this.myChart.resize();
@@ -223,7 +135,7 @@
};
</script>
<style lang="scss" scoped>
-#main1 {
+#ZCZZ {
width: 100%;
height: 400px;
}
diff --git a/admin-web/src/views/dashboard/components/progressMY.vue b/admin-web/src/views/dashboard/components/progressMY.vue
deleted file mode 100644
index fbe7ea8..0000000
--- a/admin-web/src/views/dashboard/components/progressMY.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
- <div class="container">
- <div class="box">
- <div class="flex">
- <span>寰呭搷搴�</span>
- <el-progress style="flex: 1;margin-left: 10px" :text-inside="true" :stroke-width="26" :percentage="this.projectInfo.poolBi"></el-progress>
- </div>
- <div class="flex">
- <span>杩涜涓�</span>
- <el-progress
- style="flex: 1;margin-left: 10px"
- :text-inside="true"
- :stroke-width="24"
- :percentage="this.projectInfo.doBi"
- status="success"
- ></el-progress>
- </div>
- <div class="flex">
- <span>宸插鐞�</span>
- <el-progress
- :text-inside="true"
- style="flex: 1;margin-left: 10px"
- :stroke-width="20"
- :percentage="this.projectInfo.doneBi"
- status="exception"
- ></el-progress>
- </div>
- <div class="flex">
- <span>宸插彇娑�</span>
- <el-progress
- :text-inside="true"
- style="flex: 1;margin-left: 10px"
- :stroke-width="20"
- :percentage="this.projectInfo.noBi"
- status="warning"
- ></el-progress>
- </div>
- </div>
- <p style="text-align: center;font-size: 16px;font-weight: 600">娴佺▼鍗犳瘮</p>
- </div>
-</template>
-
-<script>
-import * as dash from "@/api/dashboard/dash";
-
-export default {
- name: 'progressMY',
- data() {
- return {
- projectInfo: {},
-
- }
- },
- mounted() {
- dash.getProcess().then(res => {
- if (res) {
- this.projectInfo = res
- }
- })
- }
-};
-
-
-
-</script>
-
-<style scoped>
-
-.box {
- width: 100%;
- height: 300px;
-
- transform: translateY(30%);
-}
-.flex {
- display: flex;
- align-items: center;
- margin-bottom: 20px;
-}
-</style>
diff --git a/admin-web/src/views/dashboard/index.vue b/admin-web/src/views/dashboard/index.vue
index c65a195..d006b95 100644
--- a/admin-web/src/views/dashboard/index.vue
+++ b/admin-web/src/views/dashboard/index.vue
@@ -1,212 +1,112 @@
<template>
<div class="content">
-<!-- <el-row :gutter="10">
+ <el-row :gutter="20">
<el-col :span="12">
- <el-row :gutter="10">
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/qbgd.png"></img>
- <span>鍏ㄩ儴宸ュ崟</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">20<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/gdc.png"></img>
- <span>宸ュ崟姹�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">2<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/gdc.png"></img>
- <span>寰呭搷搴斿伐鍗�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">1<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- </el-row>
+ <el-card shadow="never">
+ <div slot="header" class="clearfix">
+ <span class="font-18 font-bold">寰呭姙鍚嶇О</span>
+ </div>
+ <div class="f-r f-r-between m-b-10">
+ <el-radio-group v-model="waitType" size="medium">
+ <el-radio-button label="1">鍏ㄩ儴</el-radio-button>
+ </el-radio-group>
+ <div class="to-more" @click="nav('/stock/transfer/transferissue')">鏌ョ湅鏇村 ></div>
+ </div>
+ <el-table :data="waitWorkData" class="top-tb" :show-header="false" size="medium">
+ <el-table-column prop="number" align="center"></el-table-column>
+ <el-table-column prop="type" align="center" width="100"></el-table-column>
+ <el-table-column prop="orgName" align="center" width="100"></el-table-column>
+ <el-table-column prop="name" align="center" width="80"></el-table-column>
+ <el-table-column prop="createTime" align="center" width="180">
+ <template slot-scope="scope">
+ <span class="font-14 color-333">{{ formattTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="date" label="鎿嶄綔" align="center" width="120">
+ <template slot-scope="scope">
+ <el-button @click.native.prevent="aduitThis(scope.row.id)" size="small" type="primary">澶勭悊</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
</el-col>
<el-col :span="12">
- <el-row :gutter="10">
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/jxzgd.png"></img>
- <span>杩涜涓伐鍗�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">3<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/gdc.png"></img>
- <span>浜嬩欢姹�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">{{eventInfo.pool}}<span class="font-12">涓�</span> </div>
- <div>
- <img v-if="eventInfo.poolLastNum>=0" class='arrow' src="@/assets/images/index/top.png"></img>
- <img v-if="eventInfo.poolLastNum<0" class='arrow' src="@/assets/images/index/down.png"></img>
- 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/dxy.png"></img>
- <span>杩涜涓簨浠�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">{{eventInfo.wait}}<span class="font-12">涓�</span> </div>
- <div>
- <img v-if="eventInfo.waitLastNum>=0" class='arrow' src="@/assets/images/index/top.png"></img>
- <img v-if="eventInfo.waitLastNum<0" class='arrow' src="@/assets/images/index/down.png"></img>
- 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- </el-row>
+ <el-card shadow="never">
+ <div slot="header" class="clearfix">
+ <span class="font-18 font-bold">棰勮閫氱煡</span>
+ </div>
+ <div class="f-r f-r-between m-b-10">
+ <el-radio-group size="medium" v-model="earlyWarningType" @change="changeEarlyWarning">
+ <el-radio-button label="1">鍏ㄩ儴</el-radio-button>
+ <el-radio-button label="2">缂鸿揣锛�12锛�</el-radio-button>
+ <el-radio-button label="3">瓒呭嚭锛�3锛�</el-radio-button>
+ </el-radio-group>
+ <div class="to-more" @click="nav('/stock/ledger/alertQuery')">鏌ョ湅鏇村 ></div>
+ </div>
+ <el-table :data="earlyWarningData" class="top-tb" :show-header="false" size="medium">
+ <el-table-column prop="type" align="center"></el-table-column>
+ <el-table-column prop="name" align="center" width="100"></el-table-column>
+ <el-table-column prop="orgName" align="center" width="100"></el-table-column>
+ <el-table-column prop="surplus" align="center" width="100">
+ <template slot-scope="scope">
+ <span class="font-14 color-333">鍓╀綑{{ scope.row.surplus }}濂�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createTime" align="center" width="180">
+ <template slot-scope="scope">
+ <span class="font-14 color-333">{{ formattTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="date" label="鎿嶄綔" align="center" width="120">
+ <template slot-scope="scope">
+ <el-button @click.native.prevent="aduitThis(scope.row.id)" size="small" type="primary">澶勭悊</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
</el-col>
</el-row>
-
- <el-row :gutter="10" style="margin-top: 10px">
+ <!-- 涓棿缁熻閮ㄥ垎-->
+ <div class="f-r f-r-between total-list">
+ <div class="total-item">
+ <div class="font-14 color-666">鐗╁搧鏁伴噺</div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">1200</span></div>
+ </div>
+ <div class="total-item">
+ <div class="font-14 color-666">璧勪骇鎬婚噾棰�</div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">120.88</span>涓囧厓</div>
+ </div>
+ <div class="total-item">
+ <div class="font-14 color-666">鐗╁搧鍗犵敤鐜�</div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">80%</span></div>
+ </div>
+ <div class="total-item">
+ <div class="font-14 color-666">A绫荤墿鍝佹暟閲�</div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">120</span></div>
+ </div>
+ <div class="total-item">
+ <div class="font-14 color-666">B绫荤墿鍝佹暟閲�</div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">123</span></div>
+ </div>
+ </div>
+ <!-- 绫诲埆閲戦缁熻/绫诲埆鏁伴噺缁熻 -->
+ <el-row :gutter="20">
<el-col :span="12">
- <el-row :gutter="10">
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/wtc.png"></img>
- <span>闂姹�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">0<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/dxy.png"></img>
- <span>寰呭搷搴旈棶棰�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">0<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/gdc.png"></img>
- <span>鍙樻洿宸ュ崟</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">0<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- </el-row>
+ <LBSLTJ></LBSLTJ>
</el-col>
<el-col :span="12">
- <el-row :gutter="10">
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/dxy.png"></img>
- <span>寰呭搷搴斿彉鏇�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">0<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/fbgd.png"></img>
- <span>鍙戝竷宸ュ崟</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">2<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="flex bg-fff box flex-between">
- <div class="flex f-c f-col">
- <img class="icon" src="@/assets/images/index/dxy.png"></img>
- <span>寰呭搷搴斿彂甯�</span>
- </div>
- <div class="flex f-e f-col">
- <div class="font-28">5<span class="font-12">涓�</span> </div>
- <div><img class='arrow' src="@/assets/images/index/top.png"></img> 鐜瘮涓婂懆</div>
- </div>
- </div>
- </el-col>
- </el-row>
+ <LBJETJ></LBJETJ>
</el-col>
</el-row>
- <el-row :gutter="10">
- <el-col :span="12">
- <XMGZD></XMGZD>
- </el-col>
- <el-col :span="12">
- <XYZC></XYZC>
- </el-col>
- </el-row>
- <el-card class="box-card">
-
- <span style="font-weight: 600;font-size: 20px">宸ュ崟缁熻</span>
-
- <el-row :gutter="10">
- <el-col :span="6">
- <SJDJ></SJDJ>
- </el-col>
- <el-col :span="6">
- <GDLX></GDLX>
- </el-col>
- <el-col :span="6">
- <SJGDZB></SJGDZB>
- </el-col>
- <el-col :span="6">
- <progressMY></progressMY>
- </el-col>
- </el-row>
-
- </el-card>-->
+ <!-- 璧勪骇澧為暱/鎶ュ簾缁熻鍥撅紙鏁伴噺锛�-->
+ <XYZC></XYZC>
</div>
</template>
<script>
// 鍒涘缓Context
-import {formattedDate} from "@/utils/DateFormatter";
-import * as dash from '@/api/dashboard/dash'
-// import * as createEvent from "@/api/eventManage/createEvent";
+import {LongToDateTime} from "@/utils/DateFormatter";
+
const ComponentContext = require.context('./components', false, /\.vue$/i);
let res_components = {};
// 鐢熸垚寰呭緟娉ㄥ唽缁勪欢闆嗗悎
@@ -219,84 +119,105 @@
components: {...res_components},
data() {
return {
- eventInfo:{}
+ waitType: '1',
+ waitWorkData: [
+ {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 1},
+ {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 2},
+ {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 3},
+ {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 4},
+ {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 5},
+ ], // 寰呭姙宸ヤ綔
+ earlyWarningType: '1',
+ earlyWarningData: [
+ {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 4, createTime: 20231127150606, id: 1},
+ {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 5, createTime: 20231127150606, id: 2},
+ {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 6, createTime: 20231127150606, id: 3},
+ {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 6, createTime: 20231127150606, id: 4},
+ ] // 棰勮閫氱煡
};
},
created() {
- // this.getEventInfo()
},
methods: {
- // 鑾峰彇浜嬩欢鏁版嵁
- getEventInfo(){
- dash.getEventInfo().then(res => {
- if (res) {
- this.eventInfo = res
- }
- })
- }
+ // 鏍煎紡鍖栨椂闂�
+ formattTime(time) {
+ return LongToDateTime(time)
+ },
+ // 鑾峰彇棰勮閫氱煡鍒楄〃鏁版嵁
+ getAduitList() {
+ let form = {
+ pageSize: 5,
+ pageNum: 1,
+ waitType: this.waitType
+ }
+ },
+ // 澶勭悊寰呭姙宸ヤ綔
+ aduitThis(id) {
+ },
+ // 鍒囨崲棰勮閫氱煡
+ changeEarlyWarning(e) {
+ this.earlyWarningType = e
+ this.$nextTick(() => {
+ this.getWarningList()
+ })
+ },
+ // 鑾峰彇棰勮閫氱煡鍒楄〃鏁版嵁
+ getWarningList() {
+ let form = {
+ pageSize: 5,
+ pageNum: 1,
+ earlyWarningType: this.earlyWarningType
+ }
+ },
+ // 璺宠浆
+ nav(url){
+ this.$router.push(url)
+ }
}
};
</script>
<style lang="scss" scoped>
-.content{
- padding:10px
+.content {
+ padding: 10px
}
-.box{
- border-radius: 10px;
- padding: 20px 0;
- align-items: flex-end;
+
+.to-more {
+ font-size: 14px;
+ color: #0d997c;
+ cursor: pointer;
}
-.flex{
- display: flex;
-}
-.flex-between{
- justify-content: space-around;
-}
-.f-col{
- flex-direction: column;
-}
-.f-c{
- align-items: center;
-}
-.f-e{
- align-items: flex-end;
-}
-.f-s{
- align-items: flex-start;
-}
-.c-1{
- color: #11AD6F;
-}
-.c-f{
- color: #FF4B4B;
-}
-.font-28{
- font-size: 28px;
-}
-.font-12{
- font-size: 12px;
-}
-.icon{
- width: 30px;
- height: 30px;
+
+.m-b-10 {
margin-bottom: 10px;
}
-.arrow{
- width: 12px;
- height: 12px;
-}
-.box-card {
- margin-top: 10px;
+
+.top-tb {
width: 100%;
- border-radius: 10px;
- border: none;
- .card-title-right {
- display: flex;
- align-items: center;
- align-self: flex-end;
- float: right;
- }
+}
+>>>.el-table__body{
+ min-height: 265px;
+}
+.total-list {
+ padding: 15px 0;
+}
+
+.total-item {
+ width: 19%;
+ padding: 12px 20px;
+ border-radius: 8px;
+ margin-right: 1%;
+ background-color: #FFFFFF;
+}
+
+.total-item:last-child {
+ margin: 0;
+}
+
+.total-num {
+ font-size: 24px;
+ font-weight: bold;
+ margin-right: 3px;
}
</style>
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue b/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
index d306e90..d3591d8 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
@@ -1,42 +1,42 @@
<template>
- <win-md class="stock-detail" :title="setting.title" @close="close" :width="'800px'">
+ <win-lg class="stock-detail" :title="setting.title" @close="close" :width="'800px'" :loading="loading">
<el-row :gutter="20">
<el-col :span="8">
- <span>鍏ュ簱鍗曞彿锛�</span>
- <span>{{ detail.businessFormCode }}</span>
- </el-col>
- <el-col :span="8">
- <span>鍏ュ簱浠撳簱锛�</span>
- <span>{{ detail.warehouseName }}</span>
+ <span>鍒嗗彂鍗曞彿锛�</span>
+ <span>SL2023001</span>
</el-col>
<el-col :span="8">
<span>鎵�灞炴満鏋勶細</span>
- <span>{{ detail.agencyName }}</span>
+ <span>娌冲崡鐪侀偖鏀垮垎鍏徃</span>
+ </el-col>
+ <el-col :span="8">
+ <span>閮ㄩ棬锛�</span>
+ <span>閲戣瀺涓氬姟閮�</span>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px">
<el-col :span="8">
- <span>鐘舵�侊細</span>
- <span>{{ detail.states == 1 ? '寰呭叆搴�' : '宸插叆搴�' }}</span>
+ <span>鍒嗗彂浜猴細</span>
+ <span>寮犵埍鐢�</span>
</el-col>
<el-col :span="8">
- <span>鍒涘缓浜猴細</span>
- <span>{{ detail.buyerName }}</span>
+ <span>鍒嗗彂鏃堕棿锛�</span>
+ <span>2023-08-08 10:23:12</span>
</el-col>
<el-col :span="8">
- <span>鍏ュ簱鏃堕棿锛�</span>
- <span>{{ detail.incomeTime | formatTime }}</span>
+ <span>棰嗗彇浜猴細</span>
+ <span>鐜嬮儴闂�</span>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px">
- <el-col class="img-row" :span="12">
- <span>閲囪喘绫诲瀷锛�</span>
- <span>{{ detail.buyType == 1 ? '闆嗛噰' : '鑷噰' }}</span>
+ <el-col :span="8">
+ <span>鑱旂郴鐢佃瘽锛�</span>
+ <span>18500000001</span>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px">
<el-col class="img-row" :span="24">
- <span>閲囪喘鎵嬬画鐓х墖锛�</span>
+ <span>鍒嗗彂鎵嬬画锛�</span>
<div class="img-box" v-for="(item, index) in fileList" :key="index" @click="handlePreview(item)">
<img class="img" :src="getUrl(item.path)" alt="" />
</div>
@@ -53,11 +53,40 @@
<span>{{ goodsItem.goodsTemplateName }}</span>
</el-col>
<el-col :span="8">
- <span>渚涜揣鍟嗭細</span>
+ <span>鐗╁搧绫诲埆锛�</span>
<span>{{ goodsItem.supplier }}</span>
</el-col>
</el-row>
- <el-table :data="goodsItem.models" :stripe="true" style="margin-top: 20px">
+ <div v-if="goodsItem.type===1">
+ <el-table :data="goodsItem.models" :stripe="true" style="margin-top: 20px">
+ <el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.baseGoodsModelsName }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.unit }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="price" label="鍒嗗彂鏁伴噺" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.price | formatPrice }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="counts" label="浣跨敤浜�" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.counts }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="counts" label="鑱旂郴鐢佃瘽" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.price * scope.row.counts | formatPrice}}
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div v-else>
<el-table-column prop="baseGoodsModelsName" label="瑙勬牸鍨嬪彿" align="center">
<template slot-scope="scope">
{{ scope.row.baseGoodsModelsName }}
@@ -68,22 +97,12 @@
{{ scope.row.unit }}
</template>
</el-table-column>
- <el-table-column prop="price" label="鍗曚环" align="center">
+ <el-table-column prop="price" label="鍒嗗彂鏁伴噺" align="center">
<template slot-scope="scope">
{{ scope.row.price | formatPrice }}
</template>
</el-table-column>
- <el-table-column prop="counts" label="鍏ュ簱鏁伴噺" align="center">
- <template slot-scope="scope">
- {{ scope.row.counts }}
- </template>
- </el-table-column>
- <el-table-column prop="counts" label="閲戦" align="center">
- <template slot-scope="scope">
- {{ scope.row.price * scope.row.counts | formatPrice}}
- </template>
- </el-table-column>
- </el-table>
+ </div>
</div>
<div id="uploadPreviewImages" style="display: none">
<span v-for="(src, index) in fileList" :key="index">
@@ -96,11 +115,11 @@
/>
</span>
</div>
- </win-md>
+ </win-lg>
</template>
<script>
import { procureDetail } from '@/api/stock/procure/purchaseOrder';
-import winMd from '@/components/win/win-md';
+import winLg from '@/components/win/win-lg';
import * as DateFormatter from '@/utils/DateFormatter';
import { getDownUrl } from '@/utils/base';
import Viewer from 'viewerjs';
@@ -109,8 +128,7 @@
let viewer = null;
export default {
- components: { winMd },
-
+ components: { winLg },
props: {
setting: {
type: Object,
@@ -119,6 +137,7 @@
},
data() {
return {
+ loading:false,
fileList: [],
detail: {
baseCategoryName: '',
@@ -205,5 +224,5 @@
};
</script>
<style lang="scss" scoped>
-@import url(../../../../styles/store.scss);
+//@import url(../../../../styles/store.scss);
</style>
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
index 2c19940..ac9c234 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
@@ -93,12 +93,7 @@
<el-form-item
label="瑙勬牸鍨嬪彿"
:prop="`procureGoods[${goodsIndex}].modelsIds`"
- :rules="{
- required: true,
- message: '璇烽�夋嫨',
- trigger: 'change',
- }"
- >
+ :rules="{required: true,message: '璇烽�夋嫨',trigger: 'change',}">
<el-select
v-model="goodsItem.modelsIds"
multiple
@@ -130,45 +125,49 @@
50
</el-form-item>
</el-col>
- <el-col :span="10" v-if="true">
+ <!--A绫诲晢鍝� -->
+ <el-col :span="24" v-if="goodsItem.type===1">
+ <el-table :data="mItem.clist" :stripe="true" >
+ <el-table-column prop="count" label="鍒嗗彂鏁伴噺" align="center">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.count"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="count" label="浣跨敤浜�" align="center">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.user" maxlength="20"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="count" label="鑱旂郴鐢佃瘽" align="center">
+ <template slot-scope="scope">
+ <el-input v-model.number="scope.row.phone" maxlength="11"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column align="left" width="60">
+ <template slot-scope="scope">
+ <i
+ v-if="mItem.clist.length > 1"
+ class="el-icon-remove-outline"
+ style="color: #f56c6c; font-size: 16px; cursor: pointer"
+ @click="handleDel(goodsIndex, mIndex, scope.$index)"
+ ></i>
+ <i
+ v-if="mItem.clist.length - 1 == scope.$index"
+ class="el-icon-circle-plus-outline"
+ style="color: #0d997c; font-size: 16px; cursor: pointer"
+ @click="handleAdd(goodsIndex, mIndex, scope.$index)"
+ ></i>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-col>
+ <!--BC绫诲晢鍝� -->
+ <el-col :span="10" v-else>
<el-form-item label="鍒嗗彂鏁伴噺:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80">
<el-input v-model.number="mItem.count" style="width: 160px;"></el-input>
</el-form-item>
</el-col>
</el-row>
- <el-table :data="mItem.clist" :stripe="true" v-if="false">
- <el-table-column prop="count" label="鍒嗗彂鏁伴噺" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.count"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="count" label="浣跨敤浜�" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.user" maxlength="20"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="count" label="鑱旂郴鐢佃瘽" align="center">
- <template slot-scope="scope">
- <el-input v-model.number="scope.row.phone" maxlength="11"></el-input>
- </template>
- </el-table-column>
- <el-table-column align="left" width="60">
- <template slot-scope="scope">
- <i
- v-if="mItem.clist.length > 1"
- class="el-icon-remove-outline"
- style="color: #f56c6c; font-size: 16px; cursor: pointer"
- @click="handleDel(goodsIndex, mIndex, scope.$index)"
- ></i>
- <i
- v-if="mItem.clist.length - 1 == scope.$index"
- class="el-icon-circle-plus-outline"
- style="color: #0d997c; font-size: 16px; cursor: pointer"
- @click="handleAdd(goodsIndex, mIndex, scope.$index)"
- ></i>
- </template>
- </el-table-column>
- </el-table>
</el-row>
<div class="btn-group">
<el-button
@@ -178,8 +177,7 @@
plain
size="mini"
@click="removeGoods(goodsIndex)"
- >绉婚櫎</el-button
- >
+ >绉婚櫎</el-button>
<el-button
v-if="formData.procureGoods.length - 1 == goodsIndex"
name="鏂板鐗╁搧"
@@ -187,8 +185,7 @@
plain
size="mini"
@click="addGoods"
- >鏂板鐗╁搧</el-button
- >
+ >鏂板鐗╁搧</el-button>
</div>
</div>
</div>
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index d94c697..8e45fed 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -10,8 +10,7 @@
<el-col>
<!--鍒楄〃-->
<div class="table-tool-bar" style="margin-bottom: 15px">
- <my-button name="鐗╁搧鍒嗗彂" @click="handleAdd" site="tools" size="medium" icon="el-icon-edit-outline" />
- <my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
+ <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
</div>
<div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
<el-row v-if="list.length" class="card" :gutter="5">
@@ -24,9 +23,7 @@
<span class="value">{{ item.businessFormCode }}</span>
</div>
<div class="card-header-right">
- <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
- >
+ <el-button name="鏌ョ湅璇︽儏" site="form" type="primary" size="mini" @click="handleDetail(item)">鏌ョ湅璇︽儏</el-button>
</div>
</div>
<div class="one-hed">
@@ -82,11 +79,6 @@
@close="detailSetting.show = false"
ref="detailRef"
></detail>
- <my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
- />
</div>
</template>
@@ -98,7 +90,7 @@
import edit from './edit';
import detail from './detail';
import { getBaseUrl } from '@/utils/base';
-import listPage from '../../../mixins/listPage'
+import listPage from '../../../mixins/listPage';
export default {
name: 'index',
@@ -120,18 +112,25 @@
},
{
type: 'select',
+ dataIndex: 'goodsTemplateId',
+ label: '鐗╁搧鍚嶇О',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
+ },
+ {
+ type: 'cascader',
dataIndex: 'agencyId',
label: '鍒嗗彂閮ㄩ棬',
placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
defaultValue: '',
options: [],
- },
- {
- type: 'text',
- dataIndex: 'goodsTemplateName',
- label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
- defaultValue: '',
},
{
type: 'text',
@@ -154,26 +153,11 @@
},
],
// 鏍戞暟鎹�
- treeDataList: [],
- // 瀵煎叆
- importSetting: {
- dialogTitle: '瀵煎叆',
- dialogShow: false,
- fileSettings: {
- data: {},
- uploadUrl: getBaseUrl() + '/pc/fin/sys/tenant/import', // 涓婁紶鍦板潃
- accept: '.xls', // 鏍煎紡
- type: 'text', // 鍥炴樉褰㈠紡
- loading: false, // 瀵煎叆鏁堟灉
- },
- /* 妯℃澘涓嬭浇 */
- templateSettings: {
- templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
- },
- onSuccess: null,
- },
+ treeDataList: []
};
+ },
+ created(){
+ this.fetchData()
},
methods: {
fetchData() {
@@ -189,41 +173,6 @@
console.log(this.list);
});
},
-
- //瀵煎叆
- importOrg() {
- this.importSetting.dialogShow = true;
- this.importSetting.onSuccess = (response, callBack) => {
- if (response.code === 1) {
- this.$message.success(response.msg);
- this.search(1);
- } else {
- this.$message.warning(response.msg);
- }
- callBack();
- };
- },
- // 鍒嗗彂
- handleIncome(row) {
- this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鍒嗗彂鍚�?`, '鍒嗗彂鍒嗗彂').then(() => {
- procureIncome({ id: row.id })
- .then((res) => {
- this.$message.success('鍒嗗彂鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
- });
- },
- del(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎鍒嗗彂鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�').then( () => {
- procureDel({ id: row.id })
- .then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
- });
- },
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
if (this.filterFrom.incomeTimeStart) {
@@ -232,9 +181,6 @@
if (this.filterFrom.incomeTimeEnd) {
this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
}
- if (this.filterFrom.agencyId && this.filterFrom.agencyId.length) {
- this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
- }
this.search(1);
},
},
@@ -242,5 +188,5 @@
</script>
<style scoped lang="scss">
-@import url(../../../../styles/store.scss);
+ //@import url(../../../../styles/index.scss);
</style>
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index e73a9dc..b87389a 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -29,7 +29,7 @@
</el-row>
<el-row :gutter="24" class="headerHeight">
<el-col :span="24">
- <el-form-item label="鎶ュ簾鎵嬬画" prop="procureDoc">
+ <el-form-item label="鎶ュ簾瀹℃壒鎵嬬画" prop="procureDoc">
<upload ref="uploadRef" :settings="uploadSettings" @on-change="uploadChange"></upload>
</el-form-item>
</el-col>
@@ -89,39 +89,79 @@
</el-form-item>
</el-col>
</el-row>
- <el-table :data="goodsItem.models" :stripe="true">
- <el-table-column prop="baseGoodsModelsId" label="瑙勬牸鍨嬪彿" align="center">
- <template slot-scope="scope">
- {{ getGoodsModelsName(scope.row.baseGoodsModelsId) }}
- </template>
- </el-table-column>
- <el-table-column label="鍗曚綅" align="center">
- <template slot-scope="scope">
- {{ scope.row.unit }}
- </template>
- </el-table-column>
- <el-table-column prop="price" label="鐜版湁搴撳瓨" align="center">
- <template slot-scope="scope">
- {{ scope.row.worehouseCount }}
- </template>
- </el-table-column>
- <el-table-column prop="counts" label="鎶ュ簾鏁伴噺" align="center">
- <template slot-scope="scope">
- <el-form-item
- label-width="0"
- style="margin-bottom: 0"
- :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`"
- :rules="rules.counts"
- >
- <el-input
- type="number"
- v-model="scope.row.counts"
- @change="countsChange($event, goodsIndex, scope.$index)"
- ></el-input>
+ <div class="card3" v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex">
+ <el-row :gutter="24" type="flex" align="middle" style="height: 50px">
+ <el-col :span="8">
+ <el-form-item label="瑙勬牸鍨嬪彿:" prop="baseGoodsModelsId" style="margin-bottom: 0">
+ {{ getGoodsModelsName(mItem.baseGoodsModelsId) }}
</el-form-item>
- </template>
- </el-table-column>
- </el-table>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗曚綅:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80">
+ 50
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐗╁搧绫诲埆:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80">
+ A绫�
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-table :data="mItem.models" :stripe="true">
+ <!-- A绫诲晢鍝佹樉绀� -->
+ <el-table-column prop="price" label="浣跨敤浜�" align="center" v-if="goodsItem.models.type===1">
+ <template slot-scope="scope">
+ {{ scope.row.worehouseCount }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="price" label="鍒嗗彂鏁伴噺" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.worehouseCount }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="price" label="鍐嶇敤鏁伴噺" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.worehouseCount }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="counts" label="鎶ュ簾鏁伴噺" align="center">
+ <template slot-scope="scope">
+ <el-form-item
+ label-width="0"
+ style="margin-bottom: 0"
+ :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`"
+ :rules="rules.counts"
+ >
+ <el-input
+ type="number"
+ v-model="scope.row.counts"
+ @change="countsChange($event, goodsIndex, scope.$index)"
+ ></el-input>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="counts" label="鎶ュ簾鍘熷洜" align="center">
+ <template slot-scope="scope">
+ <el-form-item
+ label-width="0"
+ style="margin-bottom: 0"
+ :prop="`goods[${goodsIndex}].models[${scope.$index}].reason`"
+ :rules="rules.reason"
+ >
+ <el-select v-model="scope.row.reason" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in reasonOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ @change="countsChange($event, goodsIndex, scope.$index)">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
<div class="btn-group">
<el-button
v-if="formData.goods.length > 1"
@@ -240,11 +280,11 @@
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-
baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
counts: [{ required: true, message: '璇疯緭鍏�', trigger: 'change' }],
+ reason: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
},
uploadSettings: {
@@ -258,6 +298,7 @@
disabled: false, // 鏄惁绂佺敤
type: 'picture', // text/picture
},
+ reasonOptions:[] // 鎶ュ簾鍘熷洜
};
},
computed: {
@@ -387,11 +428,7 @@
curItem.counts = worehouseCount > 0 ? worehouseCount : null;
}
},
-
- handleConfirm(){
-
- },
-
+ handleConfirm(){},
// 鎻愪氦
handleSubmit() {
this.$refs['ruleForm'].validate((valid) => {
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
index 77fadac..03a0e62 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
@@ -24,7 +24,7 @@
</div>
<div class="card-header-right">
<el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭鎶ュ簾鍗�</el-button
+ >瀵煎嚭鎶ュ簾鐧昏鍗�</el-button
>
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
>鏌ョ湅璇︽儏</el-button
diff --git a/admin-web/src/views/login/index.vue b/admin-web/src/views/login/index.vue
index 7320b30..4d8b08f 100644
--- a/admin-web/src/views/login/index.vue
+++ b/admin-web/src/views/login/index.vue
@@ -127,8 +127,8 @@
},
},
loginForm: {
- account: '', // admin
- password: '',
+ account: 'jmy123456', // admin
+ password: 'Adu_8097',
// key: '',
uuid: '',
code: '',
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 7000dc4..6973b29 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -29,22 +29,22 @@
<div class="card-header-right">
<template v-if="item.states == 1">
<el-button name="缂栬緫" site="form" type="success" size="mini" @click="handleEdit(item)"
- >缂栬緫</el-button
+ >缂栬緫</el-button
>
<el-button name="鍏ュ簱" site="form" type="primary" size="mini" @click="handleIncome(item)"
- >鍏ュ簱</el-button
+ >鍏ュ簱</el-button
>
<el-button name="鍒犻櫎" site="form" type="danger" size="mini" @click="del(item)"
- >鍒犻櫎</el-button
+ >鍒犻櫎</el-button
>
</template>
<template v-if="item.states != 1">
<el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭鍏ュ簱鍗�</el-button
+ >瀵煎嚭鍏ュ簱鍗�</el-button
>
</template>
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
+ >鏌ョ湅璇︽儏</el-button
>
</div>
</div>
--
Gitblit v1.9.1