From f5c448839b8984ef38ea7fa810633d14955a4d92 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 03 十一月 2022 16:53:09 +0800
Subject: [PATCH] 1.安灯报表报表开发完成
---
src/views/zlgl/gxjy.vue | 3
src/views/scgl/cngh.vue | 20
src/views/scgl/sckbg.vue | 6
src/api/jcsz.js | 8
src/views/bbgl/adbb.vue | 804 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/api/bbgl.js | 35 ++
src/router/index.js | 6
7 files changed, 874 insertions(+), 8 deletions(-)
diff --git a/src/api/bbgl.js b/src/api/bbgl.js
index c7cad01..361942d 100644
--- a/src/api/bbgl.js
+++ b/src/api/bbgl.js
@@ -106,3 +106,38 @@
params: data
})
}
+
+// 瀹夌伅鎶ヨ〃鏄庣粏
+export function AnDonReportDefinitSearch(data) {
+ return request({
+ url: 'ReportManager/AnDonReportDefinitSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 瀹夌伅鎶ヨ〃鏄庣粏瀵煎嚭
+export function AnDonReportDefinitExcelSearch(data) {
+ return request({
+ url: 'ReportManager/AnDonReportDefinitExcelSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 瀹夌伅鎶ヨ〃姹囨��
+export function AnDonReportSumSearch(data) {
+ return request({
+ url: 'ReportManager/AnDonReportSumSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 瀹夌伅鎶ヨ〃姹囨�诲鍑�
+export function AnDonReportSumExcelSearch(data) {
+ return request({
+ url: 'ReportManager/AnDonReportSumExcelSearch',
+ method: 'get',
+ params: data
+ })
+}
+
diff --git a/src/api/jcsz.js b/src/api/jcsz.js
index 46a4f16..46ec477 100644
--- a/src/api/jcsz.js
+++ b/src/api/jcsz.js
@@ -297,3 +297,11 @@
params: data
})
}
+// 閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅
+export function WhkspIsEqpSearch(data) {
+ return request({
+ url: 'BasicSetting/WhkspIsEqpSearch',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index bc631be..ae7f95d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -578,6 +578,12 @@
code: '1095',
component: () => import('@/views/bbgl/wxmx'),
meta: { code: '1095', title: '缁翠慨鏄庣粏', icon: '', keepAlive: true }
+ }, {
+ path: 'adbb',
+ name: 'ADBBJCancel',
+ code: '1096',
+ component: () => import('@/views/bbgl/adbb'),
+ meta: { code: '1096', title: '瀹夌伅鎶ヨ〃', icon: '', keepAlive: true }
}
]
},
diff --git a/src/views/bbgl/adbb.vue b/src/views/bbgl/adbb.vue
new file mode 100644
index 0000000..433cbe0
--- /dev/null
+++ b/src/views/bbgl/adbb.vue
@@ -0,0 +1,804 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup">
+ <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ </div>
+
+ <div v-show="currentTabPositionName==='瀹夌伅鏄庣粏'" class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label-width="70px" label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in wkshopSelectArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍛煎彨绫诲瀷" style=" display: flex;">
+ <el-select v-model="form.calltypecode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in calltypeSelectArr"
+ :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.calluser" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鍛煎彨鏃堕棿" style="display: flex;font-size: 14px;align-items: center">
+ <el-date-picker
+ v-model="form.calldate"
+ 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>
+ <el-form-item v-show="isExpandForm" label-width="70px" label="璁惧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.eqpcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="璁惧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.eqpname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍝嶅簲浜哄憳" style=" display: flex;">
+ <el-input v-model="form.responduser" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍝嶅簲鏃堕棿" style="display: flex;font-size: 14px;align-items: center">
+ <el-date-picker
+ v-model="form.responddate"
+ 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?'5%':'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 v-show="currentTabPositionName==='瀹夌伅姹囨��'" class="bodyTopFormGroup">
+ <el-form
+ ref="formSum"
+ :model="formSum"
+ label-width="100px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label-width="70px" label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select
+ v-model="formSum.wkshopcode"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="getWhkspIsEqpSearch"
+ >
+ <el-option
+ v-for="item in wkshopSelectArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐢熶骇璁惧" style=" display: flex;">
+ <el-select
+ v-model="formSum.eqpcode"
+ :disabled="formSum.wkshopcode===''"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in devicetypeArr"
+ :key="item.eqp_code"
+ :label="item.eqp_name"
+ :value="item.eqp_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍛煎彨绫诲瀷" style=" display: flex;">
+ <el-select v-model="formSum.calltypecode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in calltypeSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍛煎彨鏃堕棿" style="display: flex;font-size: 14px;align-items: center">
+ <el-date-picker
+ v-model="formSum.calldate"
+ 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>
+ <el-form-item
+ v-show="isExpandForm"
+ label-width="70px"
+ label="鍝嶅簲鏃堕棿"
+ style="display: flex;font-size: 14px;align-items: center"
+ >
+ <el-date-picker
+ v-model="formSum.responddate"
+ 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?'5%':'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>
+
+ <el-tabs
+ ref="elTabsRef"
+ type="border-card"
+ :style="{height:isExpandForm?tableHeight+'px':(tableHeight+40)+'px'}"
+ @tab-click="tabClick"
+ >
+ <el-tab-pane label="瀹夌伅鏄庣粏">
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ border
+ :height="isExpandForm?(tableHeight-130):(tableHeight-90)+'px'"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%' ,height:isExpandForm?(tableHeight-130):(tableHeight-90)+'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="wkshp_code"
+ label="杞﹂棿缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="杞﹂棿鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_code"
+ label="璁惧缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_name"
+ label="璁惧鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="typename"
+ label="鍛煎彨绫诲瀷"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="start_user"
+ label="鍛煎彨浜�"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="start_date"
+ label="鍛煎彨鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="resp_user"
+ label="鍝嶅簲浜�"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="resp_date"
+ label="鍝嶅簲鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="respondcont"
+ label="鍝嶅簲鏃堕暱"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="status"
+ label="鐘舵��"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='宸插搷搴�'" style="display: flex;align-items: center">
+ <div
+ style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983"
+ />
+ 宸插搷搴�
+ </div>
+ <div v-if="row.status==='寰呭搷搴�'" style="display: flex;align-items: center">
+ <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: yellow" />
+ 寰呭搷搴�
+ </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="getAnDonReportDefinitSearch"
+ />
+ </el-tab-pane>
+ <el-tab-pane label="瀹夌伅姹囨��">
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef2"
+ class="tableFixed"
+ :data="tableDataSum"
+ border
+ :height="isExpandForm?(tableHeight-130):(tableHeight-90)+'px'"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%' ,height:isExpandForm?(tableHeight-130):(tableHeight-90)+'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="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_name"
+ label="璁惧鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="calltypename"
+ label="鍛煎彨绫诲瀷"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="callcount"
+ label="鍛煎彨鎬绘鏁�"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="repondcount"
+ label="鍝嶅簲鎬绘鏁�"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="repondtime"
+ label="鎬诲搷搴旀椂闀匡紙鍒嗛挓锛�"
+ sortable="custom"
+ />
+
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="totalSum"
+ :page.sync="formSum.page"
+ :limit.sync="formSum.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getAnDonReportDefinitSearch"
+ />
+ </el-tab-pane>
+ </el-tabs>
+
+ </div>
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AnDengTypeSearch, WhkspIsEqpSearch } from '@/api/jcsz'
+import { handleDatetime } from '@/utils/global'
+import {
+ AnDonReportDefinitExcelSearch,
+ AnDonReportDefinitSearch,
+ AnDonReportSumExcelSearch,
+ AnDonReportSumSearch
+} from '@/api/bbgl'
+import { ShopSearch } from '@/api/dzkb'
+
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ calltypecode: '', // 鍛煎彨绫诲瀷缂栫爜
+ calluser: '', // 鍛煎彨浜哄憳
+ calldate: '', // 鍛煎彨鏃堕棿
+ eqpcode: '', // 璁惧缂栫爜
+ eqpname: '', // 璁惧鍚嶇О
+ responduser: '', // 鍝嶅簲浜哄憳
+ responddate: '', // 鍝嶅簲鏃堕棿
+ prop: 'eqp_code', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ total: 10,
+ wkshopSelectArr: [], // 鐢熶骇杞﹂棿涓嬫媺鏁扮粍
+ calltypeSelectArr: [], // 鍛煎彨绫诲瀷涓嬫媺鏁扮粍
+ tableData: [],
+ currentTabPositionName: '瀹夌伅鏄庣粏', // Tab鏍囩浣嶄簬鐨勪綅缃� 榛樿绗��0鈥欎釜
+ formSum: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ calltypecode: '', // 鍛煎彨绫诲瀷缂栫爜
+ calldate: '', // 鍛煎彨鏃堕棿
+ eqpcode: '', // 璁惧缂栫爜
+ responddate: '', // 鍝嶅簲鏃堕棿
+ prop: 'eqp_code', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ tableDataSum: [],
+ totalSum: 0,
+ devicetypeArr: []// 鐢熶骇璁惧涓嬫媺鏁扮粍
+ }
+ },
+
+ created() {
+ this.handleRequest()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ handleRequest() {
+ this.getAnDonReportDefinitSearch().then(res => {
+ if (res.code === '200') {
+ this.getShopSearch()
+ this.getAnDengTypeSearch()
+ }
+ })
+ },
+ async getAnDonReportDefinitSearch() {
+ let tempDate = this.form.calldate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ let tempDate2 = this.form.responddate
+ if (tempDate2.length > 0) {
+ tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ }
+
+ const data = {
+ wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
+ calltypecode: this.form.calltypecode, // 鍛煎彨绫诲瀷缂栫爜
+ calluser: this.form.calluser, // 鍛煎彨浜哄憳
+ calldate: tempDate, // 鍛煎彨鏃堕棿
+ eqpcode: this.form.eqpcode, // 璁惧缂栫爜
+ eqpname: this.form.eqpname, // 璁惧鍚嶇О
+ responduser: this.form.responduser, // 鍝嶅簲浜哄憳
+ responddate: tempDate2, // 鍝嶅簲鏃堕棿
+ prop: this.form.prop, // 鎺掑簭瀛楁
+ order: this.form.order, // 鎺掑簭瀛楁
+ page: this.form.page, // 绗嚑椤�
+ rows: this.form.rows // 姣忛〉澶氬皯鏉�
+ }
+
+ const res = await AnDonReportDefinitSearch(data)
+ this.tableData = res.data
+ this.total = res.count
+ return { code: res.code }
+ },
+ async getAnDonReportSumSearch() {
+ let tempDate = this.formSum.calldate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ let tempDate2 = this.formSum.responddate
+ if (tempDate2.length > 0) {
+ tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ }
+
+ const data = {
+ wkshopcode: this.formSum.wkshopcode, // 杞﹂棿缂栫爜
+ calltypecode: this.formSum.calltypecode, // 鍛煎彨绫诲瀷缂栫爜
+ calldate: tempDate, // 鍛煎彨鏃堕棿
+ eqpcode: this.formSum.eqpcode, // 璁惧缂栫爜
+ responddate: tempDate2, // 鍝嶅簲鏃堕棿
+ prop: this.formSum.prop, // 鎺掑簭瀛楁
+ order: this.formSum.order, // 鎺掑簭瀛楁
+ page: this.formSum.page, // 绗嚑椤�
+ rows: this.formSum.rows // 姣忛〉澶氬皯鏉�
+ }
+
+ const res = await AnDonReportSumSearch(data)
+ this.tableDataSum = res.data
+ this.totalSum = res.count
+ },
+ // 鑾峰彇鐢熶骇杞﹂棿
+ async getShopSearch() {
+ const { data: res } = await ShopSearch()
+ this.wkshopSelectArr = res
+ },
+ // 鑾峰彇鍛煎彨绫诲瀷
+ async getAnDengTypeSearch() {
+ const { data: res } = await AnDengTypeSearch()
+ this.calltypeSelectArr = res
+ },
+ async getWhkspIsEqpSearch(val) {
+ this.formSum.eqpcode = ''
+ const { data: res } = await WhkspIsEqpSearch({ wkshpcode: val })
+ this.devicetypeArr = res
+ },
+ // tab鏍囩鍒囨崲
+ tabClick(val) {
+ this.currentTabPositionName = val.label
+
+ if (this.currentTabPositionName === '瀹夌伅鏄庣粏') {
+ this.getAnDonReportDefinitSearch()
+ } else {
+ this.getAnDonReportSumSearch()
+ }
+
+ this.$nextTick(() => {
+ this.$refs['tableDataRef'].doLayout()
+ this.$refs['tableDataRef2'].doLayout()
+ })
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (this.currentTabPositionName === '瀹夌伅鏄庣粏') {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getAnDonReportDefinitSearch()
+ } else {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.formSum.order = order
+ this.formSum.prop = prop
+ this.getAnDonReportSumSearch()
+ }
+ },
+ // 鏌ヨ
+ search() {
+ if (this.currentTabPositionName === '瀹夌伅鏄庣粏') {
+ this.getAnDonReportDefinitSearch()
+ } else {
+ this.getAnDonReportSumSearch()
+ }
+ },
+ // 閲嶇疆
+ reset() {
+ if (this.currentTabPositionName === '瀹夌伅鏄庣粏') {
+ this.form.wkshopcode = ''
+ this.form.calltypecode = ''
+ this.form.calluser = ''
+ this.form.calldate = ''
+ this.form.eqpcode = ''
+ this.form.eqpname = ''
+ this.form.responduser = ''
+ this.form.responddate = ''
+ this.getAnDonReportDefinitSearch()
+ } else {
+ this.formSum.wkshopcode = ''
+ this.formSum.calltypecode = ''
+ this.formSum.calldate = ''
+ this.formSum.eqpcode = ''
+ this.formSum.responddate = ''
+
+ this.getAnDonReportSumSearch()
+ }
+ },
+ async download() {
+ if (this.currentTabPositionName === '瀹夌伅鏄庣粏') {
+ let calldate = this.form.calldate
+ if (calldate.length > 0) {
+ calldate = handleDatetime(calldate[0]) + '~' + handleDatetime(calldate[1])
+ }
+ let responddate = this.form.responddate
+ if (responddate.length > 0) {
+ responddate = handleDatetime(responddate[0]) + '~' + handleDatetime(responddate[1])
+ }
+ const data = {
+ wkshopcode: this.form.wkshopcode,
+ calltypecode: this.form.calltypecode,
+ calluser: this.form.calluser,
+ calldate: calldate,
+ eqpcode: this.form.eqpcode,
+ eqpname: this.form.eqpname,
+ responduser: this.form.responduser,
+ responddate: responddate
+ }
+ const { data: res } = await AnDonReportDefinitExcelSearch(data)
+ console.log(res)
+ window.location.href = res
+ } else {
+ let calldate = this.formSum.calldate
+ if (calldate.length > 0) {
+ calldate = handleDatetime(calldate[0]) + '~' + handleDatetime(calldate[1])
+ }
+ let responddate = this.formSum.responddate
+ if (responddate.length > 0) {
+ responddate = handleDatetime(responddate[0]) + '~' + handleDatetime(responddate[1])
+ }
+ const data = {
+ wkshopcode: this.formSum.wkshopcode,
+ calltypecode: this.formSum.calltypecode,
+ calldate: calldate,
+ eqpcode: this.formSum.eqpcode,
+ responddate: responddate
+ }
+ const { data: res } = await AnDonReportSumExcelSearch(data)
+ window.location.href = res
+ }
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 180
+ this.$refs.tableDataRef.doLayout()
+ this.$refs.tableDataRef2.doLayout()
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+ }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+
+::v-deep .el-tabs--border-card > .el-tabs__content {
+ padding: 0 10px;
+}
+
+::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;
+ }
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/scgl/cngh.vue b/src/views/scgl/cngh.vue
index 5fdc9cf..04964ae 100644
--- a/src/views/scgl/cngh.vue
+++ b/src/views/scgl/cngh.vue
@@ -19,6 +19,7 @@
v-model="form.workshop"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @change="getWhkspIsEqpSearch"
>
<el-option
v-for="item in workshopArr"
@@ -33,12 +34,13 @@
v-model="form.devicetype"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ :disabled="form.workshop===''"
>
<el-option
v-for="item in devicetypeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ :key="item.eqp_code"
+ :label="item.eqp_name"
+ :value="item.eqp_code"
/>
</el-select>
</el-form-item>
@@ -602,6 +604,7 @@
} from '@/api/scgl'
import { DeviceTypeSelect, WorkShopSelect } from '@/api/sbgl'
import { handleDatetime3 } from '@/utils/global'
+import { WhkspIsEqpSearch } from '@/api/jcsz'
export default {
name: 'Zzjg',
@@ -824,7 +827,7 @@
this.getCapacityPlanningSearch().then(res => {
if (res.code === '200') {
this.getWorkShopSelect()
- this.getDeviceTypeSelect()
+ // this.getDeviceTypeSelect()
}
})
},
@@ -842,8 +845,13 @@
const { data: res } = await WorkShopSelect()
this.workshopArr = res
},
- async getDeviceTypeSelect() {
- const { data: res } = await DeviceTypeSelect()
+ // async getDeviceTypeSelect() {
+ // const { data: res } = await DeviceTypeSelect()
+ // this.devicetypeArr = res
+ // },
+ async getWhkspIsEqpSearch(val) {
+ this.form.devicetype = ''
+ const { data: res } = await WhkspIsEqpSearch({ wkshpcode: val })
this.devicetypeArr = res
},
mrfaSearch(row, operation) {
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index cafa374..bbee9e4 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1938,7 +1938,6 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
- this.$store.state.app.buttonIsDisabled = true
if (this.dialogTitle === '澶栧崗鍙戞枡') {
if (parseFloat(this.dialogForm.fqty) > parseFloat(this.dialogForm.noreportqty)) {
return this.$message.info('鍙戞枡鏁伴噺涓嶈兘澶т簬鏈彂鏁伴噺!')
@@ -1953,6 +1952,7 @@
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
fqty: this.dialogForm.fqty // 鍙戞枡鏁伴噺
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepOut(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
@@ -1989,6 +1989,7 @@
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepIn(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
@@ -2015,6 +2016,7 @@
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
startqty: this.dialogForm.startqty// 寮�濮嬫暟閲�
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepStart(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
@@ -2065,7 +2067,7 @@
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
-
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 49add1f..861f99e 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -639,6 +639,9 @@
if (this.form.orderstepqrcode.length < 1) {
return this.$message.info('鎵弿鏉＄爜涓嶈兘涓虹┖锛�')
}
+ if (this.form.wo_code.toString().length === 0) {
+ return this.$message.info('鏈幏寰楀伐鍗曠紪鐮侊紒')
+ }
if (this.checkStandard.length < 1) {
return this.$message.info('妫�楠屾爣鍑嗕笉鑳戒负绌猴紒')
}
--
Gitblit v1.9.3