From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 204 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 194 insertions(+), 10 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 9526916..3acbdfe 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -143,6 +143,10 @@
>>>input[type=number] {
-moz-appearance: textfield !important; /* 閽堝 Firefox */
}
+ >>>.el-form-item__content{
+ display: inline-flex;
+ align-items: center;
+ }
</style>
<style>
.inspection .el-form-item__label {
@@ -272,9 +276,19 @@
<el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
size="small">{{ item.color }}</el-radio-button>
</el-radio-group>
+ <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px">
+ <el-form-item label="娓╁害:" style="margin-bottom: 0;">
+ <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
+ <span style="margin-left: 4px;">鈩�</span>
+ </el-form-item>
+ <el-form-item label="婀垮害:" style="margin-bottom: 0;">
+ <el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
+ <span style="margin-left: 4px;">%</span>
+ </el-form-item>
+ </el-form>
</div>
</div>
- <div class="center-box" id="nav" v-loading="tableLoading">
+ <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
@@ -379,6 +393,142 @@
</tr>
</tbody>
</table>
+ </div>
+ <div class="center-box" v-loading="tableLoading" v-else>
+ <!-- <el-divider></el-divider> -->
+ <h4 style="margin-bottom: 20px;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+ <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px">
+ <el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm.entrustCode" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm.sampleCode" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="妫�娴嬩緷鎹�:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm.sample" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="寰幆娆℃暟:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in numOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娓╁害:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <span style="margin-left: 4px;">鈩�</span>
+ </el-form-item>
+ </el-form>
+ <el-divider></el-divider>
+ <el-form :inline="true" :model="wareForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
+ <el-form-item label="浠櫒鍚嶇О:">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-left: 80px;">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-table
+ :data="wareTableData"
+ border
+ style="width: 100%;margin-bottom: 30px;" align="center">
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ width="65"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="绠¤壊鏍�"
+ width="150">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍏夌氦甯︾紪鍙�"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="province"
+ label="鍏夌氦鑹叉爣"
+ width="150">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="澶栫"
+ width="150">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.input" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍐呯"
+ width="150">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.input" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="骞冲潎鍊�"
+ min-width="150">
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="琛板噺宸�"
+ min-width="150">
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="妫�娴嬩汉"
+ min-width="150">
+ </el-table-column>
+ </el-table>
</div>
<el-upload :action="action"
:data="{
@@ -629,7 +779,17 @@
temptList:null,
fiber:[],
fibers:[],
- currentTab:null
+ currentTab:null,
+ wareForm:{},
+ numOptions:[],
+ temperatureOptions:[],
+ wareTableData:[
+ {}
+ ],
+ otherForm:{
+ humidity:null,
+ temperature:null,
+ }
}
},
computed: {
@@ -676,8 +836,17 @@
}
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.HaveJson(this.sampleProduct[0])
+ let insProduct = this.HaveJson(this.currentSample.insProduct)
+ if(insProduct&&insProduct.length>0){
+ let {temperature,humidity} = insProduct[0];
+ this.otherForm = {
+ temperature:temperature?temperature:null,
+ humidity:humidity?humidity:null,
+ }
+ }
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ console.log(this.currentSample)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -691,7 +860,6 @@
this.getReportModel(this.currentSample.id)
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
- // this.handleTableData()
this.getTableLists();
this.componentData.currentId = val;
this.currentKey = 1;
@@ -722,6 +890,24 @@
},
},
methods: {
+ subOtherForm(m,type){
+ let ids = []
+ for (let i in this.param) {
+ ids.push(i)
+ }
+ this.$axios.post(this.$api.insOrderPlan.write,{
+ [type]:Number(m),
+ ids
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ noQs:true
+ }).then(res => {
+ if (res.code == 201) return
+ this.$message.success('淇濆瓨鎴愬姛')
+ })
+ },
getPower(){
let power = JSON.parse(sessionStorage.getItem('power'))
let fileDel = false
@@ -830,7 +1016,7 @@
if(bushing&&bushing.length>0){
this.bushing = bushing
}
- this.handleTableData()
+ // this.handleTableData()
this.getTableLists();
this.currentKey = row.index
this.currentTab = null;
@@ -1006,6 +1192,7 @@
count++
})
})
+ // 闂寮�濮�
this.tableList.forEach(a => {
let dels = new Set()
let ids = []
@@ -1062,6 +1249,8 @@
}
}
})
+ console.log(5555,a.template)
+ return
ids.forEach(id => {
for (let b = 0; b < a.template.length; b++) {
if (a.template[b].r === id.r) {
@@ -1096,6 +1285,7 @@
}
})
})
+ // 闂缁撴潫
this.tableList.forEach(a => {
let arrs = []
let set = new Set()
@@ -1206,7 +1396,6 @@
this.param[a.id].insResult.v.v = a.insResult
} catch (e) {}
})
- console.log(this.tableList)
this.handleExcelMethod()
},
changeInput(m, code) {
@@ -1254,10 +1443,8 @@
try {
if (this.currentSample.insProduct.find(m => m.id == item.i)) {
let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
- console.log(comValue)
let res = Object.values(comValue)[0]
let comp = []
- console.log(res, ask)
if(res==''||res==null||res==undefined||res=='Infinity'){
item.v.v = ''
}else{
@@ -1271,10 +1458,8 @@
return eval(res) == eval(str)
}
} else if (m.includes('鈮�')) {
- console.log(res, eval(res <= m.split('鈮�')[1]))
return eval(res) >= eval(m.split('鈮�')[1])
}else if (m.includes('鈮�')) {
- console.log(res,m.split('鈮�')[1])
return eval(res) <= eval(m.split('鈮�')[1])
}else if (m.includes('<')) {
return eval(res) < eval(m.split('<')[1])
@@ -1288,7 +1473,6 @@
return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
}else if(m.includes('卤')){
let k = m.split('卤')
- console.log(eval(res),eval((k[0] - k[1])),eval(res),eval((k[0] + k[1])))
return eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
}else if(m.includes('锛�')){
return eval(res) > eval(m.split('锛�')[1])
--
Gitblit v1.9.3