From ec4a8eb416562951f84041a6cd8dd91fcb729e22 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 14:41:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspection-order.vue | 131 +++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 42 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index cc73191..8566f6b 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -80,51 +80,73 @@
</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">
+ <el-col :span="20" style="display: flex;align-items: center;flex-wrap: wrap;">
+ <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" v-show="more">
+ <div class="search_label">涓嬪崟浜猴細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" v-show="more">
+ <div class="search_label">宸ョ▼鍚嶇О锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" v-show="more">
+ <div class="search_label">鐢熶骇鍗曚綅锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div class="search_thing" style="padding-left: 10px;">
+ <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="'height: calc(100% - '+(more?'94':'44')+'px)'" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+ :key="'b'+upIndex" />
</div>
<!-- 瀹℃牳 -->
<el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -149,7 +171,7 @@
<!-- 鎾ら攢 -->
<el-dialog title="涓嬪崟鎾ら攢" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose">
<p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span
- style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p>
+ style="color:#34BD66">{{this.insOrderRow.entrustCode}}</span>鐨勪俊鎭槸鍚︽挙閿�</p>
<el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
<el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�">
<el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
@@ -249,6 +271,9 @@
sampleModel: null,
sampleCode: null,
state: 0,
+ value1:null,
+ value2:null,
+ value3:null,
orderBy: {
field: 'id',
order: 'asc'
@@ -430,7 +455,9 @@
],
tabIndex: 0,
active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
- currentId: null
+ currentId: null,
+ more:false,
+ insOrderRow:{}
}
},
mounted() {
@@ -531,6 +558,7 @@
// 鎾ら攢
handlEquash(row) {
this.quashDialogVisible = true;
+ this.insOrderRow=row
},
// 涓嬪彂
handleIssued(row) {
@@ -575,6 +603,25 @@
},
submitForm() {
this.upLoad = true;
+ if (this.tabIndex==1){
+ this.axios.put(this.$api.insOrder.updateInspected+"?id="+this.insOrderRow.id).then(res=>{
+ if (res.code===200){
+ this.upLoad=false
+ this.quashDialogVisible=false
+ this.refreshTable()
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }else{
+ this.axios.put(this.$api.insOrder.updateStatus+"?id="+this.insOrderRow.id).then(res=>{
+ if (res.code===200){
+ this.upLoad = false
+ this.quashDialogVisible = false
+ this.refreshTable()
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }
let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
delete this.formData.createTime
delete this.formData.updateTime
--
Gitblit v1.9.3