From 69fc3d41d2db8f5860f5982946117454ca2d16b3 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 24 九月 2024 15:06:37 +0800
Subject: [PATCH] 1.客户管理-客户名称其他都不用必填 2.检验下单-生产单位下拉框,如果选择的单位是没有对应的英文名称就用/代替
---
static/js/worker0.js | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 31 deletions(-)
diff --git a/static/js/worker0.js b/static/js/worker0.js
index aa80ca3..ef4f91d 100644
--- a/static/js/worker0.js
+++ b/static/js/worker0.js
@@ -1,19 +1,30 @@
+// 姝ょ嚎绋嬩负鏁版嵁閲囬泦绾跨▼
+
+// 淇濆瓨鏁版嵁
+// 鏁版嵁閲囬泦淇℃伅
let dataAcquisitionInfo = null;
+// 鏁版嵁鍒楄〃
let list = null;
+// 浼犻�掑埌涓荤嚎绋嬬殑鏁版嵁
let result = {
method:'',
value:null
}
-
+// 浼樺寲鏁伴噰杈冨鏁版嵁鏃�--璁板綍鏁伴噰椤圭洰鐨処d鏁扮粍锛岀洰鐨勬槸鍙栨渶鍚庝竴涓暟閲囬」鐩紝浼犲埌涓荤嚎绋嬭繘琛屾壒閲忕殑鏁版嵁閲囬泦淇濆瓨
+let arrSpecial = []
+// 鎺ユ敹涓荤嚎绋嬩紶閫掕繃鏉ョ殑鏁版嵁
self.onmessage = function(event) {
const data = JSON.parse(event.data);
dataAcquisitionInfo = data.dataAcquisitionInfo;
list = data.list;
+ // console.log(111,dataAcquisitionInfo)
+ arrSpecial = []
+ // 澶勭悊鏁版嵁
handleData()
}
function handleData(){
- // console.log(33333,dataAcquisitionInfo)
+ // 閬嶅巻鏁版嵁鍒楄〃
list.forEach((item,index)=>{
let num = 0;
let str = ''
@@ -30,8 +41,9 @@
str = str+m.v.v
}
}
+ // 涓婇潰鍦ㄨ褰曟楠岄」+妫�楠屽瓙椤圭殑鍚嶇О锛屽鏋滄暟閲囧寘鍚楠岄」+妫�楠屽瓙椤圭殑鏁版嵁锛屽垯鎵ц
if(dataAcquisitionInfo[str]){
- let num = 0;
+ let num = 0;//璇ユ楠岄」瀵瑰簲妫�楠屽�肩殑涓暟锛岀敤鐢ㄥ垽鏂渶澶氭湁澶氬皯涓楠屽�硷紝濡傛灉澶氭閲囬泦瓒呰繃浜嗚涓暟锛屽垯璧嬪�肩粰鏈�鍚庝竴涓楠屽��
list[index].forEach(n=>{
if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
num++
@@ -40,22 +52,52 @@
list[index].forEach((n,i)=>{
if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
let arr = n.v.ps.value.split('鍊�')
- if(arr[1] ==dataAcquisitionInfo.frequency){
- setTimeout(()=>{
- n.v.v = dataAcquisitionInfo[str]
- result = {
- method:'changeInput',
- value:{
- list:list,
- n:n
- }
+ if(Array.isArray(dataAcquisitionInfo[str].value)){
+ // 濡傛灉鏁版嵁婧愪负鏁扮粍锛屽垯鎵ц
+ for (let i = 0; i < dataAcquisitionInfo[str].value.length; i++) {
+ if(i+1==arr[1]){
+ // 璧嬪�兼暟閲囦紭鍖栨楠岄」鍒楄〃
+ arrSpecial.push(n.i)
+ setTimeout(()=>{
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ // 淇濈暀妯℃澘閰嶇疆鐨勫皬鏁扮偣浣嶆暟
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
+ n.v.v = dataAcquisitionInfo[str].value[i]?Number(dataAcquisitionInfo[str].value[i]).toFixed(num0):dataAcquisitionInfo[str].value[i]
+ }else{
+ // 鐩存帴璧嬪��
+ n.v.v = dataAcquisitionInfo[str].value[i]
+ }
+ // 浼犻�掔粰涓荤嚎绋�
+ result = {
+ method:'changeInput',
+ value:{
+ list:list,
+ n:n
+ }
+ }
+ self.postMessage(JSON.stringify(result))
+ },2000)
}
- self.postMessage(JSON.stringify(result))
- },2000)
- }else if(Number(dataAcquisitionInfo.frequency)>num){
- if(n.v.ps.value.includes(num)){
+ }
+ }else{
+ // 濡傛灉鏁版嵁婧愪负瀛楃鎴栨暟瀛楋紝鍒欐墽琛�
+ if(arr[1] ==dataAcquisitionInfo[str].frequency){
+ // 濡傛灉鏁伴噰娆℃暟绛変簬妫�楠屽�煎簭鍙凤紝鍒欒祴鍊肩粰褰撳墠妫�楠屽��
+ arrSpecial.push(n.i)
setTimeout(()=>{
- n.v.v = dataAcquisitionInfo[str]
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ // 淇濈暀妯℃澘閰嶇疆鐨勫皬鏁扮偣浣嶆暟
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
+ n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
+ }else{
+ // 鐩存帴璧嬪��
+ n.v.v = dataAcquisitionInfo[str].value
+ }
+ // 浼犻�掔粰涓荤嚎绋�
result = {
method:'changeInput',
value:{
@@ -65,20 +107,32 @@
}
self.postMessage(JSON.stringify(result))
},2000)
- // n.v.v = dataAcquisitionInfo[str]
- // result = {
- // method:'changeInput',
- // value:{
- // list:list,
- // n:n
- // }
- // }
- // self.postMessage(JSON.stringify(result))
- // setTimeout(()=>{
- // this.$delete(n.v,'v')
- // this.$set(n.v,'v',this.dataAcquisitionInfo[str])
- // this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
- // },1000)
+ }else if(Number(dataAcquisitionInfo[str].frequency)>num){
+ // 濡傛灉鏁伴噰娆℃暟澶т簬妫�楠屽�煎簭鍙凤紝鍒欒祴鍊肩粰鏈�鍚庝竴涓楠屽��
+ if(n.v.ps.value.includes(num)){
+ arrSpecial.push(n.i)
+ setTimeout(()=>{
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ // 淇濈暀妯℃澘閰嶇疆鐨勫皬鏁扮偣浣嶆暟
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
+ n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
+ }else{
+ // 鐩存帴璧嬪��
+ n.v.v = dataAcquisitionInfo[str].value
+ }
+ // 浼犻�掔粰涓荤嚎绋�
+ result = {
+ method:'changeInput',
+ value:{
+ list:list,
+ n:n
+ }
+ }
+ self.postMessage(JSON.stringify(result))
+ },2000)
+ }
}
}
}
@@ -87,4 +141,13 @@
}
})
})
+ if(arrSpecial[arrSpecial.length-1]){
+ //浼樺寲鏁伴噰杈冨鏁版嵁鏃�-璁板綍鏈�鍚庝竴涓楠岄」鐨刬d锛岀敤浜庡悗缁鐞�
+ setTimeout(()=>{
+ result = {
+ getDataTypeId:arrSpecial[arrSpecial.length-1],
+ }
+ self.postMessage(JSON.stringify(result))
+ },0)
+ }
}
--
Gitblit v1.9.3