车间报工样式

src/view/performance/chejianbaogong.vue

@@ -321,7 +321,7 @@
           </el-tabs>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 140vh" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 50%" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <el-table ref="multipleTable"
                         :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -569,8 +569,8 @@
 			</div>
 			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
 				<el-button type="text"></el-button>
-				 <el-button style="margin-bottom: 5px;" @click="addBz" >新增</el-button>
-				 <el-button  style="margin-bottom: 1vh;" @click="selectBz" >更新当前班组</el-button>
+				 <el-button style="margin-bottom: 1vh; width:10vh" @click="addBz" >新         增</el-button>
+				 <el-button  style="margin-bottom: 1vh;width:10vh" @click="selectBz" >更新当前班组</el-button>
 <!--				 <el-button style="margin-bottom: 1vh;" @click="delBz" >删除当前班组</el-button>-->
 			</div>
 			</div>
@@ -579,7 +579,7 @@
 
 
 
-		<el-dialog v-model="complaintsShow" style="width: 140vh; height:78vh;" lock-scroll :before-close="closecomplaintsShow" title="产品客诉查询" destroy-on-close>
+		<el-dialog v-model="complaintsShow" style="width: 100vh; height:78vh;" lock-scroll :before-close="closecomplaintsShow" title="产品客诉查询" destroy-on-close>
 		  <el-table ref="multipleTable"
 		           :row-style="{ height: '20px' }"
 		           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -687,7 +687,7 @@
 		  title="设备点检记录"
 		  destroy-on-close
 		  width="150vh"
-		  style="height: 78vh;"
+		  style="width: 100vh; height:78vh;"
 		>
 		  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 		    <el-col :span="4" style="margin-bottom: 0px;margin-top: 0px;">
@@ -721,7 +721,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:100%; height:45vh; margin-top: 5px;"
+		        style="width:70vh; height:45vh; margin-top: 5px;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -786,7 +786,7 @@
 		  title="制程检验记录"
 		  destroy-on-close
 		  width="160vh"
-		  style="height: 78vh;"
+		  style="width: 100vh; height:78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="5" style="margin-top=0px; margin-bottom: 0px;">
@@ -838,9 +838,9 @@
 		            :data="zhibiaoselectData"
 		            row-key="ID"
 		            highlight-current-row="true"
-		          				:show-overflow-tooltip="true"
+		          	:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:40vh;"
+		            style="width:70vh; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -898,7 +898,7 @@
 		            highlight-current-row="true"
 		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:40vh;"
+		            style="width:70vh; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -937,7 +937,7 @@
 		  title="换型清场"
 		  destroy-on-close
 		  width="145vh"
-		  style="height: 78vh;"
+		  style="width: 100vh; height:78vh;"
 		>
       <header>
         <div style="height: 50px;margin-left: 1vh;">
@@ -959,7 +959,7 @@
 		    <div v-if="huanxingstatus" style="flex: 0; margin: 0;">
 		      <el-tabs v-model="activNames" type="card" @tab-click="handleClick">
 		        <el-tab-pane label="换型清场明细信息" @click="showTable('换型清场明细信息')"  name="first">
-					<div style="width:110vh">
+					<div style="width:70vh">
 						<el-descriptions :column="9" border>
 						  <el-descriptions-item :span="9">
 							  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
@@ -1115,7 +1115,7 @@
 		            highlight-current-row="true"
 		          	:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:115vh; height:50vh;"
+		            style="width:70vh; height:50vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -1236,7 +1236,7 @@
 		  title="印版领退"
 		  destroy-on-close
 		  width="130vh"
-		  style="height: 78vh;"
+		  style="width: 120vh; height:78vh;"
 		>
       <header>
         <div style="height: 50px;margin-left: 1vh;">
@@ -1264,7 +1264,7 @@
 
 		  <div style="display: flex;">
 		    <div style="flex: 1;">
-		      <el-aside width="28vh" style="margin: 0;">
+		      <el-aside width="20vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">
 		          <el-tree :data="yinbantreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="yinbanNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -1279,7 +1279,7 @@
 		        highlight-current-row="true"
 				    :show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:100vh; height:50vh;"
+		        style="width:90vh; height:50vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
             @selection-change="handleybSelectionChange"
@@ -1359,7 +1359,7 @@
 		  title="管理人员现场巡查记录"
 		  destroy-on-close
 		  width="162vh"
-		  style="height: 78vh;"
+		  style="width: 120vh; height:78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -1435,7 +1435,7 @@
 		        row-key="ID"
 		        highlight-current-row="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:138vh; height:42vh;"
+		        style="width:90vh; height:42vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 			    	:show-overflow-tooltip="true"
@@ -1517,7 +1517,7 @@
 		  v-model="chanliangVisible"
 		  title="日产量上报"
 		  destroy-on-close
-		  width="160vh"
+		  width="130vh"
 		  style="height: 110vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
@@ -1626,12 +1626,12 @@
 				</el-col>
 				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
 				<el-form-item label="联数" prop="" style="margin-top=0px; margin-bottom: 1px;">
-				  <el-input v-model="formData3.联数" id="联数" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
+				  <el-input v-model="formData3.Gy0_ls" id="联数" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
 				</el-form-item>
 				</el-col>
 				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
 				<el-form-item label="墨色" prop="" style="margin-top=0px; margin-bottom: 1px;">
-				  <el-input v-model="formData3.墨色" id="墨色" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
+				  <el-input v-model="formData3.Gy0_ms" id="墨色" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
 				</el-form-item>
 				</el-col>
 			  </el-row>
@@ -1863,7 +1863,7 @@
               v-model="bzchanliangVisible"
               title="班组产量修改"
               destroy-on-close
-              width="160vh"
+              width="140vh"
               style="height: 60vh;"
           >
             <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
@@ -2645,27 +2645,14 @@ const SetMachineTeams = async(row) => {
   }
 }
 const clickybupdate = async (row) => {
-  formData.value.班组Id=row.ID
-  BZMC.value=row.班组号
-  console.log(row)
-  let sczl_bhkey=''
-  let sczl_namekey=''
-  for (let i = 1; i <= 10; i++) {
-    sczl_bhkey = `sczl_bh${i}`
-    sczl_namekey = `sczl_name${i}`
-    formData.value[sczl_bhkey] = '';
-    formData.value[sczl_namekey] = '';
-  }
-  for (let i = 0; i < Object.keys(row).length-4; i++) {
-    sczl_bhkey=`sczl_bh${i+1}`
-    sczl_namekey=`sczl_name${i+1}`
-    formData.value[sczl_bhkey] =row[i].split(' ')[0];
-    formData.value[sczl_namekey] = row[i].split(' ')[1];
-    console.log(formData)
-
-  }
-  console.log(formData)
-
+	
+	ElMessageBox.confirm('确定切换当前班组人员为工作班组人员吗?', '提示', {
+	    confirmButtonText: '确定',
+	    cancelButtonText: '取消',
+	    type: 'warning'
+	}).then(() => {
+	        setTeams(row)
+	    })
   // const response = await facilityWorklist({machine:JTMC});
   // if (response.code === 0) {
   //   sbzyData.splice(0, sbzyData.length, ...response.data);
@@ -2684,6 +2671,32 @@ const clickybupdate = async (row) => {
   //   }
   // }
 }
+const setTeams = async(row) => {
+	
+	
+	
+	formData.value.班组Id=row.ID
+	BZMC.value=row.班组号
+	console.log(row)
+	let sczl_bhkey=''
+	let sczl_namekey=''
+	for (let i = 1; i <= 10; i++) {
+	  sczl_bhkey = `sczl_bh${i}`
+	  sczl_namekey = `sczl_name${i}`
+	  formData.value[sczl_bhkey] = '';
+	  formData.value[sczl_namekey] = '';
+	}
+	for (let i = 0; i < Object.keys(row).length-4; i++) {
+	  sczl_bhkey=`sczl_bh${i+1}`
+	  sczl_namekey=`sczl_name${i+1}`
+	  formData.value[sczl_bhkey] =row[i].split(' ')[0];
+	  formData.value[sczl_namekey] = row[i].split(' ')[1];
+	  console.log(formData)
+	
+	}
+	console.log(formData)
+
+}
 //检验记录
 const InspectionRecord = async () => {
   JYData=[]
@@ -3232,7 +3245,8 @@ function oncomplaints() {
 const Complaints = async() => {
 	complaintsData.value=[]
 	selectedRowData.value={}
-    const res = await ComplaintRecord({productCode :formData.value.productCode})
+    // const res = await ComplaintRecord({productCode :formData.value.productCode})
+	const res = await ComplaintRecord({productCode :100601011})
     if (res.msg === '成功') {
 		complaintsData.value=res.data;
 		selectedRowData.value=complaintsData.value[0]
@@ -3488,8 +3502,8 @@ const GetMachineMac = async (addr) => {
   // const response = await getMachineMac({ addr: '68-ED-A4-26-60-D1' });
   if (response.code === 0) {
     if(response.data===null){
-      JTMC = 'MQ07#';
-      CJMC='烫模车间';
+      JTMC = 'JY01#';
+      CJMC='胶印车间';
       FacilityProduction(addr);
     }else{
       // 将接口返回的数据添加到树型结构中
@@ -3634,6 +3648,8 @@ const ReportInfo = async () => {
       sczl_rate8: classInfo.sczl_rate8,
       sczl_rate9: classInfo.sczl_rate9,
       sczl_rate10: classInfo.sczl_rate10,
+	  Gy0_ms:order_info.Gy0_ms,
+	  Gy0_ls:order_info.Gy0_ls,
     };
     formData3.value = { ...formData3.value, ...newData };
 	chanliangselectData.splice(0, chanliangselectData.length, ...response.data.bom)
@@ -3690,8 +3706,8 @@ const SubmitDailyProduction = async () => {
 	sczl_zccp: formData3.value.制程次品,
 	last_fp: formData3.value.前工序废,
 	less_sl: formData3.value.来料异常,
-	sczl_ls: formData3.value.联数,
-	sczl_ms: formData3.value.墨色,
+	sczl_ls: formData3.value.Gy0_ls,
+	sczl_ms: formData3.value.Gy0_ms,
 	zb_time: formData3.value.装版总时长,
 	dy_time: formData3.value.打样总工时,
 	run_time: formData3.value.通电工时,
@@ -4099,8 +4115,8 @@ const formData3= ref({
 	制程次品:'',
 	前工序废:'',
 	来料异常:'',
-	联数:'',
-	墨色:'',
+	Gy0_ms:'',
+	Gy0_ls:'',
 	装版总工时:'',
 	打样总工时:'',
 	通电工时:'',