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

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1752,7 +1752,7 @@
             </el-form>
           </el-dialog>
 
-		<el-dialog v-model="hesuanVisible" :before-close="closehesuanVisible" title="核算参数调整" destroy-on-close width="20%" style="height: 50%;">
+		<el-dialog v-model="hesuanVisible" :before-close="closehesuanVisible" title="核算参数调整" destroy-on-close width="40%" style="height: 50%;">
 		  <div>
 		    <el-radio-group v-model="selected" @change="agreeChange" style="display: flex; flex-direction: column;">
 		      <div style="display: flex; align-items: center;">
@@ -1772,13 +1772,13 @@
 		  <div style="margin-left: 70px;">
 		    <el-col :span="15">
 		      <el-form-item label="缩放系数:" prop="flatFeed" class="mab" v-if="SFType === true">
-		        <el-input v-model="hesuanValue.缩放系数" id="辅电表" @keydown="ent1($event)" :clearable="true" style="width: 200px;" v-if="SFType === true"/>
+		        <el-input v-model="hesuanValue.缩放系数" id="辅电表" @keydown="ent1($event)"  style="width: 200px;" v-if="SFType === true"/>
 		      </el-form-item>
 		      <el-form-item label="产品板距:" prop="flatFeed" class="mab" v-if="CPType === true">
-		        <el-input v-model="hesuanValue.产品板距" id="辅电表" @keydown="ent1($event)" :clearable="true" style="width: 200px;" v-if="CPType === true"/>
+		        <el-input v-model="hesuanValue.产品板距" id="辅电表" @keydown="ent1($event)"  style="width: 200px;" v-if="CPType === true"/>
 		      </el-form-item>
 		      <el-form-item label="印刷方式:" prop="flatFeed" class="mab" v-if="CPType === true">
-				  <el-select v-model="hesuanValue.印刷方式" placeholder="" style="width: 190px;" :clearable="true" v-if="CPType === true"	>
+				  <el-select v-model="hesuanValue.印刷方式" placeholder="" style="width: 190px;"  v-if="CPType === true"	>
 				    <el-option label="卷对卷" value="卷对卷"></el-option>
 				    <el-option label="卷对张" value="卷对张"></el-option>
 				  </el-select>
@@ -2663,7 +2663,7 @@ const Selection_ids = ref('')
 const selectionChange = (selection) => {
 	const ids = selection.map(item => {
 	  return item.UniqId
-	})
+	})
     Selection_ids.value = ids.join(',')
 }
 //删除
@@ -4544,18 +4544,24 @@ if(selected.value==='难度调整系数'){
 	SFType.value=false
 	CPType.value=false
  }
-}
+}
+
  //核算调整弹窗确定
- const hesuanenterDialog = async () => {
+ const hesuanenterDialog = async () => {
+	 console.log(selected.value)
+	 // console.log(multipleSelection.value)
  if(selected.value==='难度调整系数'){
-console.log(multipleSelection.value.length)
-	const id=ref('')
+	// console.log(multipleSelection.value.length)
+	// const Selection_ids=ref('')
 	// console.log(multipleSelection.value[0])
-	for(let i=0;i<multipleSelection.value.length;i++){
-		id.value+=multipleSelection.value[i].UniqId+','
-		console.log(multipleSelection.value[i].UniqId)
-	}
-	const res = await CoefficientEdit({id:id.value,工价系数:hesuanValue.缩放系数 })
+	// for(let i=0;i<multipleSelection.value.length;i++){
+	// 	id.value+=multipleSelection.value[i].UniqId+','
+	// 	console.log(multipleSelection.value[i].UniqId)
+	// }
+	console.log(Selection_ids.value)
+	console.log(hesuanValue.缩放系数)
+	// return false;
+	const res = await CoefficientEdit({id:Selection_ids.value,工价系数:hesuanValue.缩放系数 })
 	console.log(res)
 	if(res.code===0){
 		ElMessage({
@@ -4575,14 +4581,14 @@ console.log(multipleSelection.value.length)
 	}
  }else if(selected.value=== '凹印版距'){
 	 // console.log(hesuanValue.印刷方式)
-	 const id=ref('')
+	 // const Selection_ids=ref('')
 	 	  // console.log(multipleSelection.value.length)
 	 	  // console.log(multipleSelection.value[0])
-	 	  for(let i=0;i<multipleSelection.value.length;i++){
-	 	  	id.value+=multipleSelection.value[i].UniqId+','
-	 	  	console.log(multipleSelection.value[i].UniqId)
-	 	  }
-	 	  const res = await PrintingModeDataEdit({id:id.value,plate:hesuanValue.产品板距,mode:hesuanValue.印刷方式 })
+	 	  // for(let i=0;i<multipleSelection.value.length;i++){
+	 	  // 	id.value+=multipleSelection.value[i].UniqId+','
+	 	  // 	console.log(multipleSelection.value[i].UniqId)
+	 	  // }
+	 	  const res = await PrintingModeDataEdit({id:Selection_ids.value,plate:hesuanValue.产品板距,mode:hesuanValue.印刷方式 })
 	 	  console.log(res)
 	 	  if(res.code===0){
 	 	  	ElMessage({
@@ -4598,14 +4604,14 @@ console.log(multipleSelection.value.length)
 	 	  	})
 	 }
  }else if(selected.value=== '色度数'){
-	  const id=ref('')
+	  // const Selection_ids=ref('')
 	  // console.log(multipleSelection.value.length)
 	  // console.log(multipleSelection.value[0])
-	  for(let i=0;i<multipleSelection.value.length;i++){
-	  	id.value+=multipleSelection.value[i].UniqId+','
-	  	console.log(multipleSelection.value[i].UniqId)
-	  }
-	  const res = await ChromaDataEdit({id:id.value,ms:hesuanValue.色度数 })
+	  // for(let i=0;i<multipleSelection.value.length;i++){
+	  // 	id.value+=multipleSelection.value[i].UniqId+','
+	  // 	console.log(multipleSelection.value[i].UniqId)
+	  // }
+	  const res = await ChromaDataEdit({id:Selection_ids.value,ms:hesuanValue.色度数 })
 	  console.log(res)
 	  if(res.code===0){
 	  	ElMessage({
@@ -4621,7 +4627,14 @@ console.log(multipleSelection.value.length)
 	  	})
  }
  }
- }
+ }
+ 
+ // 核算参数调整取消
+ const hesuanVisiblecloseDialog = async () => {
+ 	 hesuanVisible.value = false
+ }
+ 
+ 
  const ent1 = (event) => {
    const inputs = document.getElementsByTagName('input');
    const currentIndex = Array.from(inputs).indexOf(event.target);