产品资料字段优化，设备运行核算界面

src/view/performance/chejianbaogong.vue

@@ -27,7 +27,7 @@
         <el-main>
 
 
-<div class="gva-search-box" style="overflow: hidden; padding: 0; display: flex;">
+<div class="gva-search-box" style="overflow: hidden; padding: 0; margin-top:20px;display: flex;">
 			<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px;">
 <!--						  <el-form-item label="工单编号" prop="name">-->
 <!--							<el-row :gutter="24">-->
@@ -120,7 +120,7 @@
 	</div>
 
 </div>
-          <div class="gva-table-box">
+          <div class="gva-table-box" style="margin-top: 20px;">
             <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
 			<el-tab-pane label="设备作业清单" @click="showTable('印件资料')" name="first" style="font-size: 14px;">
 				<el-table ref="multipleTable"
@@ -4770,6 +4770,8 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
      text-align:center;
      background-color:white}
 	 .bt {
+	   margin-top: 20PX;
+	   margin-bottom: 10PX;
 	   height: 5vh;
 	   width: 12vh;
 	   font-size:2vh;

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -1198,7 +1198,7 @@
                         <el-input v-model="add_gyformData.Gy0_方案"  placeholder="" style="width: 90px;" id="方案"  @keydown="ent($event, '备注', '方案', '加工开数')"/>
                       </el-form-item>
                       <el-form-item label="印件编号:" prop="address" class="mab"  label-width="90">
-                        <el-input v-model="add_gyformData.Gy0_cpdh"   placeholder="" style="width: 90px;" id="Gy0_yjno"/>
+                        <el-input v-model="add_gyformData.Gy0_yjno"   placeholder="" style="width: 90px;" id="Gy0_yjno"/>
                       </el-form-item>
                       <el-form-item label="工序编号:" prop="address" class="mab" >
                         <el-input v-model="add_gyformData.Gy0_gxh"   placeholder="" style="width: 90px;" id="Gy0_gxh" />
@@ -3066,8 +3066,8 @@ const addgyenterDialog = () => {
     Gy0_Ks: add_gyformData['Gy0_Ks'],
     Gy0_ls: add_gyformData['Gy0_ls'],
     Gy0_site: add_gyformData['Gy0_site'],
-    gy0_gxmc: add_gyformData['gy0_gxmc'],
-    Add_gxmc: add_gyformData['Add_gxmc'],
+    gy0_gxmc: add_gyformData['Add_gxmc'],
+    Add_gxmc: add_gyformData['gy0_gxmc'],
     Gy0_Ms: add_gyformData['Gy0_Ms'],
     Gy0_sbbh: add_gyformData['Gy0_sbbh'],
     Gy0_shdh: add_gyformData['Gy0_shdh'],

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1832,43 +1832,49 @@
 		
 		
 		<el-dialog v-model="hesuanVisible" :before-close="closehesuanVisible" title="核算参数调整" destroy-on-close width="20%" style="height: 50%;">
-		  <div style="display: flex; align-items: center;">
-		    <label>参数类型：</label>
-		    <el-radio v-model="selected" label="难度调整系数"></el-radio>
-		  </div>
-		
-		  <div style="margin-top: 10px;margin-left: 70px;">
-		    <el-radio v-model="selected" label="凹印版距"></el-radio>
+		  <div>
+		    <el-radio-group v-model="selected" @change="agreeChange" style="display: flex; flex-direction: column;"> 
+		      <div style="display: flex; align-items: center;">
+		        <label>参数类型：</label>
+		        <el-radio label="难度调整系数"></el-radio>
+		      </div>
+		      <div style="display: flex; align-items: center;margin-left: 40px;">
+		        <el-radio label="凹印版距"></el-radio>
+		      </div>
+		      
+		      <div style="display: flex; align-items: center;margin-left: 25px;"> 
+		        <el-radio label="色度数"></el-radio>
+		      </div>
+		    </el-radio-group>
 		  </div>
 		  
-		  <div style="margin-top: 10px;margin-left: 70px;">
-		    <el-radio v-model="selected" label="色度数"></el-radio>
+		  <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-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-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-form-item>
+		      <el-form-item label="色度数 :" prop="flatFeed" class="mab" v-if="SDType === true">
+		        <el-input v-model="hesuanValue.色度数" id="辅电表" @keydown="ent1($event)" :clearable="true" style="width: 200px;" v-if="SDType === true" />		  				  
+		      </el-form-item>
+		    </el-col> 
 		  </div>
 		  
-		  <div style="margin-left: 70px;">
-		  <el-col :span="15">
-		    <el-form-item label="缩放系数:" prop="flatFeed" class="mab">
-		    <el-input v-model="formData.工单编号" id="辅电表"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />		  				  
-		    </el-form-item>
-		    <el-form-item label="产品板距:" prop="flatFeed" class="mab">
-		    <el-input v-model="formData.工单编号" id="辅电表"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />		  				  
-		    </el-form-item>
-		    <el-form-item label="印刷方式:" prop="flatFeed" class="mab">
-		    <el-input v-model="formData.工单编号" id="辅电表"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />		  				  
-		    </el-form-item>
-			<el-form-item label="色度数 :" prop="flatFeed" class="mab">
-			<el-input v-model="formData.工单编号" id="辅电表"  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />		  				  
-			</el-form-item>
-		  </el-col> 
-		   </div>
-		   
-		   <template #footer>
-		     <div class="dialog-footer">
-		       <el-button @click="hesuanVisiblecloseDialog">取 消</el-button>
-		       <el-button type="primary" @click="hesuanenterDialog">确 定</el-button>
-		     </div>
-		   </template>
-		</el-dialog>
+		  <template #footer>
+		    <div class="dialog-footer">
+		      <el-button @click="hesuanVisiblecloseDialog">取 消</el-button>
+		      <el-button type="primary" @click="hesuanenterDialog">确 定</el-button>
+		    </div>
+		  </template>
+		</el-dialog>
+
+
+
 		
 		<Shebeizhuangtai
 		  v-if="dialogSbyxgl"
@@ -2033,8 +2039,8 @@ const handleNodeClick = (nodeData,node) => {
 
 const hesuanVisible = ref(false)
 const MachineVisible = ref(false)
-const machineData = reactive([])
-
+const machineData = reactive([])
+const hesuanValue = reactive({})
 const MachinelList = async () => {
   const response = await MachineDetailList({workshop:CJMC.value});
   if (response.code === 0) {
@@ -3739,18 +3745,57 @@ const MachineChanliang = async(value) => {
        chanliangVisible.value=false
    }
  }
+ selected.value='难度调整系数'
  
+ const SFType=ref(false)
+ const CPType=ref(false)
+ const SDType=ref(false)
+if(selected.value=== '难度调整系数'){
+ 	 SFType.value=true
+	 CPType.value=false
+	 SDType.value=false
+ }else if(selected.value=== '凹印版距'){
+ 	 CPType.value=true
+	 SFType.value=false
+	 SDType.value=false
+ }else if(selected.value=== '色度数'){
+ 	SDType.value=true
+	SFType.value=false
+	CPType.value=false
+ }
+ //选择变化
+ const agreeChange = async () => {
+ if(selected.value=== '难度调整系数'){
+ 	 SFType.value=true
+	 CPType.value=false
+	 SDType.value=false
+ }else if(selected.value=== '凹印版距'){
+ 	 CPType.value=true
+	 SFType.value=false
+	 SDType.value=false
+ }else if(selected.value=== '色度数'){
+ 	SDType.value=true
+	SFType.value=false
+	CPType.value=false
+ }
+}
  //核算调整弹窗确定
  const hesuanenterDialog = async () => {
-	 console.log(selected)
  if(selected.value=== '难度调整系数'){
-	 console.log('123')
+	const id=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)
+	}
+	console.log(id.value)
+	
  }else if(selected.value=== '凹印版距'){
 	 console.log('凹印版距')
  }else if(selected.value=== '色度数'){
 	  console.log('色度数')
  }
-  
  }
  const ent1 = (event) => {
    const inputs = document.getElementsByTagName('input');
@@ -3836,11 +3881,19 @@ setOptions()
 
 
 // 多选数据
-const multipleSelection = ref([])
+const multipleSelection = reactive([])
 // 多选
-const handleSelectionChange = (val) => {
-    multipleSelection.value = val
-	console.log(val)
+const handleSelectionChange = (val) => {
+	console.log(val)
+	console.log(val.length)
+	multipleSelection.value= val
+	// for(let i=0;i<val.length;i++){
+	// 	multipleSelection= val[i].UniqId
+	// }
+	console.log(multipleSelection.value)
+	// console.log(val.UniqId)
+ //    multipleSelection.value = val.UniqId
+	// console.log(multipleSelection.value)
 }
 
 // 删除行