From 3ca7a7fe929d39c51e705e39306a99e452b1efe7 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 16:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/do/b1-ins-order/add.vue | 39 +++
src/components/do/b1-ins-order/fiberoptic-config.vue | 505 +++++++++++++++++------------------------
src/components/view/b1-inspection-order.vue | 120 ++++++---
src/components/view/index-index.vue | 6
4 files changed, 326 insertions(+), 344 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index c06c537..03ffe0e 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -107,7 +107,6 @@
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
- <el-button size="medium" type="primary" @click="$parent.playOrder(4)">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
<el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -243,6 +242,30 @@
<div class="search_label">OTC璁㈠崟鍙凤細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇ОEN锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production" :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅EN锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -563,7 +586,11 @@
isLeave: 0,
orderType: null,
send: 1,
- formType: '閫佹'
+ formType: '閫佹',
+ engineering: null,
+ engineeringEn: null,
+ production: null,
+ productionEn: null,
},
sample: {
sampleCode: null,
@@ -727,6 +754,14 @@
this.$message.error('璇疯緭鍏ユ潵鏍锋柟寮�')
} else if (!this.addObj.orderType) {
this.$message.error('璇烽�夋嫨妫�楠岀被鍒�')
+ }else if (!this.addObj.engineering) {
+ this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉�')
+ } else if (!this.addObj.engineeringEn) {
+ this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉癊N')
+ }else if (!this.addObj.production) {
+ this.$message.error('璇疯緭鍏ョ敓浜у崟浣�')
+ }else if (!this.addObj.productionEn) {
+ this.$message.error('璇疯緭鍏ョ敓浜у崟浣岴N')
} else if (this.sampleList.length < 1) {
this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
} else if (!this.sampleList.every(m => m.sample)) {
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 8adeb33..bcd523b 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -1,299 +1,200 @@
<template>
-<div class="ins_order_config">
- <div>
- <el-row class="title">
- <el-col :span="6" style="padding-left: 20px;">鍏夌氦閰嶇疆</el-col>
- <el-col :span="18" style="text-align: right;">
- <el-button size="medium" type="primary" @click="save" :loading="saveLoad">淇� 瀛�</el-button>
- <el-button size="medium" @click="$parent.playOrder(0)">
- <span style="color: #3A7BFA;">鍙� 娑�</span>
- </el-button>
- </el-col>
- </el-row>
+ <div class="ins_order_config">
+ <div>
+ <el-row class="title">
+ <el-col :span="6" style="padding-left: 20px;">鍏夌氦閰嶇疆</el-col>
+ <el-col :span="18" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="save" :loading="saveLoad">淇� 瀛�</el-button>
+ <el-button size="medium" @click="$parent.playOrder(0)">
+ <span style="color: #3A7BFA;">鍙� 娑�</span>
+ </el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="center">
+ <el-row :gutter="10" style="margin-bottom: 10px;">
+ <el-col :span="9">
+ <div class="grid-content">
+ <h5>濂楅</h5>
+ <div
+ style="display: flex;align-items: center;justify-content: space-between;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item">
+ <label style="width: 70px;">鏍峰搧鍨嬪彿</label>
+ <span style="font-size: 14px;">GYTA53</span>
+ </div>
+ <el-radio-group v-model="packageInfo.radio" size="small">
+ <el-radio :label="0">鍏ㄦ</el-radio>
+ <el-radio :label="1">鎶芥</el-radio>
+ </el-radio-group>
+ </div>
+ <div class="search-item" style="margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <label style="width: 70px;">鏍峰搧缂栧彿</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div
+ style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item" style="margin-right: 10px;">
+ <label>濂楃鏁扮洰</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div class="search-item" style="margin-right: 10px;">
+ <label style="width: 70px;">鏍囧噯閲�</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div class="search-item">
+ <label style="width: 70px;">妫�娴嬮噺</label>
+ <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ </div>
+ <el-table ref="table0" :data="tableData" tooltip-effect="dark" style="width: 100%" height="150px"
+ size="small" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column label="绠¤壊鏍�" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column prop="name" label="鏍囬噺" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="娴嬭瘯閲�" show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ <el-col :span="15">
+ <div class="grid-content">
+ <h5>妫�娴嬮」淇℃伅</h5>
+ <el-table ref="table1" :data="tableData" tooltip-effect="dark" style="width: 100%" height="274px"
+ size="small" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column label="瀹為獙瀹�" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column prop="name" label="妫�娴嬮」鐩�" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="璇曢獙鏂规硶" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="鍗曚环" width="70" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="鍗曚綅" width="70" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="棰勮鏃堕棿" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="妫�娴嬫爣鍑�" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="妫�娴嬭姹�" show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="12">
+ <div class="grid-content">
+ <h5>鍏夌氦甯�</h5>
+ <div class="btns">
+ <el-button size="small" type="primary">鐢熸垚鍏夌氦甯�</el-button>
+ <el-button size="small" type="primary">淇濆瓨鍏夌氦甯﹂」鐩�</el-button>
+ </div>
+ <div
+ style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <label style="width: 80px;">绾ゅ甫绫诲瀷</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="search-item" style="width: 50%;">
+ <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <el-table ref="table2" :data="tableData" tooltip-effect="dark" style="width: 100%" height="270px"
+ size="small" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column label="鍏夌氦甯︾紪鍙�" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column prop="name" label="鍏夌氦甯﹁鏍�" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="鍙傝�冩爣鍑�" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="鍏夌氦妫�娴嬮噺" show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="grid-content">
+ <h5>鍏夌氦</h5>
+ <div class="btns">
+ <el-button size="small" type="primary">鍏夌氦閰嶈壊</el-button>
+ <el-button size="small" type="primary">淇濆瓨鍏夌氦椤圭洰</el-button>
+ </div>
+ <div
+ style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
+ <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <label style="width: 80px;">鍏夌氦绫诲瀷</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="search-item" style="width: 50%;">
+ <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+ <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <el-table ref="table3" :data="tableData" tooltip-effect="dark" style="width: 100%" height="270px"
+ size="small" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column label="绠″鑹叉爣" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column prop="name" label="鍏夌氦鑹叉爣" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="鍏夌氦瑙勬牸" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="address" label="鍙傝�冩爣鍑�" show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
</div>
- <div class="center">
- <el-row :gutter="10" style="margin-bottom: 10px;">
- <el-col :span="9">
- <div class="grid-content">
- <h4>濂楅</h4>
- <div style="display: flex;align-items: center;justify-content: space-between;padding: 0 12px;box-sizing: border-box;">
- <div class="search-item">
- <label style="width: 70px;">鏍峰搧鍨嬪彿</label>
- <span style="font-size: 14px;">GYTA53</span>
- </div>
- <el-radio-group v-model="packageInfo.radio" size="small">
- <el-radio :label="0">鍏ㄦ</el-radio>
- <el-radio :label="1">鎶芥</el-radio>
- </el-radio-group>
- </div>
- <div class="search-item" style="margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
- <label style="width: 70px;">鏍峰搧缂栧彿</label>
- <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
- </div>
- <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
- <div class="search-item" style="margin-right: 10px;">
- <label>濂楃鏁扮洰</label>
- <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
- </div>
- <div class="search-item" style="margin-right: 10px;">
- <label style="width: 70px;">鏍囧噯閲�</label>
- <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
- </div>
- <div class="search-item">
- <label style="width: 70px;">妫�娴嬮噺</label>
- <el-input v-model="packageInfo.input" placeholder="璇疯緭鍏�" size="small"></el-input>
- </div>
- </div>
- <el-table
- ref="table0"
- :data="tableData"
- tooltip-effect="dark"
- style="width: 100%"
- height="150px"
- size="small"
- @selection-change="handleSelectionChange">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column
- label="绠¤壊鏍�"
- show-overflow-tooltip>
- <template slot-scope="scope">{{ scope.row.date }}</template>
- </el-table-column>
- <el-table-column
- prop="name"
- label="鏍囬噺"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="娴嬭瘯閲�"
- show-overflow-tooltip>
- </el-table-column>
- </el-table>
- </div>
- </el-col>
- <el-col :span="15">
- <div class="grid-content">
- <h4>妫�娴嬮」淇℃伅</h4>
- <el-table
- ref="table1"
- :data="tableData"
- tooltip-effect="dark"
- style="width: 100%"
- height="274px"
- size="small"
- @selection-change="handleSelectionChange">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column
- label="瀹為獙瀹�"
- show-overflow-tooltip>
- <template slot-scope="scope">{{ scope.row.date }}</template>
- </el-table-column>
- <el-table-column
- prop="name"
- label="妫�娴嬮」鐩�"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="璇曢獙鏂规硶"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍗曚环"
- width="70"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍗曚綅"
- width="70"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="棰勮鏃堕棿"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="妫�娴嬫爣鍑�"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="妫�娴嬭姹�"
- show-overflow-tooltip>
- </el-table-column>
- </el-table>
- </div>
- </el-col>
- </el-row>
- <el-row :gutter="10">
- <el-col :span="12">
- <div class="grid-content">
- <h4>鍏夌氦甯�</h4>
- <div class="btns">
- <el-button size="small" type="primary">鐢熸垚鍏夌氦甯�</el-button>
- <el-button size="small" type="primary">淇濆瓨鍏夌氦甯﹂」鐩�</el-button>
- </div>
- <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
- <div class="search-item" style="width: 50%;margin-right: 16px;">
- <label style="width: 80px;">绾ゅ甫绫诲瀷</label>
- <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </div>
- <div class="search-item" style="width: 50%;">
- <label style="width: 80px;">鍙傝�冩爣鍑�</label>
- <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </div>
- </div>
- <el-table
- ref="table2"
- :data="tableData"
- tooltip-effect="dark"
- style="width: 100%"
- height="270px"
- size="small"
- @selection-change="handleSelectionChange">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column
- label="鍏夌氦甯︾紪鍙�"
- show-overflow-tooltip>
- <template slot-scope="scope">{{ scope.row.date }}</template>
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍏夌氦甯﹁鏍�"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍙傝�冩爣鍑�"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍏夌氦妫�娴嬮噺"
- show-overflow-tooltip>
- </el-table-column>
- </el-table>
- </div>
- </el-col>
- <el-col :span="12">
- <div class="grid-content">
- <h4>鍏夌氦</h4>
- <div class="btns">
- <el-button size="small" type="primary">鍏夌氦閰嶈壊</el-button>
- <el-button size="small" type="primary">淇濆瓨鍏夌氦椤圭洰</el-button>
- </div>
- <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
- <div class="search-item" style="width: 50%;margin-right: 16px;">
- <label style="width: 80px;">鍏夌氦绫诲瀷</label>
- <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </div>
- <div class="search-item" style="width: 50%;">
- <label style="width: 80px;">鍙傝�冩爣鍑�</label>
- <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </div>
- </div>
- <el-table
- ref="table3"
- :data="tableData"
- tooltip-effect="dark"
- style="width: 100%"
- height="270px"
- size="small"
- @selection-change="handleSelectionChange">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column
- label="绠″鑹叉爣"
- show-overflow-tooltip>
- <template slot-scope="scope">{{ scope.row.date }}</template>
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍏夌氦鑹叉爣"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍏夌氦瑙勬牸"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍙傝�冩爣鍑�"
- show-overflow-tooltip>
- </el-table-column>
- </el-table>
- </div>
- </el-col>
- </el-row>
- </div>
-</div>
</template>
<script>
-export default {
- data(){
- return{
- saveLoad:false,
- packageInfo:{
- radio:1,
- input:''
- },
- tableData:[],
- tape:{
- value:''
- },
- options:[]
+ export default {
+ data() {
+ return {
+ saveLoad: false,
+ packageInfo: {
+ radio: 1,
+ input: ''
+ },
+ tableData: [],
+ tape: {
+ value: ''
+ },
+ options: []
+ }
+ },
+ methods: {
+ save() {},
+ handleSelectionChange(val) {}
}
- },
- methods:{
- save(){},
- handleSelectionChange(val) {}
}
-}
</script>
<style scoped>
@@ -304,19 +205,27 @@
overflow-x: hidden;
}
+ .ins_order_config::-webkit-scrollbar {
+ width: 0;
+ }
+
.title {
height: 60px;
line-height: 60px;
}
- .center{
+
+ .center {
width: 100%;
height: calc(100% - 60px);
}
- .grid-content{
+
+ .grid-content {
background: #fff;
border-radius: 4px;
+ box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.05);
}
- .grid-content h4{
+
+ .grid-content h5 {
color: #3A7BFA;
font-weight: 400;
line-height: 32px;
@@ -324,21 +233,25 @@
box-sizing: border-box;
border-bottom: 1px solid #eee;
}
- .search-item{
+
+ .search-item {
display: flex;
align-items: center;
line-height: 36px;
}
- .search-item label{
+
+ .search-item label {
width: 90px;
font-size: 12px;
color: #606266;
/* text-align: right; */
}
- .btns{
+
+ .btns {
margin: 8px 0 8px 10px;
}
- >>>.el-table th.el-table__cell>.cell{
+
+ >>>.el-table th.el-table__cell>.cell {
padding-top: 2px !important;
padding-bottom: 2px !important;
}
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index a697366..8d285c2 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -9,6 +9,7 @@
height: 80px;
display: flex;
align-items: center;
+ overflow: hidden;
}
.search_thing {
@@ -76,55 +77,78 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="playOrder(4)">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
</el-col>
</el-row>
</div>
- <div class="search">
- <div class="search_thing">
- <div class="search_label">濮旀墭缂栧彿锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing">
- <div class="search_label">鏍峰搧鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing">
- <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing">
- <div class="search_label">鏍峰搧缂栧彿锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing">
- <div class="search_label">涓嬪崟鏃堕棿锛�</div>
- <div class="search_input">
- <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
- type="date"
- size="small"
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd HH:mm:ss"
- clearable
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
+ <div class="search" :style="`height: ${more?130:80}px;`">
+ <el-row :gutter="10" style="width: 100%;">
+ <el-col :span="20" style="display: flex;flex-wrap: wrap;">
+ <div class="search_thing" style="width: 20%;">
+ <div class="search_label">濮旀墭缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;">
+ <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;">
+ <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;">
+ <div class="search_label">鏍峰搧缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;">
+ <div class="search_label">涓嬪崟鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
+ type="date"
+ size="small"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ clearable
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label">涓嬪崟浜猴細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label">宸ョ▼鍚嶇О锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label">鐢熶骇鍗曚綅锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div class="search_thing">
+ <el-button type="text" :icon="!more?'el-icon-arrow-down':'el-icon-arrow-up'" style="color: #3A7BFA;" @click="more=!more">{{!more?'鏇村':'鏀惰捣'}}</el-button>
+ <el-button size="small" @click="refresh()">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ </div>
+ </el-col>
+ </el-row>
</div>
<div class="table">
<ul class="tab">
<li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
</ul>
- <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
- :key="'b'+upIndex" style="height: calc(100% - 44px)" />
+ <ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+ :key="'b'+upIndex" />
</div>
<!-- 瀹℃牳 -->
<el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -204,7 +228,8 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" />
+ <Add :active="active" :currentId="currentId" v-show="active<4" />
+ <fiberOpticConfig :currentId="currentId" v-if="active==4" />
</div>
</div>
</template>
@@ -212,10 +237,12 @@
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
+ import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
export default {
components: {
ValueTable,
- Add
+ Add,
+ fiberOpticConfig
},
data() {
return {
@@ -246,6 +273,9 @@
sampleModel: null,
sampleCode: null,
state: 0,
+ name:null,
+ engineering:null,
+ production:null,
orderBy: {
field: 'id',
order: 'asc'
@@ -426,8 +456,9 @@
},
],
tabIndex: 0,
- active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
+ active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
currentId: null,
+ more:false,
insOrderRow:{}
}
},
@@ -647,6 +678,9 @@
this.componentData.tagField.orderType.select = res.data
})
},
+ getStyle(){
+ return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
+ }
}
}
</script>
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 16a3025..e3ece03 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -313,7 +313,7 @@
<img src="../../../static/img/index-1.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">{{ getNumberFourTypes.remainingToDo }}</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfReadMessages }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">宸插姙浜嬪疁</p>
</div>
</div>
@@ -322,7 +322,7 @@
<img src="../../../static/img/index-2.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfReadMessages }}</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.remainingToDo }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">鍓╀綑寰呭姙</p>
</div>
</div>
@@ -467,7 +467,7 @@
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
timer:null,
keyMap:{},
- getNumberFourTypes: {},
+ getNumberFourTypes: {},
}
},
watch:{
--
Gitblit v1.9.3