Browse Source

Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

tty 1 year ago
parent
commit
05f0ca1c6e
2 changed files with 433 additions and 525 deletions
  1. 6 2
      src/view/performance/Dayreports.vue
  2. 427 523
      src/view/performance/Manualdocuments.vue

+ 6 - 2
src/view/performance/Dayreports.vue

@@ -1065,6 +1065,9 @@ const rqsubmit = () =>{
 
 //机台失去焦点事件
 const getJtbhsubmit = () => {
+	if(BzVisible.value){
+		return false
+	}
 	//弹出选择
 	reportGetJtbh({sczl_type:formData.value.sczl_type,key_word:''}).then(response=>{
 		if (response.code === 0) {
@@ -1125,7 +1128,8 @@ const getDedhsubmit = () => {
 	productionDedh({sczl_jtbh:formData.value.sczl_jtbh}).then(response=>{
 		if (response.code === 0) {
 			if(formData.value.sczl_jtbh==''){
-				const data = response.data;
+				const data = [];
+				data[0] = response.data;
 				   
 				   // 递归函数来构建树形结构
 				   const buildTree = (node) => {
@@ -1145,7 +1149,7 @@ const getDedhsubmit = () => {
 				   };
 				   
 				   // 构建树形结构的根节点
-				   const treeData = data.bh_mc.map(buildTree);
+				   const treeData = data.map(buildTree);
 				   
 				   GetDedhtreeData = treeData; // 假设这是外部可访问的变量
 				   GetDedhVisible.value = true; // 假设这是一个响应式引用

File diff suppressed because it is too large
+ 427 - 523
src/view/performance/Manualdocuments.vue


Some files were not shown because too many files changed in this diff