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

src/api/jixiaoguanli/baogong.js

@@ -41,4 +41,20 @@ export const ModelChangeRecord = (params) => {
     method: 'get',
     params
   })
+}
+export const RemodelDetail = (params) => {
+  return service({
+    url: '/mes_server/Facility/RemodelDetail',
+    method: 'get',
+    params
+  })
+}
+
+//客诉记录
+export const  ComplaintRecord= (params) => {
+  return service({
+    url:'/mes_server/facility/ComplaintRecord',
+    method: 'get',
+	params
+  })
 }

src/view/performance/chejianbaogong.vue

@@ -12,6 +12,7 @@
 			<el-button type="primary" @click="onstatus" >设置机台状态</el-button>
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
 			
 			
 			
@@ -313,7 +314,7 @@
           </el-tabs>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 1000px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 140vh" 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' }"
@@ -361,7 +362,7 @@
 			 </el-col>
 			</el-row> 	
 			<div style="display: flex;">
-			<div class="groupbox float-div" style="height: 17vh; width: 800px;">
+			<div class="groupbox float-div" style="height: 17vh; width: 130vh;">
 			    <span class="grouptitle">组员及分配比例</span>
 				<el-row :gutter="10" style="margin-top: 0px; height: 5vh;">
 								 <el-col :span="2">
@@ -558,10 +559,10 @@
 			  				</el-col> -->
 			  </el-row>
 			</div>
-			<div style="height: 17vh; width: 100px;margin-top: 30px;">
+			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
 				<el-button type="text"></el-button>
 				<!-- <el-button style="margin-bottom: 5px;" @click="" >新增</el-button> -->
-				<el-button style="margin-bottom: 5px;" @click="selectBz" >更新当前班组</el-button>
+				<el-button style="margin-bottom: 1vh;" @click="selectBz" >更新当前班组</el-button>
 				<!-- <el-button @click="delBz" >删除当前班组</el-button> -->
 			</div>
 			</div>
@@ -570,13 +571,115 @@
 
         
 		
+		<el-dialog v-model="complaintsShow" style="width: 140vh; 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' }"
+		           :header-cell-style="{ padding: '0px' }"
+		           :show-overflow-tooltip="true"
+		           highlight-current-row="true" @row-click="complaintshandle"
+		           style="width: 100%;height: 30vh;margin-top: 0px;" border tooltip-effect="dark" 
+				  :data="complaintsData" row-key="ID" @selection-change="complaintsSelectionChange">
+		    <!-- <el-table-column type="selection" width="55" /> -->
+		    <el-table-column align="left" label="产品编号" prop="产品编号" width="120"/>
+		    <el-table-column align="left" label="产品名称" prop="产品名称" width="200"/>
+		    <el-table-column align="left" label="客诉日期" prop="客诉日期" width="120"/>
+		    <el-table-column align="left" label="客诉单号" prop="客诉单号" width="120"/>
+			<el-table-column align="left" label="客诉方式" prop="客诉方式" width="100"/>
+		    <el-table-column align="left" label="订单编号" prop="订单编号" width="100"/>
+		    <el-table-column align="left" label="缺陷关键字" prop="缺陷关键字" width="140"/>
+		    <el-table-column align="left" label="客诉性质" prop="客诉性质" width="100"/>
+		    <el-table-column align="left" label="主要责任部门" prop="主要责任部门" width="140"/>
+		    <el-table-column align="left" label="次要责任部门" prop="次要责任部门" width="140"/>
+		  </el-table>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="6" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客户编号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客户编号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="15" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客户名称" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.客户名称" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>	
+					
+					 
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="6" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客诉单号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉单号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客诉日期" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.客诉日期" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="方式" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				 	<el-input v-model="selectedRowData.客诉方式" style="margin-bottom: 1px;margin-top: 0px;" :clearable="true" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="批次号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				 	<el-input v-model="selectedRowData.订单编号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>		
+				
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="反馈问题" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉描述" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="缺陷关键字" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.缺陷关键字" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="性质" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉性质" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="扣分" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.扣分" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="主责任部门" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.主要责任部门" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="次责任部门" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.次要责任部门" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+		</el-dialog>
 		
 		<el-dialog
 		  v-model="dianjianVisible"
 		  title="设备点检记录"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="150vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 		    <el-col :span="4" style="margin-bottom: 0px;margin-top: 0px;">
@@ -595,7 +698,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;margin-top: 0px;">
-		      <el-aside width="180px" style="margin: 0; margin-top: 0px;">
+		      <el-aside width="25vh" style="margin: 0; height: 50vh; margin-top: 0px;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="dianjiantreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="dianjianNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -610,7 +713,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:100%; height:320px; margin-top: 5px;"
+		        style="width:100%; height:45vh; margin-top: 5px;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -657,7 +760,7 @@
 		      </el-table>
 			  <el-row :gutter="24">
 			    <el-col :span="24">			      
-			        <el-input v-model="pandingfangfa"  style="height: 50px;" :clearable="true"  />			      
+			        <el-input v-model="pandingfangfa" style="margin-top=0px; height: 40px; margin-bottom: 0px;" :clearable="true"  />			      
 			    </el-col>
 			  </el-row>
 		    </div>
@@ -674,8 +777,8 @@
 		  v-model="zhichengVisible"
 		  title="制程检验记录"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="150vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -716,7 +819,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="180px" style="margin: 0;">
+		      <el-aside width="25vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="zhichengtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="zhichengNodeClick"></el-tree>
@@ -733,7 +836,7 @@
 		            highlight-current-row="true"
 		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:310px;"
+		            style="width:100%; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -791,7 +894,7 @@
 		            highlight-current-row="true"
 		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:320px;"
+		            style="width:100%; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -829,12 +932,12 @@
 		  v-model="huanxingVisible"
 		  title="换型清场"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="145vh"
+		  style="height: 78vh;"
 		>
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="180px" style="margin: 0;">
+		      <el-aside width="26vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 55vh; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="huanxingtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="huanxingNodeClick"></el-tree>
@@ -998,7 +1101,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 1;">
-		      <el-aside width="250px" style="margin: 0;">
+		      <el-aside width="34vh" 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>
@@ -1013,7 +1116,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:1000px; height:400px;"
+		        style="width:140vh; height:50vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -1096,8 +1199,8 @@
 		  v-model="xunchaVisible"
 		  title="管理人员现场巡查记录"
 		  destroy-on-close
-		  width="1200px"
-		  style="height: 78%;"
+		  width="162vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -1159,7 +1262,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="150px" 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="xunchatreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="xunchaNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -1173,7 +1276,7 @@
 		        row-key="ID"
 		        highlight-current-row="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:70%; height:330px;"
+		        style="width:138vh; height:42vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 				:show-overflow-tooltip="true"
@@ -1255,179 +1358,176 @@
 		  v-model="chanliangVisible"
 		  title="日产量上报"
 		  destroy-on-close
-		  width="1300px"
-		  style="height: 115%;"
+		  width="160vh"
+		  style="height: 110vh;"
 		>
-		  <el-row :gutter="20">
-		        <el-row :gutter="20">
-		          <el-col :span="15">
-		          <el-form-item label="工单编号" prop="id">
-		            <el-input v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
+		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+		          <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+		          <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
+		            <el-input style="margin-top=0px; margin-bottom: 1px;" v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
 		          </el-form-item>
 		          </el-col>
-		        </el-row>
 
-			  <el-col :span="8">
-			  <el-form-item label="产品名称" prop="id">
-			    <el-input v-model="formData3.product_name" id="产品名称"  @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
+			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+			  <el-form-item label="产品名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-input v-model="formData3.product_name" id="产品名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
-			  <el-col :span="8">
-			  <el-form-item label="工序名称" prop="id">
-			    <el-input v-model="formData3.gxmc" id="工序名称"  @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
+			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+			  <el-form-item label="工序名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-input v-model="formData3.gxmc" id="工序名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
-			  <el-col :span="8">
-			    <el-row :gutter="20">
-			      
-			    </el-row>
-			  </el-col>
+			  
 		    </el-row>
 			
-			<el-row :gutter="20">
-			      <el-row :gutter="20">
-			        <el-col :span="15">
-			        <el-form-item label="印件号" prop="id">
-			          <el-input v-model="formData3.yjno" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
+			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-form-item label="印件号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			          <el-input v-model="formData3.yjno" style="margin-top=0px; margin-bottom: 1px;" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			        </el-col>
-			      </el-row>
 			
-				  <el-col :span="8">
-				  <el-form-item label="印件名称" prop="id">
-					<el-input v-model="formData3.yj_name" id="印件名称"  @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
+				  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="印件名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.yj_name" id="印件名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
-				  <el-col :span="8">
-				  <el-form-item label="工艺名称" prop="id">
-					<el-input v-model="formData3.gy_name" id="工艺名称"  @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
+				  <el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="工艺名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.gy_name" id="工艺名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
-				  <el-col :span="2">
-				  <el-form-item label="" prop="id">
-				    <el-input v-model="formData3.gxh" id="gxh"  @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
+				  <el-col :span="2" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+				    <el-input v-model="formData3.gxh" id="gxh" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>						  
 			  </el-row>
 			  
 			  
 			  
-			  <el-row :gutter="20">
-			        <el-row :gutter="20">
-			          <el-col :span="15">
-			          <el-form-item label="日期" prop="id">
-			            <el-input v-model="formData3.日期" id="日期"  @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
+			  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+				  </el-col>
+			          <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			          <el-form-item label="日期" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			            <el-input v-model="formData3.日期" id="日期" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
 			          </el-form-item>
 			          </el-col>
-			        </el-row>
 			  
-			  	  <el-col :span="5">
-			  	  <el-form-item label="流程标牌" prop="id">
-			  		<el-input v-model="formData3.流程标牌" id="流程标牌"  @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="流程标牌" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.流程标牌" id="流程标牌" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="5">
-			  	  <el-form-item label="上机时间" prop="id">
-			  		<el-input v-model="formData3.上机时间" id="上机时间"  @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="上机时间" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.上机时间" id="上机时间" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
-			  	  <el-col :span="5">
-			  	  <el-form-item label="下机时间" prop="">
-			  	    <el-input v-model="formData3.下机时间"  id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="下机时间" prop="" style="margin-top=0px; margin-bottom: 1px;">
+			  	    <el-input v-model="formData3.下机时间" style="margin-top=0px; margin-bottom: 1px;" id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
-			  	  </el-col>						  
+			  	  </el-col>	
+				 <el-col :span="3">
+			     </el-col>
 			    </el-row>
 		    
 			
 			
-			<el-row :gutter="20">
-			      
-			    <el-col :span="3">
-			    <el-form-item label="产量" prop="id">
-			      <el-input v-model="formData3.产量" id="产量"  @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
+			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+			    </el-col>
+			    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-form-item label="产量" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			      <el-input v-model="formData3.产量" id="产量" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
 			    </el-form-item>
 			    </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="制程废品" prop="id">
-					<el-input v-model="formData3.制程废品" id="制程废品"  @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
+				  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="制程废品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.制程废品" id="制程废品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="制程次品" prop="id">
-					<el-input v-model="formData3.制程次品" id="制程次品"  @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
+				  <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="制程次品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.制程次品" id="制程次品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="前工序废" prop="">
-				    <el-input v-model="formData3.前工序废" id="前工序废"  @keydown="ent($event, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
+				  <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, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>	
-				<el-col :span="3">
-				<el-form-item label="来料异常" prop="">
-				  <el-input v-model="formData3.来料异常" id="来料异常"  @keydown="ent($event, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
+				<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, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
-				<el-col :span="3">
-				<el-form-item label="联数" prop="">
-				  <el-input v-model="formData3.联数" id="联数"  @keydown="ent($event, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
+				<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, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
-				<el-col :span="3">
-				<el-form-item label="墨色" prop="">
-				  <el-input v-model="formData3.墨色" id="墨色"  @keydown="ent($event, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
+				<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, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 			  </el-row>
 			  
 			  
-			  <el-row :gutter="20">			        
-			      <el-col :span="3">
-			      <el-form-item label="装版总时长" prop="id">
-			        <el-input v-model="formData3.装版总时长" id="装版总时长"  @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
+			  <el-row :gutter="20" style="margin-top=0px; margin-bottom: 1px;">			        
+			      <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			      <el-form-item label="装版总时长" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-input v-model="formData3.装版总时长" id="装版总时长" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
 			      </el-form-item>
 			      </el-col>
-			  	  <el-col :span="3">
-			  	  <el-form-item label="打样总工时" prop="id">
-			  		<el-input v-model="formData3.打样总工时" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
+			  	  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="打样总工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.打样总工时" style="margin-top=0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="3">
-			  	  <el-form-item label="通电工时" prop="id">
-			  		<el-input v-model="formData3.通电工时" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
+			  	  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="通电工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.通电工时" style="margin-top=0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
 			    </el-row>
 				
 				
-				<el-row :gutter="20">      
-				    <el-col :span="3">
-				    <el-form-item label="定额代号" prop="id">
-				      <el-input v-model="formData3.定额代号" id="定额代号"  @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
+				<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">      
+				    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;"> 
+				    <el-form-item label="定额代号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+				      <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
 				    </el-form-item>
 				    </el-col>
-					  <el-col :span="3">
-					  <el-form-item label="码包" prop="id">
-						<el-input v-model="formData3.码包" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
+					<el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
+					</el-col>
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="码包" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.码包" style="margin-top=0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
 					  </el-form-item>
 					  </el-col>
-					  <el-col :span="3">
-					  <el-form-item label="主电表" prop="id">
-						<el-input v-model="formData3.主电表"  id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="主电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.主电表" style="margin-top=0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>					  
-					  <el-col :span="3">
-					  <el-form-item label="辅电表" prop="id">
-						<el-input v-model="formData3.辅电表" id="辅电表"  @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="辅电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>
 				  </el-row>
 		  <div style="display: flex;">
-			  <div style="width: 136vh;">组员及分配比例</div>
-			  <div style="width: 15vh;">特殊组员</div>
+			  <div style="width: 131vh;">组员及分配比例</div>
+			  <div style="width: 13vh;">特殊组员</div>
 			  <div>拉料人员</div>
 		  </div>
-		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  <el-row :gutter="10" style="margin-top: 1vh;">
+		  	 <el-col :span="2">
 		  	   <el-input v-model="formData3.sczl_bzdh" id="bzdh"  @keydown="ent($event, '辅电表', 'bzdh', 'bh1')" :clearable="true" placeholder="ZI00401" />
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1461,14 +1561,14 @@
 			  <el-input v-model="formData3.sczl_bh10" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="getygsubmit($event, '10')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bhll" id="bh11"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
+			  <el-input v-model="formData3.sczl_bh11" id="bh11"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
 			</el-col>
 		   </el-row>
 		   
 		   
 		  
 		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  	 <el-col :span="2">
 		  
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1502,12 +1602,12 @@
 			  <el-input v-model="formData3.sczl_name10" id="name10"  @keydown="ent($event, 'name9', 'name10', 'name11')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.llname" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')" :clearable="true" placeholder="" />
+			  <el-input v-model="formData3.sczl_name11" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')" :clearable="true" placeholder="" />
 			</el-col>
 		   </el-row>
 		  
 		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  	 <el-col :span="2">
 		  	   
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1551,7 +1651,7 @@
 		     highlight-current-row="true"
 		     border
 		     style="width:100%"
-		     height="400px"
+		     height="40vh"
 		     @row-dblclick="batchaddSelectClick"
 		     :selectable="row => rowSelectable(row)"
 		     @selection-change="chanliangSelectionChange"
@@ -1598,87 +1698,6 @@
 		  </template>
 		</el-dialog>
 		
-		
-		<el-dialog
-		  v-model="ClearVisible"
-		  title="换型清场"
-		  destroy-on-close
-		  width="1300px"
-		  style="height: 115%;"
-		>
-		  
-		   
-		   <div style="display: flex;">
-		     <div style="flex: 1;">
-		       <el-aside width="250px" style="margin: 0;">
-		         <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
-		           <el-tree :data="CleartreeData" :props="defaultProps" highlight-current="true"
-		             @node-click="ClearNodeClick" @node-dblclick="ClearDoubleClick"></el-tree>
-		         </div>
-		       </el-aside>
-		     </div>
-		     <div style="flex: 1; margin: 0;">
-		      <el-tabs v-model="activeName" type="card" @tab-click="duohandleClick"   >
-		      
-		                  <el-tab-pane label="换型清场明细信息"  @click="showTable('印件资料')"   name="first">
-		                    
-							
-							
-							
-		                  </el-tab-pane>
-		      
-		                  <el-tab-pane label="当前设备换型记录" @click="showTable('工艺资料')" name="second">
-		                    <el-table ref="multipleTable"
-		                              highlight-current-row="true"
-		                              :show-overflow-tooltip="true"
-		                              :row-style="{ height: '20px' }"
-		                              :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-		                              :header-cell-style="{ padding: '0px' }"
-		                              @row-dblclick="gyupdateCompanyFunc"
-		                              :row-class-name="rowClassStyle"
-		                              style="width: 100%;height: 400px" border tooltip-effect="dark" :data="ClearData" row-key="ID" @selection-change="handleSelectionChange"
-		                              @row-click="clickybupdate">
-		                     <el-table-column type="selection" label="选择" width="55" />
-		                      
-		                      <el-table-column align="left" label="日期" prop="班组号" width="80" />
-		                      <el-table-column align="left" label="机台编号" prop="0" width="240" />
-		                      <el-table-column align="left" label="班组" prop="1" width="240" />
-		                      <el-table-column align="left" label="工单编号A" prop="2" width="240" />
-		                      <el-table-column align="left" label="印件名称A" prop="3" width="240" />
-		                      <el-table-column align="left" label="印件工序A" prop="4" width="100" />
-		                      <el-table-column align="left" label="码包号A" prop="5" width="100" />
-		                      <el-table-column align="left" label="工单编号B" prop="6" width="100" />
-		                      <el-table-column align="left" label="印件名称B" prop="7" width="100" />
-		                      <el-table-column align="left" label="印件工序B" prop="8" width="100" />
-		                      <el-table-column align="left" label="码包号B" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="菲林_标样_签样品_留样品" prop="6" width="100" />
-							  <el-table-column align="left" label="板材_纸张_电化铝_油墨" prop="7" width="100" />
-							  <el-table-column align="left" label="过版纸_废品_次品" prop="8" width="100" />
-							  <el-table-column align="left" label="半成品_成品_零头" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="操作台桌面_抽屉_地面" prop="8" width="100" />
-							  <el-table-column align="left" label="机长" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="带班长" prop="6" width="100" />
-							  <el-table-column align="left" label="质量巡查员" prop="7" width="100" />
-							  <el-table-column align="left" label="创建时间" prop="8" width="100" />
-							  <el-table-column align="left" label="UNIQID" prop="9_正品版" width="120" />
-		                    </el-table>
-		                  </el-tab-pane>
-
-		      
-		                </el-tabs>
-		     </div>
-		   </div>
-		   
-		  <!-- </el-scrollbar> -->
-		  <template #footer>
-		    <div class="dialog-footer">
-		      <el-button @click="closeDialog">取 消</el-button>
-		      <el-button type="primary" @click="chanliangenterDialog">确 定</el-button>
-		    </div>
-		  </template>
-		</el-dialog>
-		
-		
 		<Shebeizhuangtai
 		  v-if="dialogSbyxgl"
 		  v-model="dialogSbyxgl"
@@ -1715,7 +1734,9 @@ import {
   getMac,
   remodelGetTab,
   setMachineTeam,
-  ModelChangeRecord
+  ModelChangeRecord,
+  ComplaintRecord,
+  RemodelDetail
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -1773,6 +1794,7 @@ const detailData = reactive([])
 const treeData=ref([])
 const huanxingtreeData=ref([])
 const huanxingselectData = ref([])
+const huanxingData = ref({})
 const huanxingstatus=ref(false)
 const zhichengtreeData=ref([{
 	label: '首件与过程确认'
@@ -1834,7 +1856,9 @@ const ent = (event,id1,id2,id3) => {
 const huanxingNodeClick = (node) => {
   //存放当前节点的nodeId
   if(node.machine){
+	  console.log(node.label.split('/')[1])
 	  huanxingstatus.value=true
+	  remodelDetail(node.label.split('/')[1])
 	  modelChangeRecord(node.machine)
   }else{
 	  console.log('2')
@@ -1846,6 +1870,12 @@ const modelChangeRecord = async (val) => {
 	huanxingselectData.value=response.data
   }
 }
+const remodelDetail = async (val) => {
+  const response = await RemodelDetail({UniqId:val});
+  if (response.code === 0) {
+	huanxingData.value=response.data
+  }
+}
 const handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
   if(nodeData.level === 1){
@@ -1923,7 +1953,6 @@ const FacilityProduction = async () => {
 				// // console.log(sczl_name)
 	   //        }
 	   //      }
-	   console.log()
 	   const responses = await MachineDetailList({workshop:CJMC});
 	   if(responses.code===0){
 		   responses.data.map(item=>{
@@ -1945,12 +1974,16 @@ const FacilityProduction = async () => {
 const FacilityWorklist = async () => {
   const response = await facilityWorklist({machine:JTMC});
   if (response.code === 0) {
-	// console.log(response)
 	sbzyData.splice(0, sbzyData.length, ...response.data);
-	formData.value.productCode= response.data[0]['产品代号']
+	// formData.value.productCode= response.data[0]['产品代号']
+	response.data.map(item=>{
+		if(item['工单编号|质量信息'].substring(0, 7)==formData.value.工单编号){
+			formData.value.productCode=item.产品代号
+		}
+	})
 	selectData.value=[]
 	const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
-	formData.value.productCode= response.data[0]['产品代号']
+	// formData.value.productCode= response.data[0]['产品代号']
 	console.log(res)
 	if (res.code === 0) {
 	    selectData.value = res.data
@@ -2261,7 +2294,36 @@ const chanliangselectData = reactive([])
 const chanliangVisible = ref(false)
 const huanxingVisible = ref(false)
 const xunchaVisible = ref(false)
+//客诉记录
+const complaintsShow = ref(false)
+const complaintsData = ref([])
+function oncomplaints() {
+	Complaints()
+	
+}
+// 客诉记录表格填充
+const Complaints = async() => {
+	complaintsData.value=[]
+	selectedRowData.value={}
+    const res = await ComplaintRecord({productCode :formData.value.productCode})
+    if (res.msg === '成功') {
+		complaintsData.value=res.data;
+		selectedRowData.value=complaintsData.value[0]
+		complaintsShow.value=true
+    }else{
+		ElMessage({
+		  type: 'success',
+		  message: '未找到该产品客诉记录！'
+		})
+	}
+}
+const selectedRowData = ref({
 
+})
+//客诉表格单击
+const complaintshandle = (val, row) => {
+	selectedRowData.value=val
+};
 //设置机台状态
 function onstatus() {
 	dialogSbyxgl.value=true
@@ -2520,11 +2582,6 @@ const GetMachineMac = async () => {
     };
     treeData.value.push(newNode);
 	CJMC=newNode.label
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log(CJMC)
     JTMC = newNode.children[0].label;
     FacilityProduction();
   }
@@ -2640,6 +2697,7 @@ const SubmitDailyProduction = async () => {
 	sczl_bh8: formData3.value.sczl_bh8,
 	sczl_bh9: formData3.value.sczl_bh9,
 	sczl_bh10: formData3.value.sczl_bh10,
+	sczl_bh98:formData3.value.sczl_bh11,
 	sczl_rate1: formData3.value.sczl_rate1,
 	sczl_rate2: formData3.value.sczl_rate2,
 	sczl_rate3: formData3.value.sczl_rate3,
@@ -2979,6 +3037,7 @@ const formData3= ref({
 	sczl_bh8:'',
 	sczl_bh9:'',
 	sczl_bh10:'',
+	sczl_bh11:'',
 	sczl_name1:'',
 	sczl_name2:'',
 	sczl_name3:'',
@@ -2989,6 +3048,7 @@ const formData3= ref({
 	sczl_name8:'',
 	sczl_name9:'',
 	sczl_name10:'',
+	sczl_name11:'',
 	sczl_rate1:'',
 	sczl_rate2:'',
 	sczl_rate3:'',