From 48c35ace73ed0f83559c451b66a24f390484aa49 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 02 七月 2024 15:39:51 +0800
Subject: [PATCH] 下单页面—温度循环要求填写弹框开发联调
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 208 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 182 insertions(+), 26 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 454ee55..1711c52 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 {
@@ -274,7 +278,7 @@
</el-radio-group>
</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 +383,136 @@
</tr>
</tbody>
</table>
+ </div>
+ <div class="center-box" v-loading="tableLoading" v-else>
+ <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%;margin-bottom: 20px;">
+ <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%">
+ <el-table-column
+ fixed
+ prop="date"
+ label="绠¤壊鏍�"
+ width="150">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍏夌氦甯︾紪鍙�"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="province"
+ label="鍏夌氦鑹叉爣"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="澶栫"
+ width="120">
+ <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="300">
+ <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="骞冲潎鍊�"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="琛板噺鏌�"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="妫�娴嬩汉"
+ width="120">
+ </el-table-column>
+ </el-table>
</div>
<el-upload :action="action"
:data="{
@@ -629,7 +763,13 @@
temptList:null,
fiber:[],
fibers:[],
- currentTab:null
+ currentTab:null,
+ wareForm:{},
+ numOptions:[],
+ temperatureOptions:[],
+ wareTableData:[
+ {}
+ ]
}
},
computed: {
@@ -1251,8 +1391,10 @@
})
})
if (item.v.ps != undefined && item.v.ps.value == '缁撹') {
- if (this.currentSample.insProduct.find(m => m.id == item.i)) {
+ 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)
@@ -1303,6 +1445,10 @@
}
this.saveInsContext()
}
+ } catch (error) {
+
+ }
+
} else {
let comResult = ''
try {
@@ -1409,26 +1555,34 @@
// }
// break;
// }
- list.forEach(a => {
- if (a[0].r == item.r && comResult !== '') {
- for (var b in a) {
- if (a[b].c == item.c) {
- try{
- let val = parseFloat(comResult.toFixed(3))
- a[b].v.v = isNaN(val) ? '' : val
- }catch(e){
- a[b].v.v = comResult
+ try {
+ list.forEach(a => {
+ if (a[0].r == item.r && comResult !== '') {
+ for (var b in a) {
+ if (a[b].c == item.c) {
+ try{
+ let val = parseFloat(comResult.toFixed(3))
+ a[b].v.v = isNaN(val) ? '' : val
+ }catch(e){
+ a[b].v.v = comResult
+ }
+ break
}
- break
}
}
- }
- })
- this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ })
+ this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ } catch (error) {
+
+ }
}
}
})
- this.getCurrentInsProduct(pId)
+ try {
+ this.getCurrentInsProduct(pId)
+ } catch (error) {
+
+ }
},
getCurrentInsProduct(pId) {
if (!this.tableList[0].insProductResult) {
@@ -1743,15 +1897,17 @@
return
},
saveInsContext() {
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
- param: JSON.stringify(this.param)
- }).then(res => {
- if (res.code == 201) {
- this.$message.error('淇濆瓨澶辫触')
- return
- }
- this.$message.success('宸蹭繚瀛�')
- })
+ if(this.param){
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
+ param: JSON.stringify(this.param)
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('淇濆瓨澶辫触')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ }
},
changeEquip(val, n) {
for (let i in this.equipOptions) {
--
Gitblit v1.9.3