From db639ba99b5856503053cf74efe73b6c5604d9d6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 17 八月 2023 18:01:42 +0800
Subject: [PATCH] modified: .env.development modified: .env.production modified: .env.staging modified: src/components/Breadcrumb/index.vue modified: src/layout/components/AppMain.vue modified: src/layout/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/laboratory/measure/index.vue
---
.env.staging | 2
.env.development | 2
src/views/laboratory/measure/index.vue | 602 +++++++++++++++++++++++++++----------------------
src/layout/index.vue | 10
.env.production | 2
src/layout/components/AppMain.vue | 10
src/views/laboratory/ledger/index.vue | 17
src/components/Breadcrumb/index.vue | 20 +
8 files changed, 377 insertions(+), 288 deletions(-)
diff --git a/.env.development b/.env.development
index 9ad2460..e5e7b7a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
+VUE_APP_BASE_API = 'http://localhost:1234/'
diff --git a/.env.production b/.env.production
index b6b82fb..dd72fa5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,5 +3,5 @@
# base api
# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
+VUE_APP_BASE_API = 'http://localhost:1234/'
diff --git a/.env.staging b/.env.staging
index d5bc70f..92fbe73 100644
--- a/.env.staging
+++ b/.env.staging
@@ -5,6 +5,6 @@
# base api
# VUE_APP_BASE_API = '/stage-api'
-VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
+VUE_APP_BASE_API = 'http://localhost:1234/'
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index e29b2bc..a038a02 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,5 +1,7 @@
<template>
- <el-breadcrumb class="app-breadcrumb" separator="/">
+<div style="display: flex;justify-content: space-around;">
+ <el-col :span="12" style="background-color: #fff;">
+ <el-breadcrumb class="app-breadcrumb" separator="/">
<transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
<span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
@@ -7,6 +9,12 @@
</el-breadcrumb-item>
</transition-group>
</el-breadcrumb>
+ </el-col>
+ <el-col :span="12" style="background-color: #fff;display: flex;justify-content: end; align-items: center;">
+ <el-button v-if="backPlan" type="primary" icon="el-icon-refresh-left" size="mini" plain @click="backPlanUp">杩斿洖</el-button>
+ <el-col :span="1"></el-col>
+ </el-col>
+</div>
</template>
<script>
@@ -15,7 +23,8 @@
export default {
data() {
return {
- levelList: null
+ levelList: null,
+ backPlan: false
}
},
watch: {
@@ -27,6 +36,13 @@
this.getBreadcrumb()
},
methods: {
+ backPlanUp(){
+ this.$parent.combackPlan()
+ this.backPlan=false
+ },
+ triggerBtnPlan(){
+ this.backPlan?this.backPlan=false:this.backPlan=true
+ },
getBreadcrumb() {
// only show routes with meta.title
const matched = this.$route.matched.filter(item => item.meta && item.meta.title)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 8d3654a..5932228 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,7 +1,7 @@
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
- <router-view :key="key" />
+ <router-view ref="child" @triggerMainBtnPlan="triggerMainBtnPlan" :key="key" />
</transition>
</section>
</template>
@@ -13,6 +13,14 @@
key() {
return this.$route.path
}
+ },
+ methods: {
+ childMethod(){
+ this.$refs.child.combackLookPlan()
+ },
+ triggerMainBtnPlan(){
+ this.$parent.triggerCombackBtn()
+ }
}
}
</script>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index f8ca9cf..7d41209 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -8,8 +8,8 @@
</div>
<div class="clearFixed" />
<!-- 娓呴櫎瀹氫綅鐨勫奖鍝� -->
- <Breadcrumb class="breadcrumb-container" />
- <app-main />
+ <Breadcrumb class="breadcrumb-container" ref="breadcrumb" />
+ <app-main ref="main" @triggerCombackBtn="triggerCombackBtn"/>
</div>
</div>
</template>
@@ -50,6 +50,12 @@
methods: {
handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+ },
+ combackPlan(){
+ this.$refs.main.childMethod()
+ },
+ triggerCombackBtn(){
+ this.$refs.breadcrumb.triggerBtnPlan()
}
}
}
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 1f778a6..73f919e 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -979,12 +979,15 @@
fatherName: null,
sonName: null
}
+
if (_that.addTreeForm.type != null && _that.addTreeForm.type[0] != 0) {
- data.fatherName = _that.addTreeForm.type[0]
+ data.fatherName = _that.addTreeFormClassTree.filter(item => {
+ return item.value == _that.addTreeForm.type[0]
+ })[0].label
data.sonName = _that.addTreeForm.name
} else {
data.fatherName = _that.addTreeForm.name
- }
+ } // return;
let add = await addClassify(data);
switch (add.message.split('-$')[0]) {
case '1':
@@ -996,13 +999,13 @@
_that.resetTreeForm('addTreeForm')
break;
case '2':
- this.$message({
- message: '宸插瓨鍦ㄨ鍒嗙被',
- type: 'warning'
- });
+ this.$message({
+ message: '宸插瓨鍦ㄨ鍒嗙被',
+ type: 'warning'
+ });
break;
case '0':
- this.$message.error('娣诲姞澶辫触锛佽鑱旂郴绠＄悊鍛�');
+ this.$message.error('娣诲姞澶辫触锛佽鑱旂郴绠＄悊鍛�');
break;
}
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 7e72abe..96ab797 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -1,230 +1,178 @@
<template>
<div>
- <div class="content-main">
- <div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData">
- <el-form-item :label="this.radioValue === 0 ? '浠櫒璁惧缂栧彿:' : '缂栧彿:'" class="sermargin">
- <el-input
- v-model="searchData.code"
- class="input-form"
- placeholder="璇疯緭鍏�"
- >
- </el-input>
- </el-form-item>
- <el-form-item :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'" class="sermargin">
- <el-input
- v-model="searchData.name"
- class="input-form"
- placeholder="璇疯緭鍏�"
- >
- </el-input>
- </el-form-item>
- <el-form-item :label="this.radioValue === 0 ? '璁￠噺鍗曚綅:' : '璁￠噺鍗曚綅锛�'" style="margin-right: 20px;">
- <el-input
- v-model="searchData.measureunit"
- class="input-form"
- placeholder="璇疯緭鍏�"
- >
- </el-input>
- </el-form-item>
- </el-form>
- <el-form>
- <el-form-item v-if="this.radioValue === 0" class="rightBtn">
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
- </el-form-item>
- <el-form-item v-if="this.radioValue === 1" class="rightBtn">
- <el-button type="primary" icon="el-icon-plus">鏂板璁″垝</el-button>
- </el-form-item>
- </el-form>
- </el-form>
- </div>
- <div class="library-table">
- <div class="table-header">
- <div class="search-bar">
- <el-radio-group v-model="radioValue" @change="radioclick">
- <el-radio-button v-for="item in options" :key="item.value" :label="item.value">
+ <div class="content-main">
+ <div class="top-bar">
+ <el-form :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
+ <el-form-item :label="this.radioValue === 0 ? '浠櫒璁惧缂栧彿:' : '璁″垝鍗曞彿:'" class="sermargin">
+ <el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
+ </el-input>
+ </el-form-item>
+ <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
+ class="sermargin">
+ <el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
+ </el-input>
+ </el-form-item>
+ <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '璁￠噺鍗曚綅:' : '璁￠噺鍗曚綅锛�'"
+ style="margin-right: 20px;">
+ <el-input v-model="searchData.measureunit" class="input-form" placeholder="璇疯緭鍏�">
+ </el-input>
+ </el-form-item>
+ </el-form>
+ <el-form :hidden="lookVisible">
+ <el-form-item v-if="this.radioValue === 0" class="rightBtn">
+ <el-button type="primary" @click="search">鏌ヨ</el-button>
+ <el-button type="primary" plain @click="reset()">閲嶇疆</el-button>
+ </el-form-item>
+ <el-form-item v-if="this.radioValue === 1" class="rightBtn">
+ <el-button type="primary" @click="addPlan()" icon="el-icon-plus">鏂板璁″垝</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="library-table">
+ <div class="table-header">
+ <div class="search-bar">
+ <el-radio-group v-model="radioValue" @change="radioclick">
+ <el-radio-button v-for="item in options" :key="item.value" :label="item.value">
{{ item.label }}
</el-radio-button>
- </el-radio-group>
- </div>
- </div>
- <div class="table-box">
- <el-table
- v-if="this.radioValue === 0"
- :max-height="800"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="measureLedgerTable"
- style="width: 100%"
- >
- <el-table-column
- type="selection"
- min-width="10%"
- />
- <el-table-column
- prop="hello"
- label="浠櫒璁惧缂栧彿"
- min-width="10%"
- />
- <el-table-column
- prop="entrust_coding"
- label="浠櫒璁惧鍚嶇О"
- min-width="10%"
- />
- <el-table-column
- prop="entrusted"
- label="娴嬮噺鑼冨洿"
- min-width="15%"
- />
- <el-table-column
- prop="samples_number"
- label="璁￠噺鍛ㄦ湡"
- min-width="6%"
- />
- <el-table-column
- prop="inspection_status"
- label="璁￠噺缁撴灉"
- min-width="6%">
- <template slot-scope="scope">
- <div v-if="scope.row.inspection_status === 1">
- <span style="color: green;">姝ｅ父</span>
- </div>
- <div v-else>
- <span style="color: red;">澶卞噯</span>
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="specifications_models"
- label="璁￠噺鏃ユ湡"
- min-width="12%"
- />
- <el-table-column
- prop="dateSurvey"
- label="璁￠噺鏈夋晥鏈�"
- min-width="8%"
- />
- <el-table-column
- prop="completionDeadline"
- label="璐熻矗浜�"
- min-width="6%"
- />
- <el-table-column
- prop="contacts"
- label="鍒涘缓鏃ユ湡"
- min-width="8%"
- />
- <el-table-column
- prop="inspectionTime"
- label="鍒涘缓浜�"
- min-width="8%"
- />
- <el-table-column
- prop="inspectionTime"
- label="璁￠噺缂栧彿"
- min-width="8%"
- />
- <el-table-column
- label="鎿嶄綔"
- min-width="15%"
- >
- <template slot-scope="scope">
- <el-button type="text" size="small" >鏌ョ湅璁￠噺灞ュ巻</el-button>
- <el-button type="text" size="small" >鏌ョ湅闄勪欢</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-table
- v-if="this.radioValue === 1"
- :max-height="800"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="measurePlanTable"
- style="width: 100%"
- >
- <el-table-column
- type="selection"
- min-width="10%"
- />
- <el-table-column
- prop="hello"
- label="璁￠噺鍗曞彿"
- min-width="10%"
- />
- <el-table-column
- prop="entrust_coding"
- label="璁惧缂栧彿"
- min-width="10%"
- />
- <el-table-column
- prop="entrusted"
- label="璁惧鍚嶇О"
- min-width="15%"
- />
- <el-table-column
- prop="samples_number"
- label="璁″垝鏃ユ湡"
- min-width="6%"
- />
- <el-table-column
- prop="inspection_status"
- label="璁￠噺鐘舵��"
- min-width="6%">
- <template slot-scope="scope">
- <div v-if="scope.row.inspection_status === 1">
- <span style="color: green;">宸插畬鎴�</span>
- </div>
- <div v-else>
- <span style="color: red;">鏈畬鎴�</span>
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="specifications_models"
- label="璁￠噺璐熻矗浜�"
- min-width="12%"
- />
- <el-table-column
- prop="dateSurvey"
- label="璁￠噺鍗曚綅"
- min-width="8%"
- />
- <el-table-column
- prop="completionDeadline"
- label="鍒涘缓浜�"
- min-width="6%"
- />
- <el-table-column
- prop="contacts"
- label="鍒涘缓鏃ユ湡"
- min-width="8%"
- />
- <el-table-column
- label="鎿嶄綔"
- min-width="15%"
- >
- <template slot-scope="scope">
- <el-button type="text" size="small" >鏌ョ湅璁￠噺灞ュ巻</el-button>
- <el-button type="text" size="small" >鏌ョ湅闄勪欢</el-button>
- </template>
- </el-table-column>
- </el-table>
- <!-- 鍒嗛〉鍣� -->
- <div>
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="currentPage"
- :page-sizes="[5, 10, 20]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total">
- </el-pagination>
- </div>
- </div>
+ </el-radio-group>
</div>
+ </div>
+ <div class="table-box">
+ <el-table v-if="this.radioValue == 0" :max-height="800" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="measureLedgerTable" style="width: 100%">
+ <el-table-column type="index" min-width="10%" />
+ <el-table-column prop="equipmentCode" label="浠櫒璁惧缂栧彿" min-width="10%" />
+ <el-table-column label="璁￠噺鍗曚綅" prop="measurementUnit" min-width="10%"></el-table-column>
+ <el-table-column prop="equipmentName" label="浠櫒璁惧鍚嶇О" min-width="10%" />
+ <el-table-column prop="measuringRange" label="娴嬮噺鑼冨洿" min-width="10%" />
+ <el-table-column prop="termValidity" label="璁￠噺鍛ㄦ湡" min-width="10%">
+ <template slot-scope="scope">
+ {{ scope.row.termValidity }}鏈�
+ </template>
+ </el-table-column>
+ <el-table-column prop="result" label="璁￠噺缁撴灉" min-width="10%">
+ <template slot-scope="scope">
+ <div v-if="scope.row.result === 1">
+ <span style="color: rgb(78, 210, 16);">姝ｅ父</span>
+ </div>
+ <div v-else-if="scope.row.result === 2">
+ <span style="color: rgb(27, 202, 233);">鐭鍚庡彲鐢�</span>
+ </div>
+ <div v-else>
+ <span style="color: red;">澶卞噯</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="endDate" label="璁￠噺鏃ユ湡" min-width="12%" />
+ <el-table-column prop="validit" label="璁￠噺鏈夋晥鏈�" min-width="10%" />
+ <el-table-column prop="name" label="璐熻矗浜�" min-width="10%" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃ユ湡" min-width="10%" />
+ <el-table-column prop="name" label="鍒涘缓浜�" min-width="8%" />
+ <el-table-column prop="code" label="璁￠噺缂栧彿" min-width="8%" />
+ <el-table-column label="鎿嶄綔" min-width="15%">
+ <template slot-scope="scope">
+ <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">鏌ョ湅璁￠噺灞ュ巻</el-button>
+ <el-button type="text" size="small">鏌ョ湅闄勪欢</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table v-show="this.radioValue == 1" :max-height="800" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="measurePlanTable" style="width: 100%">
+ <el-table-column type="index" min-width="10%" />
+ <el-table-column prop="plannedOrderNumber" label="璁″垝鍗曞彿" min-width="10%" />
+ <el-table-column prop="palanDate" label="璁″垝鏃ユ湡" min-width="10%">
+ <template lot-scope="scope">
+ <!-- {{ scope.row.palanDate }} -->
+ </template>
+ </el-table-column>
+ <el-table-column prop="status" label="璁″垝鐘舵��" min-width="6%">
+ <template slot-scope="scope">
+ <div v-if="scope.row.status == 1">
+ <span style="color: green;">宸插畬鎴�</span>
+ </div>
+ <div v-else>
+ <span style="color: red;">鏈畬鎴�</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="measurePerson" label="璁″垝璐熻矗浜�" min-width="12%" />
+ <el-table-column prop="createPerson" label="鍒涘缓浜�" min-width="10%" />
+ <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" min-width="10%" />
+ <el-table-column prop="id" label="鎿嶄綔" min-width="15%">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="lookPalan(scope.row.id)">鏌ョ湅璁￠噺灞ュ巻</el-button>
+ <el-button type="text" size="small">鏌ョ湅闄勪欢</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉鍣� -->
+ <div style="display: flex;justify-content: end;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="currentPage" :page-sizes="[5, 10, 20]" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="total">
+ </el-pagination>
+ </div>
+ </div>
</div>
+ <el-drawer title="鎴戞槸鏍囬" :visible.sync="drawer" :direction="direction" :before-close="handleClose">
+ <span>鎴戞潵鍟�!</span>
+ </el-drawer>
+ <div id="myMOdel"
+ :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 100%; height: 60vh; background-color: #fff;z-index: 20;`">
+ <el-col :span="10">
+ <p style="font-size: 13px;padding-left: 40px;">璁″垝淇℃伅</p>
+ </el-col>
+ <el-col>
+ <el-form :model="planInfo" style="padding-left: 150px;color: #9b9898;">
+ <el-form-item>
+ <el-col :span="8">璁″垝缂栧彿锛�<span style="color: black;">{{ planInfo.plannedOrderNumber }}</span></el-col>
+ <el-col :span="8">璐熻矗浜猴細<span style="color: black;">{{ planInfo.measurePerson }}</span></el-col>
+ <el-col :span="8">璁″垝鏃堕棿锛�<span style="color: black;">{{ planInfo.palanDate }}</span></el-col>
+ </el-form-item>
+ <el-form-item>
+ <el-col :span="8">璁￠噺鍗曚綅锛�<span style="color: black;">{{ planInfo.unit }}</span></el-col>
+ <el-col :span="8">鍒涘缓浜猴細<span style="color: black;">{{ planInfo.createPerson }}</span></el-col>
+ <el-col :span="8">鍒涘缓鏃堕棿锛�<span style="color: black;">{{ planInfo.createTime }}</span></el-col>
+ </el-form-item>
+ </el-form>
+ </el-col>
+ <el-col>
+ <el-col style="font-size: 13px;padding-left: 55px;">
+ 璁￠噺淇℃伅
+ </el-col>
+ <el-col>
+ <el-progress style="width: 95%;padding-left: 40px;margin-top: 20px;" :percentage="6" :stroke-width="2"
+ :show-text="false"></el-progress>
+ </el-col>
+ </el-col>
+ <el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
+ <el-table :data="measureData">
+ <el-table-column type="inde" label="搴忓彿"/>
+ <el-table-column type="inde" label="浠櫒璁惧缂栧彿"/>
+ <el-table-column type="inde" label="浠櫒璁惧鍚嶇О"/>
+ <el-table-column type="inde" label="娴嬮噺鑼冨洿"/>
+ <el-table-column type="inde" label="璁＄畻鍛ㄦ湡"/>
+ <el-table-column type="inde" label="璁＄畻缁撴灉"/>
+ <el-table-column type="inde" label="璁＄畻鏃ユ湡"/>
+ <el-table-column type="inde" label="璁＄畻鏈夋晥鏈�"/>
+ <el-table-column type="inde" label="璐熻矗浜�"/>
+ <el-table-column type="inde" label="鍒涘缓鏃ユ湡"/>
+ <el-table-column type="inde" label="鍒涘缓浜�"/>
+ <el-table-column type="inde" label="璁￠噺鍗曚綅"/>
+ <el-table-column type="inde" label="璁￠噺缂栧彿"/>
+ </el-table>
+ </el-col>
+ <el-col style="width: 93%;margin-left: 40px; display: flex;justify-content: end;">
+ <el-pagination @size-change="handleSizeChangePlan" @current-change="handleCurrentChangePllan"
+ :current-page="currentPagePlan" :page-sizes="[5, 10, 20]" :page-size="pageSizePlan"
+ layout="total, sizes, prev, pager, next, jumper" :total="totalPlan">
+ </el-pagination>
+ </el-col>
+ </div>
+ </div>
</div>
</template>
@@ -233,87 +181,195 @@
export default {
data() {
return {
- searchData:{
+ searchData: {
code: '',
name: '',
measureunit: ''
},
radioValue: 0,
- options:[{
+ options: [{
value: 0,
label: '璁￠噺鍙拌处'
- },{
- value: 1 ,
+ }, {
+ value: 1,
label: '璁￠噺璁″垝'
}],
measureLedgerTable: [],
measurePlanTable: [],
currentPage: 1,
pageSize: 5,
- total: 20
+ total: 0,
+ currentPagePlan: 1,
+ pageSizePlan: 5,
+ totalPlan: 0,
+ drawer: false,
+ direction: 'rtl',
+ lookVisible: false,
+ measureData: [],
+ planInfo: {
+ plannedOrderNumber: 7897897987,
+ measurePerson: '鏌愭煇浜�',
+ palanDate: "2021-09-08 ~ 2024-08-09",
+ unit: '鏌愭煇妫�娴嬪眬',
+ createPerson: '鏌愭煇璐熻矗浜�',
+ createTime: '2021-09-08'
+ },
+ mymodelTop: -450//14
}
},
- created(){
+ created() {
this.getStandingPageList()
},
methods: {
- async getStandingPageList(){
- const res = await getStandingPageList({pageNo:this.currentPage , pageSize:this.pageSize })
- this.measureLedgerTable = res.data
- console.log(this.measureLedgerTable)
- }
-
+ handleSizeChangePlan(){
+
+ },
+ handleCurrentChangePllan(){
+
+ },
+ addPlan() {
+ this.drawer = true
+ },
+ lookPalan(id) {
+ this.lookVisible = true
+ this.mymodelTop=10
+ this.$parent.triggerMainBtnPlan()
+ },
+ combackLookPlan(){
+ this.lookVisible = false
+ this.mymodelTop=-450
+ },
+ blurSearch() {
+ if (this.radioValue === 1) {
+ console.log("璁″垝");
+ }
+ },
+ handleClose() {
+ this.drawer = false
+ },
+ handleCurrentChange() {
+ this.getStandingPageList()
+ },
+ handleSizeChange() {
+ this.getStandingPageList()
+ },
+ async getStandingPageList() {
+ const res = await getStandingPageList({
+ currentPage: this.currentPage, pageSize: this.pageSize,
+ code: this.searchData.code, name: this.searchData.name, unit: this.searchData.measureunit
+ })
+ this.measureLedgerTable = res.data.records
+ this.total = res.data.total
+ this.measureLedgerTable.forEach(item => {
+ let dateStr = ''
+ let dateArr = item.createTime
+ dateStr = dateArr[0] + "-" + dateArr[1] + "-" + dateArr[2]
+ item.createTime = dateStr
+ let endArr = item.endDate
+ item.endDate = endArr[0] + "-" + endArr[1] + "-" + endArr[2]
+ item.validit = this.addMonths(item.endDate, item.termValidity)
+ })
+ },
+ addMonths(yearMonthDay, monthNum) {
+ var arr = yearMonthDay.split('-');//2020-08-19鎴�2020-08
+ var year = parseInt(arr[0]);
+ var month = parseInt(arr[1]);
+ month = month + monthNum;
+ if (month > 12) {//鏈堜唤鍔�
+ var yearNum = parseInt((month - 1) / 12);
+ month = month % 12 == 0 ? 12 : month % 12;
+ year += yearNum;
+ } else if (month <= 0) {//鏈堜唤鍑�
+ month = Math.abs(month);
+ var yearNum = parseInt((month + 12) / 12);
+ year -= yearNum;
+ }
+ month = month < 10 ? "0" + month : month;
+ return year + "-" + month + "-" + arr[2];
+ },
+ search() {
+ this.getStandingPageList()
+ },
+ reset(formName) {
+ this.searchData.name = ''
+ this.searchData.code = ''
+ this.searchData.measureunit = ''
+ },
+ radioclick() {
+ this.radioValue ? this.getPlanPageList() : this.getStandingPageList()
+ this.reset()
+ },
+ async getPlanPageList() {
+ const res = await getPlanPageList({
+ currentPage: this.currentPage, pageSize: this.pageSize,
+ code: this.searchData.code, name: this.searchData.name, unit: this.searchData.measureunit
+ })
+ res.data.list.forEach(item => {
+ item.palanDate = item.beginTime + " ~ " + item.endTime
+ })
+ this.measurePlanTable = res.data.list
+ this.total = res.data.total
+ },
+ lookMeasurement(code) {
+ console.log(code);
+ },
}
}
</script>
<style scoped>
+.top-bar {
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
-.top-bar{
- margin: -25px -15px;
- background: #fff;
+ .sermargin {
+ margin-right: 60px;
+ }
+}
+
+.rightBtn {
+ margin-right: 50px
+}
+
+.library-table {
+ background-color: #fff;
+ flex: 1;
+ margin: 0px -15px;
+ margin-top: 40px;
+ display: flex;
+ flex-direction: column;
+
+ .table-header {
+ padding: 20px;
display: flex;
justify-content: space-between;
- padding: 5px 24px 0px 24px;
- .sermargin{
- margin-right: 60px;
+
+ .el-form-item {
+ margin-bottom: 30px !important;
}
}
-.rightBtn{
- margin-right: 50px
-}
-.library-table{
- background-color: #fff;
+
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 0px;
+ flex: 1;
+ background: #fff;
+ /* padding: 20px 20px 10px 20px; */
+ display: flex;
+ flex-direction: column;
+
+ .el-table {
flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
- display: flex;
- flex-direction: column;
- .table-header{
- padding: 20px;
- display: flex;
- justify-content: space-between;
- .el-form-item{
- margin-bottom: 30px !important;
- }
- }
- .table-box{
- padding: 0px 20px;
- margin-top: 0px;
- flex: 1;
- background: #fff;
- /* padding: 20px 20px 10px 20px; */
- display: flex;
- flex-direction: column;
- .el-table {
- flex: 1;
- }
- >div:nth-child(2){
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
- }
}
+ >div:nth-child(2) {
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
+ }
+}
</style>
--
Gitblit v1.9.3