From 02abdc9c856da39026f26843856bf4ab302e7def Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:00 +0800
Subject: [PATCH] 修改luckysheet引用
---
src/components/do/b1-ins-order/add.vue | 38 +++++++++---
index.html | 14 ++--
src/components/do/b1-inspect-order-plan/Inspection.vue | 84 +++++++++++++++++++++------
src/assets/api/controller.js | 1
4 files changed, 100 insertions(+), 37 deletions(-)
diff --git a/index.html b/index.html
index 1eedf5f..6538acb 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,12 @@
<meta http-equiv="Expires" CONTENT="0">
<meta http-equiv="Cache-Control" CONTENT="no-cache">
<meta http-equiv="Pragma" CONTENT="no-cache">
+ <link rel='stylesheet' href='/static/luckysheet\plugins\css/pluginsCss.css' />
+ <link rel='stylesheet' href='/static/luckysheet/plugins/plugins.css' />
+ <link rel='stylesheet' href='/static/luckysheet/css/luckysheet.css' />
+ <link rel='stylesheet' href='/static/luckysheet/assets/iconfont/iconfont.css' />
+ <script src="/static/luckysheet/plugins/js/plugin.js"></script>
+ <script src="/static/luckysheet/luckysheet.umd.js"></script>
<title>LIMS瀹為獙瀹ょ鐞嗙郴缁�</title>
<link rel="icon" type="image/x-icon" href="./static/img/logo.png">
@@ -13,10 +19,6 @@
<link href="./static/luckysheet/plugins/plugins.css" rel="stylesheet" />
<link href="./static/luckysheet/css/luckysheet.css" rel="stylesheet" />
<link href="./static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" /> -->
- <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet\plugins\css/pluginsCss.css' />
- <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/plugins.css' />
- <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/css/luckysheet.css' />
- <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/assets/iconfont/iconfont.css' />
<style>
#app{
overflow: hidden;
@@ -29,8 +31,6 @@
</head>
<body>
<div id="app"></div>
- <script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
- <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
- <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script>
+ <script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
</body>
</html>
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 94dd342..cfc881a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -188,6 +188,7 @@
downFile: "/insOrderPlan/downFile", // 闄勪欢涓嬭浇
checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 鏍￠獙妫�楠屼换鍔℃彁浜�
getReportModel: "/insOrderPlan/getReportModel", // 鍒囨崲鍏夌氦-鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�
+ write: "/insOrderPlan/write", // 濉啓娓╁害涓庢箍搴�
}
const systemLog = {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 43b5833..43ad37a 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1183,18 +1183,36 @@
})
}else if(type==1){
let arr = this.editTable.filter(b => b.sampleId == item.id)
- arr.forEach(f => {
- if(a.ask.includes(f.symbolItem)){
- let ask = calBack(a.ask, f.symbolItem,f.value)
- if (ask) {
- a.ask = ask
+ for (var i=0;i<arr.length;i++){
+ if(a.ask){
+ if(a.ask.includes(arr[i].symbolItem)){
+ let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
+ if (ask) {
+ a.ask = ask
+ }
+ let tell = this.handleTell(a.tell, arr[i].symbolItem,arr[i].value)
+ if (tell) {
+ a.tell = tell
+ }
}
- let tell = this.handleTell(a.tell, f.symbolItem,f.value)
- if (tell) {
- a.tell = tell
- }
+ }else{
+ this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
}
- })
+ }
+ // arr.forEach(f => {
+ // if(a.ask){
+ // if(a.ask.includes(f.symbolItem)){
+ // let ask = calBack(a.ask, f.symbolItem,f.value)
+ // if (ask) {
+ // a.ask = ask
+ // }
+ // let tell = this.handleTell(a.tell, f.symbolItem,f.value)
+ // if (tell) {
+ // a.tell = tell
+ // }
+ // }
+ // }else{}
+ // })
}
}
})
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 1711c52..3acbdfe 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -276,6 +276,16 @@
<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" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
@@ -385,6 +395,7 @@
</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;">
@@ -419,7 +430,7 @@
</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 :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
@@ -464,9 +475,14 @@
<el-table
:data="wareTableData"
border
- style="width: 100%">
+ style="width: 100%;margin-bottom: 30px;" align="center">
<el-table-column
- fixed
+ label="搴忓彿"
+ type="index"
+ width="65"
+ >
+ </el-table-column>
+ <el-table-column
prop="date"
label="绠¤壊鏍�"
width="150">
@@ -474,17 +490,17 @@
<el-table-column
prop="name"
label="鍏夌氦甯︾紪鍙�"
- width="120">
+ width="180">
</el-table-column>
<el-table-column
prop="province"
label="鍏夌氦鑹叉爣"
- width="120">
+ width="150">
</el-table-column>
<el-table-column
prop="city"
label="澶栫"
- width="120">
+ width="150">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.input" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</template>
@@ -492,7 +508,7 @@
<el-table-column
prop="address"
label="鍐呯"
- width="300">
+ width="150">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.input" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</template>
@@ -500,17 +516,17 @@
<el-table-column
prop="zip"
label="骞冲潎鍊�"
- width="120">
+ min-width="150">
</el-table-column>
<el-table-column
prop="zip"
- label="琛板噺鏌�"
- width="120">
+ label="琛板噺宸�"
+ min-width="150">
</el-table-column>
<el-table-column
prop="zip"
label="妫�娴嬩汉"
- width="120">
+ min-width="150">
</el-table-column>
</el-table>
</div>
@@ -769,7 +785,11 @@
temperatureOptions:[],
wareTableData:[
{}
- ]
+ ],
+ otherForm:{
+ humidity:null,
+ temperature:null,
+ }
}
},
computed: {
@@ -816,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: [],
@@ -831,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;
@@ -862,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
@@ -970,7 +1016,7 @@
if(bushing&&bushing.length>0){
this.bushing = bushing
}
- this.handleTableData()
+ // this.handleTableData()
this.getTableLists();
this.currentKey = row.index
this.currentTab = null;
@@ -1146,6 +1192,7 @@
count++
})
})
+ // 闂寮�濮�
this.tableList.forEach(a => {
let dels = new Set()
let ids = []
@@ -1202,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) {
@@ -1236,6 +1285,7 @@
}
})
})
+ // 闂缁撴潫
this.tableList.forEach(a => {
let arrs = []
let set = new Set()
@@ -1346,7 +1396,6 @@
this.param[a.id].insResult.v.v = a.insResult
} catch (e) {}
})
- console.log(this.tableList)
this.handleExcelMethod()
},
changeInput(m, code) {
@@ -1394,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{
@@ -1411,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])
@@ -1428,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